Skip to content

Commit a297fc3

Browse files
authored
Merge pull request #15 from csesoc/CW2-26-Add-relevant-content-for-each-section
[CW2 26] Add relevant content from CSESoc media
2 parents ca6c1c9 + 6854fe6 commit a297fc3

33 files changed

+938
-266
lines changed

Diff for: frontend/package-lock.json

+48-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"axios": "^1.7.2",
2222
"eslint-config-next": "13.4.19",
2323
"framer-motion": "^11.1.2",
24-
"next": "13.4.19",
24+
"next": "13.4.12",
2525
"postcss": "8.4.29",
2626
"react": "18.2.0",
2727
"react-dom": "18.2.0",

Diff for: frontend/public/images/csesoc-team-2007.png

23.9 KB
Loading

Diff for: frontend/public/images/csesoc-team-2008.png

32 KB
Loading

Diff for: frontend/public/images/csesoc-team-2009.png

15.5 KB
Loading

Diff for: frontend/public/images/csesoc-team-2010.png

15.1 KB
Loading

Diff for: frontend/public/images/csesoc-team-2011.png

12.3 KB
Loading

Diff for: frontend/public/images/csesoc-team-2012.png

13.9 KB
Loading

Diff for: frontend/public/images/csesoc-team-2013.png

15.4 KB
Loading

Diff for: frontend/public/images/csesoc-team-2014.png

16.2 KB
Loading

Diff for: frontend/public/images/csesoc-team-2015.png

22 KB
Loading

Diff for: frontend/public/images/csesoc-team-2016.png

22.1 KB
Loading

Diff for: frontend/public/images/csesoc-team-2017.png

20.5 KB
Loading

Diff for: frontend/public/images/csesoc-team-2018.png

28.1 KB
Loading

Diff for: frontend/public/images/csesoc-team-2019.png

28.9 KB
Loading

Diff for: frontend/public/images/csesoc-team-2020.png

27.2 KB
Loading

Diff for: frontend/public/images/csesoc-team-2024.jpeg

255 KB
Loading

Diff for: frontend/src/components/About/index.tsx

+49-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Image from 'next/image';
2+
import Link from 'next/link';
23

34
const About = () => {
45
return (
@@ -15,12 +16,10 @@ const About = () => {
1516
<Image src="/assets/csesoc_icon.svg" alt="CSESoc Icon" width={150} height={150} />
1617
</div>
1718
<h2 className="mt-10 text-3xl font-extrabold">CSESoc</h2>
18-
<p className="text-[#727B8C] font-medium">unsw-computer-science-soc</p>
19+
<p className="text-[#727B8C] font-medium">unsw-computer-science-engineering-society</p>
1920
<button className="bg-[#444F6F] w-full my-5 py-2 rounded">Follow</button>
2021
<p>
21-
We are one of the biggest and most active societies at UNSW, catering to over 3500 CSE
22-
students spanning across degrees in Computer Science, Software Engineering,
23-
Bioinformatics and Computer Engineering.
22+
CSESoc is the principal representative body for UNSW computing students.
2423
</p>
2524
<div className="my-4 flex gap-5">
2625
<Image src="/assets/people_icon.svg" alt="People" width={20} height={20} />
@@ -40,50 +39,81 @@ const About = () => {
4039
</div>
4140
{/* RIGHT SIDE */}
4241
<div className="col-span-4 lg:mt-0 mt-10">
43-
<div className="rounded border border-[#595F6D] p-5 2xl:h-80 xl:h-64 lg:h-48 sm:h-36 h-full">
42+
<div className="rounded border border-[#595F6D] p-5 h-auto">
4443
<p className="text-xs">
4544
csesoc/README<span className="text-[#7A8192]">.md</span>
4645
</p>
47-
<p className="mt-5">Lorem Ipsum</p>
46+
<p className="mt-5">
47+
CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE
48+
students spanning across degrees in Computer Science, Software Engineering,
49+
Bioinformatics and Computer Engineering.
50+
<br /><br />
51+
We are here to fulfil the social, personal and
52+
professional needs of CSE students, and promote computing through a variety of forms.
53+
</p>
4854
</div>
4955
<div className="mt-10">
5056
Pinned
57+
{/* TODO: refactor all of this */}
5158
<div className="sm:flex my-5">
5259
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
5360
<div className="flex text-[#3A76F8]">
54-
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
55-
csesoc.unsw.edu.au/<span className="font-semibold">events</span>
61+
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
62+
<Link href="/about/execs-directors-subcommittees">
63+
<span className="font-semibold hover:underline">execs-directors-subcoms</span>
64+
</Link>
5665
</div>
57-
<div className="my-5">CSESoc&apos;s recent events</div>
66+
<div className="my-5">CSESoc&apos;s execs, directors, subcommittees</div>
5867
<div className="rounded-full bg-[#CC5421] w-3 h-3" />
5968
</div>
6069
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
6170
<div className="flex text-[#3A76F8]">
62-
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
63-
csesoc.unsw.edu.au/<span className="font-semibold">socials</span>
71+
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
72+
<Link href="/about/constitution">
73+
<span className="font-semibold hover:underline">constitution</span>
74+
</Link>
6475
</div>
65-
<div className="my-5">Follow us on all socials</div>
76+
<div className="my-5">Current and past constitutions</div>
6677
<div className="rounded-full bg-[#566ACE] w-3 h-3" />
6778
</div>
6879
</div>
69-
<div className="sm:flex">
80+
<div className="sm:flex my-5">
7081
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
7182
<div className="flex text-[#3A76F8]">
72-
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
73-
csesoc.unsw.edu.au/<span className="font-semibold">join-us</span>
83+
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
84+
<Link href="/about/our-history">
85+
<span className="font-semibold hover:underline">our-history</span>
86+
</Link>
7487
</div>
75-
<div className="my-5">Get involved!</div>
88+
<div className="my-5">Dive into CSESoc&apos;s history</div>
7689
<div className="rounded-full bg-[#E7E923] w-3 h-3" />
7790
</div>
7891
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
7992
<div className="flex text-[#3A76F8]">
80-
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
81-
csesoc.unsw.edu.au/<span className="font-semibold">contact</span>
93+
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
94+
<Link href="/about/faqs">
95+
<span className="font-semibold hover:underline">faqs</span>
96+
</Link>
8297
</div>
83-
<div className="my-5">Contact us via email</div>
98+
<div className="my-5">Frequently asked questions</div>
8499
<div className="rounded-full bg-[#CC5421] w-3 h-3" />
85100
</div>
86101
</div>
102+
<div className="my-5">
103+
<div
104+
className="p-5 border border-[#595F6D] rounded-lg"
105+
style={{ width: 'calc(50% - 0.5rem)' }}
106+
>
107+
<div className="flex text-[#3A76F8]">
108+
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
109+
<Link href="/about/election-guide">
110+
<span className="font-semibold hover:underline">election-guide</span>
111+
</Link>
112+
</div>
113+
<div className="my-5"> Our election nomination guide</div>
114+
<div className="rounded-full bg-[#E7E923] w-3 h-3" />
115+
</div>
116+
</div>
87117
</div>
88118
</div>
89119
</div>

0 commit comments

Comments
 (0)