diff --git a/src/Agm.jsx b/src/Agm.jsx deleted file mode 100644 index 91b11c9..0000000 --- a/src/Agm.jsx +++ /dev/null @@ -1,16 +0,0 @@ -import './App.css' -import './agm.css'; - -function Agm() { - return ( -
-
-
-

The 2023 Code Network AGM has now passed. Details about the 2024 AGM will be announced in September 2024.

-
-
-
- ) -} - -export default Agm; \ No newline at end of file diff --git a/src/App.jsx b/src/App.jsx index b13918e..11e81d3 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -7,12 +7,13 @@ import Header from "./Header"; import Ssp from "./ssp"; import Coc from "./coc"; import About from "./About"; -import Agm from "./Agm"; +import Agm from "./routes/Agm"; import Rules from "./Rules"; import Constitution from "./constitution"; import SGM from "./Sgm"; import HackathonPage from "@/routes/Hackathon"; +import Showcase from "@/routes/Showcase"; function App() { return ( @@ -29,7 +30,7 @@ function App() { } /> } /> } /> - } /> + } /> diff --git a/src/agm.css b/src/agm.css deleted file mode 100644 index b2d2b40..0000000 --- a/src/agm.css +++ /dev/null @@ -1,10 +0,0 @@ -#agmLinks>a { - padding: 8px; - background-color: rgb(1, 214, 9); - color: white; - border-radius: 16px -} - -#agmLinks>a:hover { - background-color: rgb(150, 214, 150) -} \ No newline at end of file diff --git a/src/assets/agm.css b/src/assets/agm.css new file mode 100644 index 0000000..4bfce8a --- /dev/null +++ b/src/assets/agm.css @@ -0,0 +1,10 @@ +#agmLinks > a { + padding: 8px; + background-color: rgb(1, 214, 9); + color: white; + border-radius: 16px; +} + +#agmLinks > a:hover { + background-color: rgb(150, 214, 150); +} diff --git a/src/component/Navbar.jsx b/src/component/Navbar.jsx index 7d7b07c..0a16ece 100644 --- a/src/component/Navbar.jsx +++ b/src/component/Navbar.jsx @@ -44,6 +44,7 @@ function Navbar() { Rules Hackathon + AGM + + + + + + + + + + + + setIsDialogOpen(false)}> + setIsDialogOpen(false)}> + + + +

AGM Zoom Meeting

+

QUT Login Only

+ + + + + Meeting Link: + + + + + + +

+ {" "} + + https://qut.zoom.us/j/84965499570?pwd=obz8wIob8vdTB3YjQx5EVIpwQWkYvn.1 + {" "} +

+
+ + Meeting ID: 849 6549 9570 + navigator.clipboard.writeText("84965499570")}> + + + + + Passcode: 320767 + navigator.clipboard.writeText("320767")}> + + + +
+
+
+
+ + + + ); +} + +export default Agm; diff --git a/src/routes/Showcase.jsx b/src/routes/Showcase.jsx new file mode 100644 index 0000000..f0ddc39 --- /dev/null +++ b/src/routes/Showcase.jsx @@ -0,0 +1,15 @@ +import { Box, Typography } from "@mui/material"; + +export default function Showcase() { + return ( +
+
+ +

2024 Winter Hackathon

+

This event has now ended!

+

Check back here later to see a showcase of projects created at our 2024 Winter Hackathon

+
+
+
+ ); +}