bender/b59c0aaa-5097-4f9a-bb3f-8157421ee4ae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: 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
...
pull from: bender:version_6
Branches Tags
bender:main bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

12 Commits
version_4 ... version_6

Author SHA1 Message Date
bender
1d7e0e7fe4 Update src/app/page.tsx 2026-03-02 10:25:07 +00:00
bender
5dca1fa1f9 Update theme colors 2026-03-02 10:23:11 +00:00
bender
e896b9e3a3 Update src/app/page.tsx 2026-03-02 10:19:58 +00:00
bender
112ded484f Update src/app/layout.tsx 2026-03-02 10:19:57 +00:00
bender
61556f6a7b Update src/app/bagels/page.tsx 2026-03-02 10:19:56 +00:00
bender
529ad05bbc Merge version_5 into main 
Merge version_5 into main
 2026-03-02 10:17:45 +00:00
bender
4f952292e2 Update src/app/styles/variables.css 2026-03-02 10:17:40 +00:00
bender
4174384e86 Update src/app/page.tsx 2026-03-02 10:17:39 +00:00
bender
372190f49b Update src/app/layout.tsx 2026-03-02 10:17:38 +00:00
bender
9fddaa981e Update src/app/bagels/page.tsx 2026-03-02 10:17:37 +00:00
bender
23432529c9 Merge version_4 into main 
Merge version_4 into main
 2026-03-02 10:08:25 +00:00
bender
1dacb1fad8 Merge version_4 into main 
Merge version_4 into main
 2026-03-02 10:01:14 +00:00
4 changed files with 31 additions and 54 deletions
Expand all files Collapse all files

2
src/app/bagels/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo'; import ProductCardTwo from '@/components/sections/product/ProductCardTwo';

41
src/app/layout.tsx
View File

@@ -1,45 +1,23 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Montserrat } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import "./styles/variables.css";
import Tag from "@/tag/Tag"; import "./styles/base.css";
const montserrat = Montserrat({ const inter = Inter({ subsets: ["latin"] });
variable: "--font-montserrat", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Artisan Coffee Co. | Premium Coffee in San Francisco", description: "Discover freshly roasted, expertly crafted coffee in the heart of San Francisco. Visit our cafe for premium espresso, single-origin pour overs, and exceptional service.", keywords: ["coffee shop", "San Francisco", "artisan coffee", "specialty coffee", "espresso", "cafe", "premium roasted beans"], title: "Artisan Coffee Co.", description: "Premium artisan coffee, freshly roasted and expertly prepared"
robots: {
index: true,
follow: true
},
openGraph: {
title: "Artisan Coffee Co. | Premium Coffee in San Francisco", description: "Discover freshly roasted, expertly crafted coffee in the heart of San Francisco.", type: "website", siteName: "Artisan Coffee Co.", images: [
{
url: "http://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg", alt: "Artisan Coffee Co. - San Francisco"
}
]
},
twitter: {
card: "summary_large_image", title: "Artisan Coffee Co. | Premium Coffee in San Francisco", description: "Discover freshly roasted, expertly crafted coffee in the heart of San Francisco.", images: ["http://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg"]
}
}; };
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={inter.className}>{children}
<body
className={`${montserrat.variable} antialiased`}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1407,7 +1385,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroSplit from '@/components/sections/hero/HeroSplit'; import HeroSplit from '@/components/sections/hero/HeroSplit';
@@ -43,7 +43,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroSplit <HeroSplit
title="Freshly Roasted Coffee" title="i"
description="Welcome to Artisan Coffee Co., where we believe in the perfect cup. Every bean is carefully selected, roasted to perfection, and prepared with passion by our experienced baristas." description="Welcome to Artisan Coffee Co., where we believe in the perfect cup. Every bean is carefully selected, roasted to perfection, and prepared with passion by our experienced baristas."
tag="Premium Artisan Coffee" tag="Premium Artisan Coffee"
tagIcon={Coffee} tagIcon={Coffee}

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

@@ -2,23 +2,23 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f7f6f7;; /* --background: #000000;;;
--card: #ffffff;; --card: #1a1a1a;;;
--foreground: #25190c;; --foreground: #ffffff;;;
--primary-cta: #ff6207;; --primary-cta: #ff6207;;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;;
--accent: #ffce93;; --accent: #ff6207;;;
--background-accent: #e8cfa8;; */ --background-accent: #ff6207;;; */
--background: #f7f6f7;; --background: #000000;;;
--card: #ffffff;; --card: #1a1a1a;;;
--foreground: #25190c;; --foreground: #ffffff;;;
--primary-cta: #ff6207;; --primary-cta: #ff6207;;;
--primary-cta-text: #f7f6f7;; --primary-cta-text: #f7f6f7;;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;;
--secondary-cta-text: #25190c;; --secondary-cta-text: #ffffff;;;
--accent: #ffce93;; --accent: #ff6207;;;
--background-accent: #e8cfa8;; --background-accent: #ff6207;;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);