Merge remote-tracking branch 'origin/truth-redefined-again' into trut…

…h-redefined-again merge
kossiitkgp · Nov 14, 2024 · 7e22f7a · 7e22f7a
2 parents 29cec91 + 1414c11
commit 7e22f7a
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 44 deletions.
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -1,37 +1,37 @@
 import "../styles/Footer.css";
-import { ROUTER_PATHS } from "../util/constants";
+import { ROUTER_PATHS, DISCORD_INVITE, KOSS_CONTACT_EMAIL, KOSS_LINKEDIN_URL, KOSS_TWITTER_URL, KOSS_WEBSITE_URL } from "../util/constants";
 
 const Footer = () => {
-    return (
-        <footer className="footer">
-            <div className="footer-content">
-                <div className="footer-columns">
-                    <div className="footer-column">
-                        <h2>Social Groups</h2>
-                        <p><a href="https://discord.gg/efFwh6fnjk" target="_blank">Discord</a></p>
-                        <p><a href="https://www.linkedin.com/company/kharagpur-open-source-society/mycompany/">LinkedIn</a></p>
-                        <p><a href="https://x.com/kossiitkgp">Twitter</a></p>
-                    </div>
-                    <div className="footer-column">
-                        <h2>Quick Links</h2>
-                        <p><a href={`${ROUTER_PATHS.HOME}#timeline`}>Timeline</a></p>
-                        <p><a href={ROUTER_PATHS.FAQ}>FAQs</a></p>
-                        <p><a href={`${ROUTER_PATHS.HOME}#about`}>About KWoC</a></p>
-                    </div>
-                    <div className="footer-column">
-                        <h2>Other</h2>
-                        <p><a href="https://kossiitkgp.org/">About KOSS</a></p>
-                        {/*<p><a href="">Past Programs</a></p>*/}
-                        <p><a href="mailto:[email protected]">[email protected]</a></p>
-                    </div>
-                </div>
-            </div>
-            <div className="footer-bottom">
-                <h1>Kharagpur Winter of Code</h1>
-                <p>With 💙 by KOSS</p>
-            </div>
-        </footer>
-    );
+  return (
+    <footer className="footer">
+      <div className="footer-content">
+        <div className="footer-columns">
+          <div className="footer-column">
+            <h2>Social Groups</h2>
+            <p><a href={DISCORD_INVITE}>Discord</a></p>
+            <p><a href={KOSS_LINKEDIN_URL}>LinkedIn</a></p>
+            <p><a href={KOSS_TWITTER_URL}>Twitter</a></p>
+          </div>
+          <div className="footer-column">
+            <h2>Quick Links</h2>
+            <p><a href={`${ROUTER_PATHS.HOME}#timeline`}>Timeline</a></p>
+            <p><a href={ROUTER_PATHS.FAQ}>FAQs</a></p>
+            <p><a href={`${ROUTER_PATHS.HOME}#about`}>About KWoC</a></p>
+          </div>
+          <div className="footer-column">
+            <h2>Other</h2>
+            <p><a href={KOSS_WEBSITE_URL}>About KOSS</a></p>
+            <p><a href="https://kwoc23.kossiitkgp.org/pastprograms">Past Programs</a></p>
+            <p><a href={KOSS_CONTACT_EMAIL}>[email protected]</a></p>
+          </div>
+        </div>
+      </div>
+      <div className="footer-bottom">
+        <h1>Kharagpur Winter of Code</h1>
+        <p>With 💙 by KOSS</p>
+      </div>
+    </footer>
+  );
 };
 
 export default Footer
diff --git a/src/components/Hero.tsx b/src/components/Hero.tsx
@@ -3,6 +3,7 @@ import hook from '../assets/igloo-scroll-hook-edit.png';
 import sign from '../assets/sign-post.png';
 import "../styles/Hero.css";
 import "../styles/App.css";
+import { MENTOR_MANUAL_LINK, STUDENT_MANUAL_LINK } from '../util/constants';
 
 export const HeroComponent = () => {
   return (
@@ -15,8 +16,8 @@ export const HeroComponent = () => {
           <h1>Kharagpur <span className='yellow-text'>Winter<br />of Code</span> 2024</h1>
         </div>
         <div className="hero-button-container">
-          <button className="hero-button"> <a href="https://drive.google.com/file/d/1gc2NWeMDA3ZFzH4RWVspuerduRdfY9yu/view?usp=drive_link" target="_blank">Student Manual </a></button>
-          <button className="hero-button"> <a href="https://drive.google.com/file/d/1XUGfHygE3_KYX_qhcpvw8jhKLlcRkzHP/view?usp=drive_link" target="_blank">Mentor Manual </a></button>
+          <button className="hero-button"> <a href={STUDENT_MANUAL_LINK} target="_blank">Student Manual </a></button>
+          <button className="hero-button"> <a href={MENTOR_MANUAL_LINK} target="_blank">Mentor Manual </a></button>
         </div>
       </div>
       <div className="hero-images">

diff --git a/src/pages/StudentDashboard.tsx b/src/pages/StudentDashboard.tsx
@@ -5,7 +5,6 @@ import {
   MID_EVALS_ENDED,
   REPORT_SUBMISSION_OPEN,
   ROUTER_PATHS,
-  SLACK_INVITE,
   STUDENT_MANUAL_LINK,
 } from "../util/constants";
 import { useAuthContext } from "../util/auth";
@@ -246,12 +245,6 @@ function StudentDashboard() {
               announcements.
             </p>
             <div className="flex justify-center gap-4 mx-auto">
-              <Link
-                to={SLACK_INVITE}
-                className="text-white w-fit mx-auto focus:outline-none focus:ring-4 font-medium rounded-lg text-sm px-5 py-2.5 bg-primary-700 hover:bg-primary-600 focus:ring-primary-600 border-primary-600"
-              >
-                Slack Workspace
-              </Link>
               <Link
                 to={DISCORD_INVITE}
                 className="text-white w-fit mx-auto focus:outline-none focus:ring-4 font-medium rounded-lg text-sm px-5 py-2.5 bg-primary-700 hover:bg-primary-600 focus:ring-primary-600 border-primary-600"

diff --git a/src/util/constants.ts b/src/util/constants.ts
@@ -35,8 +35,6 @@ export enum ROUTER_PATHS {
   ONE_PROJECT_STATS = "/stats/project/:id",
 }
 export const DISCORD_INVITE = "https://discord.gg/efFwh6fnjk";
-export const SLACK_INVITE =
-  "https://join.slack.com/t/kwoc-koss/shared_invite/zt-wlftnk75-VoQHEEB9WpkHfza6~GGpWQ";
 export const KOSS_WEBSITE_URL = "https://kossiitkgp.org";
 export const KOSS_CONTACT_EMAIL = "[email protected]";
 export const KOSS_LINKEDIN_URL =
@@ -45,9 +43,9 @@ export const KOSS_TWITTER_URL = "https://twitter.com/kossiitkgp";
 export const FOSSU_WEBSITE_URL = "https://fossunited.org";
 
 export const MENTOR_MANUAL_LINK =
-  "https://drive.google.com/file/d/1qNl6RGQ6dnkFu20L3LwC4bcBFOOpd_vV/view?usp=drive_link";
+  "https://drive.google.com/file/d/1XUGfHygE3_KYX_qhcpvw8jhKLlcRkzHP/view?usp=drive_link";
 export const STUDENT_MANUAL_LINK =
-  "https://drive.google.com/file/d/18RqKEQnyS9YDKyaVQB8rvnqJtbxejf0M/view?usp=drive_link";
+  "https://drive.google.com/file/d/1gc2NWeMDA3ZFzH4RWVspuerduRdfY9yu/view?usp=drive_link";
 
 export const GH_OAUTH_CLIENT_ID = import.meta.env.VITE_GH_OAUTH_CLIENT_ID;
 export const GH_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${GH_OAUTH_CLIENT_ID}&state=replacethiswithrandomtextlater`;