From 00b4919f559422ab507d13f434f1e0f7d4501dd1 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Thu, 25 Jul 2024 16:05:15 +1000 Subject: [PATCH 1/3] added functionality --- frontend/package-lock.json | 8 +- frontend/package.json | 2 +- frontend/src/components/About/index.tsx | 28 ++-- frontend/src/components/Stats.tsx | 209 ++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 18 deletions(-) create mode 100644 frontend/src/components/Stats.tsx diff --git a/frontend/package-lock.json b/frontend/package-lock.json index cebf6c7..cc5ec6f 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -15,7 +15,7 @@ "autoprefixer": "10.4.15", "axios": "^1.7.2", "eslint-config-next": "13.4.19", - "framer-motion": "^11.1.2", + "framer-motion": "^11.2.13", "next": "13.4.12", "postcss": "8.4.29", "react": "18.2.0", @@ -2424,9 +2424,9 @@ } }, "node_modules/framer-motion": { - "version": "11.1.2", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.1.2.tgz", - "integrity": "sha512-flRo14ImBGRbOFz9KsXQ9ty3wWW2zFk0Gp4VbvZ5bG+1gZg/1CNWj9ZHtsCmZSPkBgZNOVkVf6aEtW5YxOITfw==", + "version": "11.2.13", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.2.13.tgz", + "integrity": "sha512-AyIeegfkXlkX1lWEudRYsJlC+0A59cE8oFK9IsN9bUQzxLwcvN3AEaYaznkELiWlHC7a0eD7pxsYQo7BC05S5A==", "dependencies": { "tslib": "^2.4.0" }, diff --git a/frontend/package.json b/frontend/package.json index 7aea3ff..d40091e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,7 +20,7 @@ "autoprefixer": "10.4.15", "axios": "^1.7.2", "eslint-config-next": "13.4.19", - "framer-motion": "^11.1.2", + "framer-motion": "^11.2.13", "next": "13.4.12", "postcss": "8.4.29", "react": "18.2.0", diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx index 4071a9e..de495c5 100644 --- a/frontend/src/components/About/index.tsx +++ b/frontend/src/components/About/index.tsx @@ -1,5 +1,6 @@ import Image from 'next/image'; import Link from 'next/link'; +import Stats from '../Stats'; const About = () => { return ( @@ -9,16 +10,17 @@ const About = () => {

ABOUT

-
+
{/* LEFT SIDE */} -
-
+
+{/*
CSESoc Icon -
-

CSESoc

-

unsw-computer-science-engineering-society

- -

+

*/} +{/*

CSESoc

+

unsw-computer-science-engineering-society

*/} + +{/* */} +{/*

CSESoc is the principal representative body for UNSW computing students.

@@ -35,11 +37,11 @@ const About = () => {
Mail info@csesoc.org.au -
+
*/}
{/* RIGHT SIDE */} -
-
+
+{/*

csesoc/README.md

@@ -51,8 +53,8 @@ const About = () => { We are here to fulfil the social, personal and professional needs of CSE students, and promote computing through a variety of forms.

-
-
+
*/} +
Pinned {/* TODO: refactor all of this */}
diff --git a/frontend/src/components/Stats.tsx b/frontend/src/components/Stats.tsx new file mode 100644 index 0000000..087050c --- /dev/null +++ b/frontend/src/components/Stats.tsx @@ -0,0 +1,209 @@ +import Image from 'next/image'; +import { motion, useAnimationControls } from "framer-motion" +import { useEffect } from 'react'; + +const Stats = () => { + const r = 80; + const controls = useAnimationControls() + + const progress = { + hidden: { pathLength: 0, opacity: 0 }, + visible: { + pathLength: 0.7, + opacity: 1, + transition: { + pathLength: { type: "spring", duration: 1.5, bounce: 0 }, + opacity: { duration: 0.05 } + } + } + } + + useEffect(() => { + controls.start("hidden") + controls.start("visible") + controls.stop(); + }, []); + + const revert = async() => { + await controls.start("hidden") + return await controls.start("visible") + } + + return ( +
+
+ CSESoc Icon + + + + +

CSESoc

+

unsw-computer-science-engineering-society

+
+
{revert()}}> + People + 433 + total members +
+
{revert()}}> + People + 53 + events held +
+
{revert()}}> + People + 343 + subcom +
+
{revert()}}> + People + 343 + subcom +
+{/*
+ 53 +
+ People + held +
+
+
+ People + 300 subcom +
+
+ People + 52 events held +
*/} +
+{/*
+
+ CSESoc Icon +
+
+ People + 53 + events held +
+ +
*/} +{/*
+ Location + Sydney, Australia +
+
+ Mail + info@csesoc.org.au +
+ +
+

STATS

+
+
+

323,000

+

Members

+
+
+

300

+

Team Members

+
+
+

52

+

Events held

+
+
*/} + +
+
+
+
+ People + CSESoc is the principal representative body for UNSW computing students. +
+
+ Location + Sydney, Australia +
+
+ Mail + info@csesoc.org.au +
+
+
+ +
+
+
+

+ csesoc/README.md +

+

+ 1   CSESoc is one of the biggest and most active societies at
+ 2   UNSW, catering to over 3500 CSE students spanning across
+ 3   degrees in Computer Science, Software Engineering,
+ 4   Bioinformatics and Computer Engineering. +

+ 5   We are here to fulfil the social, personal and professional
+ 6   needs of CSE students, and promote computing through a
+ 7   variety of forms. +

+
+
+ + + +
+
+
+
+

+ execs-directors-subcoms.md +

+

+ 1   100+ events (35+ careers related revents)
+ 2   41 sponsors
+ 3   480 000 discord messages
+ 4   200+ volunteers.
+ 5   Tiktok: 27.2k views, 2k+ likes
+ 6   Podcast: 10k downloads, 600+ average viewers
+ 7   500+ high school students reached. +

+
+
+ + + +
+
+
+
+ ); +}; + +export default Stats; From 4ea1a11b304801ee6f8fe8c1bf3eda4e24e9a897 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Fri, 11 Oct 2024 03:38:22 +1100 Subject: [PATCH 2/3] landing page about section changes --- frontend/src/components/About/index.tsx | 41 +----- frontend/src/components/Github.tsx | 166 ++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 39 deletions(-) create mode 100644 frontend/src/components/Github.tsx diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx index de495c5..73b1897 100644 --- a/frontend/src/components/About/index.tsx +++ b/frontend/src/components/About/index.tsx @@ -1,6 +1,6 @@ import Image from 'next/image'; import Link from 'next/link'; -import Stats from '../Stats'; +import Github from '../Github'; const About = () => { return ( @@ -13,47 +13,10 @@ const About = () => {
{/* LEFT SIDE */}
-{/*
- CSESoc Icon -
*/} -{/*

CSESoc

-

unsw-computer-science-engineering-society

*/} - -{/* */} -{/*

- CSESoc is the principal representative body for UNSW computing students. -

-
- People -
- 432 members · 342{' '} - subcom -
-
-
- Location - Sydney, Australia -
-
- Mail - info@csesoc.org.au -
*/} +
{/* RIGHT SIDE */}
-{/*
-

- csesoc/README.md -

-

- CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE - students spanning across degrees in Computer Science, Software Engineering, - Bioinformatics and Computer Engineering. -

- We are here to fulfil the social, personal and - professional needs of CSE students, and promote computing through a variety of forms. -

-
*/}
Pinned {/* TODO: refactor all of this */} diff --git a/frontend/src/components/Github.tsx b/frontend/src/components/Github.tsx new file mode 100644 index 0000000..f8758ce --- /dev/null +++ b/frontend/src/components/Github.tsx @@ -0,0 +1,166 @@ +import Image from 'next/image'; +import { motion, useAnimationControls } from "framer-motion" +import { useEffect } from 'react'; + +const Github = () => { + const r = 80; + const controls = useAnimationControls() + + const progress = { + hidden: { pathLength: 0, opacity: 0 }, + visible: { + pathLength: 0.7, + opacity: 1, + transition: { + pathLength: { type: "spring", duration: 1.5, bounce: 0 }, + opacity: { duration: 0.05 } + } + } + } + + useEffect(() => { + controls.start("hidden") + controls.start("visible") + controls.stop(); + }, []); + + const revert = async() => { + await controls.start("hidden") + return await controls.start("visible") + } + + return ( +
+
+
+

CSESoc Stats

+ unsw-computer-science-engineering-society +
{revert()}}> + People + Total members: + 433 +
+
{revert()}}> +
+ People + Events held: +
+ 53 +
+
{revert()}}> +
+ People + Subcom: +
+ 343 +
+
{revert()}}> +
+ People + Contributions: +
+ 343 +
+
+
+ + + + +{/*} CSESoc Icon*/} +
+
+
+
+
+ People + CSESoc is the principal representative body for UNSW computing students. +
+
+ Location + Sydney, Australia +
+
+ Mail + info@csesoc.org.au +
+
+
+ +
+
+
+

+ csesoc/README.md +

+

+ 1   CSESoc is one of the biggest and most active societies at
+ 2   UNSW, catering to over 3500 CSE students spanning across
+ 3   degrees in Computer Science, Software Engineering,
+ 4   Bioinformatics and Computer Engineering. +

+ 5   We are here to fulfil the social, personal and professional
+ 6   needs of CSE students, and promote computing through a
+ 7   variety of forms. +

+
+
+ + + +
+
+
+
+

+ execs-directors-subcoms.md +

+

+ 1   100+ events (35+ careers related revents)
+ 2   41 sponsors
+ 3   480 000 discord messages
+ 4   200+ volunteers.
+ 5   Tiktok: 27.2k views, 2k+ likes
+ 6   Podcast: 10k downloads, 600+ average viewers
+ 7   500+ high school students reached. +

+
+
+ + + +
+
+
+
+ ); +}; + +export default Github; From 1512a2b3879d3bbd0291ebbf261e799f36746dff Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Fri, 18 Oct 2024 19:09:56 +1100 Subject: [PATCH 3/3] change landing page about component --- .../src/components/About/AboutHomepage.tsx | 53 ++++-- frontend/src/components/Event/index.tsx | 8 +- frontend/src/components/Github.tsx | 166 ------------------ frontend/src/components/Sponsors/index.tsx | 2 +- frontend/src/pages/about/index.tsx | 6 +- 5 files changed, 43 insertions(+), 192 deletions(-) delete mode 100644 frontend/src/components/Github.tsx diff --git a/frontend/src/components/About/AboutHomepage.tsx b/frontend/src/components/About/AboutHomepage.tsx index 42c3659..50fab9a 100644 --- a/frontend/src/components/About/AboutHomepage.tsx +++ b/frontend/src/components/About/AboutHomepage.tsx @@ -9,31 +9,48 @@ export default function AboutHomePage() {
{/* LEFT SIDE */} + {/* NOTE: there is slightly altered from about/index.tsx */}
CSESoc Icon
-

CSESoc

- +

CSESoc

+

unsw-computer-science-engineering-society

+
+ People +
+ 16k members · 146{' '} + internal members +
+
+
+ Location + Sydney, Australia +
+
{/* RIGHT SIDE */}
-
-

- csesoc/README.md -

-

- CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE - students spanning across degrees in Computer Science, Software Engineering, - Bioinformatics and Computer Engineering. -

- We are here to fulfil the social, personal and - professional needs of CSE students, and promote computing through a variety of forms. -

- Learn more about us! -

- -
+

+ We are one of the largest and most active societies at UNSW, and {" "} + the largest computing society in the southern hemisphere. +

+ CSESoc comprises {" "} + over 16k members + {" "}spanning across various degrees including Computer Science, + Software Engineering, Bioinformatics and Computer Engineering. +

+ We are here to fulfil the social, personal and professional needs of CSE students, + and promote computing through a variety of forms. +

+ + +
diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index f9f98a7..b6f8fa4 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -11,10 +11,10 @@ const Event = () => { listings, check out the CSESoc Discord or our Facebook page!

- - + +
Placeholder
diff --git a/frontend/src/components/Github.tsx b/frontend/src/components/Github.tsx deleted file mode 100644 index f8758ce..0000000 --- a/frontend/src/components/Github.tsx +++ /dev/null @@ -1,166 +0,0 @@ -import Image from 'next/image'; -import { motion, useAnimationControls } from "framer-motion" -import { useEffect } from 'react'; - -const Github = () => { - const r = 80; - const controls = useAnimationControls() - - const progress = { - hidden: { pathLength: 0, opacity: 0 }, - visible: { - pathLength: 0.7, - opacity: 1, - transition: { - pathLength: { type: "spring", duration: 1.5, bounce: 0 }, - opacity: { duration: 0.05 } - } - } - } - - useEffect(() => { - controls.start("hidden") - controls.start("visible") - controls.stop(); - }, []); - - const revert = async() => { - await controls.start("hidden") - return await controls.start("visible") - } - - return ( -
-
-
-

CSESoc Stats

- unsw-computer-science-engineering-society -
{revert()}}> - People - Total members: - 433 -
-
{revert()}}> -
- People - Events held: -
- 53 -
-
{revert()}}> -
- People - Subcom: -
- 343 -
-
{revert()}}> -
- People - Contributions: -
- 343 -
-
-
- - - - -{/*} CSESoc Icon*/} -
-
-
-
-
- People - CSESoc is the principal representative body for UNSW computing students. -
-
- Location - Sydney, Australia -
-
- Mail - info@csesoc.org.au -
-
-
- -
-
-
-

- csesoc/README.md -

-

- 1   CSESoc is one of the biggest and most active societies at
- 2   UNSW, catering to over 3500 CSE students spanning across
- 3   degrees in Computer Science, Software Engineering,
- 4   Bioinformatics and Computer Engineering. -

- 5   We are here to fulfil the social, personal and professional
- 6   needs of CSE students, and promote computing through a
- 7   variety of forms. -

-
-
- - - -
-
-
-
-

- execs-directors-subcoms.md -

-

- 1   100+ events (35+ careers related revents)
- 2   41 sponsors
- 3   480 000 discord messages
- 4   200+ volunteers.
- 5   Tiktok: 27.2k views, 2k+ likes
- 6   Podcast: 10k downloads, 600+ average viewers
- 7   500+ high school students reached. -

-
-
- - - -
-
-
-
- ); -}; - -export default Github; diff --git a/frontend/src/components/Sponsors/index.tsx b/frontend/src/components/Sponsors/index.tsx index f68583f..9f3c685 100644 --- a/frontend/src/components/Sponsors/index.tsx +++ b/frontend/src/components/Sponsors/index.tsx @@ -19,7 +19,7 @@ const Sponsors = () => { diff --git a/frontend/src/pages/about/index.tsx b/frontend/src/pages/about/index.tsx index 7bdcd0f..1b99746 100644 --- a/frontend/src/pages/about/index.tsx +++ b/frontend/src/pages/about/index.tsx @@ -26,8 +26,8 @@ export default function AboutPage() {
People
- 432 members · 342{' '} - subcom + 16k members · 146{' '} + internal members
@@ -49,7 +49,7 @@ export default function AboutPage() {

CSESoc is the official representative body of computing students at UNSW. We are one of the largest and most active societies at UNSW, and the largest computing society in the southern hemisphere. - CSESoc comprises ~10k members spanning across degrees in Computer Science, Software Engineering, + CSESoc comprises over 16k members spanning across various degrees including Computer Science, Software Engineering, Bioinformatics and Computer Engineering. We are here to fulfil the social, personal and professional needs of CSE students, and promote computing through a variety of forms.