development/6a86427e-b6da-4e5a-983b-a72b252fea0e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #2.
This commit is contained in:
development
2025-12-26 11:42:47 +00:00
parent 37f0a35b4a 559f44b0b9
commit de48c5435f
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/globals.css
View File

@@ -6,8 +6,8 @@
--background: #0a0a0a;
--card: #1a1a1a;
--foreground: #f5f0fce6;
--primary-cta: #b366ff;
--foreground: #fffef5e6;
--primary-cta: #facc15;
--secondary-cta: #1a1a1a;
--accent: #737373;
--background-accent: #737373;
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-poppins), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-poppins), sans-serif;
}

23
src/app/layout.tsx
View File

@@ -1,31 +1,32 @@
import type { Metadata } from "next";
import { Source_Code_Pro } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const sourceCodePro = Source_Code_Pro({
variable: "--font-source-code-pro",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
title: "1 - Premium Specialty Coffee",
description: "Discover exceptional specialty coffee at 1. Premium beans, expert baristas, welcoming atmosphere.",
title: "2 - Premium Specialty Coffee",
description: "Discover exceptional specialty coffee at 2. Premium beans, expert baristas, welcoming atmosphere.",
keywords: ["specialty coffee", "coffee shop", "espresso", "cafe", "artisan coffee"],
robots: {
index: true,
follow: true,
},
openGraph: {
title: "1 - Premium Specialty Coffee",
description: "Discover exceptional specialty coffee at 1",
siteName: "1",
title: "2 - Premium Specialty Coffee",
description: "Discover exceptional specialty coffee at 2",
siteName: "2",
type: "website",
images: [
{
url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766749013962-htnou8d4.jpg",
alt: "1 coffee",
alt: "2 coffee",
},
],
},
@@ -40,7 +41,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={sourceCodePro.variable}
className={poppins.variable}
>
<Tag />
{children}
@@ -1266,4 +1267,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

18
src/app/page.tsx
View File

@@ -26,7 +26,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
brandName="1"
brandName="2"
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
@@ -43,7 +43,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroLogoBillboard
logoText="1"
logoText="2"
description="Discover the perfect cup. Crafted with passion, served with care. Premium specialty coffee for coffee lovers."
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766749013962-htnou8d4.jpg"
imageAlt="Freshly brewed espresso with latte art"
@@ -60,7 +60,7 @@ export default function LandingPage() {
tagIcon={Coffee}
title="Brewing Excellence Since Day One"
description="Founded in 2015 by coffee enthusiasts who believed great coffee brings people together"
subdescription="1 Coffee Roasters"
subdescription="2 Coffee Roasters"
icon={Sparkles}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766749014990-ucar89w4.jpg"
imageAlt="Premium coffee beans selection"
@@ -73,7 +73,7 @@ export default function LandingPage() {
products={[
{
id: "1",
brand: "1",
brand: "2",
name: "Single Origin Ethiopia",
price: "$18.00",
rating: 5,
@@ -83,7 +83,7 @@ export default function LandingPage() {
},
{
id: "2",
brand: "1",
brand: "2",
name: "House Blend Espresso",
price: "$16.00",
rating: 5,
@@ -93,7 +93,7 @@ export default function LandingPage() {
},
{
id: "3",
brand: "1",
brand: "2",
name: "Seasonal Cold Brew",
price: "$15.00",
rating: 4,
@@ -144,7 +144,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterSplit
logoText="1"
logoText="2"
title="Quality Coffee, Sustainable Sourcing, Community Connection"
columns={[
{
@@ -165,11 +165,11 @@ export default function LandingPage() {
]}
contactItems={[
{ icon: Phone, text: "(555) 123-4567" },
{ icon: Mail, text: "hello@1.com" },
{ icon: Mail, text: "hello@2.com" },
{ icon: MapPin, text: "123 Coffee Lane, Brew City, BC 12345" }
]}
/>
</div>
</ThemeProvider>
);
}
}