Skip to content

[CW2 26] Add relevant content from CSESoc media #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 48 additions & 44 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added frontend/public/images/csesoc-team-2007.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2008.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2009.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2010.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2012.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2013.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2014.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2015.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2016.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2017.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2018.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2019.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2020.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/images/csesoc-team-2024.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 49 additions & 19 deletions frontend/src/components/About/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Image from 'next/image';
import Link from 'next/link';

const About = () => {
return (
Expand All @@ -15,12 +16,10 @@ const About = () => {
<Image src="/assets/csesoc_icon.svg" alt="CSESoc Icon" width={150} height={150} />
</div>
<h2 className="mt-10 text-3xl font-extrabold">CSESoc</h2>
<p className="text-[#727B8C] font-medium">unsw-computer-science-soc</p>
<p className="text-[#727B8C] font-medium">unsw-computer-science-engineering-society</p>
<button className="bg-[#444F6F] w-full my-5 py-2 rounded">Follow</button>
<p>
We are 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.
CSESoc is the principal representative body for UNSW computing students.
</p>
<div className="my-4 flex gap-5">
<Image src="/assets/people_icon.svg" alt="People" width={20} height={20} />
Expand All @@ -40,50 +39,81 @@ const About = () => {
</div>
{/* RIGHT SIDE */}
<div className="col-span-4 lg:mt-0 mt-10">
<div className="rounded border border-[#595F6D] p-5 2xl:h-80 xl:h-64 lg:h-48 sm:h-36 h-full">
<div className="rounded border border-[#595F6D] p-5 h-auto">
<p className="text-xs">
csesoc/README<span className="text-[#7A8192]">.md</span>
</p>
<p className="mt-5">Lorem Ipsum</p>
<p className="mt-5">
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.
<br /><br />
We are here to fulfil the social, personal and
professional needs of CSE students, and promote computing through a variety of forms.
</p>
</div>
<div className="mt-10">
Pinned
{/* TODO: refactor all of this */}
<div className="sm:flex my-5">
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
<div className="flex text-[#3A76F8]">
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
csesoc.unsw.edu.au/<span className="font-semibold">events</span>
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
<Link href="/about/execs-directors-subcommittees">
<span className="font-semibold hover:underline">execs-directors-subcoms</span>
</Link>
</div>
<div className="my-5">CSESoc&apos;s recent events</div>
<div className="my-5">CSESoc&apos;s execs, directors, subcommittees</div>
<div className="rounded-full bg-[#CC5421] w-3 h-3" />
</div>
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
<div className="flex text-[#3A76F8]">
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
csesoc.unsw.edu.au/<span className="font-semibold">socials</span>
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
<Link href="/about/constitution">
<span className="font-semibold hover:underline">constitution</span>
</Link>
</div>
<div className="my-5">Follow us on all socials</div>
<div className="my-5">Current and past constitutions</div>
<div className="rounded-full bg-[#566ACE] w-3 h-3" />
</div>
</div>
<div className="sm:flex">
<div className="sm:flex my-5">
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg mr-5 w-full sm:mb-0 mb-5">
<div className="flex text-[#3A76F8]">
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
csesoc.unsw.edu.au/<span className="font-semibold">join-us</span>
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
<Link href="/about/our-history">
<span className="font-semibold hover:underline">our-history</span>
</Link>
</div>
<div className="my-5">Get involved!</div>
<div className="my-5">Dive into CSESoc&apos;s history</div>
<div className="rounded-full bg-[#E7E923] w-3 h-3" />
</div>
<div className="p-5 border border-[#595F6D] flex-1 rounded-lg w-full">
<div className="flex text-[#3A76F8]">
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} />
csesoc.unsw.edu.au/<span className="font-semibold">contact</span>
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
<Link href="/about/faqs">
<span className="font-semibold hover:underline">faqs</span>
</Link>
</div>
<div className="my-5">Contact us via email</div>
<div className="my-5">Frequently asked questions</div>
<div className="rounded-full bg-[#CC5421] w-3 h-3" />
</div>
</div>
<div className="my-5">
<div
className="p-5 border border-[#595F6D] rounded-lg"
style={{ width: 'calc(50% - 0.5rem)' }}
>
<div className="flex text-[#3A76F8]">
<Image src="/assets/book_icon.svg" alt="Book" width={20} height={20} className="mr-2" />
<Link href="/about/election-guide">
<span className="font-semibold hover:underline">election-guide</span>
</Link>
</div>
<div className="my-5"> Our election nomination guide</div>
<div className="rounded-full bg-[#E7E923] w-3 h-3" />
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading
Loading