development/035b1d0b-57aa-4a21-9b98-b36a91f0529d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:version_4
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

9 Commits
version_1 ... version_4

Author SHA1 Message Date
development
8133d04c16 Update src/app/page.tsx 2026-01-25 15:09:39 +00:00
development
4bc117e19c Update src/app/layout.tsx 2026-01-25 15:09:39 +00:00
development
41b3af69b4 Update src/app/globals.css 2026-01-25 15:09:38 +00:00
development
6d8c993caf Update src/app/page.tsx 2026-01-25 15:02:07 +00:00
development
18400dbe25 Update src/app/layout.tsx 2026-01-25 15:02:06 +00:00
development
95f5a47371 Update src/app/page.tsx 2026-01-25 13:51:42 +00:00
development
62e1a9577f Update src/app/layout.tsx 2026-01-25 13:51:41 +00:00
development
9c0f6319c1 Update src/app/globals.css 2026-01-25 13:51:40 +00:00
development
39cf01a178 Update src/app/blog/page.tsx 2026-01-25 13:51:39 +00:00
4 changed files with 27 additions and 24 deletions
Expand all files Collapse all files

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

@@ -54,7 +54,8 @@ export default function BlogPage() {
const url = `${apiUrl}/posts/${projectId}?status=published`;
const response = await fetch(url, {
method: "GET", headers: {
"Content-Type": "application/json"},
"Content-Type": "application/json"
},
});
if (response.ok) {
@@ -125,4 +126,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

28
src/app/globals.css
View File

@@ -4,21 +4,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
/* --background: #fef5f0;;
--card: #fde8dd;;
--foreground: #3d2817;;
--primary-cta: #d97c63;;
--secondary-cta: #ffffff;;
--accent: #159c49;;
--background-accent: #a8e8ba;; */
--accent: #f4a574;;
--background-accent: #e8a8a0;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1f514c;;
--background: #fef5f0;;
--card: #fde8dd;;
--foreground: #3d2817;;
--primary-cta: #d97c63;;
--secondary-cta: #ffffff;;
--accent: #159c49;;
--background-accent: #a8e8ba;;
--accent: #f4a574;;
--background-accent: #e8a8a0;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -578,7 +578,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-cormorant-garamond), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -591,5 +591,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-cormorant-garamond), sans-serif;
font-family: var(--font-inter), sans-serif;
}

11
src/app/layout.tsx
View File

@@ -1,12 +1,11 @@
import type { Metadata } from "next";
import { Cormorant_Garamond } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -31,7 +30,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={cormorantGaramond.variable}
className={inter.variable}
>
<Tag />
{children}
@@ -1257,4 +1256,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

7
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
@@ -168,6 +168,9 @@ export default function LandingPage() {
},
{
id: "2", value: "100%", title: "Quality Assurance", description: "Every frame passes rigorous quality control", imageSrc: "https://img.b2bpic.net/free-photo/craftswoman-working-workshop_107420-65196.jpg", imageAlt: "Quality inspection process"
},
{
id: "3", value: "98%", title: "Satisfaction Rate", description: "Customer approval rating across all collections", imageSrc: "https://img.b2bpic.net/free-photo/closeup-young-female-professional-making-eye-contact-against-colored-background_662251-651.jpg", imageAlt: "Satisfied customer testimonial"
}
]}
/>
@@ -231,4 +234,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}