-
-
- {game?.team1?.name}: {game?.team1?.points}
-
-
-
-
- {game?.team2?.name}: {game?.team2?.points}
-
+
+
{game?.team1?.name}: {game?.team1?.points}
+
{points}
+
{game?.team2?.name}: {game?.team2?.points}
+
+
{game && game.questionRevealed ? formatedQuestion : 'Coming...'}
+
+
+
+
{indexOfAnswer(0)}
+
{indexOfAnswer(1)}
+
{indexOfAnswer(2)}
+
{indexOfAnswer(3)}
+
+
+
+
{indexOfAnswer(4)}
+
{indexOfAnswer(5)}
+
{indexOfAnswer(6)}
+
{indexOfAnswer(7)}
+
-
-
+
);
};
-export default Home;
+export default QuestionsClient;
diff --git a/src/shared/components/adminTabs/Answers/AddAnswers.tsx b/src/shared/components/adminTabs/Answers/AddAnswers.tsx
index 7c4e4ac..86150f3 100644
--- a/src/shared/components/adminTabs/Answers/AddAnswers.tsx
+++ b/src/shared/components/adminTabs/Answers/AddAnswers.tsx
@@ -8,6 +8,7 @@ import {
Grid,
TextField,
Button,
+ Typography
} from '@mui/material';
import { DBQuestion, DBAnswer } from '../../../types/questions';
import QuestionsService from '../../../../services/questions.service';
@@ -44,7 +45,7 @@ const AddAnswers = () => {
if (answerIndex === index) {
return {
...answer,
- points: newValue,
+ points: newValue
};
}
return answer;
@@ -58,7 +59,7 @@ const AddAnswers = () => {
if (answerIndex === index) {
return {
...answer,
- answer: newValue,
+ answer: newValue
};
}
return answer;
@@ -72,8 +73,8 @@ const AddAnswers = () => {
...prevAnswers,
{
answer: '',
- points: 0,
- },
+ points: 0
+ }
]);
}
};
@@ -81,7 +82,7 @@ const AddAnswers = () => {
const saveAnswers = async () => {
await QuestionsService.update(questions[parseInt(selected)].id, {
...questions[parseInt(selected)],
- answers,
+ answers
});
getQuestions();
};
@@ -95,7 +96,7 @@ const AddAnswers = () => {
});
await QuestionsService.update(questions[parseInt(selected)].id, {
...questions[parseInt(selected)],
- answers: newAnswers,
+ answers: newAnswers
});
setAnswers(newAnswers);
};
@@ -104,6 +105,11 @@ const AddAnswers = () => {
+
+ You can't delete some field values. This constraint arises from the legacy codebase,
+ which restricts the ability to delete field values. Instead, you can only overwrite them
+ by selecting the existing content (Ctrl + A) and then making changes
+
Intrebare
-
- {
- props.errorType == 1
- ? {
- setOpen(false);
- }}
- >
-
-
- : {
- setOpen(false);
- }}
- >
-
- }
-
- {
- setOpen(true);
- }}
- >
- Re-open alert log
-
-
- );
-}
\ No newline at end of file
diff --git a/src/shared/components/adminTabs/CurrentGame.tsx b/src/shared/components/adminTabs/CurrentGame.tsx
index 9f731be..f6d2c59 100644
--- a/src/shared/components/adminTabs/CurrentGame.tsx
+++ b/src/shared/components/adminTabs/CurrentGame.tsx
@@ -17,6 +17,10 @@ import {
import useGame from '../../../hooks/useGame';
import GamesService from '../../../services/games.service';
import { NormalGame } from '../../types/game';
+import { useSounds } from '../../../hooks/useSounds.hook';
+import round_start from "../../../static/round_start.mp3";
+import correct_answer from "../../../static/correct_answer.mp3";
+
const CurrentGame = (props: any) => {
const [questions, setQuestions] = useState([]);
@@ -30,32 +34,22 @@ const CurrentGame = (props: any) => {
const [gamesList, setGamesList] = useState([]);
const game: NormalGame = useGame(selectedGame || '');
- const [checked, setChecked] = useState([false, false, false]);
-
- const handleChecked = (index:0|1|2) => {
- setChecked((prevState) => {
- return prevState.map((value, idx) => {
- if (idx === index){
- return !value
- }
- return value
- })
- })
- }
+ const [counterWrongAnswers, setCounterWrongAnswers] = useState(0);
+ const [allQuestions, setAllQuestions] = useState([]);
- useEffect(() => {
- const wrongAnswers = checked.filter((value) => value).length
+ useEffect(() => {
GamesService.update(selectedGame, {
...game,
- wrongAnswer: wrongAnswers,
+ wrongAnswer: counterWrongAnswers,
});
-
- }, [checked]);
+
+ }, [counterWrongAnswers]);
useEffect(() => {
QuestionsService.get()
.then((response) => {
- setQuestions(response);
+ setQuestions(game.questions || response);
+ setAllQuestions(response)
})
.catch((error) => console.error(error));
@@ -66,6 +60,22 @@ const CurrentGame = (props: any) => {
.catch((error) => console.error(error));
}, []);
+ useEffect(() => {
+ setQuestions(game.questions?.length ? game.questions : allQuestions)
+ }, [game]);
+
+
+ const playSound = (audioPath: string, timeout: number) => {
+ const audio = new Audio(audioPath)
+ const {play, stop} = useSounds(audio)
+ play(audio)
+ setTimeout(() => {
+ stop(audio)
+ }, timeout)
+ return audio
+ }
+
+
const resetDbValues = (newQuestion: string) => {
GamesService.update(selectedGame, {
...game,
@@ -77,21 +87,19 @@ const CurrentGame = (props: any) => {
};
const resetWrongAnswers = () => {
- console.log('resetting wrong answers')
GamesService.update(selectedGame, {
...game,
wrongAnswer: 0,
});
- setChecked([false, false, false])
+ setCounterWrongAnswers(0)
}
const setAllWrong = () => {
- console.log('setting all wrong')
GamesService.update(selectedGame, {
...game,
wrongAnswer: 3,
});
- setChecked([true, true, true])
+ setCounterWrongAnswers(3)
}
const resetStates = () => {
@@ -123,7 +131,9 @@ const CurrentGame = (props: any) => {
const handleRevealAnswer = (event: any, index: number) => {
const revealedAnswers = game.revealedAnswers;
+
if (event.target.checked) {
+ playSound(correct_answer, 4000)
revealedAnswers.push(index);
} else {
revealedAnswers.splice(revealedAnswers.indexOf(index), 1);
@@ -285,6 +295,7 @@ const CurrentGame = (props: any) => {
{questions[selected] && selectedGame
? questions[selected].answers.map((answer, index) => {
+ if (answer.answer === '' || answer.answer === undefined) return;
return (
@@ -348,15 +359,19 @@ const CurrentGame = (props: any) => {
label="Puncte triple"
/>
-
+
+ {playSound(round_start, 15000)}}>
+ Play intro theme song
+
+
Wrong answers
-
setAllWrong()}>
+ setAllWrong()} style={{ marginRight: 10 }}>
Set All wrong
- handleChecked(0)} />
- handleChecked(1)} />
- handleChecked(2)} />
+ setCounterWrongAnswers((prevState) => (Math.min(prevState+1, 3)))} style={{ marginRight: 10 }}>
+ {counterWrongAnswers} wrong (click for +1)
+
resetWrongAnswers()}>
Reset Wrong Answers
diff --git a/src/shared/components/adminTabs/FlashRound/FlashRoundAdmin.tsx b/src/shared/components/adminTabs/FlashRound/FlashRoundAdmin.tsx
index 9ffde6f..d89008f 100644
--- a/src/shared/components/adminTabs/FlashRound/FlashRoundAdmin.tsx
+++ b/src/shared/components/adminTabs/FlashRound/FlashRoundAdmin.tsx
@@ -1,40 +1,35 @@
import React, { useEffect, useState } from 'react';
import {
Container,
- Grid,
Button,
InputLabel,
FormControl,
Select,
MenuItem,
- ToggleButtonGroup,
- ToggleButton,
+ Grid,
} from '@mui/material';
-import { EmptyFlashRound } from '../../../models/flash-round';
import { FlashRoundAnswers, FlashRound } from '../../../types/flashRound';
import RoundAnswer from './RoundAnswer';
import useFlashRound from '../../../../hooks/useFlashRound';
import FlashRoundService from '../../../../services/flash.service';
-import BasicAlerts from '../BasicAlerts';
-import { AlertType, NormalGame } from '../../../types/game';
-import Timer from '../../Timer';
-import GamesService from '../../../../services/games.service';
-import useGame from '../../../../hooks/useGame';
-import useShowPoints from '../../../../hooks/useShowPoints';
+import { AlertType } from '../../../types/game';
+import Timer from './Timer';
+import round_start from "../../../../static/round_start.mp3";
+import { useSounds } from '../../../../hooks/useSounds.hook';
+import question_revealed from "../../../../static/question_revealed.mp3";
+import wrongAnswerSound from '../../../../static/x.mp3';
const FlashRoundAdmin = () => {
const [game, selectGame] = useState('');
const [flashRounds, setFlashRounds] = useState();
- const [answers1, setAnswers1] = useState([]);
- const [answers2, setAnswers2] = useState([]);
- const [questionNumber, setQuestionNumber] = useState(5)
- const [round, setRound] = useState(1);
+ const [answers, setAnswers] = useState([]);
+ const [questionNumber, setQuestionNumber] = useState(5);
+ const [resetChild, setResetChild] = useState(false);
const flash = useFlashRound(game);
const [alert, setAlerts] = useState({message:'', errorType:1});
- const [checked, setChecked] = useState([false, false, false]);
- const [selectedGame, setSelectedGame] = useState('');
- const gamez: NormalGame = useGame(selectedGame || '');
- const { showPoints, updateShowPoints, setAllTrue } = useShowPoints();
+ let currentToggle = flash?.toggleWrongSound
+ if (currentToggle === undefined) currentToggle = false
+ const [toggleWrong, setToggleWrong] = useState(currentToggle)
useEffect(() => {
FlashRoundService.get()
@@ -46,175 +41,156 @@ const FlashRoundAdmin = () => {
});
}, []);
- useEffect(() => {
- const wrongAnswers = checked.filter((value) => value).length
- GamesService.update(selectedGame, {
- ...gamez,
- wrongAnswer: wrongAnswers,
- });
-
- }, [checked]);
-
useEffect(() => {
- if (flash) {
- if (flash.answers1) {
- setAnswers1(flash.answers1);
- } else {
- setAnswers1(createEmptyTextFields());
- }
- if (flash.answers2) {
- setAnswers2(flash.answers2);
- } else {
- setAnswers2(createEmptyTextFields());
- }
+ if (!flash) {
+ return;
+ }
+ if (flash.answers) {
+ setAnswers(flash.answers);
+
+ } else {
+ setAnswers(createEmptyTextFields());
}
}, [flash]);
const updateTextFields = (
- round: number,
questionIndex: number,
newObject: FlashRoundAnswers
) => {
- if (round == 1 && answers1 !== undefined) {
- answers1[questionIndex] = newObject;
- setAnswers1(answers1);
- }
- if (round === 2 && answers2 !== undefined) {
- answers2[questionIndex] = newObject;
- setAnswers2(answers2);
- }
+ answers[questionIndex] = newObject;
+ setAnswers(answers);
};
- const resetWrongAnswers = () => {
- console.log('resetting wrong answers')
- GamesService.update(selectedGame, {
- ...gamez,
- wrongAnswer: 0,
- });
- setChecked([false, false, false])
- }
-
- const setAllWrong = () => {
- console.log('setting all wrong')
- GamesService.update(selectedGame, {
- ...gamez,
- wrongAnswer: 3,
- });
- setChecked([true, true, true])
- }
-
- const renderTextFields = (round: number) => {
+ const renderTextFields = () => {
+ if (answers.length <= 0) {
+ return [];
+ }
let answersArray = [];
- if (answers1.length > 0 && answers2.length > 0) {
- for (let i = 0; i < questionNumber; i++) {
- if (round === 1) {
- answersArray.push(
-
- updateTextFields(round, i, newObject)
- }
- />
- );
- } else {
- answersArray.push(
+ for (let i = 0; i < questionNumber; i++) {
+ answersArray.push(
+
+
- updateTextFields(round, i, newObject)
- }
+ answer={answers[i]?.answer}
+ points={answers[i]?.points}
+ showPoints={answers[i]?.showPoints}
+ updateFields={(newObject: FlashRoundAnswers) => updateTextFields(i, newObject)}
+ reset={resetChild}
/>
- );
- }
- }
+
+
+ saveAnswer(i)}
+ >
+ Save Answer {i + 1}
+
+
+
+ );
}
return answersArray;
};
- const handleRoundChange = (event: React.SyntheticEvent, newRound: number) => {
- setRound(newRound);
+ const saveAnswer = (questionIndex: number) => {
+ const answerToSave = answers[questionIndex];
+ console.log(answerToSave)
+ if(answerToSave.points === undefined && answerToSave.answer !== undefined){
+ answerToSave.points = 0;
+ }
+ if (!(
+ answerToSave.answer.length >= 0 &&
+ answerToSave.answer.length < 50 &&
+ answerToSave.points >= 0 &&
+ answerToSave.points < 101
+ )){
+ setAlerts({ message: 'Invalid data, check the answer or points', errorType: 0 });
+ return;
+ }
FlashRoundService.update(game, {
...flash,
- currentRound: newRound,
- });
- };
-
- const saveChanges = () => {
- let allGood = 1;
- let sumPoints = 0;
-
- if (round == 1) {
- for (let i = 0; i < answers1.length; i++) {
- sumPoints += answers1[i].points;
- if (
- !(
- answers1[i].answer.length >= 0 &&
- answers1[i].answer.length < 50 &&
- answers1[i].points >= 0 &&
- answers1[i].points < 101
- )
- ) {
- allGood = 0;
- }
- }
- } else {
- for (let i = 0; i < answers2.length; i++) {
- sumPoints += answers2[i].points;
- if (
- !(
- answers2[i].answer.length >= 0 &&
- answers2[i].answer.length < 50 &&
- answers2[i].points >= 0 &&
- answers2[i].points < 101
- )
- ) {
- allGood = 0;
- }
- }
- }
-
- if (sumPoints > 1000) {
- allGood = 0;
- }
-
- if (allGood) {
- FlashRoundService.update(game, {
- ...flash,
- answers1,
- answers2,
- type: 2,
- currentRound: round,
- }).catch((error) => console.error(error));
- setAlerts({message:"Succes", errorType:1});
- } else {
- setAlerts({message:"Invalid data, check the answer or points", errorType:0});
+ answers: [...answers],
+ type: 1,
+ }).then(() => {
+ setAlerts({ message: 'Succes', errorType: 1 });
+ })
+ .catch((error) => {
+ console.error(error);
+ setAlerts({ message: 'Error saving answer', errorType: 0 });
+ });
+ if (answerToSave.showPoints === true) {
+ playSound(question_revealed, 4000)
}
};
const createEmptyTextFields = () => {
const fields: FlashRoundAnswers[] = [];
for (let i = 0; i < 4; i++) {
- fields.push(EmptyFlashRound);
+ fields.push({ answer: '', points: 0, showPoints: false });
}
return fields;
};
- const resetRounds = () => {
+
+ const clearPointsAndAnswers = () => {
+ const clearedAnswers = answers.map(answer => ({
+ ...answer,
+ answer: '',
+ points: 0,
+ showPoints: false
+ }));
+
+ setAnswers(clearedAnswers);
+
FlashRoundService.update(game, {
...flash,
- answers1: createEmptyTextFields(),
- answers2: createEmptyTextFields(),
- currentRound: 1,
- }).catch((error) => console.error(error));
- setAnswers1([]);
- setAnswers2([]);
+ answers: clearedAnswers,
+ type: 1,
+ }).then(() => {
+ setAlerts({ message: 'Cleared points and answers', errorType: 1 });
+ setResetChild(true);
+ }).catch((error) => {
+ console.error(error);
+ setAlerts({ message: 'Error clearing points and answers', errorType: 0 });
+ });
+ };
+
+ const playSound = (audioPath: string, timeout: number) => {
+ const audio = new Audio(audioPath)
+ const {play, stop} = useSounds(audio)
+ play(audio)
+ setTimeout(() => {
+ stop(audio)
+ }, timeout)
+ return audio
+ }
+
+ useEffect(() => {
+ if (resetChild) {
+ const timeout = setTimeout(() => {
+ setResetChild(false);
+ }, 1000);
+
+ return () => clearTimeout(timeout);
+ }
+ }, [resetChild]);
+
+ const setWrong = () => {
+ setToggleWrong((prev) => !prev)
+ FlashRoundService.update(game, {
+ ...flash,
+ toggleWrongSound: toggleWrong
+ }).then(() => {
+ playSound(wrongAnswerSound, 5000);
+ }).catch((error) => {
+ console.error(error);
+ setAlerts({ message: 'Error when displaying X', errorType: 0 });
+ });
}
return (
- {alert.message ?
Link-ul pentru accesarea rundei flash:
@@ -247,46 +223,20 @@ const FlashRoundAdmin = () => {
))}
-
{game &&
- renderTextFields(1).map((field) => {
+ renderTextFields().map((field) => {
return
{field}
;
})}
- {game && (
- <>
-
- saveChanges()}>
- Salveaza prima runda
-
-
-
-
- {renderTextFields(2).map((field) => {
- return {field}
;
- })}
-
- saveChanges()}>
- Salveaza a doua runda
-
-
-
-
- Runda 1
- Runda 2
-
-
-
- )}
+
-
setAllWrong()}>Throw 3Xs
-
-
Need to refresh page if clicked erases all round :(
-
resetRounds()}>Ciao meci fulger
+
clearPointsAndAnswers()}>Clear Points and Answers
+
setWrong()} style={{marginLeft: '20px'}}>Show X
+
+
+ {playSound(round_start, 15000)}}>
+ Play intro theme song
+
+
);
};
diff --git a/src/shared/components/adminTabs/FlashRound/RoundAnswer.tsx b/src/shared/components/adminTabs/FlashRound/RoundAnswer.tsx
index a5defb6..91cc31a 100644
--- a/src/shared/components/adminTabs/FlashRound/RoundAnswer.tsx
+++ b/src/shared/components/adminTabs/FlashRound/RoundAnswer.tsx
@@ -1,11 +1,11 @@
-import { Container, Grid, TextField, Button } from '@mui/material';
+import { Container, Grid, TextField, FormControlLabel, Switch } from '@mui/material';
import React, { useState, useEffect } from 'react';
const RoundAnswer = (props: any) => {
const { updateFields } = props;
-
const [answer, setAnswer] = useState('');
const [points, setPoints] = useState();
+ const [showPoints, setShowPoints] = useState(props.answer.showPoints || false);
useEffect(() => {
if (props.answer) {
@@ -16,6 +16,18 @@ const RoundAnswer = (props: any) => {
}
}, []);
+ useEffect(() => {
+ if (props.reset) {
+ setAnswer('');
+ setPoints(0);
+ }
+ }, [[props.reset]]);
+
+ const handleShowPointsToggle = () => {
+ setShowPoints(!showPoints);
+ updateFields({ answer: answer, points: points, showPoints: !showPoints });
+ };
+
return (
@@ -28,11 +40,11 @@ const RoundAnswer = (props: any) => {
value={answer}
onChange={(e) => {
setAnswer(e.target.value);
- updateFields({ answer: e.target.value, points: points });
+ updateFields({ answer: e.target.value, points: points, showPoints: showPoints });
}}
/>
-
+
{
updateFields({
answer: answer,
points: parseInt(e.target.value),
+ showPoints: showPoints,
});
}
}}
/>
+
+
);
diff --git a/src/shared/components/Timer.tsx b/src/shared/components/adminTabs/FlashRound/Timer.tsx
similarity index 100%
rename from src/shared/components/Timer.tsx
rename to src/shared/components/adminTabs/FlashRound/Timer.tsx
diff --git a/src/shared/components/adminTabs/Games/GameField.tsx b/src/shared/components/adminTabs/Games/GameField.tsx
index 7a466eb..b48e92d 100644
--- a/src/shared/components/adminTabs/Games/GameField.tsx
+++ b/src/shared/components/adminTabs/Games/GameField.tsx
@@ -2,27 +2,25 @@ import React from 'react';
import { Grid, TextField, Button } from '@mui/material';
function GameField(props: any) {
- const { name, changeText, onDelete } = props;
+ const { name, changeText, label } = props;
- return (
- <>
-
- {
- changeText(event.target.value);
- }} />
-
-
- {
- onDelete();
- }}>Delete
-
-
- )
+ return (
+
+
+ {
+ changeText(event.target.value);
+ }}
+ fullWidth
+ sx={{ marginBottom: '10px' }}
+ />
+
+
+ )
}
-export default GameField;
\ No newline at end of file
+export default GameField;
diff --git a/src/shared/components/adminTabs/Games/GamesManagement.tsx b/src/shared/components/adminTabs/Games/GamesManagement.tsx
index 5390c75..2b02752 100644
--- a/src/shared/components/adminTabs/Games/GamesManagement.tsx
+++ b/src/shared/components/adminTabs/Games/GamesManagement.tsx
@@ -1,16 +1,13 @@
-import { Button, Container, Grid } from '@mui/material';
+import { Button, Container, Grid, Typography } from '@mui/material';
import React, { useEffect, useState } from 'react';
import GamesService from '../../../../services/games.service';
import { NormalGame } from '../../../types/game';
import GameField from './GameField';
import { EmptyGame } from '../../../models/game';
-import Checkbox from '@mui/material/Checkbox';
-
-
function GamesManagement() {
const [games, setGames] = useState([]);
- const [newChange, setNewChange] = useState(false);
+ const [localChanges, setLocalChanges] = useState>({});
useEffect(() => {
getAllGames();
@@ -31,8 +28,8 @@ function GamesManagement() {
...games,
{
...EmptyGame,
- id: response.id,
- },
+ id: response.id
+ }
]);
})
.catch((error) => console.error(error));
@@ -47,49 +44,73 @@ function GamesManagement() {
.catch((error) => console.error(error));
};
- const handleFieldChange = (newText: string, item: NormalGame) => {
- setGames([
- ...games.map((game) => {
- if (game === item) {
- return {
- ...game,
- name: newText,
- };
- }
- return game;
- }),
- ]);
+ const handleFieldChange = (newText: string, item: NormalGame, fieldName: string) => {
+ setLocalChanges({
+ ...localChanges,
+ [item.id]: {
+ ...localChanges[item.id],
+ [fieldName]: newText === '' ? null : newText
+ }
+ });
};
- const handleGameUpdate = () => {
- games.map((game) => {
- if (game.name == '') {
- GamesService.remove(game.id);
+ const handleGameQuestionsCapacityChange = (newValue: string, item: NormalGame) => {
+ setLocalChanges({
+ ...localChanges,
+ [item.id]: {
+ ...localChanges[item.id],
+ questionsCapacity: newValue === '' ? null : newValue
}
});
- let names = [];
- let k = 0;
- for (let game of games) {
- names[k] = game.name;
- k++;
+ };
+
+ const handleGameUpdate = () => {
+ const promises = [];
+
+ for (const gameId in localChanges) {
+ const changedFields = localChanges[gameId];
+ const game = games.find((g) => g.id === gameId);
+ if (game && Object.keys(changedFields).length > 0) {
+ const updatedGame = { ...game, ...changedFields };
+ promises.push(GamesService.update(gameId, updatedGame));
+ }
}
- games.map((game) => {
- GamesService.update(game.id, game).catch((error) => console.error(error));
- });
+
+ Promise.all(promises)
+ .then(() => {
+ setLocalChanges({});
+ getAllGames();
+ })
+ .catch((error) => console.error(error));
};
return (
+
+ You can't delete some field values. This constraint arises from the legacy codebase, which
+ restricts the ability to delete field values. Instead, you can only overwrite them by
+ selecting the existing content (Ctrl + A) and then making changes
+
{games.length > 0 &&
games.map((game) => (
- <>
+
+ handleFieldChange(text, game, 'name')}
+ label={'Nume joc'}
+ />
handleFieldChange(text, game)}
- onDelete={() => deleteGame(game)}
+ name={localChanges[game.id]?.questionsCapacity ?? game.questionsCapacity ?? ''}
+ changeText={(text: string) => handleGameQuestionsCapacityChange(text, game)}
+ label={'Capacitate joc'}
/>
-
+
+ deleteGame(game)}>
+ Delete
+
+
+
))}
addNewGame()}>
diff --git a/src/shared/components/adminTabs/Questions/Questions.tsx b/src/shared/components/adminTabs/Questions/Questions.tsx
index 248e8c4..75c21e9 100644
--- a/src/shared/components/adminTabs/Questions/Questions.tsx
+++ b/src/shared/components/adminTabs/Questions/Questions.tsx
@@ -5,6 +5,8 @@ import { DBQuestion } from '../../../types/questions';
import QuestionsService from '../../../../services/questions.service';
import convert from '../../../../helpers/csv-convertor.helper';
import convertFirebaseToCsv from '../../../../helpers/firebase-to-csv.helper';
+import { toast } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
const Questions = () => {
const [gameQuestions, setGameQuestions] = useState([]);
@@ -80,10 +82,16 @@ const Questions = () => {
return;
}
const firestoreData: DBQuestion[] = convert(fileContent);
-
+
+ const loadingToastId = toast.info('Se initializeaza incarcarea intrebarilor...', {
+ autoClose: false,
+ });
+
try {
await QuestionsService.removeCollection();
-
+
+ toast.dismiss(loadingToastId);
+
const insertPromises = firestoreData.map(async (question) => {
const questionId = await QuestionsService.insert(question);
return {
@@ -91,10 +99,18 @@ const Questions = () => {
id: questionId,
};
});
-
- const insertedQuestions = await Promise.all(insertPromises);
+
+ const allPromises = Promise.all(insertPromises);
+
+ toast.promise(allPromises, {
+ pending: 'Se incarca intrebarile...',
+ success: 'Intrebarile au fost incarcate cu succes!',
+ });
+
+ const insertedQuestions = await allPromises;
setGameQuestions(insertedQuestions);
+
} catch (error) {
console.error('Error handling bulk update:', error);
}
diff --git a/src/shared/components/adminTabs/Teams/TeamsTab.tsx b/src/shared/components/adminTabs/Teams/TeamsTab.tsx
index 2fa5ed8..148c4a1 100644
--- a/src/shared/components/adminTabs/Teams/TeamsTab.tsx
+++ b/src/shared/components/adminTabs/Teams/TeamsTab.tsx
@@ -7,13 +7,15 @@ import {
MenuItem,
Select,
Container,
- TextField,
-} from '@mui/material';
+ TextField, List, Typography, ListItem, ListItemText
+} from "@mui/material";
import GamesService from '../../../../services/games.service';
import { NormalGame, AlertType } from '../../../types/game';
import { EmptyGame } from '../../../models/game';
-import BasicAlerts from '../BasicAlerts';
-
+import QuestionsService from '../../../../services/questions.service';
+import { DBQuestion } from "../../../types/questions";
+import { toast } from 'react-toastify';
+import useGame from "../../../../hooks/useGame";
const Teams = () => {
const [games, setGames] = useState([]);
@@ -23,13 +25,47 @@ const Teams = () => {
const [team1Points, setTeam1Points] = useState(0);
const [team2Points, setTeam2Points] = useState(0);
-
- const [alert, setAlerts] = useState({message:'', errorType:1});
+ const [gameQuestions, setGameQuestions] = useState([]);
+ const game: NormalGame = useGame(currentGame || '');
+ const [selectedQuestions, setSelectedQuestions] = useState([]);
+ const [availableQuestions, setAvailableQuestions] = useState([]);
+
+ useEffect(() => {
+ const filteredQuestions = gameQuestions.filter(
+ (question) => !selectedQuestions.includes(question)
+ );
+ setAvailableQuestions(filteredQuestions);
+ }, [selectedQuestions, gameQuestions]);
+
+
+ const handleAddQuestion = (question: DBQuestion) => {
+ setSelectedQuestions((prevQuestions) => [...prevQuestions, question]);
+ };
+
+ const handleRemoveQuestion = (question: DBQuestion) => {
+ setSelectedQuestions((prevQuestions) =>
+ prevQuestions.filter((q) => q !== question)
+ );
+ };
+
+
+ useEffect(() => {
+ async function getGameQuestions() {
+ const questions = await QuestionsService.get();
+
+ if (questions) {
+ setGameQuestions(questions);
+ }
+ }
+
+ getGameQuestions();
+ }, []);
useEffect(() => {
updateGamesList();
}, []);
+
useEffect(() => {
const currentGameItem =
games.find((item) => item.id === currentGame) || EmptyGame;
@@ -49,7 +85,11 @@ const Teams = () => {
const saveChanges = () => {
const currentGameItem = games.find((item) => item.id === currentGame);
-
+ const questionsCapacity = currentGameItem?.questionsCapacity || 5;
+ if (selectedQuestions.length > questionsCapacity) {
+ toast.info('Prea multe intrebari selectate!', { autoClose: 3000, type: 'error' });
+ return;
+ }
if (
team1Name.length > 1 &&
team1Name.length < 40 &&
@@ -61,112 +101,169 @@ const Teams = () => {
team2Points < 3000 &&
team1Name !== team2Name
) {
- GamesService.update(currentGame, {
- ...currentGameItem,
- team1: {
- name: team1Name,
- points: team1Points,
- },
- team2: {
- name: team2Name,
- points: team2Points,
- },
- })
- .then(() => updateGamesList())
- .catch((error) => console.error(error));
-
- setAlerts({message:"Succes", errorType:1});
- } else {
- setAlerts({message:"Invalid data, check the name or points", errorType:0});
+ GamesService.update(currentGame, {
+ ...currentGameItem,
+ team1: {
+ name: team1Name,
+ points: team1Points,
+ },
+ team2: {
+ name: team2Name,
+ points: team2Points,
+ },
+ questions: selectedQuestions
+ })
+ .then(() => updateGamesList())
+ .catch((error) => console.error(error));
+ toast.info('Jocul a fost actualizat cu succes!', { autoClose: 3000, type: 'success' });
+ } else {
+ toast.info('Datele introduse nu sunt valide!', { autoClose: 3000, type: 'error' });
+ }
}
- };
+ ;
- const handleGameChange = (event: any) => {
- setCurrentGame(event.target.value);
- };
+ const handleGameChange = async (event: any) => {
+ const newGameId = event.target.value;
- return (
-
- {alert.message ?
-
-
-
- Selecteaza Jocul
-
-
- {games.length > 0 &&
- games.map((game) => (
-
- {game.name}
-
- ))}
-
-
-
-
- setTeam1Name(e.target.value)}
- />
-
-
- {
- if (!isNaN(+e.target.value)) {
- setTeam1Points(+e.target.value);
- }
- }}
- />
-
+ const newGame = await GamesService.getById(newGameId);
+ if (newGame === undefined) return;
+
+ setSelectedQuestions(newGame.questions || []);
+ setCurrentGame(newGameId);
+ setTeam1Name(newGame.team1.name);
+ setTeam1Points(newGame.team1.points);
+ setTeam2Name(newGame.team2.name);
+ setTeam2Points(newGame.team2.points);
+ };
-
- setTeam2Name(e.target.value)}
- />
-
-
- {
- if (!isNaN(+e.target.value)) {
- setTeam2Points(+e.target.value);
- }
- }}
- />
-
-
-
- Salveaza
-
-
-
-
- );
-};
+ return (
+
+
+
+
+
+ Selecteaza Jocul
+
+
+ {games.length > 0 &&
+ games.map((game) => (
+
+ {game.name}
+
+ ))}
+
+
+
+
+ setTeam1Name(e.target.value)}
+ />
+
+
+ {
+ if (!isNaN(+e.target.value)) {
+ setTeam1Points(+e.target.value);
+ }
+ }}
+ />
+
+
+
+ setTeam2Name(e.target.value)}
+ />
+
+
+ {
+ if (!isNaN(+e.target.value)) {
+ setTeam2Points(+e.target.value);
+ }
+ }}
+ />
+
+ {currentGame && (<>
+
+ Selected Questions:
+
+ {selectedQuestions.map((question) => (
+
+ handleRemoveQuestion(question)}
+ >
+ Remove
+
+
+ ))}
+
+
+
+
+
+ Select a Question
+
+ {
+ const selectedQuestionId = e.target.value as string;
+ const selectedQuestion = availableQuestions.find(
+ (question) => question.id === selectedQuestionId
+ );
+ if (selectedQuestion) {
+ handleAddQuestion(selectedQuestion);
+ }
+ }}
+ >
+ {availableQuestions.map((question) => (
+
+ {question.text}
+
+ ))}
+
+
+
+ )}
+
+
+ Salveaza
+
+
+
+
+ );
+ };
export default Teams;
diff --git a/src/shared/components/styles/admin.css b/src/shared/components/styles/admin.css
index 7bdd3c5..24b5dff 100644
--- a/src/shared/components/styles/admin.css
+++ b/src/shared/components/styles/admin.css
@@ -18,4 +18,9 @@
.login-button:hover {
background-color: #f30303;
color: #000000;
+}
+
+body {
+ background-color: #a7cfdf;
+ color: white;
}
\ No newline at end of file
diff --git a/src/shared/components/styles/home.css b/src/shared/components/styles/home.css
index 95f33f7..f2c2ea4 100644
--- a/src/shared/components/styles/home.css
+++ b/src/shared/components/styles/home.css
@@ -2,122 +2,132 @@
background-color: #26558B;
}
-.board {
- background: url("https://s3-us-west-2.amazonaws.com/s.cdpn.io/40041/bgFF.svg");
- background-color: #003c7b;
- background-repeat: repeat;
- background-size: 20px 20px;
- background-position: center center;
- box-shadow: 0 1px 24px 1px rgba(0, 0, 0,0.48);
- border-radius: 50%;
- max-width: 1500px;
- max-height: 2000px;
- min-width: 305px;
- margin: auto;
- margin-top: 100px;
+.ce-spun-studentii
+{
+ font: 'Montserrat';
+ font-weight: bold;
+ color: white;
}
-#boardScore {
- background: linear-gradient(to bottom,#7db9eb 0%,#207cca 49%,#2989d8 50%,#1e5799 100%);
+.board {
+ display: flex;
+ justify-content: space-evenly;
+ margin-bottom: 40px;
}
-.board .scor#boardScore{
- height: 75px;
- line-height: 75px;
- width: 125px !important;
- font-size: 65px;
- left: 0;
- right: 0;
- top: 20px;
- margin-bottom: 20px;
-}
-.board .card {
- display: inline-block;
- width: 470px;
- margin: 8px;
- margin-bottom: 8px;
- margin-top: 8px;
- height: 40px;
- font-size: 28px;
- background: #cedbe9;
- background: linear-gradient(to bottom,#cedbe9 0%,#aac5de 17%, #6199c7 50%, #3a84c3 51%, #419ad6 59%,#4bb8f0 71%, #3A8BC2 84%, #26558B 100%);
- text-transform: uppercase;
- color: white;
- z-index: -1;
+.echipa1
+{
+ background-color: #323231;
+ border-style: solid;
+ border-color: white;
+ border-width: 10px;
+ border-radius: 0 0 50px 50px;
+ border-top: none;
+ width: 350px;
+ height: 185px;
+ font-size: 46px;
}
-/* .board .btnHolder {
- position: absolute;
- margin: auto;
- left: 0;
- right: 0;
- bottom: -10px;
-} */
+.puncteRunda
+{
+ background-color: #323231;
+ border-style: solid;
+ border-color: white;
+ border-width: 10px;
+ border-radius: 0 0 50px 50px;
+ border-top: none;
+ width: 300px;
+ height: 155px;
+ font-size: 60px;
+ padding-top: 20px;
-.board .btnHolder .button#awardTeam1 {
- border-radius: 50px 0 0 50px;
}
-.board .btnHolder .button#awardTeam2 {
- border-radius: 0 50px 50px 0;
-}
-.board .scor, .board .button {
- background: #7db9eb;
- background: -moz-linear-gradient(top,#7db9eb 0%,#207cca 49%,#2989d8 50%,#1e5799 100%);
- background: -webkit-linear-gradient(top,#7db9eb 0%,#207cca 49%,#2989d8 50%,#1e5799 100%);
- background: linear-gradient(to bottom,#7db9eb 0%,#207cca 49%,#2989d8 50%,#1e5799 100%);
+.echipa2
+{
+ background-color: #323231;
+ border-style: solid;
+ border-color: white;
+ border-width: 10px;
+ border-radius: 0 0 50px 50px;
+ border-top: none;
+ width: 350px;
+ height: 185px;
+ font-size: 46px;
}
-.board .questions span {
- display: inline-block;
- vertical-align: middle;
- line-height: normal;
-}
-.question {
- color: black;
- /* padding: 15px; */
- font-size: 20px;
- line-height: 1;
+.intrebare
+{
+ background-color: #323231;
+ width: 1500px;
+ height: 125px;
+ border-style: solid;
+ border-color: white;
+ border-width: 5px;
+ border-radius: 30px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin:auto;
+ font-size: 42px;
+
}
-.questions {
+.tablaRaspunsuri {
+ background-color: #991a1a;
+ width: 1500px;
+ height: 635px;
+ border: 5px solid white;
+ border-radius: 50px;
+ margin-top: 20px;
+ margin-left: auto;
+ margin-right: auto;
display: flex;
- justify-content: center;
+ flex-direction: row;
+ justify-content: space-evenly;
align-items: center;
+
+
}
-.board .questions {
- width: 80%;
+.coloana1
+{
margin: auto;
- height: 70px;
- line-height: 100px;
- text-align: center;
- font-size: 30px;
- color: #ffffff;
- font-weight: bold;
- text-shadow: initial;
- text-align: center;
- border: 1px solid black;
- background: #deeeff;
- /* padding: 10px; */
- margin-bottom: 15px;
- box-shadow: inset 0 1px 24px 1px rgb(0 0 0 / 48%);
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ row-gap: 20px;
}
-.board .btnHolder .button {
- display: inline-block;
- font-size: 20px;
- margin: 10px;
- height: 50px;
- line-height: 50px;
- width: 360px;
- border: 3px solid white;
- box-shadow: 0 1px 24px 1px rgb(0 0 0 / 48%);
+.coloana2
+{
+ margin: auto;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ row-gap: 20px;
}
-body {
- background-color: #a7cfdf;
- color: white;
-}
\ No newline at end of file
+.tablaRaspunsuri .raspunsuri {
+ margin: auto;
+ width: 700px;
+ height: 125px;
+ border: 5px solid white;
+ border-radius: 25px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 50px;
+ background: rgb(50,50,49);
+ background: linear-gradient(180deg, rgba(50,50,49,1) 0%, rgba(50,50,49,1) 80%, rgba(153,26,26,1) 100%);
+
+}
+
+.ce-spun-studentii {
+ background: url("src/static/background.png") no-repeat center center;
+ background-size: cover;
+ height: 100vh;
+ }
+
\ No newline at end of file
diff --git a/src/shared/models/flash-round.ts b/src/shared/models/flash-round.ts
deleted file mode 100644
index 6caf996..0000000
--- a/src/shared/models/flash-round.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { FlashRoundAnswers } from '../types/flashRound';
-
-export const EmptyFlashRound: FlashRoundAnswers = {
- points: 0,
- answer: '',
-};
diff --git a/src/shared/models/game.ts b/src/shared/models/game.ts
index 532294c..130a7c0 100644
--- a/src/shared/models/game.ts
+++ b/src/shared/models/game.ts
@@ -17,4 +17,6 @@ export const EmptyGame: NormalGame = {
type: 1,
pointsMultiplier: 1,
wrongAnswer: 0,
+ questions: [],
+ questionsCapacity: 5,
};
diff --git a/src/shared/types/flashRound.d.ts b/src/shared/types/flashRound.d.ts
index a313815..16f4d2f 100644
--- a/src/shared/types/flashRound.d.ts
+++ b/src/shared/types/flashRound.d.ts
@@ -1,14 +1,13 @@
export interface FlashRoundAnswers {
answer: string;
points: number;
+ showPoints?: boolean;
}
export interface FlashRound {
id: string;
name: string;
- answers1: FlashRoundAnswers[];
- answers2: FlashRoundAnswers[];
+ answers: FlashRoundAnswers[];
type: number;
- currentRound: number;
- showPoints?: boolean[];
+ toggleWrongSound: boolean;
}
diff --git a/src/shared/types/game.d.ts b/src/shared/types/game.d.ts
index 9ed1b7d..ae504db 100644
--- a/src/shared/types/game.d.ts
+++ b/src/shared/types/game.d.ts
@@ -1,3 +1,5 @@
+import { DBQuestion } from "./questions";
+
export interface DBTeam {
name: string;
points: number;
@@ -14,6 +16,8 @@ export interface NormalGame {
type: number;
pointsMultiplier: number;
wrongAnswer: number;
+ questions?: DBQuestion[];
+ questionsCapacity?: number;
}
export interface AlertType {
diff --git a/src/static/background.png b/src/static/background.png
new file mode 100644
index 0000000..384b865
Binary files /dev/null and b/src/static/background.png differ
diff --git a/src/static/background1.png b/src/static/background1.png
new file mode 100644
index 0000000..cce5680
Binary files /dev/null and b/src/static/background1.png differ
diff --git a/src/static/correct_answer.mp3 b/src/static/correct_answer.mp3
new file mode 100644
index 0000000..bc6bfe2
Binary files /dev/null and b/src/static/correct_answer.mp3 differ
diff --git a/src/static/info.png b/src/static/info.png
new file mode 100644
index 0000000..6c25485
Binary files /dev/null and b/src/static/info.png differ
diff --git a/src/static/question_revealed.mp3 b/src/static/question_revealed.mp3
new file mode 100644
index 0000000..e72c8f4
Binary files /dev/null and b/src/static/question_revealed.mp3 differ
diff --git a/src/static/round_start.mp3 b/src/static/round_start.mp3
new file mode 100644
index 0000000..c5f948c
Binary files /dev/null and b/src/static/round_start.mp3 differ
diff --git a/src/static/wrong_answer.mp3 b/src/static/wrong_answer.mp3
new file mode 100644
index 0000000..b69f69d
Binary files /dev/null and b/src/static/wrong_answer.mp3 differ
diff --git a/src/utils/contants.ts b/src/utils/contants.ts
index c6b419d..5bf07be 100644
--- a/src/utils/contants.ts
+++ b/src/utils/contants.ts
@@ -1,4 +1,8 @@
export const GAMES_COLLECTION= 'games';
export const QUESTIONS_COLLECTION = 'questions';
export const FLASH_ROUND_COLLECTION = 'flash';
-export const SHOW_POINTS_COLLECTION = 'showPoints'
\ No newline at end of file
+
+export enum environmentType {
+ 'development',
+ 'production'
+}
\ No newline at end of file
diff --git a/src/utils/firebase/firebase.ts b/src/utils/firebase/firebase.ts
index 1d6fc4a..63fe405 100644
--- a/src/utils/firebase/firebase.ts
+++ b/src/utils/firebase/firebase.ts
@@ -1,24 +1,41 @@
-// Import the functions you need from the SDKs you need
-import { initializeApp } from 'firebase/app';
-import { getDatabase } from 'firebase/database';
-import { getFirestore } from 'firebase/firestore';
-// TODO: Add SDKs for Firebase products that you want to use
-// https://firebase.google.com/docs/web/setup#available-libraries
+import { initializeApp } from "firebase/app";
+import { getDatabase } from "firebase/database";
+import { getFirestore } from "firebase/firestore";
+import { getAuth } from "firebase/auth";
+import { environmentType } from "../contants";
-// Your web app's Firebase configuration
-const firebaseConfig = {
+// Your web app's Firebase configuration for local development
+const firebaseConfigDev = {
+ apiKey: "AIzaSyCKbzlajmZjuKyeWyZSxYboy51OeLzfcgE",
+ authDomain: "osut-divertisment-testing.firebaseapp.com",
+ projectId: "osut-divertisment-testing",
+ storageBucket: "osut-divertisment-testing.appspot.com",
+ messagingSenderId: "538903092781",
+ appId: "1:538903092781:web:e02312ae6f3818416f62a4"
+};
+
+// Your web app's Firebase configuration for production
+const firebaseConfigProd = {
apiKey: 'AIzaSyCoS-q_rga3axs7gFpr6bdtkdfqoebczo0',
authDomain: 'osut-divertisment.firebaseapp.com',
- databaseURL:
- 'https://osut-divertisment-default-rtdb.europe-west1.firebasedatabase.app',
+ databaseURL: 'https://osut-divertisment-default-rtdb.europe-west1.firebasedatabase.app',
projectId: 'osut-divertisment',
storageBucket: 'osut-divertisment.appspot.com',
messagingSenderId: '219304656262',
appId: '1:219304656262:web:d55d4ec98fff1de0bc0007',
};
-// Initialize Firebase
-const app = initializeApp(firebaseConfig);
+const validEnvironments = ['localhost', '127.0.0.1', 'osut-divertisment-testing.web.app', 'osut-divertisment-testing.firebaseapp.com"'];
+const isDevelopmentEnvironment = validEnvironments.includes(window.location.hostname);
+
+const app = isDevelopmentEnvironment
+ ? initializeApp(firebaseConfigDev)
+ : initializeApp(firebaseConfigProd);
export const db = getDatabase();
export const firestore = getFirestore(app);
+export const auth = getAuth(app);
+
+const currEnvironment = isDevelopmentEnvironment ? environmentType.development : environmentType.production;
+
+export{currEnvironment};
diff --git a/src/utils/input.txt b/src/utils/input.txt
new file mode 100644
index 0000000..b7b5fac
--- /dev/null
+++ b/src/utils/input.txt
@@ -0,0 +1,18 @@
+1.iNTREBARE TEST 1?
+—ABS DA 26
+—SDASDASD 10
+—ADSASD AS 21
+—ADSD WEW 8
+—WDA SD 35
+
+2.iNTREBARE TEST 2?
+—ABSDA 26
+—ADSASDAS 21
+—ADSDWEW 8
+—WDASD 35
+
+3.iNTREBARE TEST 3?
+—ABSDA 26
+—SDASDASD 10
+—ADSA SDAS 21
+—ADSDWEW 8
\ No newline at end of file
diff --git a/src/utils/output.csv b/src/utils/output.csv
new file mode 100644
index 0000000..7dbd717
--- /dev/null
+++ b/src/utils/output.csv
@@ -0,0 +1,4 @@
+question,answer,points,answer,points,answer,points,answer,points,answer,points,answer,points,answer,points,answer,points
+1.iNTREBARE TEST 1?,WDA SD,35,ABS DA,26,ADSASD AS,21,SDASDASD,10,ADSD WEW,8
+2.iNTREBARE TEST 2?,WDASD,35,ABSDA,26,ADSASDAS,21,ADSDWEW,8
+3.iNTREBARE TEST 3?,ABSDA,26,ADSA SDAS,21,SDASDASD,10,ADSDWEW,8
\ No newline at end of file
diff --git a/src/utils/scripts/addToFirestore.ts b/src/utils/scripts/addToFirestore.ts
new file mode 100644
index 0000000..f83b59d
--- /dev/null
+++ b/src/utils/scripts/addToFirestore.ts
@@ -0,0 +1,29 @@
+import { firestore } from '../firebase/firebase';
+import {
+ addDoc,
+ collection
+ } from 'firebase/firestore';
+import { FLASH_ROUND_COLLECTION } from '../contants';
+
+const arrayOfObjects = [
+ {
+ answer: 'Answer 1',
+ points: 10,
+ showPoints: false,
+ },
+ {
+ answer: 'Answer 2',
+ points: 5,
+ showPoints: false,
+ },
+ ];
+
+ const collectionRef = collection(firestore, FLASH_ROUND_COLLECTION);
+
+addDoc(collectionRef, { answers: arrayOfObjects })
+ .then((docRef) => {
+ console.log('Document written with ID: ', docRef.id);
+ })
+ .catch((error) => {
+ console.error('Error adding document: ', error);
+ });
\ No newline at end of file
diff --git a/src/utils/scripts/formatting-doc-to-txt.ts b/src/utils/scripts/formatting-doc-to-txt.ts
new file mode 100644
index 0000000..aa1798a
--- /dev/null
+++ b/src/utils/scripts/formatting-doc-to-txt.ts
@@ -0,0 +1,97 @@
+import fs from "fs";
+
+const MAX_ANSWERS = 8;
+
+const inputFilename = 'input.txt';
+const outputFilename = 'output.csv';
+
+function writeOutputFile(filename: string, data: any) {
+ const header = ['question'];
+
+ for (let fileParserIndex = 0; fileParserIndex < MAX_ANSWERS; fileParserIndex++) {
+ header.push('answer');
+ header.push('points');
+ }
+
+ const csvRows = [header, ...data];
+ const csvContent = csvRows.map(row => row.join(',')).join('\n');
+
+ fs.writeFileSync(filename, csvContent, 'utf8');
+}
+
+function readInputFile(file: string) {
+ return fs.readFileSync(file, 'utf8').split('\n');
+}
+
+function processLines(lines: string[]) {
+ const outputData = [];
+ let fileParserIndex = 0;
+
+ while (fileParserIndex < lines.length) {
+ if (lines[fileParserIndex].includes('.')) {
+ const question = lines[fileParserIndex].trim().replace(',', '');
+ console.log(`Question detected: ${question}`);
+
+ const answers = [];
+ const points = [];
+
+ for (let i = fileParserIndex + 1; i < fileParserIndex + MAX_ANSWERS; i++) {
+ try {
+ let line = lines[i].trim().replace('—', '').replace('—', '').replace('""', '').replace(',', '').replace(" ", '');
+ const parts = line.split(' ');
+
+ let answer, point;
+ if (parts.length >= 2) {
+ answer = parts.slice(0, -1).join(' ');
+ point = parts[parts.length - 1];
+ } else {
+ [answer, point] = line.split(' ');
+ }
+
+ console.log(`Answer: ${answer} Point: ${point}`);
+
+ if (answer === '' && point === undefined) {
+ break;
+ }
+
+ answers.push(answer);
+ points.push(parseInt(point));
+ } catch (error) {
+ console.log("Function processLines() from formatting-doc-to-txt.ts caught an error: "+ error);
+ break;
+ }
+ }
+
+ const sortedAnswers = [];
+
+ while (points.length > 0) {
+ const maxIndex = points.indexOf(Math.max(...points));
+ sortedAnswers.push(answers[maxIndex]);
+
+ if (points[maxIndex] !== undefined) {
+ sortedAnswers.push(points[maxIndex].toString());
+ }
+
+ answers.splice(maxIndex, 1);
+ points.splice(maxIndex, 1);
+ }
+
+ let row = [question, ...sortedAnswers];
+ row = row.filter(value => value !== undefined);
+ console.log('Inserting row: ', row);
+ outputData.push(row);
+
+ fileParserIndex += 2;
+ } else {
+ fileParserIndex++;
+ }
+ }
+
+ return outputData;
+}
+
+const lines = readInputFile(inputFilename);
+
+const outputData = processLines(lines);
+
+writeOutputFile(outputFilename, outputData);
diff --git a/tsconfig-eslint.json b/tsconfig-eslint.json
new file mode 100644
index 0000000..b7418e9
--- /dev/null
+++ b/tsconfig-eslint.json
@@ -0,0 +1,4 @@
+{
+ "extends": "./tsconfig.json",
+ "include": [".eslintrc.js", "src/**/*.ts"]
+}
diff --git a/tsconfig.json b/tsconfig.json
index 735fa71..dc5b55a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,6 @@
"noEmit": true,
"jsx": "react"
},
- "include": ["src"],
+ "include": ["src", ".eslintrc.js"],
"references": [{ "path": "./tsconfig.node.json" }]
}
+