From 72932f3d50b76f69c4d8c105296a8a7d3a4124fb Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Wed, 21 Feb 2024 15:55:54 +0800 Subject: [PATCH] feature - added theming --- Frontend/app/(admin)/blogs/[slug]/page.tsx | 19 +- Frontend/app/(admin)/blogs/page.tsx | 8 +- Frontend/app/(admin)/contact/page.tsx | 4 +- Frontend/app/(admin)/pricing/page.tsx | 97 ++++-- Frontend/app/(auth)/account/page.tsx | 2 +- Frontend/app/layout.tsx | 38 +- Frontend/app/providers.js | 5 + ...message-to-group-training-organisations.md | 30 -- .../blogs/adobe-fill-and-sign-vs-docusign.md | 42 --- .../blogs/adobe-fill-and-sign-vs-sign-now.md | 36 -- ...ating-custom-forms-a-step-by-step-guide.md | 42 --- Frontend/blogs/docusign-vs-signnow.md | 40 --- .../does-microsoft-forms-work-offline.md | 36 -- Frontend/blogs/free-group-training-forms.md | 59 ---- ...upervisor-form-processing-by-80-percent.md | 38 -- .../how-to-electronically-fill-a-document.md | 26 -- ...tup-supervisor-forms-with-workforce-one.md | 28 -- Frontend/blogs/offline-google-forms.md | 62 ---- .../blogs/sign365-vs-adobe-fill-and-sign.md | 59 ---- Frontend/blogs/sign365-vs-docusign.md | 132 ------- Frontend/blogs/sign365-vs-sign-now.md | 133 ------- ...top-5-best-document-automation-software.md | 45 --- .../your-forms-on-sign365-in-5-minutes.md | 26 -- Frontend/components/BlogCard.tsx | 10 +- Frontend/components/Button.tsx | 10 +- Frontend/components/FAQQuestion.tsx | 2 +- Frontend/components/Footer.tsx | 8 +- .../components/GetStartedSectionButton.tsx | 4 +- Frontend/components/Header.tsx | 55 ++- Frontend/components/Navigation.tsx | 6 +- Frontend/components/Utilities/Background.tsx | 14 +- .../components/Utilities/YoutubeEmbed.tsx | 2 +- Frontend/images/IconLoading.tsx | 32 +- Frontend/package-lock.json | 152 ++++---- Frontend/package.json | 2 + Frontend/sections/AccountContent.tsx | 16 +- Frontend/sections/BlogContent.tsx | 14 +- .../FormLeftDescriptionRightContactUs.tsx | 329 ++++++++---------- Frontend/sections/FeaturesBlocks.tsx | 14 +- Frontend/sections/FeaturesZigzag.tsx | 24 +- Frontend/sections/FrequentlyAsked.tsx | 2 +- .../Hero/CenterAllignedWithVideoHero.tsx | 4 +- Frontend/sections/Hero/SimpleHero.tsx | 4 +- .../sections/Hero/SquaredBackgroundHero.tsx | 36 +- .../Hero/WaitingListWithImageHero.tsx | 277 +++++++++------ Frontend/sections/HeroHome.tsx | 6 +- .../ModalLearnMore/ModalLearnMore.tsx | 4 +- .../ModalLearnMore/ModalLearnMoreForm.tsx | 166 +++++---- Frontend/sections/ModalSignIn/ModalSignIn.tsx | 21 +- .../sections/ModalSignIn/ModalSignInForm.tsx | 6 +- .../useTextsBasedOnActivityState.tsx | 32 -- Frontend/sections/ModalSignUp/ModalSignUp.tsx | 42 +-- .../sections/ModalSignUp/ModalSignUpForm.tsx | 18 +- .../sections/Newsletter/NewsletterForm.tsx | 229 ++++++------ Frontend/sections/PageHeader.tsx | 4 +- .../styles/additional-styles/range-slider.css | 57 --- Frontend/styles/additional-styles/theme.css | 152 -------- .../additional-styles/toggle-switch.css | 27 -- .../additional-styles/utility-patterns.css | 79 ----- Frontend/styles/style.css | 30 -- Frontend/tailwind.config.ts | 54 ++- Frontend/utils/colors.ts | 12 + Frontend/utils/form.ts | 16 + 63 files changed, 991 insertions(+), 1988 deletions(-) delete mode 100644 Frontend/blogs/a-founders-message-to-group-training-organisations.md delete mode 100644 Frontend/blogs/adobe-fill-and-sign-vs-docusign.md delete mode 100644 Frontend/blogs/adobe-fill-and-sign-vs-sign-now.md delete mode 100644 Frontend/blogs/creating-custom-forms-a-step-by-step-guide.md delete mode 100644 Frontend/blogs/docusign-vs-signnow.md delete mode 100644 Frontend/blogs/does-microsoft-forms-work-offline.md delete mode 100644 Frontend/blogs/free-group-training-forms.md delete mode 100644 Frontend/blogs/how-sign365-reduced-supervisor-form-processing-by-80-percent.md delete mode 100644 Frontend/blogs/how-to-electronically-fill-a-document.md delete mode 100644 Frontend/blogs/how-to-setup-supervisor-forms-with-workforce-one.md delete mode 100644 Frontend/blogs/offline-google-forms.md delete mode 100644 Frontend/blogs/sign365-vs-adobe-fill-and-sign.md delete mode 100644 Frontend/blogs/sign365-vs-docusign.md delete mode 100644 Frontend/blogs/sign365-vs-sign-now.md delete mode 100644 Frontend/blogs/top-5-best-document-automation-software.md delete mode 100644 Frontend/blogs/your-forms-on-sign365-in-5-minutes.md delete mode 100644 Frontend/sections/ModalSignIn/useTextsBasedOnActivityState.tsx delete mode 100644 Frontend/styles/additional-styles/range-slider.css delete mode 100644 Frontend/styles/additional-styles/theme.css delete mode 100644 Frontend/styles/additional-styles/toggle-switch.css delete mode 100644 Frontend/styles/additional-styles/utility-patterns.css diff --git a/Frontend/app/(admin)/blogs/[slug]/page.tsx b/Frontend/app/(admin)/blogs/[slug]/page.tsx index 18705e1..69f83bc 100644 --- a/Frontend/app/(admin)/blogs/[slug]/page.tsx +++ b/Frontend/app/(admin)/blogs/[slug]/page.tsx @@ -4,6 +4,8 @@ import { headers } from "next/headers"; import React from "react"; import Spacer from "@/components/Utilities/Spacer"; import pb from "@/lib/pocketbase"; +import Footer from "@/components/Footer"; +import Background from "@/components/Utilities/Background"; export async function generateMetadata({ params, @@ -43,10 +45,19 @@ const PostPage = async (props: any) => { requestKey: "post", }); return ( -
- - -
+
+ +
+ + +
+
+ +
); }; diff --git a/Frontend/app/(admin)/blogs/page.tsx b/Frontend/app/(admin)/blogs/page.tsx index 6550940..916e894 100644 --- a/Frontend/app/(admin)/blogs/page.tsx +++ b/Frontend/app/(admin)/blogs/page.tsx @@ -3,6 +3,7 @@ import BlogCard from "@/components/BlogCard"; import getPostMetadata from "@/utils/getPostMetaData"; import React from "react"; import Background from "@/components/Utilities/Background"; +import Footer from "@/components/Footer"; export default async function BlogsPage() { const postMetadata = await getPostMetadata(); @@ -14,7 +15,7 @@ export default async function BlogsPage() {
{/* Page sections */} @@ -23,7 +24,7 @@ export default async function BlogsPage() { subtitle={ <> {" "} -

+

Join us for the journey as we make great food. Learn and grow together

@@ -31,10 +32,11 @@ export default async function BlogsPage() { } />
-
+
{postPreviews}
+
); diff --git a/Frontend/app/(admin)/contact/page.tsx b/Frontend/app/(admin)/contact/page.tsx index 3e3aafd..a21f685 100644 --- a/Frontend/app/(admin)/contact/page.tsx +++ b/Frontend/app/(admin)/contact/page.tsx @@ -6,12 +6,12 @@ import React from "react"; const page = () => { return ( -
+
+
-
); diff --git a/Frontend/app/(admin)/pricing/page.tsx b/Frontend/app/(admin)/pricing/page.tsx index 74cf3e4..8305c07 100644 --- a/Frontend/app/(admin)/pricing/page.tsx +++ b/Frontend/app/(admin)/pricing/page.tsx @@ -11,18 +11,22 @@ import { createCheckoutSession, isAuthenticated } from "@/app/(auth)/actions"; import { toast } from "react-toastify"; import { useRouter } from "next/navigation"; import Background from "@/components/Utilities/Background"; +import Footer from "@/components/Footer"; export default function PricingPage() { const [isAnnual, setIsAnnual] = useState(false); const [products, setProducts] = useState([]); + const [isLoading, setIsLoading] = useState(true); const handleToggle = () => { setIsAnnual((prev) => !prev); }; useEffect(() => { + setIsLoading(true); (async () => { const resposeProducts: Product[] = await apiPrices(); setProducts(resposeProducts); + setIsLoading(false); })(); }, []); @@ -30,7 +34,7 @@ export default function PricingPage() {
{" "} -

+

Are you ready for fresh South West produce to be delivered to your door?

@@ -52,12 +56,21 @@ export default function PricingPage() {
- {products.map((x, i) => ( - - ))} + {isLoading ? ( + <> + + + + + ) : ( + products.map((x, i) => ( + + )) + )}
+