diff --git a/Frontend/app/(admin)/actions.ts b/Frontend/app/(admin)/actions.ts deleted file mode 100644 index bb3a287..0000000 --- a/Frontend/app/(admin)/actions.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { cookies } from "next/headers"; - -export async function setCookie(key: string, value: string) { - const cookieStore = cookies() - cookieStore.set(key, value) - } -export async function removeCookie(key: string) { - const cookieStore = cookies() - cookieStore.delete(key) - } -export async function getCookie(key: string) { - const cookieStore = cookies() - return cookieStore.get(key) -} \ No newline at end of file diff --git a/Frontend/app/(auth)/account/page.tsx b/Frontend/app/(authenticated)/account/page.tsx similarity index 100% rename from Frontend/app/(auth)/account/page.tsx rename to Frontend/app/(authenticated)/account/page.tsx diff --git a/Frontend/app/(admin)/blogs/[slug]/page.tsx b/Frontend/app/(public)/blogs/[slug]/page.tsx similarity index 100% rename from Frontend/app/(admin)/blogs/[slug]/page.tsx rename to Frontend/app/(public)/blogs/[slug]/page.tsx diff --git a/Frontend/app/(admin)/blogs/page.tsx b/Frontend/app/(public)/blogs/page.tsx similarity index 100% rename from Frontend/app/(admin)/blogs/page.tsx rename to Frontend/app/(public)/blogs/page.tsx diff --git a/Frontend/app/(admin)/contact/page.tsx b/Frontend/app/(public)/contact/page.tsx similarity index 100% rename from Frontend/app/(admin)/contact/page.tsx rename to Frontend/app/(public)/contact/page.tsx diff --git a/Frontend/app/(admin)/layout.tsx b/Frontend/app/(public)/layout.tsx similarity index 100% rename from Frontend/app/(admin)/layout.tsx rename to Frontend/app/(public)/layout.tsx diff --git a/Frontend/app/(admin)/pricing/actions.ts b/Frontend/app/(public)/pricing/actions.ts similarity index 100% rename from Frontend/app/(admin)/pricing/actions.ts rename to Frontend/app/(public)/pricing/actions.ts diff --git a/Frontend/app/(admin)/pricing/page.tsx b/Frontend/app/(public)/pricing/page.tsx similarity index 100% rename from Frontend/app/(admin)/pricing/page.tsx rename to Frontend/app/(public)/pricing/page.tsx diff --git a/Frontend/app/(auth)/actions.ts b/Frontend/app/actions.ts similarity index 97% rename from Frontend/app/(auth)/actions.ts rename to Frontend/app/actions.ts index f1483bc..15887c2 100644 --- a/Frontend/app/(auth)/actions.ts +++ b/Frontend/app/actions.ts @@ -6,7 +6,7 @@ import { cookies } from "next/headers"; import CryptoJS from 'crypto-js'; import { CheckoutSession, SignUpForm, SourceModal, Subscription, SubscriptionSession, User } from "@/types"; -import { apiPrices } from "../(admin)/pricing/actions"; +import { apiPrices } from "./(public)/pricing/actions"; export async function mailchimp(formData: { email: string; @@ -58,7 +58,7 @@ export async function signup(formData: SignUpForm) { const email = formData.email; const password = formData.password; const organisation = formData.organisation; - console.log('app/(auth)/actions', 'organisation', organisation) + console.log('app/(authenticated)/actions', 'organisation', organisation) const pocketbaseUrl = process.env.NEXT_PUBLIC_POCKETBASE_URL_STRING as string; const adminToken = process.env.NEXT_PUBLIC_POCKETBASE_ADMIN_TOKEN as string; try { @@ -230,7 +230,7 @@ export async function getSubscriptions() { pb.authStore.loadFromCookie(cookie?.value || ''); const userId = (pb.authStore.model as User).id const subscriptions = await pb.collection("subscription").getFullList({filter: `user_id="${userId}" && status="active"`}); - console.log('app/(auth)/actions', 'subscriptions', subscriptions) + console.log('app/(authenticated)/actions', 'subscriptions', subscriptions) if (subscriptions.length === 0){ return []; } diff --git a/Frontend/app/layout.tsx b/Frontend/app/layout.tsx index ac72b88..85783fd 100644 --- a/Frontend/app/layout.tsx +++ b/Frontend/app/layout.tsx @@ -1,8 +1,8 @@ import "./globals.css"; import type { Metadata } from "next"; import "../app/globals.css"; -import { Arimo, Raleway, Indie_Flower } from "next/font/google"; -import { ToastContainer, toast } from "react-toastify"; +import { Arimo, Indie_Flower } from "next/font/google"; +import { ToastContainer } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; import Header from "@/components/Header"; import { cookies } from "next/headers"; diff --git a/Frontend/app/page.tsx b/Frontend/app/page.tsx index 64a9aaf..16465b3 100644 --- a/Frontend/app/page.tsx +++ b/Frontend/app/page.tsx @@ -5,7 +5,6 @@ import { useEffect } from "react"; import React from "react"; import { WaitingListWithImageHero } from "@/sections/Hero"; import PageWrapper from "@/components/Utilities/PageWrapper"; -import pb from "@/lib/pocketbase"; export default function Home() { useEffect(() => { diff --git a/Frontend/components/GetStartedSectionButton.tsx b/Frontend/components/GetStartedSectionButton.tsx index bd14223..f4424fc 100644 --- a/Frontend/components/GetStartedSectionButton.tsx +++ b/Frontend/components/GetStartedSectionButton.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import { Subscription, User } from "@/types"; -import { getSubscriptions } from "@/app/(auth)/actions"; +import { getSubscriptions } from "@/app/actions"; import { useRouter } from "next/navigation"; interface GetStartedSectionButtonProps { diff --git a/Frontend/components/Header.tsx b/Frontend/components/Header.tsx index f975f7f..1d3bbcc 100644 --- a/Frontend/components/Header.tsx +++ b/Frontend/components/Header.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useState } from "react"; import Navigation from "@/components/Navigation"; import ModalSignUp from "@/components/Modals/ModalSignUp"; import ModalSignIn from "@/components/Modals/ModalSignIn"; -import { getAuthCookie, getUser, logout } from "@/app/(auth)/actions"; +import { getAuthCookie, getUser, logout } from "@/app/actions"; import { SourceModal, User } from "@/types"; import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; import pb from "@/lib/pocketbase"; diff --git a/Frontend/components/Logo.tsx b/Frontend/components/Logo.tsx index 6379f01..b7b74f3 100644 --- a/Frontend/components/Logo.tsx +++ b/Frontend/components/Logo.tsx @@ -1,5 +1,5 @@ import React from "react"; -import Icon from "../images/icon.svg"; + import Link from "next/link"; import Image from "next/image"; @@ -21,7 +21,13 @@ function Logo({ label, className }: LogoProps) { > {/* Logo */} - Follow us on Twitter + Follow us on Twitter {label !== undefined ? ( {label} diff --git a/Frontend/components/Modals/ModalSignIn.tsx b/Frontend/components/Modals/ModalSignIn.tsx index 162ba8c..4483532 100644 --- a/Frontend/components/Modals/ModalSignIn.tsx +++ b/Frontend/components/Modals/ModalSignIn.tsx @@ -5,7 +5,7 @@ import colors from "@/utils/colors"; import { useForm } from "react-hook-form"; import { yupResolver } from "@hookform/resolvers/yup"; import { signInValidationSchema } from "@/utils/form"; -import { login } from "@/app/(auth)/actions"; +import { login } from "@/app/actions"; import { toast } from "react-toastify"; function ModalSignIn() { diff --git a/Frontend/components/Modals/ModalSignUp.tsx b/Frontend/components/Modals/ModalSignUp.tsx index b0309f1..f34db16 100644 --- a/Frontend/components/Modals/ModalSignUp.tsx +++ b/Frontend/components/Modals/ModalSignUp.tsx @@ -7,7 +7,7 @@ import { yupResolver } from "@hookform/resolvers/yup"; import { signUpValidationSchema } from "@/utils/form"; import { companySizeList } from "@/constants"; import pb from "@/lib/pocketbase"; -import { createCheckoutSession, login } from "@/app/(auth)/actions"; +import { createCheckoutSession, login } from "@/app/actions"; import { toast } from "react-toastify"; import { Price, User } from "@/types"; import { useRouter } from "next/navigation"; diff --git a/Frontend/components/PriceCard.tsx b/Frontend/components/PriceCard.tsx index 5e1be8f..af7c782 100644 --- a/Frontend/components/PriceCard.tsx +++ b/Frontend/components/PriceCard.tsx @@ -1,7 +1,7 @@ "use client"; import { Price, Product, SourceModal } from "@/types"; -import { createCheckoutSession, isAuthenticated } from "@/app/(auth)/actions"; +import { createCheckoutSession, isAuthenticated } from "@/app/actions"; import { toast } from "react-toastify"; import { useRouter } from "next/navigation"; import Icon from "@/components/Icon/Icon"; @@ -101,9 +101,15 @@ export default function PriceCard({ ? (product?.yearlyPrice?.unit_amount ?? 0) / 100 : (product?.monthlyPrice?.unit_amount ?? 0) / 100} -

- per user per {isAnnual ? "year" : "month"} -

+ {product?.type != "one_time" ? ( +

+ per user per {isAnnual ? "year" : "month"} +

+ ) : ( +

+ One Time +

+ )} )} {product && ( diff --git a/Frontend/components/Utilities/Background.tsx b/Frontend/components/Utilities/Background.tsx index 14da941..95f5035 100644 --- a/Frontend/components/Utilities/Background.tsx +++ b/Frontend/components/Utilities/Background.tsx @@ -3,6 +3,7 @@ import colors, { hexToRgb } from "@/utils/colors"; import { useTheme } from "next-themes"; import React, { ReactNode, useEffect, useState } from "react"; +import Circuit from "@/images/circuit.svg"; const Background = ({ children }: { children: ReactNode }) => { const { theme } = useTheme(); diff --git a/Frontend/images/IconLoading.tsx b/Frontend/images/IconLoading.tsx deleted file mode 100644 index e5e421a..0000000 --- a/Frontend/images/IconLoading.tsx +++ /dev/null @@ -1,26 +0,0 @@ -export const IconLoading = () => { - return ( - - - - - ); -}; - -export default IconLoading; diff --git a/Frontend/images/check-box.svg b/Frontend/images/check-box.svg deleted file mode 100644 index 51a2383..0000000 --- a/Frontend/images/check-box.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Frontend/images/icon-clipboard.svg b/Frontend/images/icon-clipboard.svg deleted file mode 100644 index 3ef4b02..0000000 --- a/Frontend/images/icon-clipboard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Frontend/images/icon-clock.svg b/Frontend/images/icon-clock.svg deleted file mode 100644 index cf6d315..0000000 --- a/Frontend/images/icon-clock.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Frontend/images/icon-link.svg b/Frontend/images/icon-link.svg deleted file mode 100644 index f7f0ff2..0000000 --- a/Frontend/images/icon-link.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Frontend/images/icon-loading.svg b/Frontend/images/icon-loading.svg deleted file mode 100644 index e69de29..0000000 diff --git a/Frontend/images/icon-us-dollar.svg b/Frontend/images/icon-us-dollar.svg deleted file mode 100644 index b89ba2f..0000000 --- a/Frontend/images/icon-us-dollar.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Frontend/images/icon-user.svg b/Frontend/images/icon-user.svg deleted file mode 100644 index 4182e38..0000000 --- a/Frontend/images/icon-user.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Frontend/images/icon-vector.svg b/Frontend/images/icon-vector.svg deleted file mode 100644 index 7fdb780..0000000 --- a/Frontend/images/icon-vector.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Frontend/images/icon-x.svg b/Frontend/images/icon-x.svg deleted file mode 100644 index e2ca73a..0000000 --- a/Frontend/images/icon-x.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Frontend/images/logo-rounded-arrow.svg b/Frontend/images/logo-rounded-arrow.svg deleted file mode 100644 index 7932921..0000000 --- a/Frontend/images/logo-rounded-arrow.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Frontend/images/logo-traces.svg b/Frontend/images/logo-traces.svg deleted file mode 100644 index dcd80a8..0000000 --- a/Frontend/images/logo-traces.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Frontend/images/video-thumb.png b/Frontend/images/video-thumb.png deleted file mode 100644 index 0254436..0000000 Binary files a/Frontend/images/video-thumb.png and /dev/null differ diff --git a/Frontend/images/zigzag-connection.png b/Frontend/images/zigzag-connection.png deleted file mode 100644 index 70485a7..0000000 Binary files a/Frontend/images/zigzag-connection.png and /dev/null differ diff --git a/Frontend/images/zigzag-connection2.png b/Frontend/images/zigzag-connection2.png deleted file mode 100644 index 6e4d7f7..0000000 Binary files a/Frontend/images/zigzag-connection2.png and /dev/null differ diff --git a/Frontend/images/zigzag-graph.png b/Frontend/images/zigzag-graph.png deleted file mode 100644 index 175b328..0000000 Binary files a/Frontend/images/zigzag-graph.png and /dev/null differ diff --git a/Frontend/images/zigzag-streamline.png b/Frontend/images/zigzag-streamline.png deleted file mode 100644 index c58934d..0000000 Binary files a/Frontend/images/zigzag-streamline.png and /dev/null differ diff --git a/Frontend/netlify.toml b/Frontend/netlify.toml deleted file mode 100644 index 1f3b68e..0000000 --- a/Frontend/netlify.toml +++ /dev/null @@ -1,2 +0,0 @@ -[build] - functions = "./netlify/functions" \ No newline at end of file diff --git a/Frontend/public/Whitepaper.pdf b/Frontend/public/Whitepaper.pdf deleted file mode 100644 index 008b5f8..0000000 Binary files a/Frontend/public/Whitepaper.pdf and /dev/null differ diff --git a/Frontend/images/icon.svg b/Frontend/public/icons/logo.svg similarity index 100% rename from Frontend/images/icon.svg rename to Frontend/public/icons/logo.svg diff --git a/Frontend/public/images/a-founders-message-to-group-training-organisations-0.png b/Frontend/public/images/a-founders-message-to-group-training-organisations-0.png deleted file mode 100644 index 8b89231..0000000 Binary files a/Frontend/public/images/a-founders-message-to-group-training-organisations-0.png and /dev/null differ diff --git a/Frontend/public/images/blog/adobedocusign.png b/Frontend/public/images/blog/adobedocusign.png deleted file mode 100644 index bc92a09..0000000 Binary files a/Frontend/public/images/blog/adobedocusign.png and /dev/null differ diff --git a/Frontend/public/images/blog/adobesignnow.png b/Frontend/public/images/blog/adobesignnow.png deleted file mode 100644 index 57dbc02..0000000 Binary files a/Frontend/public/images/blog/adobesignnow.png and /dev/null differ diff --git a/Frontend/public/images/blog/docusignsignnow.png b/Frontend/public/images/blog/docusignsignnow.png deleted file mode 100644 index ef72576..0000000 Binary files a/Frontend/public/images/blog/docusignsignnow.png and /dev/null differ diff --git a/Frontend/public/images/blog/sign365adobe.png b/Frontend/public/images/blog/sign365adobe.png deleted file mode 100644 index e59e701..0000000 Binary files a/Frontend/public/images/blog/sign365adobe.png and /dev/null differ diff --git a/Frontend/public/images/blog/sign365docusign.png b/Frontend/public/images/blog/sign365docusign.png deleted file mode 100644 index 43d4b52..0000000 Binary files a/Frontend/public/images/blog/sign365docusign.png and /dev/null differ diff --git a/Frontend/public/images/blog/sign365signnow.png b/Frontend/public/images/blog/sign365signnow.png deleted file mode 100644 index 30a1132..0000000 Binary files a/Frontend/public/images/blog/sign365signnow.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-0.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-0.png deleted file mode 100644 index 4aab52c..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-0.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-1.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-1.png deleted file mode 100644 index aaadcea..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-1.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-2.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-2.png deleted file mode 100644 index 8a16ffe..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-2.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-3.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-3.png deleted file mode 100644 index 73e2b93..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-3.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-4.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-4.png deleted file mode 100644 index 405a232..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-4.png and /dev/null differ diff --git a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-5.png b/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-5.png deleted file mode 100644 index b3a431a..0000000 Binary files a/Frontend/public/images/creating-custom-forms-a-step-by-step-guide-5.png and /dev/null differ diff --git a/Frontend/public/images/does-microsoft-forms-work-offline-0.png b/Frontend/public/images/does-microsoft-forms-work-offline-0.png deleted file mode 100644 index 56cf883..0000000 Binary files a/Frontend/public/images/does-microsoft-forms-work-offline-0.png and /dev/null differ diff --git a/Frontend/public/images/example-training-form-template-0.png b/Frontend/public/images/example-training-form-template-0.png deleted file mode 100644 index 3abf488..0000000 Binary files a/Frontend/public/images/example-training-form-template-0.png and /dev/null differ diff --git a/Frontend/public/images/example-training-form-template-1.png b/Frontend/public/images/example-training-form-template-1.png deleted file mode 100644 index 47ba012..0000000 Binary files a/Frontend/public/images/example-training-form-template-1.png and /dev/null differ diff --git a/Frontend/public/images/hero.jpg b/Frontend/public/images/hero.jpg deleted file mode 100644 index 1220f96..0000000 Binary files a/Frontend/public/images/hero.jpg and /dev/null differ diff --git a/Frontend/public/images/how-sign365-reduced-supervisor-form-processing-by-80-percent-0.png b/Frontend/public/images/how-sign365-reduced-supervisor-form-processing-by-80-percent-0.png deleted file mode 100644 index 820bbcf..0000000 Binary files a/Frontend/public/images/how-sign365-reduced-supervisor-form-processing-by-80-percent-0.png and /dev/null differ diff --git a/Frontend/public/images/how-to-electronically-fill-a-document-0.png b/Frontend/public/images/how-to-electronically-fill-a-document-0.png deleted file mode 100644 index 704a0ed..0000000 Binary files a/Frontend/public/images/how-to-electronically-fill-a-document-0.png and /dev/null differ diff --git a/Frontend/public/images/how-to-setup-supervisor-forms-with-workforce-one-0.png b/Frontend/public/images/how-to-setup-supervisor-forms-with-workforce-one-0.png deleted file mode 100644 index 16fa269..0000000 Binary files a/Frontend/public/images/how-to-setup-supervisor-forms-with-workforce-one-0.png and /dev/null differ diff --git a/Frontend/public/images/top-5-best-document-automation-software-0.png b/Frontend/public/images/top-5-best-document-automation-software-0.png deleted file mode 100644 index 2128ace..0000000 Binary files a/Frontend/public/images/top-5-best-document-automation-software-0.png and /dev/null differ diff --git a/Frontend/public/images/your-forms-on-sign365-in-5-minutes-0.png b/Frontend/public/images/your-forms-on-sign365-in-5-minutes-0.png deleted file mode 100644 index 40c3eee..0000000 Binary files a/Frontend/public/images/your-forms-on-sign365-in-5-minutes-0.png and /dev/null differ diff --git a/Frontend/public/next.svg b/Frontend/public/next.svg deleted file mode 100644 index 5174b28..0000000 --- a/Frontend/public/next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Frontend/public/vercel.svg b/Frontend/public/vercel.svg deleted file mode 100644 index d2f8422..0000000 --- a/Frontend/public/vercel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Frontend/sections/AccountContent.tsx b/Frontend/sections/AccountContent.tsx index d3fec27..5d4a025 100644 --- a/Frontend/sections/AccountContent.tsx +++ b/Frontend/sections/AccountContent.tsx @@ -3,7 +3,7 @@ import { createManagementSubscriptionSession, getSubscriptions, -} from "@/app/(auth)/actions"; +} from "@/app/actions"; import { Subscription, User } from "@/types"; import React from "react"; import { useState, useEffect } from "react"; diff --git a/Frontend/sections/Payment.tsx b/Frontend/sections/Payment.tsx index 0eebc91..a022740 100644 --- a/Frontend/sections/Payment.tsx +++ b/Frontend/sections/Payment.tsx @@ -5,7 +5,7 @@ import { Product } from "@/types"; import PriceCard from "@/components/PriceCard"; import { useState } from "react"; import PriceToggle from "@/components/PriceToggle"; -import { apiPrices } from "../app/(admin)/pricing/actions"; +import { apiPrices } from "../app/(public)/pricing/actions"; const Payment = ({ type = "one_time",