From f89d96440f7f855b9655bbc4dbb44c07ad11f877 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Mon, 12 Feb 2024 11:30:51 +0000
Subject: [PATCH 1/3] Updated Join us translations

---
 src/translation/home.json   | 6 +-----
 src/translation/navbar.json | 2 +-
 src/translation/price.json  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/translation/home.json b/src/translation/home.json
index 9428d4d..4bc414e 100644
--- a/src/translation/home.json
+++ b/src/translation/home.json
@@ -57,10 +57,6 @@
     "description": {
       "en": "Our algorithms provide speedy results and evaluate the test, providing a brief feedback on areas that are strong and the areas where improvement is needed. So there is no need to pay a hefty amount to a tutor and spend hours upon hours to review your performance. With EnCoach, you receive the evaluation within seconds.",
       "ar": "خوارزمياتنا توفر نتائج وتقييم سريع للاختبار، وتقدم ملاحظات موجزًة على الجوانب التي تتميز بها والجوانب التي تحتاج إلى تحسين. لذا ليس هناك حاجة لدفع مبلغ ضخم لمدرس وقضاء ساعات وساعات في مراجعة أدائك. مع إنكوتش، ستتلقى التقييم في غضون ثوانٍ."
-    },
-    "join": {
-      "en": "Join",
-      "ar": "انضم"
     }
   },
   "learn_more": {
@@ -121,4 +117,4 @@
     "en": "Accreditation",
     "ar": "الاعتمادات الأكاديمية"
   }
-}
\ No newline at end of file
+}
diff --git a/src/translation/navbar.json b/src/translation/navbar.json
index 08e6609..be1a8e0 100644
--- a/src/translation/navbar.json
+++ b/src/translation/navbar.json
@@ -28,7 +28,7 @@
     "ar": "منصة انكوتش"
   },
   "join": {
-    "en": "Join",
+    "en": "Sign up",
     "ar": "انضم إلينا"
   }
 }
\ No newline at end of file
diff --git a/src/translation/price.json b/src/translation/price.json
index 4596fd1..a0abc15 100644
--- a/src/translation/price.json
+++ b/src/translation/price.json
@@ -1,6 +1,6 @@
 {
   "joinus": {
-    "en": "Join us",
+    "en": "Sign up",
     "ar": "انضم إلينا"
   },
   "title": {

From 80c0a9e21c189d37517ffaff3b039a87656755bd Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Mon, 12 Feb 2024 11:36:19 +0000
Subject: [PATCH 2/3] Removed /join legacy page

---
 src/app/join/page.tsx           | 28 ----------------------------
 src/app/layout.tsx              |  3 ---
 src/components/Navbar.tsx       |  6 +-----
 src/components/PricingTable.tsx | 23 -----------------------
 src/templates/Home.tsx          |  2 +-
 5 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 src/app/join/page.tsx
 delete mode 100644 src/components/PricingTable.tsx

diff --git a/src/app/join/page.tsx b/src/app/join/page.tsx
deleted file mode 100644
index e8270d7..0000000
--- a/src/app/join/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Link from "next/link";
-import {BsInstagram, BsTwitter} from "react-icons/bs";
-import {BiLogoFacebook} from "react-icons/bi";
-import Navbar from "@/components/Navbar";
-import PricingTable from "@/components/PricingTable";
-import Footer from "@/components/Footer";
-
-export default function Home() {
-	return (
-		<main className="h-screen w-full bg-white text-mti-black flex flex-col">
-			<Navbar currentPage="/join" language="en" />
-
-			<section className="w-full relative bg-white py-20 lg:py-48 px-8 flex flex-col items-center text-center gap-4">
-				<h2 className="text-3xl font-bold">Available Packages</h2>
-				<div className="flex flex-col gap-1">
-					<span className="max-w-lg">
-						Once the payment process is complete, you will receive a code via e-mail to register to the application.
-					</span>
-					<span className="max-w-lg">(Or have time added to your account, if already registered with the given e-mail).</span>
-					<PricingTable />
-				</div>
-			</section>
-
-			<Footer language="en" />
-		</main>
-	);
-}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 0553799..e3b998c 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -26,9 +26,6 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
 					httpEquiv="Content-Security-Policy-Report-Only"
 					content="default-src 'self' *.stripe.com *.encoach.com staging.encoach.com localhost"
 				/>
-
-				<script async src="https://js.stripe.com/v3/pricing-table.js" />
-
 				<link rel="preconnect" href="https://fonts.googleapis.com" />
 				<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
 				<link href="https://fonts.googleapis.com/css2?family=Almarai:wght@300;400;700;800&display=swap" rel="stylesheet" />
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index fbf09cc..72f94e9 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -130,11 +130,7 @@ export default function Navbar({currentPage, language}: {currentPage: string; la
 										))}
 										<Link
 											href="https://platform.encoach.com/register"
-											className={clsx(
-												"w-fit transition duration-300 ease-in-out",
-												currentPage === "/join" &&
-													"text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-											)}>
+											className="w-fit transition duration-300 ease-in-out">
 											{translation.join[language]}
 										</Link>
 										<Link href="https://platform.encoach.com" className={clsx("w-fit transition duration-300 ease-in-out")}>
diff --git a/src/components/PricingTable.tsx b/src/components/PricingTable.tsx
deleted file mode 100644
index 0ece58c..0000000
--- a/src/components/PricingTable.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-"use client";
-
-import {Elements} from "@stripe/react-stripe-js";
-import {loadStripe} from "@stripe/stripe-js";
-
-const stripePromise = loadStripe(process.env.STRIPE_KEY || "");
-
-export default function PricingTable() {
-	return (
-		<Elements stripe={stripePromise}>
-			<stripe-pricing-table id="pricing" pricing-table-id={process.env.STRIPE_PRICING_TABLE} publishable-key={process.env.STRIPE_KEY} />
-		</Elements>
-	);
-}
-
-// If using TypeScript, add the following snippet to your file as well.
-declare global {
-	namespace JSX {
-		interface IntrinsicElements {
-			"stripe-pricing-table": React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
-		}
-	}
-}
diff --git a/src/templates/Home.tsx b/src/templates/Home.tsx
index 5842291..069718a 100644
--- a/src/templates/Home.tsx
+++ b/src/templates/Home.tsx
@@ -77,7 +77,7 @@ export default function Home({language}: Props) {
 							<Title>{translation.learn_ai.title[language]}</Title>
 							<p className="max-w-lg text-base">{translation.learn_ai.description[language]}</p>
 						</div>
-						<Link href="/join">
+						<Link href="/price">
 							<button className="bg-mti-purple-light hover:bg-mti-purple text-white rounded-xl px-8 py-4 transition ease-in-out duration-300 shadow">
 								{translation.learn_more[language]}
 							</button>

From 9ff096f323132466af7233989dc48cc6579bd435 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Mon, 12 Feb 2024 12:40:45 +0000
Subject: [PATCH 3/3] Added pricing parser

---
 src/templates/Price.tsx    | 25 +++++++++++++++++++++++--
 src/translation/price.json | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/templates/Price.tsx b/src/templates/Price.tsx
index f1cec90..6eb5137 100644
--- a/src/templates/Price.tsx
+++ b/src/templates/Price.tsx
@@ -21,6 +21,28 @@ interface Package {
 }
 
 export default function Page({language}: {language: "en" | "ar"}) {
+	const getDurationUnit = (duration: number, durationUnitSingular: string, durationUnitPlural: string) => {
+		if(duration >= 2 && duration <= 10) {
+			return durationUnitPlural;
+		}
+
+		return durationUnitSingular;
+	}
+	const durationAndDurationUnitParser = (duration: number, duration_unit: DurationUnit) => {
+		if(language === 'ar') {
+			switch (duration_unit) {
+				case "days":
+					return `${duration} ${getDurationUnit(duration, translation.days.singular[language], translation.days.plural[language])}`;
+				case "weeks":
+					return `${duration} ${getDurationUnit(duration, translation.weeks.singular[language], translation.weeks.plural[language])}`;
+				case "months":
+					return `${duration} ${getDurationUnit(duration, translation.months.singular[language], translation.months.plural[language])}`;
+			}
+		}
+
+		return capitalize(duration === 1 ? duration_unit.slice(0, duration_unit.length - 1) : duration_unit);
+	}
+
 	const [payments, setPayments] = React.useState<Package[]>([]);
 	const getData = async () => {
 		// Fetch data from external API
@@ -51,8 +73,7 @@ export default function Page({language}: {language: "en" | "ar"}) {
 							<div className="flex flex-col items-start mb-2">
 								<Image src="/logo_title.png" alt="EnCoach's Logo" width={32} height={32} />
 								<span className="font-semibold text-xl">
-									EnCoach - {p.duration}{" "}
-									{capitalize(p.duration === 1 ? p.duration_unit.slice(0, p.duration_unit.length - 1) : p.duration_unit)}
+									{translation.encoach[language]} - {durationAndDurationUnitParser(p.duration, p.duration_unit)}
 								</span>
 							</div>
 							<div className="flex flex-col gap-2 items-start w-full">
diff --git a/src/translation/price.json b/src/translation/price.json
index a0abc15..6dcd592 100644
--- a/src/translation/price.json
+++ b/src/translation/price.json
@@ -22,5 +22,39 @@
   "packageIncludesC": {
     "en": "Allow yourself to correctly prepare for the exam",
     "ar": "امنح نفسك الفرصة للتحضير بشكل صحيح للإختبار"
+  },
+  "days": {
+    "singular": {
+      "en": "Day",
+      "ar": "يوم"
+    },
+    "plural": {
+      "en": "Days",
+      "ar": "أيام"
+    }
+  },
+  "weeks": {
+    "singular": {
+      "en": "Week",
+      "ar": "أسبوع"
+    },
+    "plural": {
+      "en": "Weeks",
+      "ar": "أسابيع"
+    }
+  },
+  "months": {
+    "singular": {
+      "en": "Month",
+      "ar": "شهر"
+    },
+    "plural": {
+      "en": "Months",
+      "ar": "شهور"
+    }
+  },
+  "encoach": {
+    "en": "EnCoach",
+    "ar": "إنكوتش"
   }
 }
\ No newline at end of file