Merge pull request #1416 from Feng-09/refactor/landing-page

Refactor: include company name in copyright text
hngprojects · Aug 25, 2024 · a4901d5 · a4901d5
2 parents f72e802 + 140fbc5
commit a4901d5
Show file tree

Hide file tree

Showing 10 changed files with 6,087 additions and 6,965 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/messages/en.json b/public/messages/en.json
@@ -119,7 +119,8 @@
     "footerBottom": {
       "privacyPolicy": "Privacy Policy",
       "termsOfUse": "Terms of Use",
-      "copyright": "2024 All Rights Reserved"
+      "copyright": "2024 All Rights Reserved",
+            "companyName": "HNG Boilerplate"
     }
   },
   "pricing": {

diff --git a/src/app/(auth-routes)/register/page.tsx b/src/app/(auth-routes)/register/page.tsx
@@ -15,7 +15,6 @@ import { registerUser, resendOtp, verifyOtp } from "~/actions/register";
 import CustomButton from "~/components/common/common-button/common-button";
 import { Input } from "~/components/common/input";
 import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
-import { Checkbox } from "~/components/ui/checkbox";
 import {
   Dialog,
   DialogContent,
@@ -51,7 +50,6 @@ const Register = () => {
   const [showOtp, setShowOtp] = useState(false);
   const [timeLeft, setTimeLeft] = useState<number>(15 * 60);
   const [value, setValue] = useState("");
-  const [createOrg, setCreateOrg] = useState<boolean>(false);
 
   if (status === "authenticated") {
     router.push("/dashboard");
@@ -73,12 +71,7 @@ const Register = () => {
     startTransition(async () => {
       await registerUser(values).then(async (data) => {
         if (data.status === 201) {
-          // Handle redirection based on createOrg condition
-          if (createOrg) {
-            router.push("/register/organisation");
-          } else {
-            router.push("/login");
-          }
+          router.push("/login");
 
           toast({
             title: "Account created successfully",
@@ -336,18 +329,6 @@ const Register = () => {
                 </FormItem>
               )}
             />
-            <div
-              className="flex items-center gap-2"
-              onClick={() => setCreateOrg((a) => !a)}
-            >
-              <Checkbox id="createOrg" />
-              <label
-                htmlFor="createOrg"
-                className="font-inter ms-1 text-center text-sm leading-[19.2px] hover:cursor-pointer"
-              >
-                Also create an organisation
-              </label>
-            </div>
             <CustomButton
               type="submit"
               variant="primary"

diff --git a/src/app/(landing-routes)/blog/[id]/RelatedArticle.tsx b/src/app/(landing-routes)/blog/[id]/RelatedArticle.tsx
@@ -1,7 +1,8 @@
 import { useRouter } from "next/navigation";
+// import { blogPosts } from "../data/mock";
+import { useEffect, useState } from "react";
 
 import BlogCard from "~/components/layouts/BlogCards";
-import { blogPosts } from "../data/mock";
 
 export type New = {
   id: number;
@@ -10,29 +11,65 @@ export type New = {
 
 const RelatedArticle = () => {
   const router = useRouter();
+  const [data, setData] = useState<
+    {
+      id: string;
+      title: string;
+      date: string;
+      readTime: string;
+      category: string;
+      image: string;
+      labelClassName: string;
+    }[]
+  >([]);
+  const [isLoading, setIsLoading] = useState<boolean>(true);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        setIsLoading(true);
+        const response = await fetch(
+          `https://staging.api-csharp.boilerplate.hng.tech/api/v1/blogs`,
+        );
+        const result = await response.json();
+        setData(result.data);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
   return (
     <>
       <div className="">
         <h1 className="font-inter text-center text-xl font-bold leading-[29.05px] text-[#525252] sm:text-2xl md:text-left">
           Related Articles
         </h1>
-        <div className="mt-6 grid gap-6 sm:mt-8 sm:gap-8">
-          {blogPosts.slice(0, 3).map((post, index) => (
-            <BlogCard
-              key={index}
-              title={post.title}
-              date={post.date}
-              readTime={post.readTime}
-              category={post.category}
-              image={post.image}
-              labelClassName={post.labelClassName}
-              onClick={() => {
-                localStorage.setItem("currentBlogPost", JSON.stringify(post));
-                router.push(`/blog/${post.id}`);
-              }}
-            />
-          ))}
-        </div>
+        {isLoading ? (
+          <div className="animate-pulse text-2xl font-bold">
+            Loading Related...
+          </div>
+        ) : (
+          <div className="mt-6 grid gap-6 sm:mt-8 sm:gap-8">
+            {data?.slice(0, 3).map((post, index) => (
+              <BlogCard
+                key={index}
+                title={post.title}
+                date={post.date}
+                readTime={post.readTime}
+                category={post.category}
+                image={post.image}
+                labelClassName={post.labelClassName}
+                onClick={() => {
+                  localStorage.setItem("currentBlogPost", JSON.stringify(post));
+                  router.push(`/blog/${post.id}`);
+                }}
+              />
+            ))}
+          </div>
+        )}
       </div>
     </>
   );