bender/39b1c1b9-79d3-4667-a744-12ac5be31ca3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 5 commits from version_1 into main 2026-03-13 16:50:13 +00:00
Conversation 0 Commits 5 Files Changed 5 +76 -37
5 changed files with 76 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/about/page.tsx
View File

@@ -106,7 +106,7 @@ export default function AboutPage() {
icon: CheckCircle,
},
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm"
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=3"
imageAlt="Our skilled baking team at work in the GLO-BAKE kitchen"
mediaAnimation="opacity"
imagePosition="right"
@@ -160,7 +160,7 @@ export default function AboutPage() {
role: "Regular Customer",
company: "Pretoria",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=3",
imageAlt: "Sarah testimonial",
},
{
@@ -169,7 +169,7 @@ export default function AboutPage() {
role: "Event Planner",
company: "Pretoria Events",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=3",
imageAlt: "John testimonial",
},
{
@@ -178,7 +178,7 @@ export default function AboutPage() {
role: "Business Owner",
company: "Pretoria Central",
rating: 4,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik&_wi=2",
imageAlt: "Amelia testimonial",
},
{
@@ -187,7 +187,7 @@ export default function AboutPage() {
role: "Family Man",
company: "Pretoria North",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp&_wi=2",
imageAlt: "Michael testimonial",
},
{
@@ -196,7 +196,7 @@ export default function AboutPage() {
role: "Regular Customer",
company: "Pretoria",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=4",
imageAlt: "Linda testimonial",
},
{
@@ -205,7 +205,7 @@ export default function AboutPage() {
role: "Corporate Manager",
company: "Pretoria CBD",
rating: 4,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=4",
imageAlt: "David testimonial",
},
]}

6
src/app/custom-cake-orders/page.tsx
View File

@@ -95,11 +95,11 @@ export default function CustomCakeOrdersPage() {
buttonAnimation="slide-up"
mediaItems={[
{
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng&_wi=2",
imageAlt: "beautiful birthday cake celebration",
},
{
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco&_wi=2",
imageAlt: "elegant celebration cake special",
},
]}
@@ -153,7 +153,7 @@ export default function CustomCakeOrdersPage() {
icon: CheckCircle,
},
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco"
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco&_wi=3"
imageAlt="Beautiful custom celebration cake"
mediaAnimation="opacity"
imagePosition="right"

55
src/app/layout.tsx
View File

@@ -1,18 +1,22 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Poppins } from "next/font/google";
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
title: "Webild components 2",
description: "Generated by create next app",
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const poppins = Poppins({
variable: "--font-poppins",
@@ -20,6 +24,39 @@ const poppins = Poppins({
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
title: "GLO-BAKE - Fresh Bread & Cakes Pretoria",
description: "Fresh bread, custom cakes, and delicious pastries baked daily in Pretoria. Order now or call +27 12 345 6789.",
keywords: "bakery Pretoria, fresh bread Pretoria, birthday cakes Pretoria, cake shop near me, local bakery Pretoria CBD",
metadataBase: new URL("https://glo-bake.co.za"),
alternates: {
canonical: "https://glo-bake.co.za",
},
openGraph: {
title: "GLO-BAKE - Fresh Bread & Cakes Baked Daily",
description: "Discover fresh artisan bread, custom cakes, and delicious pastries at GLO-BAKE in Pretoria.",
url: "https://glo-bake.co.za",
siteName: "GLO-BAKE",
type: "website",
images: [
{
url: "https://glo-bake.co.za/og-image.jpg",
alt: "Fresh bread and pastries from GLO-BAKE bakery",
},
],
},
twitter: {
card: "summary_large_image",
title: "GLO-BAKE - Fresh Bread & Cakes Pretoria",
description: "Fresh baked goods made daily with quality ingredients.",
images: ["https://glo-bake.co.za/twitter-image.jpg"],
},
robots: {
index: true,
follow: true,
},
};
export default function RootLayout({
children,
}: Readonly<{
@@ -28,7 +65,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${poppins.variable} antialiased`}>
<body
className={`${halant.variable} ${inter.variable} ${poppins.variable} antialiased`}
>
<Tag />
{children}
<script
@@ -40,4 +79,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

12
src/app/our-baked-goods/page.tsx
View File

@@ -95,11 +95,11 @@ export default function OurBakedGoodsPage() {
buttonAnimation="slide-up"
mediaItems={[
{
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=4",
imageAlt: "artisan fresh bread loaf",
},
{
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=2",
imageAlt: "delicious pastries variety bakery",
},
]}
@@ -122,28 +122,28 @@ export default function OurBakedGoodsPage() {
id: "bread-1",
name: "Fresh Sourdough Bread",
price: "R45",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=5",
imageAlt: "Fresh artisan sourdough bread",
},
{
id: "pastry-1",
name: "Fresh Pastries & Desserts",
price: "From R25",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=3",
imageAlt: "Delicious assorted pastries",
},
{
id: "bread-2",
name: "Rolls & Sandwich Bread",
price: "From R35",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v&_wi=2",
imageAlt: "Fresh sandwich bread rolls",
},
{
id: "daily-1",
name: "Daily Baked Goods",
price: "From R20",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0&_wi=2",
imageAlt: "Daily bakery items",
},
]}

26
src/app/page.tsx
View File

@@ -145,7 +145,7 @@ export default function HomePage() {
id: "bread-1",
name: "Fresh Sourdough Bread",
price: "R45",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=1",
imageAlt: "Fresh artisan sourdough bread",
isFavorited: false,
},
@@ -153,7 +153,7 @@ export default function HomePage() {
id: "cake-1",
name: "Birthday Cakes",
price: "From R250",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=vqqfng&_wi=1",
imageAlt: "Beautiful custom birthday cake",
isFavorited: false,
},
@@ -161,7 +161,7 @@ export default function HomePage() {
id: "cake-2",
name: "Custom Celebration Cakes",
price: "From R350",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=5gvsco&_wi=1",
imageAlt: "Elegant celebration cake",
isFavorited: false,
},
@@ -169,7 +169,7 @@ export default function HomePage() {
id: "pastry-1",
name: "Fresh Pastries & Desserts",
price: "From R25",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=o42xrg&_wi=1",
imageAlt: "Delicious assorted pastries",
isFavorited: false,
},
@@ -177,7 +177,7 @@ export default function HomePage() {
id: "bread-2",
name: "Rolls & Sandwich Bread",
price: "From R35",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=6ha69v&_wi=1",
imageAlt: "Fresh sandwich bread rolls",
isFavorited: false,
},
@@ -185,7 +185,7 @@ export default function HomePage() {
id: "daily-1",
name: "Daily Baked Goods",
price: "From R20",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=37yav0&_wi=1",
imageAlt: "Daily bakery items",
isFavorited: false,
},
@@ -247,7 +247,7 @@ export default function HomePage() {
icon: CheckCircle,
},
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm"
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=620ojm&_wi=2"
imageAlt="Fresh artisan bread at GLO-BAKE"
mediaAnimation="opacity"
imagePosition="right"
@@ -272,7 +272,7 @@ export default function HomePage() {
role: "Regular Customer",
company: "Pretoria",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=1",
imageAlt: "Sarah testimonial",
},
{
@@ -281,7 +281,7 @@ export default function HomePage() {
role: "Event Planner",
company: "Pretoria Events",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=1",
imageAlt: "John testimonial",
},
{
@@ -290,7 +290,7 @@ export default function HomePage() {
role: "Business Owner",
company: "Pretoria Central",
rating: 4,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=2wjhik&_wi=1",
imageAlt: "Amelia testimonial",
},
{
@@ -299,7 +299,7 @@ export default function HomePage() {
role: "Family Man",
company: "Pretoria North",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=nw5byp&_wi=1",
imageAlt: "Michael testimonial",
},
{
@@ -308,7 +308,7 @@ export default function HomePage() {
role: "Regular Customer",
company: "Pretoria",
rating: 5,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9kggst&_wi=2",
imageAlt: "Linda testimonial",
},
{
@@ -317,7 +317,7 @@ export default function HomePage() {
role: "Corporate Manager",
company: "Pretoria CBD",
rating: 4,
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=u072uy&_wi=2",
imageAlt: "David testimonial",
},
]}