From e73237eff7b479df97eddd85a6d3d338198eb498 Mon Sep 17 00:00:00 2001 From: rqlq Date: Mon, 13 May 2024 18:07:48 +1000 Subject: [PATCH 1/4] disabled cta link --- src/routes/Root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/Root.tsx b/src/routes/Root.tsx index 0405c95..a97a770 100644 --- a/src/routes/Root.tsx +++ b/src/routes/Root.tsx @@ -67,7 +67,7 @@ function Root() { title: ["Join the ", "Hack", "Melbourne team for 2024"], desc: ["We make an impact on our future and learn some", "more skills along the way!"], button: "Apply Now", - link: "https://docs.google.com/forms/d/e/1FAIpQLSc_Cu4yD6Du6LWXD4itRBALJ0elsou0LN56xKPveT3HvrlBmw/viewform", + link: "", }; return ( From 6700b0c8d33dc6b63c402253b4020d041556c582 Mon Sep 17 00:00:00 2001 From: rqlq Date: Sun, 19 May 2024 19:47:12 +1000 Subject: [PATCH 2/4] Disabled join committee button by commenting out --- src/layouts/Layout.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layouts/Layout.tsx b/src/layouts/Layout.tsx index 04c2b45..e6adad7 100644 --- a/src/layouts/Layout.tsx +++ b/src/layouts/Layout.tsx @@ -52,10 +52,10 @@ const Layout = () => { { title: "Organisation", links: [ - { - name: "Join Committee", - link: "https://docs.google.com/forms/d/e/1FAIpQLSc_Cu4yD6Du6LWXD4itRBALJ0elsou0LN56xKPveT3HvrlBmw/viewform", - }, + // { + // name: "Join Committee", + // link: "https://docs.google.com/forms/d/e/1FAIpQLSc_Cu4yD6Du6LWXD4itRBALJ0elsou0LN56xKPveT3HvrlBmw/viewform", + // }, { name: "UMSU", link: UMSU_LINK }, { name: "Contact Us", link: "mailto:${SECRETARY_EMAIL}" }, ], From cf42375671bf80b4c50cef7f5a22dcfc69ed2405 Mon Sep 17 00:00:00 2001 From: rqlq Date: Thu, 20 Jun 2024 13:04:11 +1000 Subject: [PATCH 3/4] Redirecting urls, insta, discord, etc --- src/main.tsx | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/src/main.tsx b/src/main.tsx index 73f2a10..b2b9ed2 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,10 +1,7 @@ -import React from "react"; +import React, { useEffect } from "react"; import ReactDOM from "react-dom/client"; - import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from "react-router-dom"; - import "./index.css"; - import Layout from "./layouts/Layout"; // Main Pages @@ -16,24 +13,39 @@ import Privacy from "./routes/Privacy"; import Terms from "./routes/Terms"; import Calendar from "./routes/Calendar"; -//Event Pages +// Event Pages import OWeek from "./routes/eventPages/OWeek"; import OWeekGame from "./routes/eventPages/OWeekGame"; import GameComplete from "./routes/eventPages/GameComplete"; import HackiethonQuiz from "./routes/eventPages/HackiethonQuiz"; import QuizResults from "./features/HackiethonQuiz/QuizResults"; -//Blog Pages +// Blog Pages import Blogs from "./routes/Blogs"; import { BlogInterface, BlogsData } from "./routes/blogs/BlogsData"; -//Google Analytics +// Google Analytics import ReactGA from "react-ga4"; import Hackiethon from "./routes/eventPages/Hackiethon"; import Links from "./routes/Links"; ReactGA.initialize("G-BCJY191MCE"); +// Interface for the props that the Redirect component will receive +interface RedirectProps { + to: string; +} + +// Redirect component using the React.FC type +const Redirect: React.FC = ({ to }) => { + useEffect(() => { + window.location.replace(to); + }, [to]); + + return null; +}; + + const router = createBrowserRouter( createRoutesFromElements( }> @@ -56,6 +68,14 @@ const router = createBrowserRouter( {BlogsData.map((blog: BlogInterface) => ( } /> ))} + {/* Redirects */} + } /> + } /> + } /> + } /> + } /> + } /> + } /> , ), ); From 893715eb5b7b1770372cbf9a0cac1ef26ff7fa66 Mon Sep 17 00:00:00 2001 From: vjy02 Date: Tue, 16 Jul 2024 17:28:07 +1000 Subject: [PATCH 4/4] add /links --- src/main.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.tsx b/src/main.tsx index ab93f3d..c47d181 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -46,6 +46,7 @@ const router = createBrowserRouter( } /> } /> }> + }> } /> } /> } />