Skip to content

Commit f17251a

Browse files
jamest0jamest0
committed
fix formatting and merge conflicts
2 parents 926342a + 931d483 commit f17251a

File tree

13 files changed

+190
-1
lines changed

13 files changed

+190
-1
lines changed

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"discord.enabled": true
3+
}

‎components/ResourcesAndContacts/index.tsx

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
// import DiscordLogo from "@/public/assets/discord_logo.svg"
2+
import Image from "next/image";
3+
4+
const ResourcesAndContacts = () => {
5+
return (
6+
<section className="bg-no-repeat bg-center py-8 px-15 min-h-screen flex justify-center items-center">
7+
<div className="2xl:w-[100rem]">
8+
<div className="relative">
9+
<Image src="assets/resources_bg.svg" alt="Background" className="-z-50 absolute" fill />
10+
11+
<div className="text-center my-10">
12+
<p className="text-[#3977F8] font-game text-xl">03</p>
13+
<h1 className="font-bold text-5xl">RESOURCES & CONTACTS</h1>
14+
</div>
15+
16+
<div className="py-8 bg-no-repeat bg-center">
17+
<div className="grid grid-cols-4 1 gap-x-9 gap-y-5">
18+
<a href="https://circles.csesoc.app/course-selector" target="_blank" className="col-span-4 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
19+
<h2 className="mt-5 text-3xl font-extrabold">Circles</h2>
20+
<p className="mt-7 text-lg mb-5">A UNSW degree planner where you can explore and validate your degree structure.</p>
21+
</a>
22+
23+
<a href="https://structs.sh/" target="_blank" className="col-span-1 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
24+
<h2 className="mt-1 text-3xl font-extrabold">Structs.sh</h2>
25+
<p className="mt-7 text-lg mb-5">An educational data structures and algorithms platform.</p>
26+
</a>
27+
28+
<a href="https://jobsboard.csesoc.unsw.edu.au/" target="_blank" className="col-span-1 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
29+
<h2 className="mt-1 text-3xl font-extrabold">Jobs Board</h2>
30+
<p className="mt-7 text-lg mb-5">A place where CSESoc students can look for relevant job opportunities.</p>
31+
</a>
32+
33+
<a href="https://notangles.csesoc.app/" target="_blank" className="col-span-1 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
34+
<h2 className="mt-1 text-3xl font-extrabold">Notangles</h2>
35+
36+
<p className="mt-7 text-lg mb-5">Trimester timetabling tool - no more timetable tangles!</p>
37+
</a>
38+
39+
<a href="https://unilectives.csesoc.app/" target="_blank" className="col-span-1 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
40+
<h2 className="mt-1 text-3xl font-extrabold">Uni-lectives</h2>
41+
42+
<p className="mt-7 text-lg mb-5">Read course electives to help you pick your electives or even write your own!</p>
43+
</a>
44+
45+
<a href="https://compclub.org/" target="_blank" className="col-span-2 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
46+
<h2 className="mt-1 text-3xl font-extrabold">CompClub</h2>
47+
48+
<p className="mt-7 text-lg mb-5">Promoting computing to high school students</p>
49+
</a>
50+
51+
<a href="https://media.csesoc.org.au/" target="_blank" className="col-span-2 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
52+
<h2 className="mt-1 text-3xl font-extrabold">CSESoc Media</h2>
53+
<p className="mt-7 text-lg mb-5">All things content</p>
54+
</a>
55+
56+
<a href="https://media.csesoc.org.au/fyg-2023/" target="_blank" className="col-span-2 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
57+
<h2 className="mt-1 text-3xl font-extrabold">First Year Guide</h2>
58+
<p className="mt-7 text-lg mb-5">The ultimate guide to conquering your first year at CSE</p>
59+
</a>
60+
61+
<a href="https://media.csesoc.org.au/cse-enrol/" target="_blank" className="block col-span-2 p-5 border border-[#595F6D] rounded-lg hover:bg-gray-100 hover:bg-opacity-10">
62+
<h2 className="mt-1 text-3xl font-extrabold">Enrolment Guide</h2>
63+
<p className="mt-7 text-lg mb-5">Learn how to get a headstart on uni</p>
64+
</a>
65+
</div>
66+
</div>
67+
</div>
68+
69+
<div className="mt-10">
70+
<div className="grid grid-cols-3 1 gap-x-9 gap-y-5 mb-20">
71+
<a href="https://bit.ly/CSESocDiscord" target="_blank" className="col-span-1 flex justify-center pt-2 pb-2 border border-[#595F6D] rounded-sm hover:bg-gray-100 hover:bg-opacity-10">
72+
<Image src="assets/discord_logo.svg" alt="" width={25} height={25} className="mr-1" />
73+
<p className="text-xl font-bold m-2">DISCORD</p>
74+
</a>
75+
<a href="https://www.facebook.com/csesoc/" target="_blank" className="col-span-1 flex justify-center pt-2 pb-2 border border-[#595F6D] rounded-sm hover:bg-gray-100 hover:bg-opacity-10">
76+
<Image src="assets/fb_logo.svg" alt="" width={25} height={25} className="mr-1" />
77+
<p className="text-xl font-bold m-2">FACEBOOK</p>
78+
</a>
79+
<a href="https://www.facebook.com/groups/csesoc" target="_blank" className="col-span-1 flex justify-center pt-2 pb-2 border border-[#595F6D] rounded-sm hover:bg-gray-100 hover:bg-opacity-10">
80+
<Image src="assets/group_icon.svg" alt="" width={25} height={25} className="mr-1" />
81+
<p className="text-xl font-bold m-2">FACEBOOK GROUP</p>
82+
</a>
83+
</div>
84+
85+
<div className="flex 1 justify-around ml-40 mr-40">
86+
<a href="https://twitter.com/csesoc?lang=en" target="_blank">
87+
<Image src="assets/x_twitter_icon.svg" alt="X/Twitter" width={35} height={35} className="mr-1 fill-white" />
88+
</a>
89+
<a href="https://www.youtube.com/@CSESocUNSW" target="_blank">
90+
<Image src="assets/youtube_logo.svg" alt="Youtube" width={35} height={35} className="mr-1 fill-white" />
91+
</a>
92+
<a href="https://www.instagram.com/csesoc_unsw/?hl=en" target="_blank">
93+
<Image src="assets/instagram_logo.svg" alt="Instagram" width={35} height={35} className="mr-1 fill-white" />
94+
</a>
95+
<a href="https://www.tiktok.com/@csesoc?lang=en" target="_blank">
96+
<Image src="assets/tiktok_logo.svg" alt="TikTok" width={35} height={35} className="mr-1 fill-white" />
97+
</a>
98+
<a href="#" target="_blank">
99+
<Image src="assets/wechat_logo.svg" alt="weChat" width={40} height={40} className="mr-1 fill-white" />
100+
</a>
101+
<a href="https://www.linkedin.com/company/csesoc?originalSubdomain=au" target="_blank">
102+
<Image src="assets/linkedin_logo.svg" alt="LinkedIn" width={35} height={35} className="mr-1 fill-white" />
103+
</a>
104+
</div>
105+
</div>
106+
</div>
107+
</section>
108+
);
109+
};
110+
111+
export default ResourcesAndContacts;

‎pages/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import Image from "next/image";
22
import Landing from "@/components/Landing";
33
import About from "@/components/About";
44
import Event from "@/components/Event";
5-
5+
import ResourcesAndContacts from "@/components/ResourcesAndContacts"
66
export default function Home() {
77
return (
88
<section>
99
<Landing />
1010
<About />
1111
<Event />
12+
<ResourcesAndContacts/>
1213
</section>
1314
);
1415
}

‎public/assets/discord_logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/fb_logo.svg

Lines changed: 40 additions & 0 deletions
Loading

‎public/assets/group_icon.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/instagram_logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/linkedin_logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/resources_bg.svg

Lines changed: 26 additions & 0 deletions
Loading

‎public/assets/tiktok_logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/wechat_logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/assets/x_twitter_icon.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)