From 3fe8a621ab40a2c59ede2471b417189b5aca3211 Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Fri, 7 Jun 2024 01:35:04 +1000
Subject: [PATCH 01/16] added contact us page
---
frontend/src/pages/contact-us.tsx | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 frontend/src/pages/contact-us.tsx
diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx
new file mode 100644
index 0000000..fd4c606
--- /dev/null
+++ b/frontend/src/pages/contact-us.tsx
@@ -0,0 +1,6 @@
+export default function ContactUs() {
+ return
From 43c6187792fa917993b494eaeb1b455f1134cddf Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Fri, 7 Jun 2024 01:52:03 +1000
Subject: [PATCH 03/16] added contact page
---
frontend/package-lock.json | 92 ++++++++++++++++---------------
frontend/package.json | 2 +-
frontend/src/pages/contact-us.tsx | 22 ++++++--
frontend/tsconfig.json | 23 ++++++--
4 files changed, 84 insertions(+), 55 deletions(-)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fd73377..cebf6c7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16,7 +16,7 @@
"axios": "^1.7.2",
"eslint-config-next": "13.4.19",
"framer-motion": "^11.1.2",
- "next": "13.4.19",
+ "next": "13.4.12",
"postcss": "8.4.29",
"react": "18.2.0",
"react-dom": "18.2.0",
@@ -242,9 +242,9 @@
}
},
"node_modules/@next/env": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.19.tgz",
- "integrity": "sha512-FsAT5x0jF2kkhNkKkukhsyYOrRqtSxrEhfliniIq0bwWbuXLgyt3Gv0Ml+b91XwjwArmuP7NxCiGd++GGKdNMQ=="
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.12.tgz",
+ "integrity": "sha512-RmHanbV21saP/6OEPBJ7yJMuys68cIf8OBBWd7+uj40LdpmswVAwe1uzeuFyUsd6SfeITWT3XnQfn6wULeKwDQ=="
},
"node_modules/@next/eslint-plugin-next": {
"version": "14.2.3",
@@ -302,9 +302,9 @@
}
},
"node_modules/@next/swc-darwin-arm64": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.19.tgz",
- "integrity": "sha512-vv1qrjXeGbuF2mOkhkdxMDtv9np7W4mcBtaDnHU+yJG+bBwa6rYsYSCI/9Xm5+TuF5SbZbrWO6G1NfTh1TMjvQ==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.12.tgz",
+ "integrity": "sha512-deUrbCXTMZ6ZhbOoloqecnUeNpUOupi8SE2tx4jPfNS9uyUR9zK4iXBvH65opVcA/9F5I/p8vDXSYbUlbmBjZg==",
"cpu": [
"arm64"
],
@@ -317,9 +317,9 @@
}
},
"node_modules/@next/swc-darwin-x64": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.19.tgz",
- "integrity": "sha512-jyzO6wwYhx6F+7gD8ddZfuqO4TtpJdw3wyOduR4fxTUCm3aLw7YmHGYNjS0xRSYGAkLpBkH1E0RcelyId6lNsw==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.12.tgz",
+ "integrity": "sha512-WRvH7RxgRHlC1yb5oG0ZLx8F7uci9AivM5/HGGv9ZyG2Als8Ij64GC3d+mQ5sJhWjusyU6T6V1WKTUoTmOB0zQ==",
"cpu": [
"x64"
],
@@ -332,9 +332,9 @@
}
},
"node_modules/@next/swc-linux-arm64-gnu": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.19.tgz",
- "integrity": "sha512-vdlnIlaAEh6H+G6HrKZB9c2zJKnpPVKnA6LBwjwT2BTjxI7e0Hx30+FoWCgi50e+YO49p6oPOtesP9mXDRiiUg==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.12.tgz",
+ "integrity": "sha512-YEKracAWuxp54tKiAvvq73PUs9lok57cc8meYRibTWe/VdPB2vLgkTVWFcw31YDuRXdEhdX0fWS6Q+ESBhnEig==",
"cpu": [
"arm64"
],
@@ -347,9 +347,9 @@
}
},
"node_modules/@next/swc-linux-arm64-musl": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.19.tgz",
- "integrity": "sha512-aU0HkH2XPgxqrbNRBFb3si9Ahu/CpaR5RPmN2s9GiM9qJCiBBlZtRTiEca+DC+xRPyCThTtWYgxjWHgU7ZkyvA==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.12.tgz",
+ "integrity": "sha512-LhJR7/RAjdHJ2Isl2pgc/JaoxNk0KtBgkVpiDJPVExVWA1c6gzY57+3zWuxuyWzTG+fhLZo2Y80pLXgIJv7g3g==",
"cpu": [
"arm64"
],
@@ -362,9 +362,9 @@
}
},
"node_modules/@next/swc-linux-x64-gnu": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.19.tgz",
- "integrity": "sha512-htwOEagMa/CXNykFFeAHHvMJeqZfNQEoQvHfsA4wgg5QqGNqD5soeCer4oGlCol6NGUxknrQO6VEustcv+Md+g==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.12.tgz",
+ "integrity": "sha512-1DWLL/B9nBNiQRng+1aqs3OaZcxC16Nf+mOnpcrZZSdyKHek3WQh6j/fkbukObgNGwmCoVevLUa/p3UFTTqgqg==",
"cpu": [
"x64"
],
@@ -377,9 +377,9 @@
}
},
"node_modules/@next/swc-linux-x64-musl": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.19.tgz",
- "integrity": "sha512-4Gj4vvtbK1JH8ApWTT214b3GwUh9EKKQjY41hH/t+u55Knxi/0wesMzwQRhppK6Ddalhu0TEttbiJ+wRcoEj5Q==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.12.tgz",
+ "integrity": "sha512-kEAJmgYFhp0VL+eRWmUkVxLVunn7oL9Mdue/FS8yzRBVj7Z0AnIrHpTIeIUl1bbdQq1VaoOztnKicAjfkLTRCQ==",
"cpu": [
"x64"
],
@@ -392,9 +392,9 @@
}
},
"node_modules/@next/swc-win32-arm64-msvc": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.19.tgz",
- "integrity": "sha512-bUfDevQK4NsIAHXs3/JNgnvEY+LRyneDN788W2NYiRIIzmILjba7LaQTfihuFawZDhRtkYCv3JDC3B4TwnmRJw==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.12.tgz",
+ "integrity": "sha512-GMLuL/loR6yIIRTnPRY6UGbLL9MBdw2anxkOnANxvLvsml4F0HNIgvnU3Ej4BjbqMTNjD4hcPFdlEow4XHPdZA==",
"cpu": [
"arm64"
],
@@ -407,9 +407,9 @@
}
},
"node_modules/@next/swc-win32-ia32-msvc": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.19.tgz",
- "integrity": "sha512-Y5kikILFAr81LYIFaw6j/NrOtmiM4Sf3GtOc0pn50ez2GCkr+oejYuKGcwAwq3jiTKuzF6OF4iT2INPoxRycEA==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.12.tgz",
+ "integrity": "sha512-PhgNqN2Vnkm7XaMdRmmX0ZSwZXQAtamBVSa9A/V1dfKQCV1rjIZeiy/dbBnVYGdj63ANfsOR/30XpxP71W0eww==",
"cpu": [
"ia32"
],
@@ -422,9 +422,9 @@
}
},
"node_modules/@next/swc-win32-x64-msvc": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.19.tgz",
- "integrity": "sha512-YzA78jBDXMYiINdPdJJwGgPNT3YqBNNGhsthsDoWHL9p24tEJn9ViQf/ZqTbwSpX/RrkPupLfuuTH2sf73JBAw==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.12.tgz",
+ "integrity": "sha512-Z+56e/Ljt0bUs+T+jPjhFyxYBcdY2RIq9ELFU+qAMQMteHo7ymbV7CKmlcX59RI9C4YzN8PgMgLyAoi916b5HA==",
"cpu": [
"x64"
],
@@ -3490,11 +3490,11 @@
"dev": true
},
"node_modules/next": {
- "version": "13.4.19",
- "resolved": "https://registry.npmjs.org/next/-/next-13.4.19.tgz",
- "integrity": "sha512-HuPSzzAbJ1T4BD8e0bs6B9C1kWQ6gv8ykZoRWs5AQoiIuqbGHHdQO7Ljuvg05Q0Z24E2ABozHe6FxDvI6HfyAw==",
+ "version": "13.4.12",
+ "resolved": "https://registry.npmjs.org/next/-/next-13.4.12.tgz",
+ "integrity": "sha512-eHfnru9x6NRmTMcjQp6Nz0J4XH9OubmzOa7CkWL+AUrUxpibub3vWwttjduu9No16dug1kq04hiUUpo7J3m3Xw==",
"dependencies": {
- "@next/env": "13.4.19",
+ "@next/env": "13.4.12",
"@swc/helpers": "0.5.1",
"busboy": "1.6.0",
"caniuse-lite": "^1.0.30001406",
@@ -3510,18 +3510,19 @@
"node": ">=16.8.0"
},
"optionalDependencies": {
- "@next/swc-darwin-arm64": "13.4.19",
- "@next/swc-darwin-x64": "13.4.19",
- "@next/swc-linux-arm64-gnu": "13.4.19",
- "@next/swc-linux-arm64-musl": "13.4.19",
- "@next/swc-linux-x64-gnu": "13.4.19",
- "@next/swc-linux-x64-musl": "13.4.19",
- "@next/swc-win32-arm64-msvc": "13.4.19",
- "@next/swc-win32-ia32-msvc": "13.4.19",
- "@next/swc-win32-x64-msvc": "13.4.19"
+ "@next/swc-darwin-arm64": "13.4.12",
+ "@next/swc-darwin-x64": "13.4.12",
+ "@next/swc-linux-arm64-gnu": "13.4.12",
+ "@next/swc-linux-arm64-musl": "13.4.12",
+ "@next/swc-linux-x64-gnu": "13.4.12",
+ "@next/swc-linux-x64-musl": "13.4.12",
+ "@next/swc-win32-arm64-msvc": "13.4.12",
+ "@next/swc-win32-ia32-msvc": "13.4.12",
+ "@next/swc-win32-x64-msvc": "13.4.12"
},
"peerDependencies": {
"@opentelemetry/api": "^1.1.0",
+ "fibers": ">= 3.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.3.0"
@@ -3530,6 +3531,9 @@
"@opentelemetry/api": {
"optional": true
},
+ "fibers": {
+ "optional": true
+ },
"sass": {
"optional": true
}
diff --git a/frontend/package.json b/frontend/package.json
index e1133f6..7aea3ff 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,7 +21,7 @@
"axios": "^1.7.2",
"eslint-config-next": "13.4.19",
"framer-motion": "^11.1.2",
- "next": "13.4.19",
+ "next": "13.4.12",
"postcss": "8.4.29",
"react": "18.2.0",
"react-dom": "18.2.0",
diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx
index fd4c606..5d23004 100644
--- a/frontend/src/pages/contact-us.tsx
+++ b/frontend/src/pages/contact-us.tsx
@@ -1,6 +1,18 @@
+import Footer from '@/components/Footer';
+import Hamburger from '@/components/Hamburger';
+import Navbar from '@/components/Navbar';
+
export default function ContactUs() {
- return
-
Hello world
-
-
-}
\ No newline at end of file
+ return (
+
+
+
+
+ Follow us on social media to be notified of upcoming events and opportunities' or
+ something like that
+
+
+
+
+ );
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 0ca7323..c0a5209 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es5",
- "lib": ["dom", "dom.iterable", "esnext"],
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
@@ -14,9 +18,18 @@
"jsx": "preserve",
"incremental": true,
"paths": {
- "@/*": ["./src/*"]
- }
+ "@/*": [
+ "./src/*"
+ ]
+ },
+ "forceConsistentCasingInFileNames": true
},
- "include": ["./next-env.d.ts", "**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "include": [
+ "./next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
}
From 7b1271b070f6b3971428bb96f6aa71dd1b5463ef Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Fri, 7 Jun 2024 02:07:00 +1000
Subject: [PATCH 04/16] added content for contact us with reference to
https://media.csesoc.org.au/contact-us/
---
frontend/src/pages/contact-us.tsx | 54 +++++++++++++++++++++++++++++--
1 file changed, 52 insertions(+), 2 deletions(-)
diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx
index 5d23004..85edbf5 100644
--- a/frontend/src/pages/contact-us.tsx
+++ b/frontend/src/pages/contact-us.tsx
@@ -7,9 +7,59 @@ export default function ContactUs() {
+
- Follow us on social media to be notified of upcoming events and opportunities' or
- something like that
+ CSESoc is the official representative body of computing students at UNSW. We are here to
+ fulfil the social, personal and professional needs of CSE students, and promote computing
+ through a variety of forms.
+
+ Contact
+
+
+
+
+ And be sure to follow us on social media to be notified of upcoming events and
+ opportunities!
From fb8fddb6205643bec14c299cd0e6c7a68a0a5ce4 Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Fri, 7 Jun 2024 02:11:03 +1000
Subject: [PATCH 05/16] added contact us to hamburger menu option
---
frontend/src/components/Hamburger.tsx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/frontend/src/components/Hamburger.tsx b/frontend/src/components/Hamburger.tsx
index bbeb2c5..401f4c5 100644
--- a/frontend/src/components/Hamburger.tsx
+++ b/frontend/src/components/Hamburger.tsx
@@ -47,6 +47,9 @@ export default function Hamburger() {
Sponsors
+
+ Contact Us
+
)}
From 454aa6a0a9b04f04af80083b931b85f0da53cd7d Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:55:44 +1000
Subject: [PATCH 06/16] removed image and added iframe
---
frontend/src/pages/contact-us.tsx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx
index 85edbf5..1012729 100644
--- a/frontend/src/pages/contact-us.tsx
+++ b/frontend/src/pages/contact-us.tsx
@@ -7,10 +7,6 @@ export default function ContactUs() {
-
CSESoc is the official representative body of computing students at UNSW. We are here to
fulfil the social, personal and professional needs of CSE students, and promote computing
@@ -53,8 +49,10 @@ export default function ContactUs() {
this form
+
+
From 0ed13af535162d25df299d211a6adef799105136 Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Thu, 13 Jun 2024 19:00:19 +1000
Subject: [PATCH 07/16] added padding and enlarged text
---
frontend/src/pages/contact-us.tsx | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx
index 1012729..35e2ae6 100644
--- a/frontend/src/pages/contact-us.tsx
+++ b/frontend/src/pages/contact-us.tsx
@@ -7,16 +7,15 @@ export default function ContactUs() {
-
+
CSESoc is the official representative body of computing students at UNSW. We are here to
fulfil the social, personal and professional needs of CSE students, and promote computing
through a variety of forms.
- Contact
For general enquiries or feedback on our society
-
+
Please email{' '}
info@csesoc.org.au
@@ -25,7 +24,7 @@ export default function ContactUs() {
For feedback on CSESoc Media
-
+
Please email{' '}
media@csesoc.org.au
@@ -34,7 +33,7 @@ export default function ContactUs() {
For enquiries about sponsorship
-
+
Please email{' '}
sponsorship@csesoc.org.au
@@ -43,7 +42,7 @@ export default function ContactUs() {
For sharing opportunities with our members
-
+
Please fill out{' '}
this form
From 6167f3827f2a886b4f68bac4dfbbd57d21d506f6 Mon Sep 17 00:00:00 2001
From: QuadAces <107918856+QuadAces@users.noreply.github.com>
Date: Thu, 13 Jun 2024 19:12:39 +1000
Subject: [PATCH 08/16] altered resources page
---
frontend/src/components/Contacts/index.tsx | 113 ++++++++++++++++++
.../index.tsx | 104 +---------------
frontend/src/pages/contact-us.tsx | 4 +-
frontend/src/pages/index.tsx | 4 +-
frontend/src/pages/resources.tsx | 5 +-
5 files changed, 123 insertions(+), 107 deletions(-)
create mode 100644 frontend/src/components/Contacts/index.tsx
rename frontend/src/components/{ResourcesAndContacts => Resources}/index.tsx (58%)
diff --git a/frontend/src/components/Contacts/index.tsx b/frontend/src/components/Contacts/index.tsx
new file mode 100644
index 0000000..1d8a8b3
--- /dev/null
+++ b/frontend/src/components/Contacts/index.tsx
@@ -0,0 +1,113 @@
+// import DiscordLogo from "@/public/assets/discord_logo.svg"
+import Image from 'next/image';
+
+const boxStyling =
+ 'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
+const socialsBoxStyling =
+ 'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
+
+const Contacts = () => {
+ return (
+
+ );
+};
+
+export default Contacts;
diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/Resources/index.tsx
similarity index 58%
rename from frontend/src/components/ResourcesAndContacts/index.tsx
rename to frontend/src/components/Resources/index.tsx
index 459abbe..938fdfa 100644
--- a/frontend/src/components/ResourcesAndContacts/index.tsx
+++ b/frontend/src/components/Resources/index.tsx
@@ -6,7 +6,7 @@ const boxStyling =
const socialsBoxStyling =
'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
-const ResourcesAndContacts = () => {
+const Resources = () => {
return (
@@ -118,109 +118,9 @@ const ResourcesAndContacts = () => {
-
-