Merge branch 'dev' into prod

UofT-Frosh-Orientation · Jul 18, 2024 · b42883f · b42883f
2 parents 012d1b2 + e3f1e9b
commit b42883f
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 33 deletions.
diff --git a/...nts/profile/leedur/PermissionDashboardLinks/ProfilePageLeaderPermissionDashboardLinks.jsx b/...nts/profile/leedur/PermissionDashboardLinks/ProfilePageLeaderPermissionDashboardLinks.jsx
@@ -19,7 +19,7 @@ export const ProfilePageLeaderPermissionDashboardLinks = () => {
   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/pages/AnnouncementDashboard/CreateAnnounce.jsx b/client/src/pages/AnnouncementDashboard/CreateAnnounce.jsx
@@ -20,7 +20,7 @@ const CreateAnnounce = () => {
 
   return (
     <div className="announcement-creator">
-      <h3>Send an Announcement</h3>
+      <h3>SEND AN ANNOUNCEMENT</h3>
       <div className="full-width-input">
         <TextInput
           label="Announcement Name"

diff --git a/client/src/pages/FAQLeaders/FAQLeaders.jsx b/client/src/pages/FAQLeaders/FAQLeaders.jsx
@@ -28,7 +28,7 @@ const PageFAQLeaders = () => {
     <div>
       <div className={'faq-leaders-page'}>
         <div className={'faq-leaders-create-question-container'}>
-          <h1 className={'faq-leaders-titles'}>Create a new question!</h1>
+          <h1 className={'faq-leaders-titles'}>CREATE A NEW QUESTION!</h1>
           <FAQLeadersNewPost editMade={editMade} setEditMade={setEditMade} />
         </div>
         <div className={'faq-leaders-edit-question-container'}>
@@ -313,7 +313,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {
         </span>
       </PopupModal>
       <div className={`${isEdit ? 'faq-leaders-hide' : ''}`}>
-        <h1 className={'faq-leaders-questions-titles'}>{questionText}</h1>
+        <h1 className={'faq-leaders-questions-titles' }>{questionText}</h1>
         <p className={'faq-leaders-description'}>
           <b>Answer:</b> {answerText}
         </p>
@@ -346,7 +346,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {
           </div>
           <label>
             <div className={''}>
-              <h1 className={'faq-leaders-subtitles'}>Question</h1>
+              <h1 className={'faq-leaders-subtitles'}>QUESTION</h1>
               <TextInput
                 onChange={(text) => handleEditQuestion(text)}
                 inputType={'text'}
@@ -360,7 +360,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {
           </label>
           <label>
             <div className={''}>
-              <h1 className={'faq-leaders-subtitles'}>Answer</h1>
+              <h1 className={'faq-leaders-subtitles'}>ANSWER</h1>
               <TextInput
                 onChange={(text) => handleEditAnswer(text)}
                 inputType={'textArea'}
@@ -374,7 +374,7 @@ const FAQLeadersQuestionWrapper = ({ question, editMade, setEditMade }) => {
           </label>
           <label>
             <div className={''}>
-              <h1 className={'faq-leaders-subtitles'}>Category</h1>
+              <h1 className={'faq-leaders-subtitles'}>CATEGORY</h1>
               <TextInput
                 onChange={(text) => handleEditCategory(text)}
                 inputType={'text'}

diff --git a/client/src/pages/FAQLeaders/FAQLeaders.scss b/client/src/pages/FAQLeaders/FAQLeaders.scss
@@ -1,5 +1,10 @@
 @import '../../scssStyles/mixins';
 
+@font-face {
+  font-family: 'Proxima Nova';
+  src: url('../../../../client/assets/fonts/proximanova_regular.ttf') format('opentype');
+}
+
 .faq-leaders-page {
   margin: 100px auto;
   width: 80%;
@@ -94,6 +99,7 @@
 .faq-leaders-titles {
   margin: 10px;
   text-align: center;
+  font-family: 'Proxima Nova', sans-serif;
   font-size: 30px;
   font-weight: bold;
   color: var(--text-dark-use);
@@ -106,6 +112,7 @@
   margin: 7px;
   font-size: 18px;
   color: var(--text-dark-use);
+  font-family: 'Proxima Nova', sans-serif;
   @include devices(tablet) {
     font-size: 15px;
   }
@@ -150,3 +157,7 @@
   margin: 10px;
   color: var(--text-dark-use);
 }
+
+.proxima-nova-text {
+  font-family: 'Proxima Nova', sans-serif;
+}
diff --git a/client/src/pages/FroshInfoTable/FroshInfoTable.jsx b/client/src/pages/FroshInfoTable/FroshInfoTable.jsx
@@ -140,7 +140,7 @@ const PageFroshInfoTable = () => {
   return (
     <div className="frosh-info-table">
       <div className="header">
-        <h1>Frosh Data</h1>
+        <h1>FROSH DATA</h1>
         <div className="buttons-container">
           {user?.authScopes?.approved?.includes('froshData:unRegisteredUsers') ? (
             <Button
@@ -267,8 +267,8 @@ const PageFroshInfoTable = () => {
       <div className="table-wrap">
         {froshList?.length === 0 ? (
           <div style={{ margin: '5%', textAlign: 'center' }}>
-            <h2>It looks a bit empty here...</h2>
-            <h2>Please read notes listed above and ensure you have the correct permissions.</h2>
+            <h2>IT LOOKS A BIT EMPTY HERE...</h2>
+            <h2>PLEASE READ NOTES LISTED ABOVE AND ENSURE YOU HAVE THE CORRECT PERMISSIONS.</h2>
             <br />
           </div>
         ) : (

diff --git a/client/src/pages/PasswordReset/PasswordReset.jsx b/client/src/pages/PasswordReset/PasswordReset.jsx
@@ -94,7 +94,7 @@ export const PasswordReset = () => {
         <div className={'navbar-space-top'} />
         <div className={'password-reset-container'}>
           <img className={'password-reset-logo'} src={MainFroshLogo} alt={'Frosh week logo'} />
-          <h1 style={{ color: 'var(--text-dynamic)' }}>Reset your password</h1>
+          <h1 style={{ color: 'var(--text-dynamic)' }}>RESET YOUR PASSWORD</h1>
           <h3 style={{ color: 'var(--text-dynamic)' }}>For F!rosh Week 2T4, UofT Engineering</h3>
           <div className={'full-width-input'}>
             <TextInput

diff --git a/client/src/pages/ScopeRequest/ScopeRequest.jsx b/client/src/pages/ScopeRequest/ScopeRequest.jsx
@@ -33,8 +33,8 @@ export const PageScopeRequest = () => {
       }}
     >
       <div className="scope-request-page">
-        <h1>Leadur Permissions Request</h1>
-        <h2>General Permissions</h2>
+        <h1>LEEDUR PERMISSIONS REQUEST</h1>
+        <h2>GENERAL PERMISSIONS</h2>
         <Button
           onClick={() => {
             setSelectAllGeneralScopes(true);
@@ -86,7 +86,7 @@ export const PageScopeRequest = () => {
           })}
         </div>
         <br />
-        <h2>Frosh Registration Information</h2>
+        <h2>FROSH REGISTRATION INFORMATION</h2>
         <Button
           onClick={() => {
             setSelectAllRegistrationScopes(true);

diff --git a/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx b/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx
@@ -560,7 +560,7 @@ const CurrentScuntGameSettings = () => {
   return (
     <div className="current-scunt-game-settings-container">
       <h3 style={{ color: 'var(--text-dynamic)', textAlign: 'center', marginBottom: '20px' }}>
-        Current Scunt Settings
+        CURRENT SCUNT SETTINGS
       </h3>
 
       {scuntSettings ? (

diff --git a/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx b/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx
@@ -70,15 +70,15 @@ export const PageScuntJudgeForm = () => {
     return (
       <div className="scunt-judge-form-page">
         <div className="scunt-judge-form-container">
-          <h1>Judging is not currently allowed.</h1>
+          <h1>JUDGING IS NOT CURRENTLY ALLOWED.</h1>
         </div>
       </div>
     );
 
   return (
     <div className="scunt-judge-form-page">
       <div className="scunt-judge-form-container">
-        <h1>Judge Dashboard</h1>
+        <h1>JUDGE DASHBOARD</h1>
         <h3>
           Hello,{' '}
           {user?.preferredName === '' || !user?.preferredName
@@ -108,7 +108,7 @@ const ScuntNegativePoints = ({ teams, teamObjs }) => {
   return (
     <div style={{ width: '100%' }}>
       <div style={{ height: '15px' }} />
-      <h2>Remove Points</h2>
+      <h2>REMOVE POINTS</h2>
       <>
         <div
           style={{

diff --git a/client/src/pages/ScuntTransactions/ScuntTransactions.jsx b/client/src/pages/ScuntTransactions/ScuntTransactions.jsx
@@ -48,7 +48,7 @@ export const ScuntTransactions = () => {
       <div className="navbar-space-top"></div>
       <div className="scunt-point-transactions-page">
         <div className="scunt-point-transactions-container">
-          <h1>Point Transactions</h1>
+          <h1>POINT TRANSACTIONS</h1>
           <div className="separator" />
           <p>Transactions of all points that have been distributed to teams</p>
           <p>When displaying all teams, only the latest 50 transactions are shown</p>
@@ -67,7 +67,7 @@ export const ScuntTransactions = () => {
                 alignItems: 'center',
               }}
             >
-              <h2>Team:</h2>
+              <h2>TEAM:</h2>
               <div style={{ width: '10px' }}></div>
               <Dropdown
                 initialSelectedIndex={0}

diff --git a/client/src/pages/TimelineAdmin/TimelineAdmin.jsx b/client/src/pages/TimelineAdmin/TimelineAdmin.jsx
@@ -14,11 +14,11 @@ const PageTimelineAdmin = () => {
   return (
     <div className={'timeline-admin-page'}>
       <div className={'timeline-admin-create-event-container'}>
-        <h1 className={'timeline-admin-titles'}>Create a new timeline event!</h1>
+        <h1 className={'timeline-admin-titles'}>CREATE A NEW TIMELINE EVENT!</h1>
         <CreateNewTimelineEvent editMade={editMade} setEditMade={setEditMade} />
       </div>
       <div className={'timeline-admin-existing-events-container'}>
-        <h1 className={'timeline-admin-titles'}>Existing events</h1>
+        <h1 className={'timeline-admin-titles'}>EXISTING EVENTS</h1>
         <ExistingTimelineEvents editMade={editMade} setEditMade={setEditMade} />
       </div>
     </div>
@@ -109,7 +109,7 @@ const CreateNewTimelineEvent = ({ editMade, setEditMade }) => {
     <form>
       <label>
         <div>
-          <h1 className={'timeline-admin-subtitles'}>Event Name</h1>
+          <h1 className={'timeline-admin-subtitles'}>EVENT NAME</h1>
           <TextInput
             onChange={(text) => handleEditEventName(text)}
             inputType={'text'}
@@ -123,7 +123,7 @@ const CreateNewTimelineEvent = ({ editMade, setEditMade }) => {
       </label>
       <label>
         <div>
-          <h1 className={'timeline-admin-subtitles'}>Date</h1>
+          <h1 className={'timeline-admin-subtitles'}>DATE</h1>
           <TextInput
             onChange={(date) => handleEditDate(date)}
             inputType={'date'}
@@ -138,7 +138,7 @@ const CreateNewTimelineEvent = ({ editMade, setEditMade }) => {
       </label>
       <label>
         <div>
-          <h1 className={'timeline-admin-subtitles'}>Description</h1>
+          <h1 className={'timeline-admin-subtitles'}>DESCRIPTION</h1>
           <TextInput
             onChange={(text) => handleEditDescription(text)}
             inputType={'textArea'}
@@ -152,7 +152,7 @@ const CreateNewTimelineEvent = ({ editMade, setEditMade }) => {
       </label>
       <label>
         <div>
-          <h1 className={'timeline-admin-subtitles'}>Link</h1>
+          <h1 className={'timeline-admin-subtitles'}>LINK</h1>
           <TextInput
             onChange={(text) => handleEditLink(text)}
             inputType={'text'}
@@ -166,7 +166,7 @@ const CreateNewTimelineEvent = ({ editMade, setEditMade }) => {
       </label>
       <label>
         <div>
-          <h1 className={'timeline-admin-subtitles'}>Label for the link</h1>
+          <h1 className={'timeline-admin-subtitles'}>LABEL FOR THE LINK</h1>
           <TextInput
             onChange={(text) => handleEditLinkLabel(text)}
             inputType={'text'}