Skip to content

Commit

Permalink
update scunt
Browse files Browse the repository at this point in the history
  • Loading branch information
Freeassassin committed Sep 6, 2023
1 parent fe85b34 commit 4eb4bc9
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 7 deletions.
Binary file added client/src/assets/judges/tyler.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/assets/judges/will.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions client/src/util/scunt-judges.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import katie from '../assets/judges/katie.jpg';
import emaan from '../assets/judges/emaan.jpg';
import amelie from '../assets/judges/amelie.jpg';
import tech from '../assets/judges/tech.png';
import tyler from '../assets/judges/tyler.png';
import will from '../assets/judges/will.jpg';

export const scuntJudges = [
{
Expand Down Expand Up @@ -275,4 +277,31 @@ export const scuntJudges = [
],
img: amelie,
},
{
name: 'Tyler',
description: 'Hello fellow kids, I enjoy CFCs and tobogganing down hills on concrete.',
content: [
'An unusual but delicious food combination',
'Convince the bnad to crash me and join them',
'Artwork of a cool train',
'Show me your fursona',
'Bring me all of my roommates',
'Find the city bylaw that allows me to sue my landlord for not having running water',
],
img: tyler,
},
{
name: 'Will',
description:
'Hay there! My name is Will I’m a chem 2T5 I’m one of the scunt co-chairs and I L O V E love animal facts',
content: [
'Get sturdy for me',
'Get something new banded from the SUDS, the pit or SkavEnger Hunt’ that wasn’t banned before',
'Make fan art of me and Tyler',
'Best performance of“Jamaica there trapped down in…”',
'Bring me a grocery store cake, I’ll pay you back',
'Decorate my hat',
],
img: will,
},
];
8 changes: 1 addition & 7 deletions server/src/services/ScuntTeamServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ const ScuntTeamServices = {
async getTeamPoints() {
//Get amount of teams (Scunt Game Settings) and points for each team
//Add up and calculate all tranactions for each team
return ScuntTeamModel.find(
{},
{ name: 1, number: 1, points: 1 },
{
sort: { points: -1 },
},
).then(
return ScuntTeamModel.find({}, { name: 1, number: 1, points: 1 }).then(
(teams) => {
if (!teams.length) throw new Error('TEAMS_NOT_FOUND');
return teams;
Expand Down

0 comments on commit 4eb4bc9

Please sign in to comment.