From 5bc88d02d0139852ebddeb4a847a115f5ff2cbab Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 13 Jun 2024 19:48:24 +1000 Subject: [PATCH 01/13] changed data structure --- frontend/public/data/data.ts | 65 +++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/frontend/public/data/data.ts b/frontend/public/data/data.ts index 2fbdffe..c1f714d 100644 --- a/frontend/public/data/data.ts +++ b/frontend/public/data/data.ts @@ -2,6 +2,7 @@ export type sponsorInfo = { href: string; svg: string; alt: string; + description: string; }; export type socialInfo = { @@ -14,12 +15,15 @@ export const diamondLinks: sponsorInfo[] = [ { href: 'https://www.janestreet.com/', svg: 'assets/janestreet_logo.svg', - alt: 'Janestreet logo' + alt: 'Janestreet logo', + description: "Jane Street is a research-driven trading firm where curious people work together on deep problems", }, { href: 'https://www.tiktok.com/en/', svg: 'assets/tiktok_logo.svg', - alt: 'Tiktok logo' + alt: 'Tiktok logo', + description: "TikTok is a social media platform for creating, sharing and discovering short videos", + } ]; @@ -27,32 +31,35 @@ export const goldLinks: sponsorInfo[] = [ { href: 'https://www.atlassian.com/', svg: 'assets/atlassian_logo.svg', - alt: 'Atlassian logo' + alt: 'Atlassian logo', + description: "Atlassian Corporation is an Australian-American software company that develops products for software developers, and project managers among other groups", + }, { href: 'https://www.citadel.com/', svg: 'assets/citadel_logo.svg', - alt: 'Citadel logo' + alt: 'Citadel logo', + description: "We are an alternative investment manager working on behalf of the world's preeminent institutions. Discover our work, teams, careers and more", }, { href: 'https://www.imc.com/ap/', svg: 'assets/imc_logo.svg', - alt: 'IMC logo' + alt: 'IMC logo', + description: "For three decades IMC has provided liquidity to the financial markets globally. Specialised in algorithmic trading and advanced technology, we set the pace for the evolution of market making.", + }, { href: 'https://neara.com/', svg: 'assets/neara_logo.svg', - alt: 'Neara logo' + alt: 'Neara logo', + description: "Neara electric utility software is a physics-enabled platform that builds 3D interactive models of critical infrastructure networks and assets.", + }, { href: 'https://safetyculture.com/', svg: 'assets/safetyculture_logo.svg', - alt: 'SafetyCulture logo' - }, - { - href: 'https://www.thetradedesk.com/', - svg: 'assets/The_Trade_Desk.svg', - alt: 'TradeDesk logo' + alt: 'SafetyCulture logo', + description: "Get to the root cause of workplace trends with total visibility across your organization. Use data from completed inspections, reported incidents, sensors, and asset history to keep workers safe, and prevent things from happening in the first place" } ]; @@ -60,57 +67,69 @@ export const silverLinks: sponsorInfo[] = [ { href: 'https://appian.com/', svg: 'assets/appian_logo.svg', - alt: 'Appian logo' + alt: 'Appian logo', + description: "Appian Corporation is an American cloud computing and enterprise software company headquartered in McLean, Virginia, part of the Dulles Technology Corridor. The company sells a platform as a service for building enterprise software applications", }, { href: 'https://www.flowtraders.com/', svg: 'assets/flowtraders_logo.svg', - alt: 'FlowTraders logo' + alt: 'FlowTraders logo', + description: "Flow Traders is a proprietary trading firm. A market maker, it provides liquidity in the securities market by using high frequency and quantitative trading strategies", }, { href: 'https://www.macquarie.com.au/', svg: 'assets/macquarie_logo.svg', - alt: 'Macquarie logo' + alt: 'Macquarie logo', + description: "Macquarie Bank offers transaction accounts, home loans, credit cards, online banking, business banking and more" + }, { href: 'https://optiver.com/', svg: 'assets/optiver_logo.svg', - alt: 'Optiver logo' + alt: 'Optiver logo', + description: "Optiver is a global market maker. As one of the oldest market making firms in the world, Optiver has been improving financial markets since 1986" }, { href: 'https://quantium.com/', svg: 'assets/quantium_logo.svg', - alt: 'Quantium logo' + alt: 'Quantium logo', + description: "Quantium has developed a world-class data science and AI solution that has transformed the accuracy of Walmart's prediction of customers' needs at scale" }, { href: 'https://quickli.com.au/', svg: 'assets/quickli_logo.svg', - alt: 'Quickli logo' + alt: 'Quickli logo', + description: "Bringing 30+ lender calcs into one, easy-to-use interface delivering accurate results and relevant policy insights for even the most complex scenarios." }, { href: 'https://www.revolutionise.com.au/', svg: 'assets/revsport_logo.svg', - alt: 'RevolutioniseSport logo' + alt: 'RevolutioniseSport logo', + description: "revolutioniseSPORT is an online management platform for sports of all shapes and sizes" }, { href: 'https://www.recordpoint.com/', svg: 'assets/recordpoint_logo.svg', - alt: 'RecordPoint logo' + alt: 'RecordPoint logo', + description: "Manage all your data and records in one central place – without moving them", }, { href: 'https://sig.com/', svg: 'assets/susquehanna_logo.svg', - alt: 'Susquehanna logo' + alt: 'Susquehanna logo', + description: "Discover Susquehanna, a global quantitative trading firm built on a rigorous, analytical foundation in financial markets." }, { href: 'https://zip.co/au', svg: 'assets/zip_logo.svg', - alt: 'Zip logo' + alt: 'Zip logo', + description: "Zip Co Limited is a global 'buy now pay later' financial technology company with operations in Australia, New Zealand and the USA", }, { href: 'https://www.canva.com/en_au/', svg: 'assets/canva_logo.svg', - alt: 'Canva logo' + alt: 'Canva logo', + description: "Canva is a free-to-use online graphic design tool. Use it to create social media posts, presentations, posters, videos, logos and more." } ]; From a12aca058b88446c0ec5cbc44d2f7d808e6a2601 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:40:48 +1000 Subject: [PATCH 02/13] added modal popup --- .../src/components/Sponsors/sponsorModal.tsx | 28 ++++++++++++++++ .../src/components/Sponsors/sponsorlinks.tsx | 33 +++++++++++++++---- frontend/tsconfig.json | 23 ++++++++++--- 3 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 frontend/src/components/Sponsors/sponsorModal.tsx diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx new file mode 100644 index 0000000..f99406d --- /dev/null +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -0,0 +1,28 @@ +import { setFlagsFromString } from 'v8'; +import { sponsorInfo } from '../../../public/data/data'; +//@ts-ignore +export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: any }) { + if (props.sponsorInfo === null) { + return ( +
+

Error no sponsor selected!

+
+ ); + } + return ( +
{ + props.setFalse(); + }} + > +
+ + {props.sponsorInfo.alt} + +

{props.sponsorInfo.description}

+ +
+
+ ); +} diff --git a/frontend/src/components/Sponsors/sponsorlinks.tsx b/frontend/src/components/Sponsors/sponsorlinks.tsx index d6f647b..560accc 100644 --- a/frontend/src/components/Sponsors/sponsorlinks.tsx +++ b/frontend/src/components/Sponsors/sponsorlinks.tsx @@ -1,14 +1,23 @@ -import { diamondLinks, goldLinks, silverLinks } from '../../../public/data/data'; +import { useState } from 'react'; +import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '../../../public/data/data'; +import SponsorModal from './sponsorModal'; //import '/styles/sponsorLinks.module.css'; const logostyle = 'h-14'; const logodiv = 'block gap-y-8 h-14'; const background = 'rgba(57, 119, 248, 0.6)'; // const outer = 'rounded-[4rem] w-[90rem] flex flex-col pl-14 py-14 gap-16'; + + function SponsorLinks() { + const [showModal, setShowModal] = useState(false); + const [information, setInformation] = useState(null); + return (
-
+
+ {/* @ts-ignore */} + {showModal && {setShowModal(false)}}/>}
Diamond Sponsors {diamondLinks.map((item, index) => { return ( - + ); })}
@@ -29,9 +44,15 @@ function SponsorLinks() {

Gold Sponsors

{goldLinks.map((item, index) => { return ( - + ); })}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 0ca7323..c0a5209 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,7 +1,11 @@ { "compilerOptions": { "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "allowJs": true, "skipLibCheck": true, "strict": true, @@ -14,9 +18,18 @@ "jsx": "preserve", "incremental": true, "paths": { - "@/*": ["./src/*"] - } + "@/*": [ + "./src/*" + ] + }, + "forceConsistentCasingInFileNames": true }, - "include": ["./next-env.d.ts", "**/*.ts", "**/*.tsx"], - "exclude": ["node_modules"] + "include": [ + "./next-env.d.ts", + "**/*.ts", + "**/*.tsx" + ], + "exclude": [ + "node_modules" + ] } From 5e81274c4e6e2c0caae41e81cc22b7f47a7a812b Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:46:16 +1000 Subject: [PATCH 03/13] added silver sponsors and cleaned up file --- frontend/src/components/Sponsors/sponsorlinks.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/Sponsors/sponsorlinks.tsx b/frontend/src/components/Sponsors/sponsorlinks.tsx index 560accc..f3d14fb 100644 --- a/frontend/src/components/Sponsors/sponsorlinks.tsx +++ b/frontend/src/components/Sponsors/sponsorlinks.tsx @@ -26,7 +26,6 @@ function SponsorLinks() { {diamondLinks.map((item, index) => { return (
{ setInformation(item); setShowModal(true); @@ -49,7 +48,6 @@ function SponsorLinks() { setInformation(item); setShowModal(true); }} - // href={item.href} > {item.alt}
@@ -63,9 +61,14 @@ function SponsorLinks() {

Silver Sponsors

{silverLinks.map((item, index) => { return ( - +
{ + setInformation(item); + setShowModal(true); + }} + > {item.alt} - +
); })}
From 2c79d052f5aa4dce48610b8d691ca0b8acba7ca5 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:49:42 +1000 Subject: [PATCH 04/13] made linter stop complaining --- .../src/components/Sponsors/sponsorModal.tsx | 9 +++- .../src/components/Sponsors/sponsorlinks.tsx | 51 +++++++++++-------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index f99406d..7249a89 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -17,11 +17,16 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s }} >
- + {props.sponsorInfo.alt}

{props.sponsorInfo.description}

- +
); diff --git a/frontend/src/components/Sponsors/sponsorlinks.tsx b/frontend/src/components/Sponsors/sponsorlinks.tsx index f3d14fb..d2a329e 100644 --- a/frontend/src/components/Sponsors/sponsorlinks.tsx +++ b/frontend/src/components/Sponsors/sponsorlinks.tsx @@ -7,17 +7,22 @@ const logodiv = 'block gap-y-8 h-14'; const background = 'rgba(57, 119, 248, 0.6)'; // const outer = 'rounded-[4rem] w-[90rem] flex flex-col pl-14 py-14 gap-16'; - - function SponsorLinks() { const [showModal, setShowModal] = useState(false); const [information, setInformation] = useState(null); - + return (
-
+
{/* @ts-ignore */} - {showModal && {setShowModal(false)}}/>} + {showModal && ( + { + setShowModal(false); + }} + /> + )}
Diamond Sponsors {diamondLinks.map((item, index) => { return ( -
{ - setInformation(item); - setShowModal(true); - }} +
{ + setInformation(item); + setShowModal(true); + }} > {item.alt}
@@ -43,11 +50,13 @@ function SponsorLinks() {

Gold Sponsors

{goldLinks.map((item, index) => { return ( -
{ - setInformation(item); - setShowModal(true); - }} +
{ + setInformation(item); + setShowModal(true); + }} > {item.alt}
@@ -61,11 +70,13 @@ function SponsorLinks() {

Silver Sponsors

{silverLinks.map((item, index) => { return ( -
{ - setInformation(item); - setShowModal(true); - }} +
{ + setInformation(item); + setShowModal(true); + }} > {item.alt}
From d67cc644e7ef0357eeadaf63cab9b39e2db8a998 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 20 Jun 2024 20:53:34 +1000 Subject: [PATCH 05/13] made linter stop complaining --- frontend/src/components/Sponsors/sponsorModal.tsx | 4 ++-- frontend/src/components/Sponsors/sponsorlinks.tsx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index 7249a89..4cb9dd2 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -1,6 +1,6 @@ -import { setFlagsFromString } from 'v8'; +import { MouseEventHandler } from 'react'; import { sponsorInfo } from '../../../public/data/data'; -//@ts-ignore + export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: any }) { if (props.sponsorInfo === null) { return ( diff --git a/frontend/src/components/Sponsors/sponsorlinks.tsx b/frontend/src/components/Sponsors/sponsorlinks.tsx index d2a329e..cfd31fa 100644 --- a/frontend/src/components/Sponsors/sponsorlinks.tsx +++ b/frontend/src/components/Sponsors/sponsorlinks.tsx @@ -14,7 +14,6 @@ function SponsorLinks() { return (
- {/* @ts-ignore */} {showModal && ( Date: Thu, 27 Jun 2024 01:49:29 +1000 Subject: [PATCH 06/13] removed import --- frontend/src/components/Sponsors/sponsorModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index 4cb9dd2..43269d0 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -1,4 +1,3 @@ -import { MouseEventHandler } from 'react'; import { sponsorInfo } from '../../../public/data/data'; export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: any }) { From a2fb1718bb26a67a06837921e3966a224b26f34e Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:50:20 +1000 Subject: [PATCH 07/13] added type for setFalse --- frontend/src/components/Sponsors/sponsorModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index 43269d0..176a2ae 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -1,6 +1,6 @@ import { sponsorInfo } from '../../../public/data/data'; -export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: any }) { +export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: () => void }) { if (props.sponsorInfo === null) { return (
From e1f7a4e6b3069dc9f0f33bda4c9f23d04632f183 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:02:53 +1000 Subject: [PATCH 08/13] messed around with css enough to eventually make card responsive and specify max height/width --- frontend/src/components/Sponsors/sponsorModal.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index 176a2ae..bb2064a 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -15,14 +15,14 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s props.setFalse(); }} > -
- - {props.sponsorInfo.alt} +
+ + {props.sponsorInfo.alt}

{props.sponsorInfo.description}

From d5f37d5dba619add40250c8d4571bcb4ca889022 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:03:10 +1000 Subject: [PATCH 09/13] changed close to Close --- frontend/src/components/Sponsors/sponsorModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index bb2064a..d9b3326 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -24,7 +24,7 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s onClick={props.setFalse} className="bg-white border absolute bottom-10 text-[#3977F8] border-[#A7A6E5] text-lg rounded-xl w-[70%] xl:h-12 h-10" > - close + Close
From 63319d93bed55d6303c567eb3ffd75494f186f19 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:04:14 +1000 Subject: [PATCH 10/13] fixed imports --- frontend/src/components/Sponsors/sponsorlinks.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/Sponsors/sponsorlinks.tsx b/frontend/src/components/Sponsors/sponsorlinks.tsx index cfd31fa..23f5c7f 100644 --- a/frontend/src/components/Sponsors/sponsorlinks.tsx +++ b/frontend/src/components/Sponsors/sponsorlinks.tsx @@ -1,6 +1,7 @@ import { useState } from 'react'; import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '../../../public/data/data'; import SponsorModal from './sponsorModal'; + //import '/styles/sponsorLinks.module.css'; const logostyle = 'h-14'; const logodiv = 'block gap-y-8 h-14'; From ddf1a5b1a92224c4d246ef391c5da9b141558119 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:06:46 +1000 Subject: [PATCH 11/13] fixed another import --- frontend/src/pages/sponsors.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/sponsors.tsx b/frontend/src/pages/sponsors.tsx index 94de148..3396d59 100644 --- a/frontend/src/pages/sponsors.tsx +++ b/frontend/src/pages/sponsors.tsx @@ -1,6 +1,6 @@ -import SponsorLinks from '@/components/Sponsors/sponsorlinks'; import Navbar from '@/components/Navbar'; import Footer from '@/components/Footer'; +import SponsorLinks from '@/components/Sponsors/sponsorlinks'; export default function SponsorsPage() { return ( From 4985eb99c5c70ef43e8f56d00684897c3930aee2 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:36:17 +1000 Subject: [PATCH 12/13] added css transition on hover --- frontend/src/components/Sponsors/sponsorModal.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/sponsorModal.tsx index d9b3326..7ec718a 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/sponsorModal.tsx @@ -1,5 +1,5 @@ import { sponsorInfo } from '../../../public/data/data'; - +import {motion} from 'framer-motion' export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: () => void }) { if (props.sponsorInfo === null) { return ( @@ -15,10 +15,14 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s props.setFalse(); }} > -
- - {props.sponsorInfo.alt} - + +
+ + {props.sponsorInfo.alt} +

{props.sponsorInfo.description}

); })} @@ -58,7 +58,7 @@ function SponsorLinks() { setShowModal(true); }} > - {item.alt} + {item.alt}
); })} @@ -78,7 +78,7 @@ function SponsorLinks() { setShowModal(true); }} > - {item.alt} + {item.alt}
); })} diff --git a/frontend/src/components/Sponsors/sponsorModal.tsx b/frontend/src/components/Sponsors/SponsorModal.tsx similarity index 73% rename from frontend/src/components/Sponsors/sponsorModal.tsx rename to frontend/src/components/Sponsors/SponsorModal.tsx index 7ec718a..b6e0b29 100644 --- a/frontend/src/components/Sponsors/sponsorModal.tsx +++ b/frontend/src/components/Sponsors/SponsorModal.tsx @@ -10,18 +10,23 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s } return (
{ props.setFalse(); }} >
- - {props.sponsorInfo.alt} + + {props.sponsorInfo.alt}

{props.sponsorInfo.description}

); -} +} diff --git a/frontend/src/pages/sponsors.tsx b/frontend/src/pages/sponsors.tsx index 3396d59..fd97023 100644 --- a/frontend/src/pages/sponsors.tsx +++ b/frontend/src/pages/sponsors.tsx @@ -1,6 +1,6 @@ import Navbar from '@/components/Navbar'; import Footer from '@/components/Footer'; -import SponsorLinks from '@/components/Sponsors/sponsorlinks'; +import SponsorLinks from '@/components/Sponsors/SponsorLinks'; export default function SponsorsPage() { return (