diff --git a/client/src/App.scss b/client/src/App.scss index 64eaf25b..e3b8dfb8 100644 --- a/client/src/App.scss +++ b/client/src/App.scss @@ -198,3 +198,7 @@ a:hover { display: none; } } + +.proxima-nova-text { + font-family: 'Proxima Nova', sans-serif; +} diff --git a/client/src/assets/about/execs/vedant_pfp.png b/client/src/assets/about/execs/vedant_pfp.png deleted file mode 100644 index b2144d8e..00000000 Binary files a/client/src/assets/about/execs/vedant_pfp.png and /dev/null differ diff --git a/client/src/assets/about/execs/vedant_pfp.webp b/client/src/assets/about/execs/vedant_pfp.webp new file mode 100644 index 00000000..184dbc2e Binary files /dev/null and b/client/src/assets/about/execs/vedant_pfp.webp differ diff --git a/client/src/assets/judges/tyler.png b/client/src/assets/judges/tyler.png new file mode 100644 index 00000000..943b61a9 Binary files /dev/null and b/client/src/assets/judges/tyler.png differ diff --git a/client/src/assets/judges/will.jpg b/client/src/assets/judges/will.jpg new file mode 100644 index 00000000..bed897fd Binary files /dev/null and b/client/src/assets/judges/will.jpg differ diff --git a/client/src/assets/logo/frosh-hard-hat-white.png b/client/src/assets/logo/frosh-hard-hat-white.png new file mode 100644 index 00000000..862b9ebd Binary files /dev/null and b/client/src/assets/logo/frosh-hard-hat-white.png differ diff --git a/client/src/assets/schedule/data.jsx b/client/src/assets/schedule/data.jsx index 5876b765..660677ee 100644 --- a/client/src/assets/schedule/data.jsx +++ b/client/src/assets/schedule/data.jsx @@ -164,9 +164,9 @@ Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -379,9 +379,9 @@ export const dataBeta = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -602,9 +602,9 @@ export const dataChi = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -825,9 +825,9 @@ export const dataDelta = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1048,9 +1048,9 @@ export const dataGamma = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1273,9 +1273,9 @@ export const dataIota = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1498,9 +1498,9 @@ export const dataKappa = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1723,9 +1723,9 @@ export const dataLambda = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1948,9 +1948,9 @@ export const dataNu = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2171,9 +2171,9 @@ export const dataOmega = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2396,9 +2396,9 @@ export const dataOmicron = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2619,9 +2619,9 @@ export const dataPhi = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2844,9 +2844,9 @@ export const dataPi = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3067,9 +3067,9 @@ export const dataPsi = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3298,9 +3298,9 @@ export const dataRho = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3529,9 +3529,9 @@ export const dataSigma = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3760,9 +3760,9 @@ export const dataTau = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3985,9 +3985,9 @@ export const dataTheta = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -4208,9 +4208,9 @@ export const dataUpsilon = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -4431,9 +4431,9 @@ export const dataZeta = { Color: 'yellow', }, { - 'Event Name': 'HAVENGER SCUNT', + 'Event Name': 'SKULE™ HUNT', 'Event Description': - "Havenger Scunt: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -4540,7 +4540,7 @@ export const data = { { 'Event Name': 'CAMPUS TOUR & BUILD BATTLE', 'Event Description': - "Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T7 class!", + "Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T8 class!", 'Start Time': '10:00 AM', 'End Time': '12:00 PM', Color: 'yellow', @@ -4562,7 +4562,7 @@ export const data = { { 'Event Name': 'CAMPUS TOUR & BUILD BATTLE', 'Event Description': - "Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T7 class!", + "Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T8 class!", 'Start Time': '2:00 PM', 'End Time': '5:00 PM', Color: 'yellow', @@ -4616,7 +4616,7 @@ export const data = { ], 'FRIDAY AUGUST 30': [ { - 'Event Name': 'F!ROSH OLYMPICS', + 'Event Name': 'F!ROSH OLYMPIKS', 'Start Time': '9:00 AM', 'End Time': '5:00 PM', Color: 'gray', diff --git a/client/src/assets/sponsors/Longos.jpg b/client/src/assets/sponsors/Longos.jpg new file mode 100644 index 00000000..4cc05abc Binary files /dev/null and b/client/src/assets/sponsors/Longos.jpg differ diff --git a/client/src/components/Navbar/Navbar.scss b/client/src/components/Navbar/Navbar.scss index c019456e..33509ad1 100644 --- a/client/src/components/Navbar/Navbar.scss +++ b/client/src/components/Navbar/Navbar.scss @@ -29,7 +29,7 @@ li { position: fixed; background-color: var(--navbar-bg); width: 100%; - height: 60px; + height: 50px; filter: drop-shadow(0px -2px 5px rgba(0, 0, 0, 0.25)); } diff --git a/client/src/components/Navbar/NavbarStorybook.jsx b/client/src/components/Navbar/NavbarStorybook.jsx index d0a57530..ee4c1882 100644 --- a/client/src/components/Navbar/NavbarStorybook.jsx +++ b/client/src/components/Navbar/NavbarStorybook.jsx @@ -9,7 +9,7 @@ import MessageIconPurple from '../../assets/navbar/message-solid-purple.svg'; import HomeIconGrey from '../../assets/navbar/house-solid-grey.svg'; import AboutIconGrey from '../../assets/navbar/circle-info-solid-grey.svg'; import MessageIconGrey from '../../assets/navbar/message-solid-grey.svg'; -import MainFroshLogo from '../../assets/logo/frosh-main-logo.svg'; +import MainFroshLogo from '../../assets/logo/main-logo.png'; const pages = { main: [ diff --git a/client/src/components/footer/FooterStorybook.jsx b/client/src/components/footer/FooterStorybook.jsx index 6dde0e90..679ff70e 100644 --- a/client/src/components/footer/FooterStorybook.jsx +++ b/client/src/components/footer/FooterStorybook.jsx @@ -52,7 +52,7 @@ const FooterStorybook = () => { })} {/* instagram */} -
Made with 💜 by the F!rosh Week 2T3 Tech Team
+
Made with 💜 by the F!rosh Week 2T4 Tech Team
); diff --git a/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx b/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx index 823c0af3..0bd7aeb8 100644 --- a/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx +++ b/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'; export const ProfilePageResources = ({ froshObject }) => { return (
-

Resources

+

RESOURCES

{resources.map((resource, index) => { return ( { const dropdowns = [ { label: 'data', - title: 'Data', + title: 'DATA', state: openDataDropdown, setState: setOpenDataDropdown, icon: DataDashboardIcon, @@ -46,7 +46,7 @@ export const ProfilePageLeaderPermissionDashboardLinks = () => { }, { label: 'outreach', - title: 'Outreach', + title: 'OUTREACH', state: openOutreachDropdown, setState: setOpenOutreachDropdown, icon: OutreachDashboardIcon, @@ -73,13 +73,13 @@ export const ProfilePageLeaderPermissionDashboardLinks = () => { }, { label: 'scunt', - title: 'Scunt', + title: 'Skule™ Hunt', state: openScuntDropdown, setState: setOpenScuntDropdown, icon: ScuntDashboardIcon, items: [ { - label: 'Scunt Judge Panel', + label: 'Skule™ Hunt Judge Panel', anyRegisterScope: false, link: '/scunt-judge-form', authScopes: [ @@ -96,7 +96,7 @@ export const ProfilePageLeaderPermissionDashboardLinks = () => { ], }, { - label: 'Scunt Mission Panel', + label: 'Skule™ Hunt Mission Panel', anyRegisterScope: false, link: '/scunt-missions-dashboard', authScopes: [ @@ -107,13 +107,13 @@ export const ProfilePageLeaderPermissionDashboardLinks = () => { ], }, { - label: 'Scunt Point Transactions', + label: 'Skule™ Hunt Point Transactions', anyRegisterScope: false, link: '/scunt-transactions', authScopes: ['scunt:exec view transactions'], }, { - label: 'Scunt Settings', + label: 'Skule™ Hunt Settings', anyRegisterScope: false, link: '/scunt-game-controls', authScopes: ['scunt:exec game controls'], diff --git a/client/src/components/schedule/ScheduleHome/ScheduleHome.scss b/client/src/components/schedule/ScheduleHome/ScheduleHome.scss index 8cc18f6d..c4919850 100644 --- a/client/src/components/schedule/ScheduleHome/ScheduleHome.scss +++ b/client/src/components/schedule/ScheduleHome/ScheduleHome.scss @@ -99,7 +99,7 @@ transition: transform 200ms, opacity 500ms; &:hover { transform: scale(1.03); - cursor: pointer; + cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here } h1 { font-size: 28px; diff --git a/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx b/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx index 080edca3..068f8929 100644 --- a/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx +++ b/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx @@ -8,7 +8,7 @@ const TaskAnnouncement = ({ tasks, onDone }) => { if (!tasks || tasks.length <= 0) { return (
-

There is nothing here yet!

+

THERE IS NOTHING HERE YET!

); } diff --git a/client/src/pages/AnnouncementDashboard/CreateAnnounce.jsx b/client/src/pages/AnnouncementDashboard/CreateAnnounce.jsx index d922fff8..733ef544 100644 --- a/client/src/pages/AnnouncementDashboard/CreateAnnounce.jsx +++ b/client/src/pages/AnnouncementDashboard/CreateAnnounce.jsx @@ -20,7 +20,7 @@ const CreateAnnounce = () => { return (
-

Send an Announcement

+

SEND AN ANNOUNCEMENT

{ {validEmailToken ? (
-

Perfect!

+

PERFECT!

Your email is now verified. Head to the login page to get started!

+ ))} +
+); + +PaginationControls.propTypes = { + currentPage: PropTypes.number.isRequired, + totalPages: PropTypes.number.isRequired, + handlePageChange: PropTypes.func.isRequired, +}; + export { PageFAQ }; diff --git a/client/src/pages/FAQ/FAQ.scss b/client/src/pages/FAQ/FAQ.scss index 04d318b0..e13ba9aa 100644 --- a/client/src/pages/FAQ/FAQ.scss +++ b/client/src/pages/FAQ/FAQ.scss @@ -293,3 +293,30 @@ text-align: center; color: var(--text-dynamic); } + +.pagination-controls { + display: flex; + justify-content: center; + margin-top: 20px; + + button { + margin: 0 5px; + padding: 10px 15px; + border: none; + border-radius: 5px; + background-color: var(--purple); + color: white; + cursor: pointer; + transition: background-color 0.3s, color 0.3s; + + &:hover { + background-color: var(--light-purple); + color: var(--purple-shades-dark); + } + + &.active { + background-color: var(--purple-shades-dark); + color: white; + } + } +} diff --git a/client/src/pages/FAQLeaders/FAQLeaders.jsx b/client/src/pages/FAQLeaders/FAQLeaders.jsx index 735dbf9b..4532549e 100644 --- a/client/src/pages/FAQLeaders/FAQLeaders.jsx +++ b/client/src/pages/FAQLeaders/FAQLeaders.jsx @@ -28,7 +28,7 @@ const PageFAQLeaders = () => {
-

Create a new question!

+

CREATE A NEW QUESTION!

@@ -313,7 +313,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {
-

{questionText}

+

{questionText}

Answer: {answerText}

@@ -346,7 +346,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {