Release 1.1.0

assets/styles/form.scss

@@ -85,6 +85,10 @@ button:hover {
 	background-color: #c90c0c;
 }
 
+button:disabled {
+	background-color: var(--light-pink);
+}
+
 .item {
 	display: flex;
 	flex-direction: column;

database/Schemas/Location.js

@@ -0,0 +1,17 @@
+const mongoose = require('mongoose');
+
+const locationSchema = new mongoose.Schema({
+	_id: { type: String, required: true },
+	name: { type: String, required: true },
+	pointerQuestion: [{ type: String, required: true }],
+	code: { type: String, required: true },
+	questions: [
+		{
+			question: { type: String, required: true },
+			answer: { type: Number, required: true }
+		}
+	],
+	keywords: [{ type: String, required: true }]
+}, { collection: 'locations' });
+
+module.exports = mongoose.model('Location', locationSchema);

database/Schemas/RiddleQuestion.js

@@ -0,0 +1,9 @@
+const mongoose = require('mongoose');
+
+const riddleQuestionSchema = new mongoose.Schema({
+	_id: { type: String, required: true },
+	question: { type: String, required: true },
+	answer: { type: String, required: true }
+}, { collection: 'riddle-questions' });
+
+module.exports = mongoose.model('RiddleQuestion', riddleQuestionSchema);

database/Schemas/Team.js

@@ -0,0 +1,27 @@
+const mongoose = require('mongoose');
+
+const teamSchema = new mongoose.Schema({
+	_id: { type: Number, required: true },
+	name: { type: String, required: true },
+	isAdmin: Boolean,
+	password: { type: String, requred: true },
+	members: [
+		{
+			name: { type: String, required: true },
+			email: { type: String, required: true },
+			phone: { type: String, required: true }
+		}
+	],
+	status: { type: String, required: true },
+	questionsAttempted: { type: Number, required: true, default: 0 },
+	order: [
+		{
+			location: { type: Number, required: true },
+			pointer: { type: Number, required: true },
+			question: { type: Number, required: true }
+		}
+	],
+	timeout: { type: [Date, null] }
+}, { collection: 'event-teams' });
+
+module.exports = mongoose.model('Team', teamSchema);

database/Schemas/TeamSession.js

@@ -0,0 +1,9 @@
+const mongoose = require('mongoose');
+
+const sessionSchema = new mongoose.Schema({
+	_id: { type: String, required: true },
+	teamId: { type: Number, required: true },
+	timestamp: { type: Date, default: new Date() }
+}, { collection: 'team-session' });
+
+module.exports = mongoose.model('TeamSession', sessionSchema);

database/handler.js

@@ -4,6 +4,10 @@ const Session = require('./Schemas/Session');
 const Questions = require('./Schemas/Questions');
 const Records = require('./Schemas/Records');
 const Results = require('./Schemas/Results');
+// Treasure Hunt stuff
+const Location = require('./Schemas/Location');
+const Team = require('./Schemas/Team');
+const TeamSession = require('./Schemas/TeamSession');
 
 async function createUser (userData) {
 	const _id = userData.userID ?? (await User.find({ _id: { '$gt': 10000 } })).length + 10001;
@@ -171,6 +175,76 @@ async function getLiveResults (quizId) {
 	return await Results.find({ quizId }).lean().sort({ 'points': -1 });
 }
 
+// Treasure Hunt Methods
+
+async function getLocations () {
+	return await Location.find().lean();
+}
+
+async function getTeams () {
+	return await Team.find({ isAdmin: [undefined, false] }).lean();
+}
+
+async function getTeamById (_id) {
+	return await Team.findById(_id);
+}
+
+async function validateTeam ({ username: teamId, password }) {
+	const team = await Team.findById(~~teamId);
+	if (!team) throw new Error('Team could not be found');
+	if (team.password === password) return team._id;
+	else throw new Error('Password does not match');
+}
+
+async function updateTeamDetails (ctx) {
+	const { id, name, members } = ctx;
+	const team = await Team.findById(id);
+	team.name = name;
+	team.members = members;
+	return await team.save();
+}
+
+async function updateTeamStatus (ctx) {
+	const { _id, status } = ctx;
+	const team = await Team.findById(_id);
+	team.status = status;
+	if (status === 'riddle-timeout') {
+		team.timeout = new Date(Date.now() + 120 * 1000);
+		setTimeout(async () => {
+			team.status = 'riddle-question';
+			team.timeout = null;
+			await team.save();
+		}, 120 * 1000);
+	} else if (status === 'location-code') {
+		team.questionsAttempted = ctx.questionNo;
+	}
+	return await team.save();
+}
+
+async function getTeamFromSessionID (sessionId) {
+	const session = await TeamSession.findById(sessionId);
+	const team = await Team.findById(session.teamId);
+	if (!team) throw new Error('Team Not Found');
+	else return team;
+}
+
+async function createTeamSession (teamId) {
+	// 3327: You Are My Special
+	const sessionId = [3, 3, 2, 7].map(i => (Math.random() + 1).toString(36).substring(2, 2 + i)).join('-');
+	const session = new TeamSession({
+		_id: sessionId,
+		teamId: teamId
+	});
+	await session.save();
+	return sessionId;
+}
+
+async function removeTeamSession (sessionId) {
+	// Use this if we want to remove sessions after logout
+	await Session.findByIdAndDelete(sessionId);
+}
+
+
 module.exports = {
 	createUser,
 	editUser,
@@ -190,5 +264,14 @@ module.exports = {
 	addLiveRecord,
 	addLiveResult,
 	updateLiveResult,
-	getLiveResults
+	getLiveResults,
+	getLocations,
+	getTeams,
+	getTeamById,
+	validateTeam,
+	updateTeamDetails,
+	updateTeamStatus,
+	getTeamFromSessionID,
+	createTeamSession,
+	removeTeamSession
 };

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mask-event",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"description": "A lighter site made for events using github.com/kgpmask/MASK as a base",
 	"main": "src/server.js",
 	"directories": {

routers/admin-router.js

@@ -3,25 +3,67 @@ const dbh = require('../database/handler');
 const { body, validationResult } = require('express-validator');
 const checkAdmin = require('./check-admin');
 
+const teams = require('../src/samples/teams.json');
+const riddleQuestions = require('../src/samples/riddleQuestions.json');
+
 router.use('/', checkAdmin);
 
 router.get('/', (req, res) => {
 	res.renderFile('admin/_admin.njk');
 });
 
+router.get('/edit-team', async (req, res) => {
+	const teamID = parseInt(req.query.teamID);
+	const team = await dbh.getTeamById(teamID);
+	return res.renderFile('admin/team-edit.njk', { team });
+});
+
+router.patch('/edit-team', [
+	body('id')
+		.isNumeric()
+		.trim()
+		.notEmpty().withMessage('No ID Provided'),
+	body('teamName')
+		.trim()
+		.notEmpty().withMessage('No Name Provided')
+], async (req, res) => {
+	const errors = validationResult(req);
+	if (!errors.isEmpty()) {
+		const errorMessages = errors.array().map(error => error.msg);
+		throw new Error(errorMessages[0]);
+	}
+	const team = {
+		id: req.body.id,
+		name: req.body.teamName,
+		members: [
+			{ name: req.body.name1, email: req.body.email1, phone: req.body.phone1 },
+			{ name: req.body.name2, email: req.body.email2, phone: req.body.phone2 },
+			{ name: req.body.name3, email: req.body.email3, phone: req.body.phone3 },
+			{ name: req.body.name4, email: req.body.email4, phone: req.body.phone4 }
+		].filter(i => i.name)
+	};
+	// const teamIndex = teams.findIndex(t => t.id === team.id);
+	// if (teamIndex === -1) {
+	// 	teams.push(team);
+	// }
+	await dbh.updateTeamDetails(team);
+	return res.status(200).send('Edited Successfully');
+});
+
+
 router.get('/list-users', async (req, res) => {
 	const users = await dbh.getUsers();
 	res.renderFile('admin/user-list.njk', { users });
 });
 
-router.get('/edit-user', async (req, res) => {
-	const username = req.query.username;
-	if (!username) return res.redirect('/admin/list-users');
-	const data = (await dbh.getUserByUsername(username)).toObject();
-	delete data.salt;
-	delete data.hash;
-	res.renderFile('admin/user-edit.njk', { ...data });
-});
+// router.get('/edit-user', async (req, res) => {
+// 	const username = req.query.username;
+// 	if (!username) return res.redirect('/admin/list-users');
+// 	const data = (await dbh.getUserByUsername(username)).toObject();
+// 	delete data.salt;
+// 	delete data.hash;
+// 	res.renderFile('admin/user-edit.njk', { ...data });
+// });
 
 router.patch('/edit-user', [
 	body('name')