Merge pull request #96 from mokletdev/staging

Staging
mokletdev · May 21, 2024 · 68d55ea · 68d55ea
2 parents f0b802d + 8768e8d
commit 68d55ea
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 20 deletions.
diff --git a/public/icon-colored.svg b/public/icon-colored.svg
diff --git a/public/image/juri2.png b/public/image/juri2.png
diff --git a/public/image/juri3.png b/public/image/juri3.png
diff --git a/public/image/juri_placeholder.png b/public/image/juri_placeholder.png
diff --git a/src/app/(main)/components/Hero.tsx b/src/app/(main)/components/Hero.tsx
@@ -1,13 +1,15 @@
 import { RightArrow } from "@/app/components/global/Icons";
 import { SecondaryLinkButton } from "@/app/components/global/LinkButton";
 import { H1, H3, LargeP, P } from "@/app/components/global/Text";
-import Image from "next/image";
-
+import { getServerSession } from "@/lib/next-auth";
 import dynamic from "next/dynamic";
+import Image from "next/image";
 
 const Countdown = dynamic(() => import("./parts/Countdown"), { ssr: false });
 
-export default function Hero() {
+export default async function Hero() {
+  const session = await getServerSession();
+
   return (
     <section
       className="relative w-full h-screen mb-[370px] sm:mb-[500px] md:mb-[450px] xl:mb-[336px] flex flex-col justify-center"
@@ -82,12 +84,12 @@ export default function Hero() {
             BARISAN <span className="italic">JAWARA</span>
           </H1>
           <SecondaryLinkButton
-            href="/auth/register"
+            href={session ? "/dashboard" : "/auth/register"}
             target="_blank"
             className="group inline-flex py-[12px] px-[20px] justify-center items-center"
           >
             <span className="flex gap-2 text-sm font-bold">
-              Daftar Sekarang
+              {session ? "Lihat Dashboard" : "Daftar Sekarang"}
               <RightArrow className="group-hover:translate-x-2 transition-all duration-300" />
             </span>
           </SecondaryLinkButton>

diff --git a/src/app/(main)/components/Juri.tsx b/src/app/(main)/components/Juri.tsx
@@ -3,17 +3,23 @@ import { H3, P } from "@/app/components/global/Text";
 import SectionWrapper from "@/app/components/global/Wrapper";
 import Image from "next/image";
 
-const dummy = {
-  image: "/image/juri1.png",
-  name: "Adi Prasetyo Utomo",
-  title: "Juri",
-};
-
-const comingSoon = {
-  image: "/image/juri_placeholder.png",
-  name: "Coming Soon!",
-  title:  "",
-}
+const juris = [
+  {
+    image: "/image/juri1.png",
+    name: "Adi Prasetyo Utomo",
+    title: "Juri",
+  },
+  {
+    image: "/image/juri2.png",
+    name: "Sendy Cahyono S.Tr.T",
+    title: "Juri",
+  },
+  {
+    image: "/image/juri3.png",
+    name: "Peltu Herman Nurcahya",
+    title: "Juri",
+  },
+];
 
 interface JuriCardProps {
   image: string;
@@ -60,9 +66,9 @@ export default function Juri() {
         </div>
         <div className="relative flex justify-center items-center gap-28 lg:gap-4 flex-col lg:flex-row">
           <div className="absolute w-full rounded-[30px] bg-white min-h-[293px] -top-14 hidden lg:block"></div>
-          <JuriCard image={comingSoon.image} name={comingSoon.name} title={comingSoon.title} />
-          <JuriCard image={dummy.image} name={dummy.name} title={dummy.title} />
-          <JuriCard image={comingSoon.image} name={comingSoon.name} title={comingSoon.title} />
+          <JuriCard image={juris[0].image} name={juris[0].name} title={juris[0].title} />
+          <JuriCard image={juris[1].image} name={juris[1].name} title={juris[1].title} />
+          <JuriCard image={juris[2].image} name={juris[2].name} title={juris[2].title} />
         </div>
       </div>
     </SectionWrapper>

diff --git a/src/app/components/global/Navbar.tsx b/src/app/components/global/Navbar.tsx
@@ -40,7 +40,7 @@ export default function Navbar() {
       <div className="flex items-center justify-between px-[30px] xl:px-[50px] py-[22px] h-full">
         <Link href={"/"}>
           <Image
-            src={"/logo.svg"}
+            src={"/icon-colored.svg"}
             alt="logo"
             width={64}
             height={64}