From 1e3b0a4b875a78bbe97359268808db424ebcba0c Mon Sep 17 00:00:00 2001 From: Patrick <42367024+Patadam@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:57:21 +1000 Subject: [PATCH 1/3] add initial agm details --- src/App.jsx | 2 +- src/assets/agm.css | 10 ++++++++ src/component/Navbar.jsx | 1 + src/routes/Agm.jsx | 50 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 src/assets/agm.css create mode 100644 src/routes/Agm.jsx diff --git a/src/App.jsx b/src/App.jsx index b13918e..377e4cb 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -7,7 +7,7 @@ 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"; 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 + + + + + + + + + + + + ); +} + +export default Agm; From bcd115db857169d1dea705b1a731f8ca60aa7c4a Mon Sep 17 00:00:00 2001 From: Patrick <42367024+Patadam@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:04:36 +1000 Subject: [PATCH 2/3] update hackathon page and fixes --- src/Agm.jsx | 16 ------------ src/App.jsx | 3 ++- src/agm.css | 10 -------- src/main.jsx | 54 +++++++++++++++++++++-------------------- src/routes/Agm.jsx | 2 +- src/routes/Showcase.jsx | 15 ++++++++++++ 6 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 src/Agm.jsx delete mode 100644 src/agm.css create mode 100644 src/routes/Showcase.jsx 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 377e4cb..11e81d3 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -13,6 +13,7 @@ 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/main.jsx b/src/main.jsx index c3d1d3e..b615839 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,30 +1,32 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import { BrowserRouter } from 'react-router-dom'; +import React from "react"; +import ReactDOM from "react-dom"; +import "./index.css"; +import App from "./App"; +import { BrowserRouter } from "react-router-dom"; -import Footer from './Footer'; -import { Routes, Route } from 'react-router-dom'; -import Navbar from './component/Navbar'; -import AnimatedCursor from './component/cursor'; +import Footer from "./Footer"; +import { Routes, Route } from "react-router-dom"; +import Navbar from "./component/Navbar"; +import AnimatedCursor from "./component/cursor"; -ReactDOM.render( - -
- -
-
- -
+import { createRoot } from "react-dom/client"; +const container = document.getElementById("root"); +const root = createRoot(container); +root.render( + + +
+ +
+
+ +
+
+
-
-
- , - - document.getElementById('root'), + + ); diff --git a/src/routes/Agm.jsx b/src/routes/Agm.jsx index 4f7c0d6..6f34a7a 100644 --- a/src/routes/Agm.jsx +++ b/src/routes/Agm.jsx @@ -8,7 +8,7 @@ function Agm() { return (
-
+

January 2024 Annual General Meeting

The 2024 Annual General Meeting will be held on Monday, September 9th at 5pm in GP D-108. 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

+ +
+
+ ); +} From 3d2bdcb5a374593ed6f94c332430163385147926 Mon Sep 17 00:00:00 2001 From: Patrick <42367024+Patadam@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:54:23 +1000 Subject: [PATCH 3/3] updates --- src/routes/Agm.jsx | 68 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/src/routes/Agm.jsx b/src/routes/Agm.jsx index 6f34a7a..aed4026 100644 --- a/src/routes/Agm.jsx +++ b/src/routes/Agm.jsx @@ -1,15 +1,19 @@ -import { Book, FileOpen } from "@mui/icons-material"; +import { Close, CopyAll, LinkOutlined, OpenInNew } from "@mui/icons-material"; +import { Box, Button, Dialog, IconButton, Stack } from "@mui/material"; +import React from "react"; import "../App.css"; import "../assets/agm.css"; -import React from "react"; -import { Button, Link, Stack } from "@mui/material"; function Agm() { + const [isDialogOpen, setIsDialogOpen] = React.useState(false); return (
-
-

January 2024 Annual General Meeting

+
+

Annual General Meeting (AGM) 2024

+

+ Have your say on our 2025 executive team and nominate yourself or others to be in the 2025 Code Network Executive team. +

The 2024 Annual General Meeting will be held on Monday, September 9th at 5pm in GP D-108.

@@ -32,7 +36,7 @@ function Agm() { @@ -40,7 +44,59 @@ function Agm() { Meeting Agenda + + + + 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")}> + + + + + + +