Skip to content

Commit 4995513

Browse files
derekxu04derekxu04
committed
Merge branch 'CW2-25_create_contact_us_page' into CW2-26-Add-relevant-content-for-each-section
2 parents dd71706 + 604574f commit 4995513

File tree

10 files changed

+269
-159
lines changed

10 files changed

+269
-159
lines changed

‎frontend/package-lock.json

Lines changed: 48 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

Lines changed: 1 addition & 1 deletion
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",

‎frontend/src/components/Contacts/index.tsx

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
import Image from 'next/image';
2+
3+
const boxStyling =
4+
'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
5+
const socialsBoxStyling =
6+
'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';
7+
8+
const Contacts = () => {
9+
return (
10+
<div className="md:mt-10 mt-5">
11+
<div className="grid grid-cols-3 1 gap-x-9 gap-y-5 mb-10">
12+
<a href="https://bit.ly/CSESocDiscord" target="_blank" className={socialsBoxStyling}>
13+
<Image
14+
src="assets/discord_logo.svg"
15+
alt="discord logo"
16+
width={25}
17+
height={25}
18+
className="mr-1"
19+
/>
20+
<p className="text-xl font-bold m-2">DISCORD</p>
21+
</a>
22+
<a
23+
href="https://www.facebook.com/csesoc/"
24+
target="_blank"
25+
className={socialsBoxStyling}
26+
>
27+
<Image
28+
src="assets/fb_logo.svg"
29+
alt="facebook logo"
30+
width={25}
31+
height={25}
32+
className="mr-1"
33+
/>
34+
<p className="text-xl font-bold m-2">FACEBOOK</p>
35+
</a>
36+
<a
37+
href="https://www.facebook.com/groups/csesoc"
38+
target="_blank"
39+
className={socialsBoxStyling}
40+
>
41+
<Image
42+
src="assets/group_icon.svg"
43+
alt="facebook group"
44+
width={25}
45+
height={25}
46+
className="mr-1"
47+
/>
48+
<p className="text-xl font-bold m-2">FACEBOOK GROUP</p>
49+
</a>
50+
</div>
51+
52+
<div className="flex 1 justify-around xl:mx-40">
53+
<a href="https://twitter.com/csesoc?lang=en" target="_blank">
54+
<Image
55+
src="assets/x_twitter_icon.svg"
56+
alt="X/Twitter"
57+
width={35}
58+
height={35}
59+
className="mr-1 fill-white hover:scale-105 transition-all"
60+
/>
61+
</a>
62+
<a href="https://www.youtube.com/@CSESocUNSW" target="_blank">
63+
<Image
64+
src="assets/youtube_logo.svg"
65+
alt="Youtube"
66+
width={35}
67+
height={35}
68+
className="mr-1 fill-white hover:scale-105 transition-all"
69+
/>
70+
</a>
71+
<a href="https://www.instagram.com/csesoc_unsw/?hl=en" target="_blank">
72+
<Image
73+
src="assets/instagram_logo.svg"
74+
alt="Instagram"
75+
width={35}
76+
height={35}
77+
className="mr-1 fill-white hover:scale-105 transition-all"
78+
/>
79+
</a>
80+
<a href="https://www.tiktok.com/@csesoc?lang=en" target="_blank">
81+
<Image
82+
src="assets/tiktok_logo.svg"
83+
alt="TikTok"
84+
width={35}
85+
height={35}
86+
className="mr-1 fill-white hover:scale-105 transition-all"
87+
/>
88+
</a>
89+
<a href="#" target="_blank">
90+
<Image
91+
src="assets/wechat_logo.svg"
92+
alt="weChat"
93+
width={40}
94+
height={40}
95+
className="mr-1 fill-white hover:scale-105 transition-all"
96+
/>
97+
</a>
98+
<a href="https://www.linkedin.com/company/csesoc?originalSubdomain=au" target="_blank">
99+
<Image
100+
src="assets/linkedin_logo.svg"
101+
alt="LinkedIn"
102+
width={35}
103+
height={35}
104+
className="mr-1 fill-white hover:scale-105 transition-all"
105+
/>
106+
</a>
107+
</div>
108+
</div>
109+
);
110+
};
111+
112+
export default Contacts;

‎frontend/src/components/Hamburger.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ export default function Hamburger() {
4747
<li className="py-2 text-lg">
4848
<Link href={'./sponsors'}>Sponsors</Link>
4949
</li>
50+
<li className="py-2 text-lg">
51+
<Link href={'./contact'}>Contact Us</Link>
52+
</li>
5053
</ul>
5154
</motion.div>
5255
)}

‎frontend/src/components/Navbar.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ const Navbar = () => {
4141
<p className="text-[0.6rem] text-[#C4C5C8]">04</p>
4242
<div>{'//'} sponsors</div>
4343
</Link>
44+
<Link href="contact">
45+
<p className="text-[0.6rem] text-[#C4C5C8]">05</p>
46+
<div>{'//'} contact Us</div>
47+
</Link>
4448
</div>
4549
<div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
4650
<Hamburger />

0 commit comments

Comments
 (0)