Hacker Portal Discord Link

src/components/Button.tsx

@@ -1,4 +1,5 @@
 import React from "react"
+import { Link } from "react-router-dom"
 
 interface ButtonProps {
   text: string
@@ -12,10 +13,10 @@ const Button: React.FC<ButtonProps> = ({ text, override, link, type }) => {
     type === "clear" ? "text-blue-chinese" : "bg-blue-chinese text-[#FFF]"
 
   return (
-    <a
+    <Link
       target='_blank'
       rel='noopener noreferrer'
-      href={link}
+      to={link}
       className={
         "rounded-md border-2 border-blue-chinese p-3 text-center " +
         typeStyling +
@@ -24,7 +25,7 @@ const Button: React.FC<ButtonProps> = ({ text, override, link, type }) => {
       }
     >
       {text}
-    </a>
+    </Link>
   )
 }
 

src/views/(static)/support/home/QuestionResources.tsx

@@ -7,17 +7,30 @@ const QuestionResources: React.FC = () => {
     <Card title='Have a Question?'>
       <div className='flex flex-col items-center gap-10'>
         {/* <img className='w-2/3' alt='People Graphic' src={People} /> */}
-        <p className='font-nunito w-4/5 text-center'>
+        <p className='w-4/5 text-center'>
           Our organizing team is available throughout the whole event. If
-          there’s anything you need please contact us through slack or find an
-          organizer in person.
+          there&apos;s anything you need please contact us through discord or
+          find an organizer in person.
         </p>
-        <Button
-          text='Join Our Discord'
-          link='https://discord.gg/rGjDTCk3Nx'
-          type='full'
-          override='w-full'
-        />
+
+        <p className='w-4/5 text-center'>
+          Login to your dashboard to find our 2024 Discord Invite Link.
+        </p>
+
+        <div className='flex w-full flex-col gap-3'>
+          <Button
+            text='Join Our General Discord'
+            link='https://discord.gg/rGjDTCk3Nx'
+            type='full'
+            override='w-full'
+          />
+          <Button
+            text='Join Our 2024 Event Discord'
+            link='/portal/hacker'
+            type='clear'
+            override='w-full'
+          />
+        </div>
         <a
           className='text-blue-button underline'
           href='https://docs.google.com/document/d/e/2PACX-1vQMV0TiHt3CiEraUKBhTJ3a0lDoyawcQzLgqOhvDgAzS42WUX1AfDmFlYwgDySs9TmEkh1Cm0110qLx/pub'

src/views/(static)/support/resources/EventInfo.tsx

@@ -1,5 +1,6 @@
 import React from "react"
 import Card from "../../../../components/Card"
+import { Link } from "react-router-dom"
 
 const EventInfo: React.FC = () => {
   return (
@@ -20,13 +21,13 @@ const EventInfo: React.FC = () => {
           <p className='font-bold'>Discord</p>
           <p>Discord will be used for communication during the event.</p>
           <p>
-            Join our Discord{" "}
-            <a
+            Join our 2024 Discord{" "}
+            <Link
               className='text-blue-button hover:underline'
-              href='https://discord.gg/rGjDTCk3Nx'
+              to='/portal/hacker'
             >
-              here
-            </a>
+              in your dashboard
+            </Link>
             .
           </p>
         </div>

src/views/portal/hacker/dashboard/index.tsx

@@ -10,12 +10,33 @@ const DashbaordHacker = () => {
   const fullName = user?.displayName || user?.email
 
   return (
-    <div className='space-y-10'>
+    <div className='space-y-10 px-4 sm:px-6 lg:px-8'>
       <div className='space-y-3'>
         <p className='font-subtext capitalize'>Welcome {fullName},</p>
         <h1 className='font-title text-2xl'>Hacker Portal Dashboard</h1>
       </div>
-      <Announcements />
+
+      <div className='flex min-w-0 flex-col items-center justify-center gap-10 xl:flex-row xl:items-stretch'>
+        <Announcements />
+
+        <div className='w-full max-w-2xl grow space-y-10 rounded-3xl bg-[#4659FF]/10 px-10 py-5 md:p-10 xl:max-w-none'>
+          <h3 className='font-title text-xl md:text-2xl'>
+            Admitted Hackers Only Discord Server
+          </h3>
+          <p className='font-subtext'>
+            In addition to our general server, we have a 2024 specific server to
+            help addmitted hackers team up and get help from mentors.
+          </p>
+          <a
+            href='https://discord.gg/2246PEzV'
+            target='_blank'
+            rel='noreferrer'
+            className='flex h-16 w-full items-center justify-center rounded-md bg-white px-3 py-1.5 text-center font-subtext text-lg leading-6 text-blue-imperial shadow-sm transition-colors hover:bg-white/80 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-royal disabled:bg-white/50 md:text-2xl'
+          >
+            Join 2024 Discord server
+          </a>
+        </div>
+      </div>
     </div>
   )
 }