-
+
@@ -603,7 +682,7 @@ const Dashboard: React.FC = () => {
-
+
downloadTxtFile(quiz)}
@@ -613,7 +692,7 @@ const Dashboard: React.FC = () => {
-
+
handleEditQuiz(quiz)}
@@ -623,7 +702,7 @@ const Dashboard: React.FC = () => {
-
+
handleDuplicateQuiz(quiz)}
@@ -632,27 +711,20 @@ const Dashboard: React.FC = () => {
{' '}
+
+
+
-
+
handleRemoveQuiz(quiz)}
>
{' '}
{' '}
-
-
- handleShareQuiz(quiz)}
- >
- {' '}
- {' '}
-
-
))}
diff --git a/client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx b/client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx
index 89f822a..2b220da 100644
--- a/client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx
+++ b/client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx
@@ -1,5 +1,5 @@
// EditorQuiz.tsx
-import React, { useState, useEffect, useRef, CSSProperties } from 'react';
+import React, { useState, useEffect, CSSProperties } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { FolderType } from '../../../Types/FolderType';
@@ -9,14 +9,15 @@ import GiftCheatSheet from 'src/components/GIFTCheatSheet/GiftCheatSheet';
import GIFTTemplatePreview from 'src/components/GiftTemplate/GIFTTemplatePreview';
import { QuizType } from '../../../Types/QuizType';
-
+import SaveIcon from '@mui/icons-material/Save';
import './editorQuiz.css';
-import { Button, TextField, NativeSelect, Divider, Dialog, DialogTitle, DialogActions, DialogContent } from '@mui/material';
+import { Button, TextField, NativeSelect, Divider } from '@mui/material';
import ReturnButton from 'src/components/ReturnButton/ReturnButton';
+import ImageGalleryModal from 'src/components/ImageGallery/ImageGalleryModal/ImageGalleryModal';
import ApiService from '../../../services/ApiService';
import { escapeForGIFT } from '../../../utils/giftUtils';
-import { Upload } from '@mui/icons-material';
+import { ENV_VARIABLES } from 'src/constants';
interface EditQuizParams {
id: string;
@@ -38,8 +39,6 @@ const QuizForm: React.FC = () => {
const handleSelectFolder = (event: React.ChangeEvent
) => {
setSelectedFolder(event.target.value);
};
- const fileInputRef = useRef(null);
- const [dialogOpen, setDialogOpen] = useState(false);
const [showScrollButton, setShowScrollButton] = useState(false);
const scrollToTop = () => {
@@ -166,86 +165,75 @@ const QuizForm: React.FC = () => {
return Chargement...
;
}
- const handleSaveImage = async () => {
- try {
- const inputElement = document.getElementById('file-input') as HTMLInputElement;
-
- if (!inputElement?.files || inputElement.files.length === 0) {
- setDialogOpen(true);
- return;
- }
-
- if (!inputElement.files || inputElement.files.length === 0) {
- window.alert("Veuillez d'abord choisir une image à téléverser.")
- return;
- }
-
- const imageUrl = await ApiService.uploadImage(inputElement.files[0]);
-
- // Check for errors
- if(imageUrl.indexOf("ERROR") >= 0) {
- window.alert(`Une erreur est survenue.\n Veuillez réessayer plus tard`)
- return;
- }
-
- setImageLinks(prevLinks => [...prevLinks, imageUrl]);
-
- // Reset the file input element
- if (fileInputRef.current) {
- fileInputRef.current.value = '';
- }
- } catch (error) {
- window.alert(`Une erreur est survenue.\n${error}\nVeuillez réessayer plus tard.`)
-
- }
- };
-
const handleCopyToClipboard = async (link: string) => {
navigator.clipboard.writeText(link);
}
- return (
-
+ const handleCopyImage = (id: string) => {
+ const escLink = `${ENV_VARIABLES.BACKEND_URL}/api/image/get/${id}`;
+ setImageLinks(prevLinks => [...prevLinks, escLink]);
+ }
-
+ return (
+
+
-
Éditeur de quiz
+
+
-
+
{/*
Éditeur
*/}
-
-
- {folders.map((folder: FolderType) => (
-
- ))}
-
-
-
@@ -258,37 +246,11 @@ const QuizForm: React.FC = () => {
onEditorChange={handleUpdatePreview} />
-
-
-
+
+
Mes images :
+
-
-
Mes images :
+
(Voir section
@@ -302,7 +264,7 @@ const QuizForm: React.FC = () => {
{imageLinks.map((link, index) => {
- const imgTag = `} "texte de l'infobulle")`;
+ const imgTag = `[markdown]} "texte de l'infobulle") {T}`;
return (
-
{
const navigate = useNavigate();
const [socket, setSocket] = useState(null);
const [students, setStudents] = useState([]);
- const { quizId = '', roomName = '' } = useParams<{ quizId: string, roomName: string }>();
+ const { quizId = '', roomName = '' } = useParams<{ quizId: string; roomName: string }>();
const [quizQuestions, setQuizQuestions] = useState();
const [quiz, setQuiz] = useState(null);
const [quizMode, setQuizMode] = useState<'teacher' | 'student'>('teacher');
const [connectingError, setConnectingError] = useState('');
const [currentQuestion, setCurrentQuestion] = useState(undefined);
const [quizStarted, setQuizStarted] = useState(false);
- const [formattedRoomName, setFormattedRoomName] = useState("");
+ const [formattedRoomName, setFormattedRoomName] = useState('');
const [newlyConnectedUser, setNewlyConnectedUser] = useState(null);
+ const roomUrl = `${window.location.origin}/student/join-room?roomName=${roomName}`;
+ const [showQrModal, setShowQrModal] = useState(false);
+ const [copied, setCopied] = useState(false);
- // Handle the newly connected user in useEffect, because it needs state info
+ const handleCopy = () => {
+ navigator.clipboard.writeText(roomUrl).then(() => {
+ setCopied(true);
+ setTimeout(() => setCopied(false), 2000);
+ });
+ };
+
+ // Handle the newly connected user in useEffect, because it needs state info
// not available in the socket.on() callback
useEffect(() => {
if (newlyConnectedUser) {
console.log(`Handling newly connected user: ${newlyConnectedUser.name}`);
setStudents((prevStudents) => [...prevStudents, newlyConnectedUser]);
-
+
// only send nextQuestion if the quiz has started
if (!quizStarted) {
console.log(`!quizStarted: returning.... `);
return;
}
-
+
if (quizMode === 'teacher') {
webSocketService.nextQuestion({
roomName: formattedRoomName,
@@ -65,7 +80,7 @@ const ManageRoom: React.FC = () => {
} else {
console.error('Invalid quiz mode:', quizMode);
}
-
+
// Reset the newly connected user state
setNewlyConnectedUser(null);
}
@@ -82,6 +97,15 @@ const ManageRoom: React.FC = () => {
verifyLogin();
}, []);
+ useEffect(() => {
+ if (!roomName) {
+ console.error('Room name is missing!');
+ return;
+ }
+
+ console.log(`Joining room: ${roomName}`);
+ }, [roomName]);
+
useEffect(() => {
if (!roomName || !quizId) {
window.alert(
@@ -96,7 +120,7 @@ const ManageRoom: React.FC = () => {
return () => {
disconnectWebSocket();
};
- }, [roomName, navigate]);
+ }, [roomName, navigate]);
useEffect(() => {
if (quizId) {
@@ -143,8 +167,8 @@ const ManageRoom: React.FC = () => {
setFormattedRoomName(roomNameUpper);
console.log(`Creating WebSocket room named ${roomNameUpper}`);
- /**
- * ATTENTION: Lire les variables d'état dans
+ /**
+ * ATTENTION: Lire les variables d'état dans
* les .on() n'est pas une bonne pratique.
* Les valeurs sont celles au moment de la création
* de la fonction et non au moment de l'exécution.
@@ -184,7 +208,6 @@ const ManageRoom: React.FC = () => {
};
useEffect(() => {
-
if (socket) {
console.log(`Listening for submit-answer-room in room ${formattedRoomName}`);
socket.on('submit-answer-room', (answerData: AnswerReceptionFromBackendType) => {
@@ -258,10 +281,12 @@ const ManageRoom: React.FC = () => {
if (nextQuestionIndex === undefined || nextQuestionIndex > quizQuestions.length - 1) return;
setCurrentQuestion(quizQuestions[nextQuestionIndex]);
- webSocketService.nextQuestion({roomName: formattedRoomName,
- questions: quizQuestions,
- questionIndex: nextQuestionIndex,
- isLaunch: false});
+ webSocketService.nextQuestion({
+ roomName: formattedRoomName,
+ questions: quizQuestions,
+ questionIndex: nextQuestionIndex,
+ isLaunch: false
+ });
};
const previousQuestion = () => {
@@ -271,7 +296,12 @@ const ManageRoom: React.FC = () => {
if (prevQuestionIndex === undefined || prevQuestionIndex < 0) return;
setCurrentQuestion(quizQuestions[prevQuestionIndex]);
- webSocketService.nextQuestion({roomName: formattedRoomName, questions: quizQuestions, questionIndex: prevQuestionIndex, isLaunch: false});
+ webSocketService.nextQuestion({
+ roomName: formattedRoomName,
+ questions: quizQuestions,
+ questionIndex: prevQuestionIndex,
+ isLaunch: false
+ });
};
const initializeQuizQuestion = () => {
@@ -299,7 +329,12 @@ const ManageRoom: React.FC = () => {
}
setCurrentQuestion(quizQuestions[0]);
- webSocketService.nextQuestion({roomName: formattedRoomName, questions: quizQuestions, questionIndex: 0, isLaunch: true});
+ webSocketService.nextQuestion({
+ roomName: formattedRoomName,
+ questions: quizQuestions,
+ questionIndex: 0,
+ isLaunch: true
+ });
};
const launchStudentMode = () => {
@@ -336,73 +371,26 @@ const ManageRoom: React.FC = () => {
if (quiz?.content && quizQuestions) {
setCurrentQuestion(quizQuestions[questionIndex]);
if (quizMode === 'teacher') {
- webSocketService.nextQuestion({roomName: formattedRoomName, questions: quizQuestions, questionIndex, isLaunch: false});
+ webSocketService.nextQuestion({
+ roomName: formattedRoomName,
+ questions: quizQuestions,
+ questionIndex,
+ isLaunch: false
+ });
}
}
};
+ const finishQuiz = () => {
+ disconnectWebSocket();
+ navigate('/teacher/dashboard');
+ };
+
const handleReturn = () => {
disconnectWebSocket();
navigate('/teacher/dashboard');
};
- function checkIfIsCorrect(
- answer: AnswerType,
- idQuestion: number,
- questions: QuestionType[]
- ): boolean {
- const questionInfo = questions.find((q) =>
- q.question.id ? q.question.id === idQuestion.toString() : false
- ) as QuestionType | undefined;
-
- const answerText = answer.toString();
- if (questionInfo) {
- const question = questionInfo.question as ParsedGIFTQuestion;
- if (question.type === 'TF') {
- return (
- (question.isTrue && answerText == 'true') ||
- (!question.isTrue && answerText == 'false')
- );
- } else if (question.type === 'MC') {
- return question.choices.some(
- (choice) => choice.isCorrect && choice.formattedText.text === answerText
- );
- } else if (question.type === 'Numerical') {
- if (isHighLowNumericalAnswer(question.choices[0])) {
- const choice = question.choices[0];
- const answerNumber = parseFloat(answerText);
- if (!isNaN(answerNumber)) {
- return (
- answerNumber <= choice.numberHigh && answerNumber >= choice.numberLow
- );
- }
- }
- if (isRangeNumericalAnswer(question.choices[0])) {
- const answerNumber = parseFloat(answerText);
- const range = question.choices[0].range;
- const correctAnswer = question.choices[0].number;
- if (!isNaN(answerNumber)) {
- return (
- answerNumber <= correctAnswer + range &&
- answerNumber >= correctAnswer - range
- );
- }
- }
- if (isSimpleNumericalAnswer(question.choices[0])) {
- const answerNumber = parseFloat(answerText);
- if (!isNaN(answerNumber)) {
- return answerNumber === question.choices[0].number;
- }
- }
- } else if (question.type === 'Short') {
- return question.choices.some(
- (choice) => choice.text.toUpperCase() === answerText.toUpperCase()
- );
- }
- }
- return false;
- }
-
if (!formattedRoomName) {
return (
@@ -427,32 +415,95 @@ const ManageRoom: React.FC = () => {
return (
-
Salle : {formattedRoomName}
-
+ {/* En-tête avec bouton Disconnect à gauche et QR code à droite */}
+
+
+
+
+
+
+
- {(
+
+ Salle : {formattedRoomName}
-
+ {' '}
{students.length}/60
- )}
+
@@ -487,7 +538,6 @@ const ManageRoom: React.FC = () => {
)}
@@ -529,6 +579,11 @@ const ManageRoom: React.FC = () => {
)}
+
+
+
) : (
{
if (!context) throw new Error('useRooms must be used within a RoomProvider');
return context;
};
+
+/**
+ * Checks if the answer is correct - logic varies by type of question!
+ * True/False: answer must match the isTrue property
+ * Multiple Choice: answer must match the correct choice(s)
+ * Numerical: answer must be within the range or equal to the number (for each type of correct answer)
+ * Short Answer: answer must match the correct choice(s) (case-insensitive)
+ * @param answer
+ * @param idQuestion
+ * @param questions
+ * @returns
+ */
+export function checkIfIsCorrect(
+ answer: AnswerType,
+ idQuestion: number,
+ questions: QuestionType[]
+): boolean {
+ const questionInfo = questions.find((q) =>
+ q.question.id ? q.question.id === idQuestion.toString() : false
+ ) as QuestionType | undefined;
+
+ const simpleAnswerText = answer.toString();
+ if (questionInfo) {
+ const question = questionInfo.question as ParsedGIFTQuestion;
+ if (question.type === 'TF') {
+ return (
+ (question.isTrue && simpleAnswerText == 'true') ||
+ (!question.isTrue && simpleAnswerText == 'false')
+ );
+ } else if (question.type === 'MC') {
+ const correctChoices = question.choices.filter((choice) => choice.isCorrect
+ /* || (choice.weight && choice.weight > 0)*/ // handle weighted answers
+ );
+ const multipleAnswers = Array.isArray(answer) ? answer : [answer as string];
+ if (correctChoices.length === 0) {
+ return false;
+ }
+ // check if all (and only) correct choices are in the multipleAnswers array
+ return correctChoices.length === multipleAnswers.length && correctChoices.every(
+ (choice) => multipleAnswers.includes(choice.formattedText.text)
+ );
+ } else if (question.type === 'Numerical') {
+ if (isMultipleNumericalAnswer(question.choices[0])) { // Multiple numerical answers
+ // check to see if answer[0] is a match for any of the choices that isCorrect
+ const correctChoices = question.choices.filter((choice) => isMultipleNumericalAnswer(choice) && choice.isCorrect);
+ if (correctChoices.length === 0) { // weird case where there are multiple numerical answers but none are correct
+ return false;
+ }
+ return correctChoices.some((choice) => {
+ // narrow choice to MultipleNumericalAnswer type
+ const multipleNumericalChoice = choice as MultipleNumericalAnswer;
+ return isCorrectNumericalAnswer(multipleNumericalChoice.answer, simpleAnswerText);
+ });
+ }
+ if (isHighLowNumericalAnswer(question.choices[0])) {
+ // const choice = question.choices[0];
+ // const answerNumber = parseFloat(simpleAnswerText);
+ // if (!isNaN(answerNumber)) {
+ // return (
+ // answerNumber <= choice.numberHigh && answerNumber >= choice.numberLow
+ // );
+ // }
+ return isCorrectNumericalAnswer(question.choices[0], simpleAnswerText);
+ }
+ if (isRangeNumericalAnswer(question.choices[0])) {
+ // const answerNumber = parseFloat(simpleAnswerText);
+ // const range = question.choices[0].range;
+ // const correctAnswer = question.choices[0].number;
+ // if (!isNaN(answerNumber)) {
+ // return (
+ // answerNumber <= correctAnswer + range &&
+ // answerNumber >= correctAnswer - range
+ // );
+ // }
+ return isCorrectNumericalAnswer(question.choices[0], simpleAnswerText);
+ }
+ if (isSimpleNumericalAnswer(question.choices[0])) {
+ // const answerNumber = parseFloat(simpleAnswerText);
+ // if (!isNaN(answerNumber)) {
+ // return answerNumber === question.choices[0].number;
+ // }
+ return isCorrectNumericalAnswer(question.choices[0], simpleAnswerText);
+ }
+ } else if (question.type === 'Short') {
+ return question.choices.some(
+ (choice) => choice.text.toUpperCase() === simpleAnswerText.toUpperCase()
+ );
+ }
+ }
+ return false;
+}
+
+/**
+* Determines if a numerical answer is correct based on the type of numerical answer.
+* @param correctAnswer The correct answer (of type NumericalAnswer).
+* @param userAnswer The user's answer (as a string or number).
+* @returns True if the user's answer is correct, false otherwise.
+*/
+export function isCorrectNumericalAnswer(
+ correctAnswer: NumericalAnswer,
+ userAnswer: string | number
+): boolean {
+ const answerNumber = typeof userAnswer === 'string' ? parseFloat(userAnswer) : userAnswer;
+
+ if (isNaN(answerNumber)) {
+ return false; // User's answer is not a valid number
+ }
+
+ if (isSimpleNumericalAnswer(correctAnswer)) {
+ // Exact match for simple numerical answers
+ return answerNumber === correctAnswer.number;
+ }
+
+ if (isRangeNumericalAnswer(correctAnswer)) {
+ // Check if the user's answer is within the range
+ const { number, range } = correctAnswer;
+ return answerNumber >= number - range && answerNumber <= number + range;
+ }
+
+ if (isHighLowNumericalAnswer(correctAnswer)) {
+ // Check if the user's answer is within the high-low range
+ const { numberLow, numberHigh } = correctAnswer;
+ return answerNumber >= numberLow && answerNumber <= numberHigh;
+ }
+
+ // if (isMultipleNumericalAnswer(correctAnswer)) {
+ // // Check if the user's answer matches any of the multiple numerical answers
+ // return correctAnswer.answer.some((choice) =>
+ // isCorrectNumericalAnswer(choice, answerNumber)
+ // );
+ // }
+
+ return false; // Default to false if the answer type is not recognized
+}
diff --git a/client/src/pages/Teacher/Share/Share.tsx b/client/src/pages/Teacher/Share/Share.tsx
index 0dc4fe7..2004b4d 100644
--- a/client/src/pages/Teacher/Share/Share.tsx
+++ b/client/src/pages/Teacher/Share/Share.tsx
@@ -1,66 +1,72 @@
-// EditorQuiz.tsx
import React, { useState, useEffect } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
-
import { FolderType } from '../../../Types/FolderType';
-
-
import './share.css';
-import { Button, NativeSelect } from '@mui/material';
+import { Button, NativeSelect, Typography, Box } from '@mui/material';
import ReturnButton from 'src/components/ReturnButton/ReturnButton';
-
import ApiService from '../../../services/ApiService';
+import SaveIcon from '@mui/icons-material/Save';
const Share: React.FC = () => {
- console.log('Component rendered');
const navigate = useNavigate();
const { id } = useParams();
const [quizTitle, setQuizTitle] = useState('');
const [selectedFolder, setSelectedFolder] = useState('');
-
const [folders, setFolders] = useState([]);
+ const [quizExists, setQuizExists] = useState(false);
+ const [loading, setLoading] = useState(true);
useEffect(() => {
const fetchData = async () => {
- console.log("QUIZID : " + id)
- if (!id) {
- window.alert(`Une erreur est survenue.\n Le quiz n'a pas été trouvé\nVeuillez réessayer plus tard`)
- console.error('Quiz not found for id:', id);
+ try {
+ if (!id) {
+ console.error('Quiz not found for id:', id);
+ navigate('/teacher/dashboard');
+ return;
+ }
+
+ if (!ApiService.isLoggedIn()) {
+ navigate("/login");
+ return;
+ }
+
+ const quizIds = await ApiService.getAllQuizIds();
+
+ if (quizIds.includes(id)) {
+ setQuizExists(true);
+ setLoading(false);
+ return;
+ }
+
+ const userFolders = await ApiService.getUserFolders();
+
+ if (userFolders.length == 0) {
+ navigate('/teacher/dashboard');
+ return;
+ }
+
+ setFolders(userFolders as FolderType[]);
+
+ const title = await ApiService.getSharedQuiz(id);
+
+ if (!title) {
+ console.error('Quiz not found for id:', id);
+ navigate('/teacher/dashboard');
+ return;
+ }
+
+ setQuizTitle(title);
+ setLoading(false);
+ } catch (error) {
+ console.error('Error fetching data:', error);
+ setLoading(false);
navigate('/teacher/dashboard');
- return;
}
-
- if (!ApiService.isLoggedIn()) {
- window.alert(`Vous n'êtes pas connecté.\nVeuillez vous connecter et revenir à ce lien`);
- navigate("/login");
- return;
- }
-
- const userFolders = await ApiService.getUserFolders();
-
- if (userFolders.length == 0) {
- window.alert(`Vous n'avez aucun dossier.\nVeuillez en créer un et revenir à ce lien`)
- navigate('/teacher/dashboard');
- return;
- }
-
- setFolders(userFolders as FolderType[]);
-
- const title = await ApiService.getSharedQuiz(id);
-
- if (!title) {
- window.alert(`Une erreur est survenue.\n Veuillez réessayer plus tard`)
- console.error('Quiz not found for id:', id);
- navigate('/teacher/dashboard');
- return;
- }
-
- setQuizTitle(title);
};
fetchData();
- }, []);
+ }, [id, navigate]);
const handleSelectFolder = (event: React.ChangeEvent) => {
setSelectedFolder(event.target.value);
@@ -68,14 +74,12 @@ const Share: React.FC = () => {
const handleQuizSave = async () => {
try {
-
if (selectedFolder == '') {
alert("Veuillez choisir un dossier");
return;
}
if (!id) {
- window.alert(`Une erreur est survenue.\n Le quiz n'a pas été trouvé\nVeuillez réessayer plus tard`)
console.error('Quiz not found for id:', id);
navigate('/teacher/dashboard');
return;
@@ -85,49 +89,92 @@ const Share: React.FC = () => {
navigate('/teacher/dashboard');
} catch (error) {
- window.alert(`Une erreur est survenue.\n Veuillez réessayer plus tard`)
console.log(error)
}
};
+ if (loading) {
+ return Chargement...
;
+ }
+
+ if (quizExists) {
+ return (
+
+
+
+
+
+
+ Le quiz que vous essayez d'importer existe déjà sur votre compte.
+
+
+
+
+
+ Si vous souhaitiez créer une copie de ce quiz,
+ vous pouvez utiliser la fonction "Dupliquer" disponible
+ dans votre tableau de bord.
+
+
+
+
-
-
-
Importer quiz: {quizTitle}
-
+
+
Importation du Quiz: {quizTitle}
+
+ Vous êtes sur le point d'importer le quiz {quizTitle}, choisissez un dossier dans lequel enregistrer ce nouveau quiz.
+
+
-
-
-
+
-
{folders.map((folder: FolderType) => (
))}
-
-
-
);
};
-export default Share;
+export default Share;
\ No newline at end of file
diff --git a/client/src/pages/Teacher/Share/share.css b/client/src/pages/Teacher/Share/share.css
index 119b645..146f318 100644
--- a/client/src/pages/Teacher/Share/share.css
+++ b/client/src/pages/Teacher/Share/share.css
@@ -3,19 +3,58 @@
display: flex;
flex-direction: row;
justify-content: space-between;
- align-content: stretch
+ align-content: stretch;
}
+
.quizImport .importHeader .returnButton {
flex-basis: 10%;
-
display: flex;
justify-content: center;
}
-.quizImport .importHeader .title {
+.quizImport .importHeader .titleContainer {
flex-basis: auto;
+ text-align: center; /* Center the title and subtitle */
+}
+
+.quizImport .importHeader .mainTitle {
+ font-size: 44px; /* Larger font size for the main title */
+ font-weight: bold; /* Remove bold */
+ color: #333; /* Slightly paler color */
+}
+
+.quizImport .importHeader .subTitle {
+ font-size: 14px; /* Smaller font size for the subtitle */
+ color: #666; /* Pale gray color */
+ margin-top: 8px; /* Add some space between the title and subtitle */
}
.quizImport .importHeader .dumb {
flex-basis: 10%;
+}
+
+.quizImport .editSection {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-top: 20px;
+}
+
+.quizImport .editSection .formContainer {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ gap: 20px; /* Adds space between the select and button */
+ width: 100%;
+ max-width: 400px; /* Limits the width of the form container */
+}
+
+.quizImport .editSection .folderSelect {
+ width: 100%; /* Ensures the select element takes the full width of its container */
+}
+
+.quizImport .editSection .saveButton {
+ width: 100%; /* Makes the button take the full width of its container */
+ padding: 10px 20px; /* Increases the button's padding for a larger appearance */
+ font-size: 16px; /* Increases the font size for better visibility */
}
\ No newline at end of file
diff --git a/client/src/services/ApiService.tsx b/client/src/services/ApiService.tsx
index 2661d24..f19bde5 100644
--- a/client/src/services/ApiService.tsx
+++ b/client/src/services/ApiService.tsx
@@ -76,8 +76,6 @@ class ApiService {
return false;
}
- console.log("ApiService: isLoggedIn: Token:", token);
-
// Update token expiry
this.saveToken(token);
@@ -93,7 +91,6 @@ class ApiService {
}
try {
- console.log("ApiService: isLoggedInTeacher: Token:", token);
const decodedToken = jwtDecode(token) as { roles: string[] };
/////// REMOVE BELOW
@@ -105,7 +102,6 @@ class ApiService {
const userRoles = decodedToken.roles;
const requiredRole = 'teacher';
- console.log("ApiService: isLoggedInTeacher: UserRoles:", userRoles);
if (!userRoles || !userRoles.includes(requiredRole)) {
return false;
}
@@ -165,6 +161,22 @@ class ApiService {
return object.username;
}
+ public getUserID(): string {
+ const token = localStorage.getItem("jwt");
+
+ if (!token) {
+ return "";
+ }
+
+ const jsonObj = jwtDecode(token) as { userId: string };
+
+ if (!jsonObj.userId) {
+ return "";
+ }
+
+ return jsonObj.userId;
+ }
+
// Route to know if rooms need authentication to join
public async getRoomsRequireAuth(): Promise
{
const url: string = this.constructRequestUrl(`/auth/getRoomsRequireAuth`);
@@ -201,7 +213,6 @@ class ApiService {
const result: AxiosResponse = await axios.post(url, body, { headers: headers });
- console.log(result);
if (result.status == 200) {
//window.location.href = result.request.responseURL;
window.location.href = '/login';
@@ -213,7 +224,6 @@ class ApiService {
return true;
} catch (error) {
- console.log("Error details: ", error);
if (axios.isAxiosError(error)) {
const err = error as AxiosError;
@@ -576,7 +586,6 @@ public async login(email: string, password: string): Promise {
const headers = this.constructRequestHeaders();
const body = { folderId };
- console.log(headers);
const result: AxiosResponse = await axios.post(url, body, { headers: headers });
if (result.status !== 200) {
@@ -866,36 +875,6 @@ public async login(email: string, password: string): Promise {
}
}
- async ShareQuiz(quizId: string, email: string): Promise {
- try {
- if (!quizId || !email) {
- throw new Error(`quizId and email are required.`);
- }
-
- const url: string = this.constructRequestUrl(`/quiz/Share`);
- const headers = this.constructRequestHeaders();
- const body = { quizId, email };
-
- const result: AxiosResponse = await axios.put(url, body, { headers: headers });
-
- if (result.status !== 200) {
- throw new Error(`Update and share quiz failed. Status: ${result.status}`);
- }
-
- return true;
- } catch (error) {
- console.log("Error details: ", error);
-
- if (axios.isAxiosError(error)) {
- const err = error as AxiosError;
- const data = err.response?.data as { error: string } | undefined;
- return data?.error || 'Unknown server error during request.';
- }
-
- return `An unexpected error occurred.`;
- }
- }
-
async getSharedQuiz(quizId: string): Promise {
try {
if (!quizId) {
@@ -1192,6 +1171,103 @@ public async login(email: string, password: string): Promise {
}
}
+ public async getImages(page: number, limit: number): Promise {
+ return this.isAdmin() ? this.getAllImages(page, limit) : this.getUserImages(page, limit);
+ }
+
+ public async getUserImages(page: number, limit: number): Promise {
+ try {
+ const url: string = this.constructRequestUrl(`/image/getUserImages`);
+ const headers = this.constructRequestHeaders();
+ let params : ImagesParams = { page: page, limit: limit };
+
+ const uid = this.getUserID();
+ if(uid !== ''){
+ params.uid = uid;
+ }
+
+ const result: AxiosResponse = await axios.get(url, { params: params, headers: headers });
+
+ if (result.status !== 200) {
+ throw new Error(`L'affichage des images de l'utilisateur a échoué. Status: ${result.status}`);
+ }
+ const images = result.data;
+
+ return images;
+
+ } catch (error) {
+ console.log("Error details: ", error);
+
+ if (axios.isAxiosError(error)) {
+ const err = error as AxiosError;
+ const data = err.response?.data as { error: string } | undefined;
+ const msg = data?.error || 'Erreur serveur inconnue lors de la requête.';
+ throw new Error(`L'enregistrement a échoué. Status: ${msg}`);
+ }
+
+ throw new Error(`ERROR : Une erreur inattendue s'est produite.`);
+ }
+ }
+
+ public async deleteImage(imgId: string): Promise {
+ return this.isAdmin() ? this.deleteAnyImage(imgId) : this.deleteUserImage(imgId);
+ }
+
+ public async deleteUserImage(imgId: string): Promise {
+ try {
+ const url: string = this.constructRequestUrl(`/image/delete`);
+ const headers = this.constructRequestHeaders();
+ const uid = this.getUserID();
+ let params = { uid: uid, imgId: imgId };
+
+ const result: AxiosResponse = await axios.delete(url, { params: params, headers: headers });
+
+ if (result.status !== 200) {
+ throw new Error(`La suppression de l'image a échoué. Status: ${result.status}`);
+ }
+
+ const deleted = result.data.deleted;
+ return deleted;
+
+ } catch (error) {
+ console.log("Error details: ", error);
+
+ if (axios.isAxiosError(error)) {
+ const err = error as AxiosError;
+ const data = err.response?.data as { error: string } | undefined;
+ const msg = data?.error || 'Erreur serveur inconnue lors de la requête.';
+ throw new Error(`L'enregistrement a échoué. Status: ${msg}`);
+ }
+
+ throw new Error(`ERROR : Une erreur inattendue s'est produite.`);
+ }
+ }
+
+ public async getAllQuizIds(): Promise {
+ try {
+ const folders = await this.getUserFolders();
+
+ const allQuizIds: string[] = [];
+
+ if (Array.isArray(folders)) {
+ for (const folder of folders) {
+ const folderQuizzes = await this.getFolderContent(folder._id);
+
+ if (Array.isArray(folderQuizzes)) {
+ allQuizIds.push(...folderQuizzes.map(quiz => quiz._id));
+ }
+ }
+ } else {
+ console.error('Failed to get user folders:', folders);
+ }
+
+ return allQuizIds;
+ } catch (error) {
+ console.error('Failed to get all quiz ids:', error);
+ throw error;
+ }
+ }
+
public async getUsers(): Promise {
try {
@@ -1218,7 +1294,7 @@ public async login(email: string, password: string): Promise {
}
}
- public async getImages(page: number, limit: number): Promise {
+ public async getAllImages(page: number, limit: number): Promise {
try {
const url: string = this.constructRequestUrl(`/admin/getImages`);
const headers = this.constructRequestHeaders();
@@ -1247,7 +1323,7 @@ public async login(email: string, password: string): Promise {
}
}
- public async deleteImage(imgId: string): Promise {
+ public async deleteAnyImage(imgId: string): Promise {
try {
const url: string = this.constructRequestUrl(`/admin/deleteImage`);
const headers = this.constructRequestHeaders();
diff --git a/docker-compose-local.yaml b/docker-compose-local.yaml
index 0fc505b..f9fc01f 100644
--- a/docker-compose-local.yaml
+++ b/docker-compose-local.yaml
@@ -55,7 +55,7 @@ services:
image: mongo
container_name: mongo
ports:
- - "27017:27017"
+ - "27019:27017"
tty: true
volumes:
- mongodb_data:/data/db
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..144d2f8
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,329 @@
+{
+ "name": "EvalueTonSavoir",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "dependencies": {
+ "axios-mock-adapter": "^2.1.0"
+ }
+ },
+ "node_modules/asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+ "peer": true
+ },
+ "node_modules/axios": {
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+ "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
+ "peer": true,
+ "dependencies": {
+ "follow-redirects": "^1.15.6",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
+ }
+ },
+ "node_modules/axios-mock-adapter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-2.1.0.tgz",
+ "integrity": "sha512-AZUe4OjECGCNNssH8SOdtneiQELsqTsat3SQQCWLPjN436/H+L9AjWfV7bF+Zg/YL9cgbhrz5671hoh+Tbn98w==",
+ "dependencies": {
+ "fast-deep-equal": "^3.1.3",
+ "is-buffer": "^2.0.5"
+ },
+ "peerDependencies": {
+ "axios": ">= 0.17.0"
+ }
+ },
+ "node_modules/call-bind-apply-helpers": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+ "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+ "peer": true,
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "peer": true,
+ "dependencies": {
+ "delayed-stream": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+ "peer": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/dunder-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+ "peer": true,
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-define-property": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-errors": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-object-atoms": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+ "peer": true,
+ "dependencies": {
+ "es-errors": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-set-tostringtag": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+ "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+ "peer": true,
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.6",
+ "has-tostringtag": "^1.0.2",
+ "hasown": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+ },
+ "node_modules/follow-redirects": {
+ "version": "1.15.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/RubenVerborgh"
+ }
+ ],
+ "peer": true,
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependenciesMeta": {
+ "debug": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/form-data": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+ "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+ "peer": true,
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "es-set-tostringtag": "^2.1.0",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "peer": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-intrinsic": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+ "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+ "peer": true,
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.2",
+ "es-define-property": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.1.1",
+ "function-bind": "^1.1.2",
+ "get-proto": "^1.0.1",
+ "gopd": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "hasown": "^2.0.2",
+ "math-intrinsics": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+ "peer": true,
+ "dependencies": {
+ "dunder-proto": "^1.0.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/gopd": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-tostringtag": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+ "peer": true,
+ "dependencies": {
+ "has-symbols": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "peer": true,
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/is-buffer": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+ "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/math-intrinsics": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "peer": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "peer": true,
+ "dependencies": {
+ "mime-db": "1.52.0"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "peer": true
+ }
+ }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..a8332a4
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+ "dependencies": {
+ "axios-mock-adapter": "^2.1.0"
+ }
+}
diff --git a/server/__tests__/image.test.js b/server/__tests__/image.test.js
index 488d27b..7ce4ad1 100644
--- a/server/__tests__/image.test.js
+++ b/server/__tests__/image.test.js
@@ -7,6 +7,9 @@
// const BASE_URL = '/image'
+const Images = require('../models/images');
+const ObjectId = require('mongodb').ObjectId;
+
describe.skip("POST /upload", () => {
describe("when the jwt is not sent", () => {
@@ -64,3 +67,289 @@ describe.skip("GET /get", () => {
})
})
+
+jest.mock('mongodb', () => {
+ const originalModule = jest.requireActual('mongodb');
+ return {
+ ...originalModule,
+ ObjectId: {
+ ...originalModule.ObjectId,
+ createFromHexString: jest.fn().mockReturnValue('507f191e810c19729de860ea'), // Return a valid 24-character ObjectId string
+ },
+ };
+});
+
+describe('Images', () => {
+ let db;
+ let images;
+ let dbConn;
+ let mockImagesCollection;
+ let mockFindCursor;
+
+ beforeEach(() => {
+
+ const mockImagesCursor = {
+ sort: jest.fn().mockReturnThis(),
+ skip: jest.fn().mockReturnThis(),
+ limit: jest.fn().mockReturnThis(),
+ toArray: jest.fn()
+ };
+
+ const mockFilesCursor = {
+ sort: jest.fn().mockReturnThis(),
+ skip: jest.fn().mockReturnThis(),
+ limit: jest.fn().mockReturnThis(),
+ toArray: jest.fn()
+ };
+
+ mockImagesCollection = {
+ insertOne: jest.fn().mockResolvedValue({ insertedId: 'image123' }),
+ findOne: jest.fn(),
+ find: jest.fn().mockReturnValue(mockImagesCursor),
+ countDocuments: jest.fn(),
+ deleteOne: jest.fn()
+ };
+
+ mockFilesCollection = {
+ find: jest.fn().mockReturnValue(mockFilesCursor)
+ };
+
+ dbConn = {
+ collection: jest.fn((name) => {
+ if (name === 'images') {
+ return mockImagesCollection;
+ } else if (name === 'files') {
+ return mockFilesCollection;
+ }
+ })
+ };
+
+ db = {
+ connect: jest.fn().mockResolvedValue(),
+ getConnection: jest.fn().mockReturnValue(dbConn)
+ };
+
+ images = new Images(db);
+ });
+
+ describe('upload', () => {
+ it('should upload an image and return the inserted ID', async () => {
+ const testFile = { originalname: 'test.png', buffer: Buffer.from('dummydata'), mimetype: 'image/png' };
+ const userId = 'user123';
+
+ const result = await images.upload(testFile, userId);
+
+ expect(db.connect).toHaveBeenCalled();
+ expect(db.getConnection).toHaveBeenCalled();
+ expect(dbConn.collection).toHaveBeenCalledWith('images');
+ expect(mockImagesCollection.insertOne).toHaveBeenCalledWith({
+ userId: userId,
+ file_name: 'test.png',
+ file_content: testFile.buffer.toString('base64'),
+ mime_type: 'image/png',
+ created_at: expect.any(Date)
+ });
+ expect(result).toBe('image123');
+ });
+ });
+
+ describe('get', () => {
+ it('should retrieve the image if found', async () => {
+ const imageId = '65d9a8f9b5e8d1a5e6a8c9f0';
+ const testImage = {
+ file_name: 'test.png',
+ file_content: Buffer.from('dummydata').toString('base64'),
+ mime_type: 'image/png'
+ };
+ mockImagesCollection.findOne.mockResolvedValue(testImage);
+
+ const result = await images.get(imageId);
+
+ expect(db.connect).toHaveBeenCalled();
+ expect(db.getConnection).toHaveBeenCalled();
+ expect(dbConn.collection).toHaveBeenCalledWith('images');
+ expect(mockImagesCollection.findOne).toHaveBeenCalledWith({ _id: ObjectId.createFromHexString(imageId) });
+ expect(result).toEqual({
+ file_name: 'test.png',
+ file_content: Buffer.from('dummydata'),
+ mime_type: 'image/png'
+ });
+ });
+
+ it('should return null if image is not found', async () => {
+ const imageId = '65d9a8f9b5e8d1a5e6a8c9f0';
+ mockImagesCollection.findOne.mockResolvedValue(null);
+
+ const result = await images.get(imageId);
+
+ expect(result).toBeNull();
+ });
+ });
+
+ describe('getImages', () => {
+ it('should retrieve a paginated list of images', async () => {
+ const mockImages = [
+ { _id: '1', userId: 'user1', file_name: 'image1.png', file_content: Buffer.from('data1'), mime_type: 'image/png' },
+ { _id: '2', userId: 'user2', file_name: 'image2.png', file_content: Buffer.from('data2'), mime_type: 'image/png' }
+ ];
+
+ mockImagesCollection.countDocuments.mockResolvedValue(2);
+ // Create a mock cursor for images collection
+ const mockFindCursor = {
+ sort: jest.fn().mockReturnThis(),
+ skip: jest.fn().mockReturnThis(),
+ limit: jest.fn().mockReturnThis(),
+ toArray: jest.fn().mockResolvedValue(mockImages), // Return mock images when toArray is called
+ };
+
+ // Mock the find method to return the mock cursor
+ mockImagesCollection.find.mockReturnValue(mockFindCursor);
+ const result = await images.getImages(1, 10);
+
+ expect(db.connect).toHaveBeenCalled();
+ expect(db.getConnection).toHaveBeenCalled();
+ expect(dbConn.collection).toHaveBeenCalledWith('images');
+ expect(mockImagesCollection.find).toHaveBeenCalledWith({});
+ expect(mockFindCursor.sort).toHaveBeenCalledWith({ created_at: 1 });
+ expect(mockFindCursor.skip).toHaveBeenCalledWith(0);
+ expect(mockFindCursor.limit).toHaveBeenCalledWith(10);
+ expect(result).toEqual({
+ images: [
+ { id: '1', user: 'user1', file_name: 'image1.png', file_content: 'ZGF0YTE=', mime_type: 'image/png' },
+ { id: '2', user: 'user2', file_name: 'image2.png', file_content: 'ZGF0YTI=', mime_type: 'image/png' }
+ ],
+ total: 2,
+ });
+ });
+
+ it('should return an empty array if no images are found', async () => {
+ mockImagesCollection.countDocuments.mockResolvedValue(0);
+
+ const result = await images.getImages(1, 10);
+
+ expect(result).toEqual({ images: [], total: 0 });
+ });
+ });
+
+ describe('getUserImages', () => {
+ it('should return empty images array when no images exist', async () => {
+ mockImagesCollection.countDocuments.mockResolvedValue(0);
+
+ const result = await images.getUserImages(1, 10, 'user123');
+
+ expect(result).toEqual({ images: [], total: 0 });
+ expect(db.connect).toHaveBeenCalled();
+ expect(mockImagesCollection.countDocuments).toHaveBeenCalledWith({ userId: 'user123' });
+ });
+
+ it('should return images when they exist', async () => {
+ const mockImages = [
+ {
+ _id: 'img1',
+ userId: 'user123',
+ file_name: 'image1.png',
+ file_content: Buffer.from('testdata'),
+ mime_type: 'image/png'
+ }
+ ];
+
+ mockImagesCollection.countDocuments.mockResolvedValue(1);
+ mockImagesCollection.find.mockReturnValue({
+ sort: jest.fn().mockReturnThis(),
+ skip: jest.fn().mockReturnThis(),
+ limit: jest.fn().mockReturnThis(),
+ toArray: jest.fn().mockResolvedValue(mockImages)
+ });
+
+ const result = await images.getUserImages(1, 10, 'user123');
+
+ expect(result).toEqual({
+ images: [
+ {
+ id: 'img1',
+ user: 'user123',
+ file_name: 'image1.png',
+ file_content: Buffer.from('testdata').toString('base64'),
+ mime_type: 'image/png'
+ }
+ ],
+ total: 1
+ });
+ expect(db.connect).toHaveBeenCalled();
+ expect(mockImagesCollection.countDocuments).toHaveBeenCalledWith({ userId: 'user123' });
+ });
+ });
+ describe('delete', () => {
+ it('should not delete the image when it exists in the files collection', async () => {
+ const uid = 'user123';
+ const imgId = '507f191e810c19729de860ea'; // A valid 24-character ObjectId string
+
+ // Mock the files collection cursor to simulate an image found
+ const mockFilesCursor = {
+ toArray: jest.fn().mockResolvedValue([{ _id: imgId }]) // Image found
+ };
+
+ mockFilesCollection.find.mockReturnValue(mockFilesCursor);
+ mockImagesCollection.deleteOne.mockResolvedValue({ deletedCount: 0 });
+
+ const result = await images.delete(uid, imgId);
+
+ // Ensure the files collection is queried
+ expect(dbConn.collection).toHaveBeenCalledWith('files');
+ expect(mockFilesCollection.find).toHaveBeenCalledWith({
+ userId: uid,
+ content: { $regex: new RegExp(`/api/image/get/${imgId}`) },
+ });
+
+ // Ensure the images collection is queried for deletion
+ expect(dbConn.collection).toHaveBeenCalledWith('files');
+ expect(mockImagesCollection.deleteOne).not.toHaveBeenCalledWith({
+ _id: ObjectId.createFromHexString(imgId), // Ensure the ObjectId is created correctly
+ });
+
+ expect(result).toEqual({ deleted: false });
+ });
+
+ it('should delete the image if not found in the files collection', async () => {
+ const uid = 'user123';
+ const imgId = '507f191e810c19729de860ea';
+
+ // Mock the files collection cursor to simulate the image not being found
+ const mockFindCursor = {
+ toArray: jest.fn().mockResolvedValue([]) // Empty array means image not found
+ };
+
+ mockFilesCollection.find.mockReturnValue(mockFindCursor);
+ mockImagesCollection.deleteOne.mockResolvedValue({ deletedCount: 1 });
+
+ const result = await images.delete(uid, imgId);
+
+ // Ensure the deleteOne is not called if the image is not found
+ expect(mockImagesCollection.deleteOne).toHaveBeenCalled();
+ expect(result).toEqual({ deleted: true });
+ });
+
+ it('should return false if the delete operation fails in the images collection', async () => {
+ const uid = 'user123';
+ const imgId = '507f191e810c19729de860ea';
+
+ // Mock the files collection cursor to simulate the image being found
+ const mockFindCursor = {
+ toArray: jest.fn().mockResolvedValue([{ _id: imgId }]) // Image found
+ };
+
+ mockFilesCollection.find.mockReturnValue(mockFindCursor);
+ mockImagesCollection.deleteOne.mockResolvedValue({ deletedCount: 0 }); // Simulate failure
+
+ const result = await images.delete(uid, imgId);
+
+ // Ensure the images collection deletion is called
+ expect(mockImagesCollection.deleteOne).not.toHaveBeenCalledWith({
+ _id: ObjectId.createFromHexString(imgId), // Ensure the ObjectId is created correctly
+ });
+
+ expect(result).toEqual({ deleted: false });
+ });
+
+ });
+});
\ No newline at end of file
diff --git a/server/controllers/images.js b/server/controllers/images.js
index b77ed96..7de02ad 100644
--- a/server/controllers/images.js
+++ b/server/controllers/images.js
@@ -50,6 +50,58 @@ class ImagesController {
}
};
+ getImages = async (req, res, next) => {
+ try {
+ const page = parseInt(req.query.page) || 1;
+ const limit = parseInt(req.query.limit) || 5;
+ const images = await this.images.getImages(page, limit);
+
+ if (!images || images.length === 0) {
+ throw new AppError(IMAGE_NOT_FOUND);
+ }
+
+ res.setHeader('Content-Type', 'application/json');
+ return res.status(200).json(images);
+ } catch (error) {
+ return next(error);
+ }
+ };
+
+ getUserImages = async (req, res, next) => {
+ try {
+ const page = parseInt(req.query.page) || 1;
+ const limit = parseInt(req.query.limit) || 5;
+ const uid = req.query.uid;
+ const images = await this.images.getUserImages(page, limit, uid);
+
+ if (!images || images.length === 0) {
+ throw new AppError(IMAGE_NOT_FOUND);
+ }
+
+ res.setHeader('Content-Type', 'application/json');
+ return res.status(200).json(images);
+ } catch (error) {
+ return next(error);
+ }
+ };
+
+ delete = async (req, res, next) => {
+ try {
+ const uid = req.query.uid;
+ const imgId = req.query.imgId;
+
+ if (!uid || !imgId) {
+ throw new AppError(MISSING_REQUIRED_PARAMETER);
+ }
+ const images = await this.images.delete(uid, imgId);
+
+ res.setHeader('Content-Type', 'application/json');
+ return res.status(200).json(images);
+ } catch (error) {
+ return next(error);
+ }
+ };
+
}
module.exports = ImagesController;
diff --git a/server/models/images.js b/server/models/images.js
index 67a6583..e3b6afd 100644
--- a/server/models/images.js
+++ b/server/models/images.js
@@ -42,6 +42,84 @@ class Images {
};
}
+ async getImages(page, limit) {
+ await this.db.connect()
+ const conn = this.db.getConnection();
+
+ const imagesCollection = conn.collection('images');
+
+
+ const total = await imagesCollection.countDocuments();
+ if (!total || total === 0) return { images: [], total };
+
+ const result = await imagesCollection.find({})
+ .sort({ created_at: 1 })
+ .skip((page - 1) * limit)
+ .limit(limit)
+ .toArray();
+
+ const objImages = result.map(image => ({
+ id: image._id,
+ user: image.userId,
+ file_name: image.file_name,
+ file_content: image.file_content.toString('base64'),
+ mime_type: image.mime_type
+ }));
+
+ let respObj = {
+ images: objImages,
+ total: total
+ }
+
+ return respObj;
+ }
+
+ async getUserImages(page, limit, uid) {
+ await this.db.connect()
+ const conn = this.db.getConnection();
+ const imagesCollection = conn.collection('images');
+ const total = await imagesCollection.countDocuments({ userId: uid });
+ if (!total || total === 0) return { images: [], total };
+
+ const result = await imagesCollection.find({ userId: uid })
+ .sort({ created_at: -1 })
+ .skip((page - 1) * limit)
+ .limit(limit)
+ .toArray();
+
+ const objImages = result.map(image => ({
+ id: image._id,
+ user: image.userId,
+ file_name: image.file_name,
+ file_content: image.file_content.toString('base64'),
+ mime_type: image.mime_type
+ }));
+
+ let respObj = {
+ images: objImages,
+ total: total
+ }
+
+ return respObj;
+ }
+
+ async delete(uid, imgId) {
+ let resp = false;
+ await this.db.connect()
+ const conn = this.db.getConnection();
+ const quizColl = conn.collection('files');
+ const rgxImg = new RegExp(`/api/image/get/${imgId}`);
+
+ const result = await quizColl.find({ userId: uid, content: { $regex: rgxImg }}).toArray();
+ if(!result || result.length < 1){
+ const imgsColl = conn.collection('images');
+ const isDeleted = await imgsColl.deleteOne({ _id: ObjectId.createFromHexString(imgId) });
+ if(isDeleted){
+ resp = true;
+ }
+ }
+ return { deleted: resp };
+ }
}
module.exports = Images;
diff --git a/server/package-lock.json b/server/package-lock.json
index 0f006f8..66bd45a 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -24,6 +24,7 @@
"passport-oauth2": "^1.8.0",
"passport-openidconnect": "^0.1.2",
"patch-package": "^8.0.0",
+ "qrcode.react": "^4.2.0",
"socket.io": "^4.7.2",
"socket.io-client": "^4.7.2"
},
@@ -38,7 +39,7 @@
"supertest": "^6.3.4"
},
"engines": {
- "node": "20.x"
+ "node": "22.x"
}
},
"node_modules/@ampproject/remapping": {
@@ -55,68 +56,20 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.22.13",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
- "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+ "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/highlight": "^7.22.13",
- "chalk": "^2.4.2"
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "js-tokens": "^4.0.0",
+ "picocolors": "^1.0.0"
},
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/code-frame/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/code-frame/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true,
- "engines": {
- "node": ">=0.8.0"
- }
- },
"node_modules/@babel/compat-data": {
"version": "7.23.3",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
@@ -342,19 +295,21 @@
}
},
"node_modules/@babel/helper-string-parser": {
- "version": "7.22.5",
- "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
- "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+ "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
- "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+ "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=6.9.0"
}
@@ -369,88 +324,28 @@
}
},
"node_modules/@babel/helpers": {
- "version": "7.23.2",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
- "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+ "version": "7.26.10",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+ "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/template": "^7.22.15",
- "@babel/traverse": "^7.23.2",
- "@babel/types": "^7.23.0"
+ "@babel/template": "^7.26.9",
+ "@babel/types": "^7.26.10"
},
"engines": {
"node": ">=6.9.0"
}
},
- "node_modules/@babel/highlight": {
- "version": "7.22.20",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
- "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
- "dev": true,
- "dependencies": {
- "@babel/helper-validator-identifier": "^7.22.20",
- "chalk": "^2.4.2",
- "js-tokens": "^4.0.0"
- },
- "engines": {
- "node": ">=6.9.0"
- }
- },
- "node_modules/@babel/highlight/node_modules/ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "dependencies": {
- "color-convert": "^1.9.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "dependencies": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-convert": {
- "version": "1.9.3",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
- "dependencies": {
- "color-name": "1.1.3"
- }
- },
- "node_modules/@babel/highlight/node_modules/color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
- "dev": true
- },
- "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
- "dev": true,
- "engines": {
- "node": ">=0.8.0"
- }
- },
"node_modules/@babel/parser": {
- "version": "7.23.3",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz",
- "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==",
+ "version": "7.26.10",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz",
+ "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==",
"dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/types": "^7.26.10"
+ },
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -636,14 +531,15 @@
}
},
"node_modules/@babel/template": {
- "version": "7.22.15",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
- "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+ "version": "7.26.9",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+ "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/code-frame": "^7.22.13",
- "@babel/parser": "^7.22.15",
- "@babel/types": "^7.22.15"
+ "@babel/code-frame": "^7.26.2",
+ "@babel/parser": "^7.26.9",
+ "@babel/types": "^7.26.9"
},
"engines": {
"node": ">=6.9.0"
@@ -704,14 +600,14 @@
"dev": true
},
"node_modules/@babel/types": {
- "version": "7.23.3",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz",
- "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==",
+ "version": "7.26.10",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
+ "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "@babel/helper-string-parser": "^7.22.5",
- "@babel/helper-validator-identifier": "^7.22.20",
- "to-fast-properties": "^2.0.0"
+ "@babel/helper-string-parser": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9"
},
"engines": {
"node": ">=6.9.0"
@@ -4772,7 +4668,8 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
- "dev": true
+ "dev": true,
+ "license": "MIT"
},
"node_modules/js-yaml": {
"version": "3.14.1",
@@ -5954,6 +5851,15 @@
}
]
},
+ "node_modules/qrcode.react": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-4.2.0.tgz",
+ "integrity": "sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==",
+ "license": "ISC",
+ "peerDependencies": {
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+ }
+ },
"node_modules/qs": {
"version": "6.13.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
@@ -5998,6 +5904,16 @@
"node": ">= 0.8"
}
},
+ "node_modules/react": {
+ "version": "19.0.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
+ "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
+ "license": "MIT",
+ "peer": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/react-is": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
@@ -6683,15 +6599,6 @@
"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
"dev": true
},
- "node_modules/to-fast-properties": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
- "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
- "dev": true,
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/server/package.json b/server/package.json
index cd0348b..0eaf6d2 100644
--- a/server/package.json
+++ b/server/package.json
@@ -28,6 +28,7 @@
"passport-oauth2": "^1.8.0",
"passport-openidconnect": "^0.1.2",
"patch-package": "^8.0.0",
+ "qrcode.react": "^4.2.0",
"socket.io": "^4.7.2",
"socket.io-client": "^4.7.2"
},
@@ -42,7 +43,7 @@
"supertest": "^6.3.4"
},
"engines": {
- "node": "20.x"
+ "node": "22.x"
},
"jest": {
"testEnvironment": "node",
diff --git a/server/routers/images.js b/server/routers/images.js
index 06e2830..94d2802 100644
--- a/server/routers/images.js
+++ b/server/routers/images.js
@@ -12,5 +12,8 @@ const upload = multer({ storage: storage });
router.post("/upload", jwt.authenticate, upload.single('image'), asyncHandler(images.upload));
router.get("/get/:id", asyncHandler(images.get));
+router.get("/getImages", asyncHandler(images.getImages));
+router.get("/getUserImages", jwt.authenticate, asyncHandler(images.getUserImages));
+router.delete("/delete", jwt.authenticate, asyncHandler(images.delete));
module.exports = router;