bender/55ec2792-1b14-419e-b10f-28e769bbf051
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_4
Branches Tags
bender:main bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

14 Commits
version_1 ... version_4

Author SHA1 Message Date
bender
8b04f5ee10 Update src/app/styles/variables.css 2026-02-17 05:05:14 +00:00
bender
5bfdfe7013 Update src/app/shop/page.tsx 2026-02-17 05:05:13 +00:00
bender
f11aec4b56 Update src/app/shop/[id]/page.tsx 2026-02-17 05:05:13 +00:00
bender
5c286eb00f Update src/app/page.tsx 2026-02-17 05:05:12 +00:00
bender
9cc97ffaaa Update src/app/blog/page.tsx 2026-02-17 05:05:11 +00:00
bender
7fecaf5c78 Merge version_3 into main 
Merge version_3 into main
 2026-02-17 05:02:27 +00:00
bender
52c04f1b39 Update src/app/styles/variables.css 2026-02-17 05:02:23 +00:00
bender
1fc68974e0 Merge version_2 into main 
Merge version_2 into main
 2026-02-17 04:59:19 +00:00
bender
5237c18342 Update src/app/styles/variables.css 2026-02-17 04:59:15 +00:00
bender
9ecbac179c Update src/app/shop/page.tsx 2026-02-17 04:59:14 +00:00
bender
c4dea4f0ea Update src/app/shop/[id]/page.tsx 2026-02-17 04:59:13 +00:00
bender
eaaab63f91 Update src/app/page.tsx 2026-02-17 04:59:13 +00:00
bender
fd605b1007 Update src/app/layout.tsx 2026-02-17 04:59:12 +00:00
bender
ef308a6ee1 Update src/app/blog/page.tsx 2026-02-17 04:59:11 +00:00
6 changed files with 47 additions and 52 deletions
Expand all files Collapse all files

8
src/app/blog/page.tsx
View File

@@ -14,12 +14,12 @@ export default function BlogPage() {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>

2
src/app/layout.tsx
View File

@@ -1263,4 +1263,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

10
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
@@ -17,12 +17,12 @@ export default function LandingPage() {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>

33
src/app/shop/[id]/page.tsx
View File

@@ -71,12 +71,12 @@ export default function ProductPage({ params }: ProductPageProps) {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
@@ -89,8 +89,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"
@@ -122,12 +121,12 @@ export default function ProductPage({ params }: ProductPageProps) {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
@@ -140,8 +139,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"
@@ -180,12 +178,12 @@ export default function ProductPage({ params }: ProductPageProps) {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
@@ -198,8 +196,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
brandName="GlowUp Beauty Clinic"

22
src/app/shop/page.tsx
View File

@@ -21,12 +21,12 @@ export default function ShopPage() {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
@@ -39,8 +39,7 @@ export default function ShopPage() {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{"text":"Book Now","href":"contact"}}
brandName="GlowUp Beauty Clinic"
@@ -71,12 +70,12 @@ export default function ShopPage() {
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
borderRadius="pill"
contentWidth="small"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="solid"
primaryButtonStyle="radial-glow"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
@@ -89,8 +88,7 @@ export default function ShopPage() {
{"name":"About","id":"about"},
{"name":"Team","id":"team"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{"text":"Book Now","href":"contact"}}
brandName="GlowUp Beauty Clinic"

24
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f3251;;
/* --background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #ff1744;;
--secondary-cta: #ffffff;;
--accent: #15479c;;
--background-accent: #a8cce8;; */
--accent: #f5c4c7;;
--background-accent: #f09199;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f3251;;
--background: #fffafa;;
--card: #fff7f7;;
--foreground: #1a0000;;
--primary-cta: #ff1744;;
--secondary-cta: #ffffff;;
--accent: #15479c;;
--background-accent: #a8cce8;;
--accent: #f5c4c7;;
--background-accent: #f09199;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);