Merge version_2 into main #4

Merged
bender merged 4 commits from version_2 into main 2026-04-03 10:23:53 +00:00
4 changed files with 65 additions and 343 deletions

View File

@@ -6,40 +6,28 @@ import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
import FooterMedia from '@/components/sections/footer/FooterMedia';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
export default function LandingPage() {
export default function AboutPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultButtonVariant="none"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="smallMedium"
sizing="large"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="medium"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Start",
id: "/",
},
{
name: "Tjänster",
id: "/tjänster",
},
{
name: "Pink Store",
id: "/pink-store",
},
{
name: "Om oss",
id: "/om-oss",
},
{ name: "Start", id: "/" },
{ name: "Tjänster", id: "/tjänster" },
{ name: "Pink Store", id: "/pink-store" },
{ name: "Om oss", id: "/om-oss" },
]}
brandName="Söderlings"
/>
@@ -55,48 +43,21 @@ export default function LandingPage() {
description="Från en liten salong 1954 till det vi är idag."
features={[
{
title: "Etablerad 1954",
description: "Vi har varit en del av Vällingby City i över 70 år.",
imageSrc: "http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg?_wi=6",
},
title: "Etablerad 1954", description: "Vi har varit en del av Vällingby City i över 70 år.", imageSrc: "https://img.b2bpic.net/free-photo/hairdresser-tools-salon_23-2148705008.jpg"},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg?_wi=7"
imageSrc="https://img.b2bpic.net/free-photo/hairdresser-salon-interior_23-2148705018.jpg"
columns={[
{
title: "Söderlings",
items: [
{
label: "Vällingbyplan 3",
href: "#",
},
{
label: "08-87 06 05",
href: "tel:08870605",
},
],
},
{
title: "Länkar",
items: [
{
label: "Start",
href: "/",
},
{
label: "Boka tid",
href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591",
},
],
},
{ title: "Söderlings", items: [{ label: "Vällingbyplan 3", href: "#" }, { label: "08-87 06 05", href: "tel:08870605" }] },
{ title: "Länkar", items: [{ label: "Start", href: "/" }, { label: "Boka tid", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" }] },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -14,37 +14,25 @@ import { Award, Calendar, Scissors, UserCheck } from "lucide-react";
export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultButtonVariant="none"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="smallMedium"
sizing="large"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="medium"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Start",
id: "/",
},
{
name: "Tjänster",
id: "/tjänster",
},
{
name: "Pink Store",
id: "/pink-store",
},
{
name: "Om oss",
id: "/om-oss",
},
{ name: "Start", id: "/" },
{ name: "Tjänster", id: "/tjänster" },
{ name: "Pink Store", id: "/pink-store" },
{ name: "Om oss", id: "/om-oss" },
]}
brandName="Söderlings"
/>
@@ -52,22 +40,14 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroLogoBillboard
background={{
variant: "sparkles-gradient",
}}
background={{ variant: "sparkles-gradient" }}
logoText="Söderlings Frisersalong"
description="En av de äldsta och största salongerna i Vällingby City — grundad 1954."
buttons={[
{
text: "Ring & boka: 08-87 06 05",
href: "tel:08870605",
},
{
text: "Boka Pink Store online",
href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591",
},
{ text: "Ring & boka: 08-87 06 05", href: "tel:08870605" },
{ text: "Boka Pink Store online", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" },
]}
imageSrc="http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/hairdresser-cutting-hair-customer-salon_23-2148705001.jpg"
mediaAnimation="slide-up"
/>
</div>
@@ -77,26 +57,10 @@ export default function LandingPage() {
useInvertedBackground={false}
title="Vårt arv i siffror"
metrics={[
{
icon: Award,
label: "Års erfarenhet",
value: "70+",
},
{
icon: Calendar,
label: "Dagar öppet",
value: "7",
},
{
icon: Scissors,
label: "Salonger under ett tak",
value: "2",
},
{
icon: UserCheck,
label: "Dropp-in välkommen",
value: "Ja",
},
{ icon: Award, label: "Års erfarenhet", value: "70+" },
{ icon: Calendar, label: "Dagar öppet", value: "7" },
{ icon: Scissors, label: "Salonger under ett tak", value: "2" },
{ icon: UserCheck, label: "Dropp-in välkommen", value: "Ja" },
]}
metricsAnimation="slide-up"
/>
@@ -111,38 +75,9 @@ export default function LandingPage() {
title="Vad våra kunder säger"
description="Här är några av de fina orden våra stammisar delat med sig av genom åren."
testimonials={[
{
id: "t1",
name: "Maria L.",
role: "Stammis",
company: "Vällingby",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/set-combs-scissors_23-2148352908.jpg?_wi=1",
},
{
id: "t2",
name: "Johan P.",
role: "Kund",
company: "Vällingby",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/women-with-creative-colored-hair_633478-184.jpg?_wi=1",
},
{
id: "t3",
name: "Sara B.",
role: "Kund",
company: "Hässelby",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/client-manicure-appointment-holding-hand-bowl_23-2149171320.jpg?_wi=1",
},
{
id: "t4",
name: "Erik S.",
role: "Stammis",
company: "Vällingby",
rating: 4,
imageSrc: "http://img.b2bpic.net/free-photo/set-combs-scissors_23-2148352908.jpg?_wi=2",
},
{ id: "t1", name: "Maria L.", role: "Stammis", company: "Vällingby", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/hairdresser-styling-hair-salon_23-2148705005.jpg" },
{ id: "t2", name: "Johan P.", role: "Kund", company: "Vällingby", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/barber-cutting-hair-client_23-2148705012.jpg" },
{ id: "t3", name: "Sara B.", role: "Kund", company: "Hässelby", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/woman-at-hair-salon_23-2148705003.jpg" },
]}
/>
</div>
@@ -156,38 +91,12 @@ export default function LandingPage() {
description="Kvalitet i varje detalj, tillgängligt för alla."
plans={[
{
id: "p1",
tag: "Populär",
price: "650 kr",
period: "från",
description: "Klassisk klippning anpassad efter din stil.",
button: {
text: "Boka tid",
href: "https://www.bokadirekt.se/",
},
featuresTitle: "Ingår",
features: [
"Tvätt & massage",
"Skräddarsydd rådgivning",
"Styling",
],
id: "p1", tag: "Populär", price: "650 kr", period: "från", description: "Klassisk klippning anpassad efter din stil.", button: { text: "Boka tid", href: "https://www.bokadirekt.se/" },
featuresTitle: "Ingår", features: ["Tvätt & massage", "Skräddarsydd rådgivning", "Styling"]
},
{
id: "p2",
tag: "Lyx",
price: "1200 kr",
period: "från",
description: "Fullständig färgbehandling för en ny look.",
button: {
text: "Boka tid",
href: "https://www.bokadirekt.se/",
},
featuresTitle: "Ingår",
features: [
"Färgning",
"Inpackning",
"Fön & Styling",
],
id: "p2", tag: "Lyx", price: "1200 kr", period: "från", description: "Fullständig färgbehandling för en ny look.", button: { text: "Boka tid", href: "https://www.bokadirekt.se/" },
featuresTitle: "Ingår", features: ["Färgning", "Inpackning", "Fön & Styling"]
},
]}
/>
@@ -196,9 +105,7 @@ export default function LandingPage() {
<div id="contact-info" data-section="contact-info">
<ContactCenter
useInvertedBackground={false}
background={{
variant: "rotated-rays-static-grid",
}}
background={{ variant: "rotated-rays-static-grid" }}
tag="Kontakt"
title="Hitta till oss"
description="Vällingbyplan 3, Vällingby. Varmt välkomna!"
@@ -207,38 +114,14 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/hairdresser-working-client-salon_23-2148705015.jpg"
columns={[
{
title: "Söderlings",
items: [
{
label: "Vällingbyplan 3",
href: "#",
},
{
label: "08-87 06 05",
href: "tel:08870605",
},
],
},
{
title: "Länkar",
items: [
{
label: "Start",
href: "/",
},
{
label: "Boka tid",
href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591",
},
],
},
{ title: "Söderlings", items: [{ label: "Vällingbyplan 3", href: "#" }, { label: "08-87 06 05", href: "tel:08870605" }] },
{ title: "Länkar", items: [{ label: "Start", href: "/" }, { label: "Boka tid", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" }] },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -7,40 +7,28 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
export default function LandingPage() {
export default function PinkStorePage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultButtonVariant="none"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="smallMedium"
sizing="large"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="medium"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{
name: "Start",
id: "/",
},
{
name: "Tjänster",
id: "/tjänster",
},
{
name: "Pink Store",
id: "/pink-store",
},
{
name: "Om oss",
id: "/om-oss",
},
{ name: "Start", id: "/" },
{ name: "Tjänster", id: "/tjänster" },
{ name: "Pink Store", id: "/pink-store" },
{ name: "Om oss", id: "/om-oss" },
]}
brandName="Söderlings"
/>
@@ -53,90 +41,24 @@ export default function LandingPage() {
gridVariant="bento-grid"
useInvertedBackground={false}
products={[
{
id: "n1",
name: "Nagelförlängning",
price: "fr. 850 kr",
variant: "Skönhet",
imageSrc: "http://img.b2bpic.net/free-photo/client-manicure-appointment-holding-hand-bowl_23-2149171320.jpg?_wi=2",
},
{
id: "n2",
name: "Klassisk Manikyr",
price: "450 kr",
variant: "Naglar",
imageSrc: "http://img.b2bpic.net/free-photo/client-manicure-appointment-holding-hand-bowl_23-2149171320.jpg?_wi=3",
},
{
id: "n3",
name: "Gellack",
price: "600 kr",
variant: "Naglar",
imageSrc: "http://img.b2bpic.net/free-photo/client-manicure-appointment-holding-hand-bowl_23-2149171320.jpg?_wi=4",
},
{ id: "n1", name: "Nagelförlängning", price: "fr. 850 kr", variant: "Skönhet", imageSrc: "https://img.b2bpic.net/free-photo/manicure-salon-tools_23-2148705022.jpg" },
{ id: "n2", name: "Klassisk Manikyr", price: "450 kr", variant: "Naglar", imageSrc: "https://img.b2bpic.net/free-photo/manicure-session_23-2148705025.jpg" },
]}
title="Pink Store Skönhet"
description="Allt för dina naglar och hudvård under samma tak."
/>
</div>
<div id="feature" data-section="feature">
<FeatureCardOne
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Exklusiva produkter"
description="Vi handplockar de bästa märkena för ditt hemmaspa."
features={[
{
title: "Nagelvård",
description: "Professionella produkter för att behålla salongskänslan hemma.",
imageSrc: "http://img.b2bpic.net/free-photo/client-manicure-appointment-holding-hand-bowl_23-2149171320.jpg?_wi=5",
},
{
title: "Hudvård",
description: "Skonsamma och effektiva produkter för varje hudtyp.",
imageSrc: "http://img.b2bpic.net/free-photo/women-with-creative-colored-hair_633478-184.jpg?_wi=4",
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/beauty-salon-interior_23-2148705030.jpg"
columns={[
{
title: "Söderlings",
items: [
{
label: "Vällingbyplan 3",
href: "#",
},
{
label: "08-87 06 05",
href: "tel:08870605",
},
],
},
{
title: "Länkar",
items: [
{
label: "Start",
href: "/",
},
{
label: "Boka tid",
href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591",
},
],
},
{ title: "Söderlings", items: [{ label: "Vällingbyplan 3", href: "#" }, { label: "08-87 06 05", href: "tel:08870605" }] },
{ title: "Länkar", items: [{ label: "Start", href: "/" }, { label: "Boka tid", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" }] },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -2,7 +2,6 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
import FooterMedia from '@/components/sections/footer/FooterMedia';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -11,15 +10,15 @@ import { Palette, Scissors } from "lucide-react";
export default function TjänsterPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultButtonVariant="none"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="smallMedium"
sizing="large"
background="circleGradient"
cardStyle="gradient-bordered"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
headingFontWeight="medium"
>
<ReactLenis root>
@@ -42,70 +41,27 @@ export default function TjänsterPage() {
useInvertedBackground={false}
features={[
{
id: "f1", title: "Klippning", description: "Från snagg till avancerad långhårsklippning.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/set-combs-scissors_23-2148352908.jpg?_wi=1", imageAlt: "luxury salon dark interior golden details"
},
items: [
{ icon: Scissors, text: "Herrklippning" },
{ icon: Scissors, text: "Damklippning" },
{ icon: Scissors, text: "Ungdomsklippning" },
],
id: "f1", title: "Klippning", description: "Från snagg till avancerad långhårsklippning.",
media: { imageSrc: "https://img.b2bpic.net/free-photo/hair-salon-professional_23-2148705035.jpg" },
items: [{ icon: Scissors, text: "Herrklippning" }, { icon: Scissors, text: "Damklippning" }],
reverse: false
},
{
id: "f2", title: "Färg & Styling", description: "Allt från balayage till permanent.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/women-with-creative-colored-hair_633478-184.jpg?_wi=1", imageAlt: "professional haircut salon tools"
},
items: [
{ icon: Palette, text: "Slingor & Balayage" },
{ icon: Palette, text: "Färgbehandlingar" },
{ icon: Palette, text: "Styling & Fön" },
],
reverse: true
},
]}
title="Våra Tjänster"
description="Vi erbjuder ett brett utbud av hår- och skönhetstjänster utförda av erfarna proffs."
/>
</div>
<div id="feature" data-section="feature">
<FeatureCardOne
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Vår filosofi"
description="Vi kombinerar modern teknik med gediget hantverk."
features={[
{
title: "Precision", description: "Varje klippning utförs med högsta precision för en hållbar look.", imageSrc: "http://img.b2bpic.net/free-photo/set-combs-scissors_23-2148352908.jpg?_wi=2"},
{
title: "Kreativitet", description: "Våra stylister älskar att experimentera med färg och form.", imageSrc: "http://img.b2bpic.net/free-photo/women-with-creative-colored-hair_633478-184.jpg?_wi=2"},
]}
description="Vi erbjuder ett brett utbud av hår- och skönhetstjänster."
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/luxury-coffee-shop-table-inside-barista-bar-generated-by-ai_188544-29280.jpg"
imageSrc="https://img.b2bpic.net/free-photo/hair-salon-interior_23-2148705040.jpg"
columns={[
{
title: "Söderlings", items: [
{ label: "Vällingbyplan 3", href: "#" },
{ label: "08-87 06 05", href: "tel:08870605" },
],
},
{
title: "Länkar", items: [
{ label: "Start", href: "/" },
{ label: "Boka tid", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" },
],
},
{ title: "Söderlings", items: [{ label: "Vällingbyplan 3", href: "#" }, { label: "08-87 06 05", href: "tel:08870605" }] },
{ title: "Länkar", items: [{ label: "Start", href: "/" }, { label: "Boka tid", href: "https://www.bokadirekt.se/places/sderlings-pinkstore-8591" }] },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}