From 9ddb6296b94d5a09d4e32f83b88bd92a72194f35 Mon Sep 17 00:00:00 2001 From: HasithDeAlwis Date: Thu, 19 Dec 2024 15:46:31 -0500 Subject: [PATCH] fix(ui/web): broken social media links and past sponsors not present --- .../footer/constants/footer.constants.ts | 29 +++++++++----- .../navbar/constants/navbar.constants.ts | 29 +++++++++----- .../constants/welcome.constants.ts | 40 ++++++++++--------- .../constants/sponsorship.constants.ts | 18 ++++++++- 4 files changed, 78 insertions(+), 38 deletions(-) diff --git a/libs/website/shared/ui/navigation/footer/constants/footer.constants.ts b/libs/website/shared/ui/navigation/footer/constants/footer.constants.ts index 52017295b..2284e7a24 100644 --- a/libs/website/shared/ui/navigation/footer/constants/footer.constants.ts +++ b/libs/website/shared/ui/navigation/footer/constants/footer.constants.ts @@ -1,3 +1,4 @@ +import type { Media } from '@cuhacking/shared/types' import discord_white from '@cuhacking/shared/assets/icons/socials/discord-white-1.svg' import docs_white from '@cuhacking/shared/assets/icons/socials/docs-white-1.svg' import email_white from '@cuhacking/shared/assets/icons/socials/email-white-1.svg' @@ -8,58 +9,68 @@ import linkedin_white from '@cuhacking/shared/assets/icons/socials/linkedin-whit import linktree_white from '@cuhacking/shared/assets/icons/socials/linktree-white-1.svg' import cuHackingLogo from '@cuhacking/shared/assets/logos/cuHacking/cuhacking-logo-1.svg' -const socials = [ +const socials: { link: string, name: string, media: Media }[] = [ { - link: 'https://instagram.com', + link: 'https://www.instagram.com/cuhacking/', + name: 'Instagram', media: { src: instagram_white, alt: 'Instagram', }, }, { - link: 'https://github.com', + + link: 'https://github.com/cuhacking/2025', + name: 'Github', media: { src: github_white, alt: 'GitHub', }, }, { - link: 'https://discord.com', + + link: 'https://discord.com/invite/h2cQqF9aZf', + name: 'Discord', media: { src: discord_white, alt: 'Discord', }, }, { - link: 'https://docs.com', + link: 'https://docs.cuhacking.ca/', + name: 'Docs', media: { src: docs_white, alt: 'Documentation', }, }, { - link: 'https://figma.com', + link: 'https://www.figma.com/design/wc1JOWR48tBNkjcjwY3AzB/%E2%8C%A8%EF%B8%8F-cuHacking-Design-System?node-id=0-1&t=YTR1ET4Qw1wG1cjz-1', + name: 'Figma', media: { src: figma_white, alt: 'Figma', }, }, { - link: 'mailto:example@email.com', + link: 'mailto:info@cuhacking.ca', + name: 'Email', media: { src: email_white, alt: 'Email', }, }, { - link: 'https://linkedin.com', + link: 'https://ca.linkedin.com/company/cuhacking', + name: 'LinkedIn', media: { src: linkedin_white, alt: 'LinkedIn', }, }, { - link: 'https://linktr.ee', + link: 'https://linktr.ee/cuhacking_', + name: 'Linktree', media: { src: linktree_white, alt: 'Linktree', diff --git a/libs/website/shared/ui/navigation/navbar/constants/navbar.constants.ts b/libs/website/shared/ui/navigation/navbar/constants/navbar.constants.ts index 8e28b1978..5613e3e57 100644 --- a/libs/website/shared/ui/navigation/navbar/constants/navbar.constants.ts +++ b/libs/website/shared/ui/navigation/navbar/constants/navbar.constants.ts @@ -1,3 +1,4 @@ +import type { Media } from '@cuhacking/shared/types' import cross from '@cuhacking/shared/assets/icons/general/cross-1.svg' import hamburger from '@cuhacking/shared/assets/icons/general/hamburger-1.svg' import discord_white from '@cuhacking/shared/assets/icons/socials/discord-white-1.svg' @@ -17,58 +18,68 @@ const links = [ { name: 'FAQ', link: '/#faq' }, ] -const socials = [ +const socials: { link: string, name: string, media: Media }[] = [ { - link: 'https://instagram.com', + link: 'https://www.instagram.com/cuhacking/', + name: 'Instagram', media: { src: instagram_white, alt: 'Instagram', }, }, { - link: 'https://github.com', + + link: 'https://github.com/cuhacking/2025', + name: 'Github', media: { src: github_white, alt: 'GitHub', }, }, { - link: 'https://discord.com', + + link: 'https://discord.com/invite/h2cQqF9aZf', + name: 'Discord', media: { src: discord_white, alt: 'Discord', }, }, { - link: 'https://docs.com', + link: 'https://docs.cuhacking.ca/', + name: 'Docs', media: { src: docs_white, alt: 'Documentation', }, }, { - link: 'https://figma.com', + link: 'https://www.figma.com/design/wc1JOWR48tBNkjcjwY3AzB/%E2%8C%A8%EF%B8%8F-cuHacking-Design-System?node-id=0-1&t=YTR1ET4Qw1wG1cjz-1', + name: 'Figma', media: { src: figma_white, alt: 'Figma', }, }, { - link: 'mailto:example@email.com', + link: 'mailto:info@cuhacking.ca', + name: 'Email', media: { src: email_white, alt: 'Email', }, }, { - link: 'https://linkedin.com', + link: 'https://ca.linkedin.com/company/cuhacking', + name: 'LinkedIn', media: { src: linkedin_white, alt: 'LinkedIn', }, }, { - link: 'https://linktr.ee', + link: 'https://linktr.ee/cuhacking_', + name: 'Linktree', media: { src: linktree_white, alt: 'Linktree', diff --git a/libs/website/ui/introduction/constants/welcome.constants.ts b/libs/website/ui/introduction/constants/welcome.constants.ts index 98cf1fea5..22d40342e 100644 --- a/libs/website/ui/introduction/constants/welcome.constants.ts +++ b/libs/website/ui/introduction/constants/welcome.constants.ts @@ -1,51 +1,55 @@ -import discord_green from '@cuhacking/shared/assets/icons/socials/discord-green-1.svg'; -import docs_green from '@cuhacking/shared/assets/icons/socials/docs-green-1.svg'; -import email_green from '@cuhacking/shared/assets/icons/socials/email-green-1.svg'; -import figma_green from '@cuhacking/shared/assets/icons/socials/figma-green-1.svg'; -import github_green from '@cuhacking/shared/assets/icons/socials/github-green-1.svg'; -import instagram_green from '@cuhacking/shared/assets/icons/socials/instagram-green-1.svg'; -import linkedin_green from '@cuhacking/shared/assets/icons/socials/linkedin-green-1.svg'; -import linktree_green from '@cuhacking/shared/assets/icons/socials/linktree-green-1.svg'; +import type { Media } from '@cuhacking/shared/types' +import discord_green from '@cuhacking/shared/assets/icons/socials/discord-green-1.svg' +import docs_green from '@cuhacking/shared/assets/icons/socials/docs-green-1.svg' +import email_green from '@cuhacking/shared/assets/icons/socials/email-green-1.svg' +import figma_green from '@cuhacking/shared/assets/icons/socials/figma-green-1.svg' +import github_green from '@cuhacking/shared/assets/icons/socials/github-green-1.svg' +import instagram_green from '@cuhacking/shared/assets/icons/socials/instagram-green-1.svg' +import linkedin_green from '@cuhacking/shared/assets/icons/socials/linkedin-green-1.svg' +import linktree_green from '@cuhacking/shared/assets/icons/socials/linktree-green-1.svg' -interface Media { - src: string; - alt: string; -} - -const socials: { link: string; media: Media }[] = [ +const socials: { link: string, name: string, media: Media }[] = [ { link: 'https://www.instagram.com/cuhacking/', + name: 'Instagram', media: { src: instagram_green, alt: 'Instagram' }, }, { link: 'https://github.com/cuhacking/2025', + name: 'GitHub', media: { src: github_green, alt: 'GitHub' }, }, { - link: 'https://discord.gg/fh2KseMysN', + link: 'https://discord.com/invite/h2cQqF9aZf', + name: 'Discord', media: { src: discord_green, alt: 'Discord' }, }, { link: 'https://docs.cuhacking.ca/', + name: 'Docs', media: { src: docs_green, alt: 'Documentation' }, }, { link: 'https://www.figma.com/design/wc1JOWR48tBNkjcjwY3AzB/%E2%8C%A8%EF%B8%8F-cuHacking-Design-System?node-id=1512-3204&t=aOMNy0KT02qD4MhD-1', + name: 'Figma', media: { src: figma_green, alt: 'Figma' }, }, { link: 'mailto:info@cuhacking.ca', + name: 'Email', media: { src: email_green, alt: 'Email' }, }, { link: 'https://ca.linkedin.com/company/cuhacking', + name: 'LinkedIn', media: { src: linkedin_green, alt: 'LinkedIn' }, }, { - link: 'https://linktr.ee/cuhacking_?fbclid=PAZXh0bgNhZW0CMTEAAaZcB9hM3ZkwE4vR0NjpoFmPrg3gfXxlm5NdhqMy-eKHv-VXw8ekbvCznlM_aem_wSxlDGzbFI7sVeAAUVTAoQ', + link: 'https://linktr.ee/cuhacking_', + name: 'Linktree', media: { src: linktree_green, alt: 'Linktree' }, }, -]; +] export const WELCOME_CONSTANTS = { SOCIALS: socials, -}; +} diff --git a/libs/website/ui/sponsorship/constants/sponsorship.constants.ts b/libs/website/ui/sponsorship/constants/sponsorship.constants.ts index 12830201e..6041d87f9 100644 --- a/libs/website/ui/sponsorship/constants/sponsorship.constants.ts +++ b/libs/website/ui/sponsorship/constants/sponsorship.constants.ts @@ -1,16 +1,30 @@ +import onePassword from '@cuhacking/shared/assets/logos/sponsors/1password.white.svg' import balsamiq from '@cuhacking/shared/assets/logos/sponsors/balsamiq.white.svg' +import bloomberg from '@cuhacking/shared/assets/logos/sponsors/bloomberg.white.svg' import digitalOcean from '@cuhacking/shared/assets/logos/sponsors/digital-ocean.white.svg' import ea from '@cuhacking/shared/assets/logos/sponsors/ea.white.svg' +import github from '@cuhacking/shared/assets/logos/sponsors/github.white.svg' +import marchNetworks from '@cuhacking/shared/assets/logos/sponsors/march-networks.white.svg' +import mlh from '@cuhacking/shared/assets/logos/sponsors/mlh.white.svg' import rbc from '@cuhacking/shared/assets/logos/sponsors/rbc.white.svg' +import techDomains from '@cuhacking/shared/assets/logos/sponsors/techdomains.white.svg' +import wolfram from '@cuhacking/shared/assets/logos/sponsors/wolfram.white.svg' const presentSponsors = [ - { name: 'RBC', logo: rbc, link: 'https://www.rbc.com' }, - { name: 'Balsamiq', logo: balsamiq, link: 'https://balsamiq.com' }, ] const pastSponsors = [ { name: 'Electronic Arts', logo: ea, link: 'https://www.ea.com' }, { name: 'Digital Ocean', logo: digitalOcean, link: 'https://www.digitalocean.com' }, + { name: 'Balsamiq', logo: balsamiq, link: 'https://balsamiq.com' }, + { name: 'RBC', logo: rbc, link: 'https://www.rbc.com' }, + { name: '1Password', logo: onePassword, link: 'https://1password.com' }, + { name: 'Bloomberg', logo: bloomberg, link: 'https://www.bloomberg.com' }, + { name: 'GitHub', logo: github, link: 'https://github.com' }, + { name: 'March Networks', logo: marchNetworks, link: 'https://www.marchnetworks.com' }, + { name: 'MLH', logo: mlh, link: 'https://mlh.io' }, + { name: '.TECH Domains', logo: techDomains, link: 'https://get.tech' }, + { name: 'Wolfram', logo: wolfram, link: 'https://www.wolfram.com' }, ] const sponsorshipText = [