+//
+// );
+// }
+// return (
+// +// Looking for your Scunt login Token? +//
+//You have chosen not to participate in Scunt.
+// +//
+// {
+// setShowToken(!showToken);
+// }}
+// />
+//
+// );
+// };
- if (!user?.attendingScunt && user?.userType !== 'leadur') {
- return (
- {getScuntTeamObjFromTeamNumber(user?.scuntTeam, scuntTeams)?.name}
+// +//Team {user?.scuntTeam ? user?.scuntTeam.toString() : '‽'}
+// +//{ +// navigator.clipboard.writeText(code); +// setSnackbar('Copied to clipboard'); +// }} +// > +// {code} +//
+//Scunt Login Token
+//+// Use this token to login to the{' '} +// +// Scunt Discord +// +//
+//
-
- );
- }
- return (
- - Looking for your Scunt login Token? -
-You have chosen not to participate in Scunt.
- -
- {
- setShowToken(!showToken);
- }}
- />
-
- );
-};
-
-ProfilePageScuntToken.propTypes = {
- scuntTeams: PropTypes.array,
- scuntTeamObjs: PropTypes.array,
-};
+// ProfilePageScuntToken.propTypes = {
+// scuntTeams: PropTypes.array,
+// scuntTeamObjs: PropTypes.array,
+// };
diff --git a/client/src/pages/Profile/PageProfileFrosh.jsx b/client/src/pages/Profile/PageProfileFrosh.jsx
index 3bdc50b5..18022ef5 100644
--- a/client/src/pages/Profile/PageProfileFrosh.jsx
+++ b/client/src/pages/Profile/PageProfileFrosh.jsx
@@ -29,7 +29,7 @@ import { scuntSettingsSelector } from '../../state/scuntSettings/scuntSettingsSl
import { getRemainingTickets } from '../FroshRetreat/FroshRetreat';
import { ProfilePageSchedule } from '../../components/profile/ProfilePageSchedule/ProfilePageSchedule';
import { ProfilePageResources } from '../../components/profile/ProfilePageResources/ProfilePageResources';
-import { ProfilePageFroshScuntTeamsSelection } from '../../components/profile/scunt/ProfilePageFroshScuntTeamsSelection/ProfilePageFroshScuntTeamsSelection';
+// import { ProfilePageFroshScuntTeamsSelection } from '../../components/profile/scunt/ProfilePageFroshScuntTeamsSelection/ProfilePageFroshScuntTeamsSelection';
import { getScuntTeams } from '../../state/scuntTeams/saga';
import { getScuntSettings } from '../../state/scuntSettings/saga';
import { scuntTeamsSelector } from '../../state/scuntTeams/scuntTeamsSlice';
@@ -42,16 +42,18 @@ const PageProfileFrosh = () => {
const dispatch = useDispatch();
useEffect(() => {
- dispatch(getScuntSettings());
- dispatch(getScuntTeams());
- }, [dispatch]);
+ if (user?.attendingScunt) {
+ dispatch(getScuntSettings());
+ dispatch(getScuntTeams());
+ }
+ }, [dispatch, user]);
return (
<>
{getScuntTeamObjFromTeamNumber(user?.scuntTeam, scuntTeams)?.name}
- -Team {user?.scuntTeam ? user?.scuntTeam.toString() : '‽'}
- -{ - navigator.clipboard.writeText(code); - setSnackbar('Copied to clipboard'); - }} - > - {code} -
-Scunt Login Token
-- Use this token to login to the{' '} - - Scunt Discord - -
-
-
@@ -164,8 +166,7 @@ const ProfilePageFroshScuntMessage = () => {
const isRegistered = useSelector(registeredSelector);
const { darkMode } = useContext(DarkModeContext);
- const code = user?.scuntToken;
- if (code === undefined || !isRegistered || !scuntSettings || !scuntSettings?.revealTeams) {
+ if (!isRegistered || !scuntSettings || !scuntSettings?.revealTeams) {
return null;
}
@@ -174,8 +175,8 @@ const ProfilePageFroshScuntMessage = () => {
-
Havenger Scunt!
-Find more information about Scunt by clicking here!
+SkavENGer Hunt!
+Find more information about The Hunt by clicking here!
Your Scunt Team:
diff --git a/client/src/pages/Profile/PageProfileLeader.jsx b/client/src/pages/Profile/PageProfileLeader.jsx index 60b3dc1b..7ed4e304 100644 --- a/client/src/pages/Profile/PageProfileLeader.jsx +++ b/client/src/pages/Profile/PageProfileLeader.jsx @@ -25,7 +25,8 @@ const PageProfileLeader = () => { const { user } = useSelector(userSelector); const qrCodeLeader = user?.authScopes?.approved.includes('scanner:registration') || - user?.authScopes?.approved.includes('scanner:kits'); + user?.authScopes?.approved.includes('scanner:kits') || + user?.authScopes?.approved.includes('scanner:food'); const dispatch = useDispatch(); diff --git a/client/src/pages/ScopeRequest/functions.jsx b/client/src/pages/ScopeRequest/functions.jsx index 02511246..c85859ee 100644 --- a/client/src/pages/ScopeRequest/functions.jsx +++ b/client/src/pages/ScopeRequest/functions.jsx @@ -39,7 +39,7 @@ export const getTotalScopes = () => { accounts: ['read', 'edit', 'delete'], email: ['send'], timeline: ['create', 'edit', 'delete'], - scanner: ['registration', 'kits'], + scanner: ['registration', 'kits', 'food'], scunt: [ 'judge missions', 'judge bribe points', diff --git a/client/src/pages/ScuntHome/ScuntHome.jsx b/client/src/pages/ScuntHome/ScuntHome.jsx index 75497586..c4b48cf3 100644 --- a/client/src/pages/ScuntHome/ScuntHome.jsx +++ b/client/src/pages/ScuntHome/ScuntHome.jsx @@ -5,19 +5,20 @@ import WaveDarkMode from '../../assets/darkmode/misc/wave.png'; import waveBottom from '../../assets/misc/wave-reverse.png'; import waveBottomDarkMode from '../../assets/darkmode/misc/wave-reverse.png'; import { Confetti } from '../../components/misc/Confetti/Confetti'; -import { Link, useLocation } from 'react-router-dom'; +import { Link } from 'react-router-dom'; import { ScuntLinks } from '../../components/ScuntLinks/ScuntLinks'; import { DarkModeContext } from '../../util/DarkModeProvider'; -import DiscordIcon from '../../assets/social/discord-brands.svg'; +// import DiscordIcon from '../../assets/social/discord-brands.svg'; import { aboutScunt, okayToInviteToScunt, scuntDiscord } from '../../util/scunt-constants'; import { useDispatch, useSelector } from 'react-redux'; import { userSelector } from '../../state/user/userSlice'; import { scuntSettingsSelector } from '../../state/scuntSettings/scuntSettingsSlice'; import useAxios from '../../hooks/useAxios'; -import { ProfilePageScuntToken } from '../../components/profile/scunt/ProfilePageScuntToken/ProfilePageScuntToken'; +// import { ProfilePageScuntToken } from '../../components/profile/scunt/ProfilePageScuntToken/ProfilePageScuntToken'; import { scuntTeamsSelector } from '../../state/scuntTeams/scuntTeamsSlice'; import { getScuntSettings } from '../../state/scuntSettings/saga'; import { getScuntTeams } from '../../state/scuntTeams/saga'; +// import { ProfilePageScuntTeam } from '../Profile/PageProfileFrosh'; const { axios } = useAxios(); export const PageScuntHome = () => { @@ -39,54 +40,27 @@ export const PageScuntHome = () => { const AboutScunt = () => { const { darkMode } = useContext(DarkModeContext); - const [scuntTeamObjs, setScuntTeamObjs] = useState(); - const { scuntTeams } = useSelector(scuntTeamsSelector); - // const getScuntTeams = async () => { - // try { - // const response = await axios.get('/scunt-teams'); - // const { teamPoints } = response.data; - // if (teamPoints.length <= 0 || !teamPoints) setScuntTeams([]); - // else { - // setScuntTeamObjs(teamPoints); - // setScuntTeams( - // teamPoints.map((team) => { - // return team?.name; - // }), - // ); - // } - // } catch (e) { - // console.error(e.toString()); - // setScuntTeams(['Error loading teams']); - // } - // }; - - // useEffect(() => { - // getScuntTeams(); - // }, []); return ( <> - {darkMode ? ( -
-
-
+ {/*
+
*/}
Check the Rules for more information
-
- ) : (
- <>
- )
- ) : (
- <>
- )}
+ ) : null
+ ) : null}
{loggedIn && user?.scuntTeam && mission !== undefined ? (
-
{!loggedIn ? (
- {missioninput.map((i) => {
- return (
- {
- handleInput(input, i.key);
- }
- // TODO: update the state var -- DONE
+
@@ -429,16 +430,12 @@ const PageScuntMissionsListShow = () => {
+
);
};
@@ -429,7 +425,7 @@ const ScuntUploadMissions = () => {
if (file) {
fileReader.onload = function (event) {
const text = event.target.result;
- const { data, errors } = parseCsvString(text, csvFields);
+ const { data } = parseCsvString(text, csvFields);
setArray(data);
};
diff --git a/client/src/pages/ScuntMissionsList/ScuntMissionsList.jsx b/client/src/pages/ScuntMissionsList/ScuntMissionsList.jsx
index 1ce4964d..1829feb3 100644
--- a/client/src/pages/ScuntMissionsList/ScuntMissionsList.jsx
+++ b/client/src/pages/ScuntMissionsList/ScuntMissionsList.jsx
@@ -36,6 +36,7 @@ function getMissionCategories(missions) {
const PageScuntMissionsList = () => {
const { user } = useSelector(userSelector);
+ const loggedIn = useSelector(loggedInSelector);
const { setSnackbar } = useContext(SnackbarContext);
const leader = user?.userType === 'leadur';
const { scuntSettings, loading } = useSelector(scuntSettingsSelector);
@@ -44,14 +45,14 @@ const PageScuntMissionsList = () => {
const dispatch = useDispatch();
useEffect(() => {
- if (scuntSettings) setRevealMissions(scuntSettings?.revealMissions);
+ if (scuntSettings?.revealMissions) setRevealMissions(true);
}, [scuntSettings]);
useEffect(() => {
dispatch(getScuntMissions({ showHidden: false }));
}, [dispatch]);
- if (revealMissions !== true && !leader) {
+ if ((revealMissions !== true && !leader) || !loggedIn) {
return (
<>
+
-
+
+ {missioninput.map((i) => {
+ return (
+ {
+ handleInput(input, i.key);
}
- style={{ width: '100%', flexGrow: '1' }}
- description={i.des}
- />
- );
- })}
- {
- handleInput(state, 'isHidden');
- }}
- />
- {
- handleInput(state, 'isJudgingStation');
- }}
- />
-
-
-
+
-
-
- Mission Preview
- - {newMission !== undefined ? ( - keys?.map((i) => { - return ( -
-
- );
- })
- ) : (
- <>
- )}
- - {convertCamelToLabel(i)} - {': '} -
- {newMission[i] === true || newMission[i] === false ? ( -
- {newMission[i].toString()}
-
- ) : (
- newMission[i].toString()
- )}
-
+
+
+
+ Mission Preview
+ + {newMission !== undefined ? ( + keys?.map((i) => { + return ( +
+
+ );
+ })
+ ) : (
+ <>
+ )}
+ {convertCamelToLabel(i)} + {': '} +
+ {newMission[i] === true || newMission[i] === false ? ( +
+ {newMission[i].toString()}
+
+ ) : (
+ newMission[i].toString()
+ )}
+ No search results
) : mission === undefined ? ( - ) : ( - <> - )} + ) : null}To see mission status and mission QR code please login to your account.
- ) : ( - <> - )} + ) : null} {loggedIn && mission !== undefined ? ( missionStatus?.completed ? ( <> @@ -452,12 +449,8 @@ const PageScuntMissionsListShow = () => {Scunt
-What is Scunt?
+The H!unt
+What is S!cavenger H!unt?
- Scunt is the best part of F!rosh Week (we promise we aren’t biased)! It’s a chaos filled event where you and your team compete against other F!rosh to get as many points as you possibly can. Your team gains points by completing missions and getting them judged by our super judgy judges (judging stations are located in the Pit and on the GB steps). The top three teams mayyyy also get something special on top of well-deserved bragging rights ;) -
-Important Info
-- You will be assigned a Scunt team (different from your F!rosh group) on Wednesday on the F!rosh week website. Please meet with your team on King’s College Road (outside of Sandford Fleming) at 5:30PM. We’ve attached a map that shows the location each team will be meeting at and our Scunt HLs will also have signs. Please do not be late, teams will be moving off of campus once the event begins. If you have any questions contact us at scunt@orientation.skule.ca. + The H!unt is the best part of F!rosh Week (we promise we aren’t biased)! It’s a chaos filled event where you and your team compete against other F!rosh to get as many points as you possibly can. Your team gains points by completing missions and getting them judged by our super judgy judges (judging stations are located in the Pit). The top three teams mayyyy also get something special on top of well-deserved bragging rights ;)
+ `; export const rules = { start: [ { title: 'Eligibility', - sub: 'To compete in the Havenger Scunt, one must be:', + sub: 'To compete in the S!cavenger H!unt, one must be:', items: [ 'Human, or near human (Engineering Science students will be accepted).', - 'A F!rosh (2T6!).', + 'A F!rosh (2T7!).', 'Currently enrolled within the Faculty of Applied Science and Engineering at the University of Toronto.', 'Have officially registered for the event via F!rosh Week 2T3.', ], @@ -35,7 +32,7 @@ export const rules = { }, { title: 'Teams', - sub: 'The team structure of Havenger Scunt will be as follows:', + sub: 'The team structure of S!cavenger H!unt will be as follows:', items: [ 'Contestants will be assigned randomly to 1 of 10 teams to approximate fairness prior to the event.', 'Each team will consist of 2 Head Leedurs and a number of Leedurs.', @@ -44,11 +41,11 @@ export const rules = { }, { title: 'Event Schedule', - sub: 'The timing of Havenger Scunt will be as follows:', + sub: 'The timing of S!cavenger H!unt will be as follows:', items: [ - 'The event shall begin on Wednesday, September 7th at 6:00 PM EST. At this time, orientation.skule.ca/scunt will go live with the list, as will all the commands on our Discord server. Oh yeah and the judges will rise from their upper year slumber too.', + 'The event shall begin on Wednesday, September 6th at 6:00 PM EST. At this time, orientation.skule.ca/scunt will go live with the list. Oh yeah and the judges will rise from their upper year slumber too.', 'The Royal Wedding will occur at approximately 10:00 PM', - 'The event will end on Wednesday, September 7th at 11:00 PM EST. There will be a 15-minute warning announcement.', + 'The event will end on Wednesday, September 6th at 11:00 PM EST. There will be a 15-minute warning announcement.', ], }, { @@ -61,7 +58,7 @@ export const rules = { '***The item must be on the list.***', 'Said item must have been completed by (at minimum) one freshman (F!rosh) from said team. Items completed by Leedurs alone will be ineligible for scoring.- Leedurs may present digital evidence to a Judge to submit an item for their team, but there must either be a F!rosh featured in the photo/video, or proof that it was sent to the Leedur by a F!rosh.
- Occasionally, members of the F!rosh Week Executive Team may stand in as judges, during busy periods.
- Occasionally, members of the F!rosh Week Executive Team may stand in as judges, during busy periods.
- Partway through the evening, the judges will swap stations.
- If there is a line, the submitter must return to the back of the line upon completion of the three items.
- If there is no line, the submitter must move to a different judge to submit more items.
- Judges and Base Leedurs are entitled to further limit the number of items judged at once if needed, to decrease wait times.
- The Base Leedurs and Patrollers must be obeyed, if they get sad points will be deducted.