From c7bd997c01d40640ae10339aa27ad020eef4f570 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Thu, 22 Aug 2024 18:06:43 +1000 Subject: [PATCH 1/3] Upload arc logo asset and append to contacts display --- frontend/public/assets/arc_logo.svg | 24 ++++++++++++++++++++++ frontend/src/components/Contacts/index.tsx | 9 ++++++++ 2 files changed, 33 insertions(+) create mode 100644 frontend/public/assets/arc_logo.svg diff --git a/frontend/public/assets/arc_logo.svg b/frontend/public/assets/arc_logo.svg new file mode 100644 index 0000000..4e9e9ba --- /dev/null +++ b/frontend/public/assets/arc_logo.svg @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/frontend/src/components/Contacts/index.tsx b/frontend/src/components/Contacts/index.tsx index 0f41a69..70480de 100644 --- a/frontend/src/components/Contacts/index.tsx +++ b/frontend/src/components/Contacts/index.tsx @@ -95,6 +95,15 @@ const Contacts = () => { className="mr-1 fill-white hover:scale-105 transition-all" /> + + Arc Membership Portal + ); From 79f6f2ff6007d51e4459ce90ab3bf0bef6fef94b Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Thu, 22 Aug 2024 19:30:17 +1000 Subject: [PATCH 2/3] Fix logo colouration and append to social footer bar --- frontend/public/assets/arc_logo.svg | 37 ++++++++++------------------- frontend/public/data/socialInfos.ts | 5 ++++ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/frontend/public/assets/arc_logo.svg b/frontend/public/assets/arc_logo.svg index 4e9e9ba..e6f739c 100644 --- a/frontend/public/assets/arc_logo.svg +++ b/frontend/public/assets/arc_logo.svg @@ -1,24 +1,13 @@ - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/frontend/public/data/socialInfos.ts b/frontend/public/data/socialInfos.ts index 8614619..ec8fb71 100644 --- a/frontend/public/data/socialInfos.ts +++ b/frontend/public/data/socialInfos.ts @@ -39,5 +39,10 @@ export const socialLinks: socialInfo[] = [ href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au', src: '/assets/linkedin_logo.svg', alt: 'LinkedIn' + }, + { + href: 'https://member.arc.unsw.edu.au/s/clubdetail?clubid=0016F0000371VxAQAU', + src: '/assets/arc_logo.svg', + alt: 'Arc Membership Portal' } ]; From e4e046e1e81506c9362abe05cc201c75ce793e8b Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Thu, 22 Aug 2024 19:36:45 +1000 Subject: [PATCH 3/3] Formatting and element positioning adjustments --- frontend/src/components/Contacts/index.tsx | 39 +++++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/Contacts/index.tsx b/frontend/src/components/Contacts/index.tsx index 70480de..8ea88f8 100644 --- a/frontend/src/components/Contacts/index.tsx +++ b/frontend/src/components/Contacts/index.tsx @@ -1,15 +1,18 @@ import Image from 'next/image'; -const boxStyling = - 'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300'; const socialsBoxStyling = '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'; +const socialsStyling = + 'flex justify-center'; const Contacts = () => { return (
- + discord logo {
- + X/Twitter { className="mr-1 fill-white hover:scale-105 transition-all" /> - + Youtube { className="mr-1 fill-white hover:scale-105 transition-all" /> - + Instagram { className="mr-1 fill-white hover:scale-105 transition-all" /> - + TikTok { className="mr-1 fill-white hover:scale-105 transition-all" /> - + LinkedIn { className="mr-1 fill-white hover:scale-105 transition-all" /> - +