diff --git a/Frontend/app/(admin)/blogs/page.tsx b/Frontend/app/(admin)/blogs/page.tsx index 0568774..00067c9 100644 --- a/Frontend/app/(admin)/blogs/page.tsx +++ b/Frontend/app/(admin)/blogs/page.tsx @@ -25,8 +25,8 @@ export default async function BlogsPage() { <> {" "}

- Join us for the journey as we make great food. Learn and grow - together + Take a look as we show you how to make a great PocketBase + + React App

} diff --git a/Frontend/app/(admin)/pricing/page.tsx b/Frontend/app/(admin)/pricing/page.tsx index 0a070a9..ca13440 100644 --- a/Frontend/app/(admin)/pricing/page.tsx +++ b/Frontend/app/(admin)/pricing/page.tsx @@ -22,8 +22,7 @@ export default function PricingPage() { <> {" "}

- Are you ready for fresh South West produce to be delivered to - your door? + Are you ready to save 20 hours?

} diff --git a/Frontend/app/layout.tsx b/Frontend/app/layout.tsx index 236a83a..ac72b88 100644 --- a/Frontend/app/layout.tsx +++ b/Frontend/app/layout.tsx @@ -9,10 +9,10 @@ import { cookies } from "next/headers"; import { isAuthenticated } from "@/lib/auth"; import { GTagProvider, PHProvider, ThemeProvider } from "./providers"; import PrelineScript from "@/components/Utilities/PrelineScript"; -import pb from "@/lib/pocketbase"; +import { title } from "@/constants"; -const raleway = Raleway({ - variable: "--heading-font", +const raleway = Arimo({ + variable: "--body-font", subsets: ["latin"], }); @@ -28,8 +28,8 @@ const indieFlower = Indie_Flower({ }); export const metadata: Metadata = { - title: "FastPocket", - description: "FastPocket", + title: title, + description: title, }; export default async function RootLayout({ diff --git a/Frontend/components/BlogCard.tsx b/Frontend/components/BlogCard.tsx index 88eba47..877e0c0 100644 --- a/Frontend/components/BlogCard.tsx +++ b/Frontend/components/BlogCard.tsx @@ -19,7 +19,7 @@ function BlogCard({ <>
  • - +
    • {/* Copyrights note */}
    - © {new Date().getFullYear()} Bethel Farms + © {new Date().getFullYear()} {title}
    diff --git a/Frontend/components/Logo.tsx b/Frontend/components/Logo.tsx index 4e0e72f..6379f01 100644 --- a/Frontend/components/Logo.tsx +++ b/Frontend/components/Logo.tsx @@ -1,6 +1,7 @@ import React from "react"; -import Icon from "./Icon"; +import Icon from "../images/icon.svg"; import Link from "next/link"; +import Image from "next/image"; interface LogoProps { label?: string; @@ -15,11 +16,12 @@ function Logo({ label, className }: LogoProps) { ? "https://www.youtube.com/channel/UCZzzsJK5koyqUnP4x4oXnqw" : "/" } - className={className} + className={className ?? "" + " flex flex-row items-center justify-center"} target={label !== undefined ? "_blank" : ""} > {/* Logo */} - + + Follow us on Twitter {label !== undefined ? ( {label} diff --git a/Frontend/components/PriceCard.tsx b/Frontend/components/PriceCard.tsx index 8a0736c..ccc7ee5 100644 --- a/Frontend/components/PriceCard.tsx +++ b/Frontend/components/PriceCard.tsx @@ -56,7 +56,7 @@ export default function PriceCard({ }; return (
    @@ -105,7 +105,7 @@ export default function PriceCard({ {product && ( diff --git a/Frontend/components/Utilities/Background.tsx b/Frontend/components/Utilities/Background.tsx index 0be81c1..14da941 100644 --- a/Frontend/components/Utilities/Background.tsx +++ b/Frontend/components/Utilities/Background.tsx @@ -2,7 +2,7 @@ import colors, { hexToRgb } from "@/utils/colors"; import { useTheme } from "next-themes"; -import React, { ReactNode, useEffect, useMemo, useState } from "react"; +import React, { ReactNode, useEffect, useState } from "react"; const Background = ({ children }: { children: ReactNode }) => { const { theme } = useTheme(); @@ -25,7 +25,7 @@ const Background = ({ children }: { children: ReactNode }) => {
    {children} diff --git a/Frontend/constants/index.ts b/Frontend/constants/index.ts index 009fddf..54fc3b1 100644 --- a/Frontend/constants/index.ts +++ b/Frontend/constants/index.ts @@ -4,4 +4,6 @@ export const companySizeList = [ "30-70 employees", "70-100 employees", "100+ employees" -] \ No newline at end of file +] + +export const title = "FastPocket" \ No newline at end of file diff --git a/Frontend/images/icon.svg b/Frontend/images/icon.svg index 878cfd4..0ab689c 100644 --- a/Frontend/images/icon.svg +++ b/Frontend/images/icon.svg @@ -1,4 +1,4 @@ - - + + + diff --git a/Frontend/public/images/circuit.svg b/Frontend/public/images/circuit.svg new file mode 100644 index 0000000..09ea9fb --- /dev/null +++ b/Frontend/public/images/circuit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Frontend/sections/BlogContent.tsx b/Frontend/sections/BlogContent.tsx index 7fccf59..ee04505 100644 --- a/Frontend/sections/BlogContent.tsx +++ b/Frontend/sections/BlogContent.tsx @@ -3,7 +3,7 @@ import Image from "next/image"; function BlogContent({ post }: { post: any }) { return ( -
    +

    {post.title}

    diff --git a/Frontend/sections/ContactUs/FormLeftDescriptionRightContactUs.tsx b/Frontend/sections/ContactUs/FormLeftDescriptionRightContactUs.tsx index 9255c9a..d2abc87 100644 --- a/Frontend/sections/ContactUs/FormLeftDescriptionRightContactUs.tsx +++ b/Frontend/sections/ContactUs/FormLeftDescriptionRightContactUs.tsx @@ -48,7 +48,7 @@ const FormLeftDescriptionRightContactUs = () => {
    {/* Card */} -
    +

    Fill in the form

    diff --git a/Frontend/sections/Hero/SquaredBackgroundHero.tsx b/Frontend/sections/Hero/SquaredBackgroundHero.tsx index 00f56c8..f3f1faa 100644 --- a/Frontend/sections/Hero/SquaredBackgroundHero.tsx +++ b/Frontend/sections/Hero/SquaredBackgroundHero.tsx @@ -1,3 +1,4 @@ +import { title } from "@/constants"; import React from "react"; const SquaredBackgroundHero = () => { @@ -11,7 +12,7 @@ const SquaredBackgroundHero = () => {

    Start your journey with{" "} - FastPocket + {title}

    Hand-picked professionals and expertly crafted components, diff --git a/Frontend/sections/Hero/WaitingListWithImageHero.tsx b/Frontend/sections/Hero/WaitingListWithImageHero.tsx index 70b5b3f..b8da7a5 100644 --- a/Frontend/sections/Hero/WaitingListWithImageHero.tsx +++ b/Frontend/sections/Hero/WaitingListWithImageHero.tsx @@ -8,6 +8,8 @@ import Icon from "@/components/Icon"; import Footer from "@/components/Footer"; import Background from "@/components/Utilities/Background"; import { toast } from "react-toastify"; +import { title } from "@/constants"; +import Logo from "@/components/Logo"; const WaitingListWithImageHero = () => { const { @@ -44,16 +46,18 @@ const WaitingListWithImageHero = () => { return (

    -
    -

    - - Bethel Farms +
    +

    + + {title}

    {typeof window !== "undefined" && !localStorage.getItem("waitinglist") ? ( <> -

    - Get notified when we launch +

    + Finish Your React + + PocketBase project, With A{" "} + Head Start

    @@ -169,7 +173,10 @@ const WaitingListWithImageHero = () => {
    -