Skip to content

Commit 4a359ad

Browse files
authored
Merge pull request #10 from csesoc/CW2-7-move-social-media-to-footer
CW2-7-move-social-media-to-footer
2 parents d2fc2d6 + bc4ae19 commit 4a359ad

File tree

3 files changed

+81
-49
lines changed

3 files changed

+81
-49
lines changed

components/Footer.tsx

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,52 @@
11
import Image from 'next/image';
22
import Link from 'next/link';
3+
import Image from 'next/image';
4+
import { socialLinks } from '../public/data/data';
35

46
const Footer = () => {
57
return (
68
<section>
7-
<div className="sm:flex justify-between">
8-
<div className="flex items-center">
9-
<img src="assets/csesoc_logo_white.svg" alt="CSESoc Logo" />
10-
<Link href="/flag/ollie_is_hiding.png" target="_blank" className="sm:hidden block">
11-
<Image
12-
src="/flag/ollie_is_hiding.png"
13-
alt="Ollie"
14-
draggable="false"
15-
width={60}
16-
height={60}
17-
className="ml-10"
18-
/>
19-
</Link>
20-
<Image
21-
src="/flag/ollie_is_hiding.png"
22-
alt="Ollie"
23-
draggable="false"
24-
width={60}
25-
height={60}
26-
className="ml-10 sm:block hidden"
27-
/>
9+
<div className="sm:flex justify-between pb-10">
10+
<div className="flex flex-col gap-10">
11+
<div className="flex items-center">
12+
<Link href="/" className="flex">
13+
<Image src="assets/csesoc_logo_white.svg" width={231} height={53} alt="CSESoc Logo" />
14+
<Image
15+
src="/flag/ollie_is_hiding.png"
16+
alt="Ollie"
17+
draggable="false"
18+
width={60}
19+
height={60}
20+
className="ml-10"
21+
/>
22+
</Link>
23+
</div>
24+
<div className="grid grid-cols-8 gap-4">
25+
{socialLinks.map((item, index) => {
26+
return (
27+
<a key={index} className="" href={item.href}>
28+
<Image
29+
className="h-4 fill-white min-w-full hover:scale-125 transition-all"
30+
src={item.src}
31+
alt={item.alt}
32+
height={0}
33+
width={0}
34+
/>
35+
</a>
36+
);
37+
})}
38+
</div>
2839
</div>
2940
<div className="flex flex-col max-w-[14rem] sm:mt-0 mt-10 font-light">
3041
<p className="mb-6">B03 CSE Building K17, UNSW [email protected]</p>
3142
<p>© 2021 — CSESoc UNSW</p>
3243
</div>
3344
</div>
34-
<img
45+
<Image
3546
src="assets/sponsors_backdrop.svg"
3647
alt="Sponsors backdrop"
48+
height={0}
49+
width={0}
3750
className="absolute bottom-0 left-0 w-screen -z-10"
3851
/>
3952
</section>

components/Sponsors/index.tsx

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Link from 'next/link';
22
import React from 'react';
3+
import Footer from '../Footer';
34

45
const Sponsors = () => {
56
const firstRowBoxesStyling =
@@ -46,33 +47,7 @@ const Sponsors = () => {
4647
</div>
4748
</div>
4849
</div>
49-
<div className="sm:flex justify-between">
50-
<div className="flex items-center">
51-
<img src="assets/csesoc_logo_white.svg" alt="CSESoc Logo" />
52-
<Link href="/flag/ollie_is_hiding.png" target="_blank" className="sm:hidden block">
53-
<img
54-
src="/flag/ollie_is_hiding.png"
55-
alt="Ollie"
56-
draggable="false"
57-
width={60}
58-
height={60}
59-
className="ml-10"
60-
/>
61-
</Link>
62-
<img
63-
src="/flag/ollie_is_hiding.png"
64-
alt="Ollie"
65-
draggable="false"
66-
width={60}
67-
height={60}
68-
className="ml-10 sm:block hidden"
69-
/>
70-
</div>
71-
<div className="flex flex-col max-w-[14rem] sm:mt-0 mt-10 font-light">
72-
<p className="mb-6">B03 CSE Building K17, UNSW [email protected]</p>
73-
<p>© 2021 — CSESoc UNSW</p>
74-
</div>
75-
</div>
50+
<Footer />
7651
<img
7752
src="assets/sponsors_backdrop.svg"
7853
alt="Sponsors backdrop"

public/data/data.ts

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ export type sponsorInfo = {
44
alt: string;
55
};
66

7+
export type socialInfo = {
8+
href: string;
9+
src: string;
10+
alt: string;
11+
};
12+
713
export const diamondLinks: sponsorInfo[] = [
814
{
915
href: 'https://www.janestreet.com/',
@@ -102,3 +108,41 @@ export const silverLinks: sponsorInfo[] = [
102108
alt: 'Canva logo'
103109
}
104110
];
111+
112+
export const socialLinks: socialInfo[] = [
113+
{
114+
href: 'https://bit.ly/CSESocDiscord',
115+
src: 'assets/discord_logo.svg',
116+
alt: 'Discord'
117+
},
118+
{
119+
href: 'https://www.facebook.com/csesoc/',
120+
src: 'assets/fb_logo.svg',
121+
alt: 'Facebook'
122+
},
123+
{
124+
href: 'https://twitter.com/csesoc?lang=en',
125+
src: 'assets/x_twitter_icon.svg',
126+
alt: 'X/Twitter'
127+
},
128+
{
129+
href: 'https://www.youtube.com/@CSESocUNSW',
130+
src: 'assets/youtube_logo.svg',
131+
alt: 'Youtube'
132+
},
133+
{
134+
href: 'https://www.instagram.com/csesoc_unsw/?hl=en',
135+
src: 'assets/instagram_logo.svg',
136+
alt: 'Instagram'
137+
},
138+
{
139+
href: 'https://www.tiktok.com/@csesoc?lang=en',
140+
src: 'assets/tiktok_logo.svg',
141+
alt: 'TikTok'
142+
},
143+
{
144+
href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au',
145+
src: 'assets/linkedin_logo.svg',
146+
alt: 'LinkedIn'
147+
}
148+
];

0 commit comments

Comments
 (0)