diff --git a/client/src/Types/QuestionType.tsx b/client/src/Types/QuestionType.tsx index 5098af8..c1e7182 100644 --- a/client/src/Types/QuestionType.tsx +++ b/client/src/Types/QuestionType.tsx @@ -2,5 +2,4 @@ import { GIFTQuestion } from 'gift-pegjs'; export interface QuestionType { question: GIFTQuestion; - image: string; } diff --git a/client/src/__tests__/Types/QuestionType.test.tsx b/client/src/__tests__/Types/QuestionType.test.tsx index 7106429..43c2900 100644 --- a/client/src/__tests__/Types/QuestionType.test.tsx +++ b/client/src/__tests__/Types/QuestionType.test.tsx @@ -1,38 +1,42 @@ -/*//QuestionType.test.tsx +//QuestionType.test.tsx import { GIFTQuestion } from 'gift-pegjs'; import { QuestionType } from '../../Types/QuestionType'; +const sampleStem = 'Sample question stem'; +const options = ['Option A', 'Option B']; +const sampleFormat = 'plain'; +const sampleType = 'MC'; +const sampleTitle = 'Sample Question'; + const mockQuestion: GIFTQuestion = { id: '1', - type: 'MC', - stem: { format: 'plain', text: 'Sample Question' }, - title: 'Sample Question', + type: sampleType, + stem: { format: sampleFormat, text: sampleStem }, + title: sampleTitle, hasEmbeddedAnswers: false, globalFeedback: null, choices: [ - { text: { format: 'plain', text: 'Option A' }, isCorrect: true, weight: 1, feedback: null }, - { text: { format: 'plain', text: 'Option B' }, isCorrect: false, weight: 0, feedback: null }, + { text: { format: sampleFormat, text: options[0] }, isCorrect: true, weight: 1, feedback: null }, + { text: { format: sampleFormat, text: options[1] }, isCorrect: false, weight: 0, feedback: null }, ], }; const mockQuestionType: QuestionType = { question: mockQuestion, - image: 'sample-image-url', }; describe('QuestionType', () => { test('has the expected structure', () => { expect(mockQuestionType).toEqual(expect.objectContaining({ question: expect.any(Object), - image: expect.any(String), })); expect(mockQuestionType.question).toEqual(expect.objectContaining({ id: expect.any(String), type: expect.any(String), stem: expect.objectContaining({ - format: expect.any(String), - text: expect.any(String), + format: sampleFormat, + text: sampleStem, }), title: expect.any(String), hasEmbeddedAnswers: expect.any(Boolean), @@ -40,4 +44,4 @@ describe('QuestionType', () => { choices: expect.any(Array), })); }); -});*/ +}); diff --git a/client/src/__tests__/Types/QuizType.test.tsx b/client/src/__tests__/Types/QuizType.test.tsx index 0fbaa6d..22f3db3 100644 --- a/client/src/__tests__/Types/QuizType.test.tsx +++ b/client/src/__tests__/Types/QuizType.test.tsx @@ -1,4 +1,4 @@ -/*//QuizType.test.tsx +//QuizType.test.tsx import { QuizType } from "../../Types/QuizType"; export function isQuizValid(quiz: QuizType): boolean { return quiz.title.length > 0 && quiz.content.length > 0; @@ -8,6 +8,10 @@ describe('isQuizValid function', () => { it('returns true for a valid quiz', () => { const validQuiz: QuizType = { _id: '1', + folderId: 'test', + userId: 'user', + created_at: new Date('2021-10-01'), + updated_at: new Date('2021-10-02'), title: 'Sample Quiz', content: ['Question 1', 'Question 2'], }; @@ -19,7 +23,11 @@ describe('isQuizValid function', () => { it('returns false for an invalid quiz with an empty title', () => { const invalidQuiz: QuizType = { _id: '2', + folderId: 'test', + userId: 'user', title: '', + created_at: new Date('2021-10-01'), + updated_at: new Date('2021-10-02'), content: ['Question 1', 'Question 2'], }; @@ -29,12 +37,16 @@ describe('isQuizValid function', () => { it('returns false for an invalid quiz with no questions', () => { const invalidQuiz: QuizType = { - _id: '3', - title: 'Sample Quiz', + _id: '2', + folderId: 'test', + userId: 'user', + title: 'sample', + created_at: new Date('2021-10-01'), + updated_at: new Date('2021-10-02'), content: [], }; const result = isQuizValid(invalidQuiz); expect(result).toBe(false); }); -});*/ +}); diff --git a/client/src/__tests__/components/GiftTemplate/GIFTTemplatePreview.test.tsx b/client/src/__tests__/components/GiftTemplate/GIFTTemplatePreview.test.tsx index 38e494e..a33726b 100644 --- a/client/src/__tests__/components/GiftTemplate/GIFTTemplatePreview.test.tsx +++ b/client/src/__tests__/components/GiftTemplate/GIFTTemplatePreview.test.tsx @@ -26,25 +26,25 @@ describe('GIFTTemplatePreview Component', () => { const previewContainer = screen.getByTestId('preview-container'); expect(previewContainer).toBeInTheDocument(); }); - it('renders images correctly', () => { - const questions = [ - 'Question 1', - 'Image 1', - 'Question 2', - 'Image 2', - ]; - const { getByAltText } = render(); - const image1 = getByAltText('Image 1'); - const image2 = getByAltText('Image 2'); - expect(image1).toBeInTheDocument(); - expect(image2).toBeInTheDocument(); - }); - it('renders non-images correctly', () => { - const questions = ['Question 1', 'Question 2']; - const { queryByAltText } = render(); - const image1 = queryByAltText('Image 1'); - const image2 = queryByAltText('Image 2'); - expect(image1).toBeNull(); - expect(image2).toBeNull(); - }); -}); \ No newline at end of file + // it('renders images correctly', () => { + // const questions = [ + // 'Question 1', + // 'Image 1', + // 'Question 2', + // 'Image 2', + // ]; + // const { getByAltText } = render(); + // const image1 = getByAltText('Image 1'); + // const image2 = getByAltText('Image 2'); + // expect(image1).toBeInTheDocument(); + // expect(image2).toBeInTheDocument(); + // }); + // it('renders non-images correctly', () => { + // const questions = ['Question 1', 'Question 2']; + // const { queryByAltText } = render(); + // const image1 = queryByAltText('Image 1'); + // const image2 = queryByAltText('Image 2'); + // expect(image1).toBeNull(); + // expect(image2).toBeNull(); + // }); +}); diff --git a/client/src/__tests__/components/Questions/ShortAnswerQuestion/ShortAnswerQuestion.test.tsx b/client/src/__tests__/components/Questions/ShortAnswerQuestion/ShortAnswerQuestion.test.tsx index 9ddf322..3cc618e 100644 --- a/client/src/__tests__/components/Questions/ShortAnswerQuestion/ShortAnswerQuestion.test.tsx +++ b/client/src/__tests__/components/Questions/ShortAnswerQuestion/ShortAnswerQuestion.test.tsx @@ -1,10 +1,11 @@ -/*// ShortAnswerQuestion.test.tsx +// ShortAnswerQuestion.test.tsx import { render, screen, fireEvent } from '@testing-library/react'; import '@testing-library/jest-dom'; import ShortAnswerQuestion from '../../../../components/Questions/ShortAnswerQuestion/ShortAnswerQuestion'; describe('ShortAnswerQuestion Component', () => { const mockHandleSubmitAnswer = jest.fn(); + const sampleStem = 'Sample question stem'; const sampleProps = { questionTitle: 'Sample Question', @@ -34,14 +35,12 @@ describe('ShortAnswerQuestion Component', () => { }; beforeEach(() => { - render(); + render(); }); it('renders correctly', () => { - expect(screen.getByText('Sample Question')).toBeInTheDocument(); - + expect(screen.getByText(sampleStem)).toBeInTheDocument(); expect(screen.getByTestId('text-input')).toBeInTheDocument(); - expect(screen.getByText('Répondre')).toBeInTheDocument(); }); @@ -77,4 +76,4 @@ describe('ShortAnswerQuestion Component', () => { expect(mockHandleSubmitAnswer).toHaveBeenCalledWith('User Input'); }); -});*/ +}); diff --git a/client/src/__tests__/components/Questions/TrueFalseQuestion/TrueFalseQuestion.test.tsx b/client/src/__tests__/components/Questions/TrueFalseQuestion/TrueFalseQuestion.test.tsx index 60fc20e..eec0de4 100644 --- a/client/src/__tests__/components/Questions/TrueFalseQuestion/TrueFalseQuestion.test.tsx +++ b/client/src/__tests__/components/Questions/TrueFalseQuestion/TrueFalseQuestion.test.tsx @@ -1,10 +1,11 @@ -/*// TrueFalseQuestion.test.tsx +// TrueFalseQuestion.test.tsx import { render, fireEvent, screen } from '@testing-library/react'; import '@testing-library/jest-dom'; import TrueFalseQuestion from '../../../../components/Questions/TrueFalseQuestion/TrueFalseQuestion'; describe('TrueFalseQuestion Component', () => { const mockHandleSubmitAnswer = jest.fn(); + const sampleStem = 'Sample question stem'; const sampleProps = { questionTitle: 'Sample True/False Question', @@ -14,15 +15,13 @@ describe('TrueFalseQuestion Component', () => { }; beforeEach(() => { - render(); + render(); }); it('renders correctly', () => { - expect(screen.getByText('Sample True/False Question')).toBeInTheDocument(); - + expect(screen.getByText(sampleStem)).toBeInTheDocument(); expect(screen.getByText('Vrai')).toBeInTheDocument(); expect(screen.getByText('Faux')).toBeInTheDocument(); - expect(screen.getByText('Répondre')).toBeInTheDocument(); }); @@ -61,4 +60,4 @@ describe('TrueFalseQuestion Component', () => { expect(mockHandleSubmitAnswer).toHaveBeenCalledWith(false); }); -});*/ +}); diff --git a/client/src/__tests__/pages/Student/StudentModeQuiz/StudentModeQuiz.test.tsx b/client/src/__tests__/pages/Student/StudentModeQuiz/StudentModeQuiz.test.tsx index 239ee4b..59657fe 100644 --- a/client/src/__tests__/pages/Student/StudentModeQuiz/StudentModeQuiz.test.tsx +++ b/client/src/__tests__/pages/Student/StudentModeQuiz/StudentModeQuiz.test.tsx @@ -1,126 +1,141 @@ -import { render, screen, fireEvent } from '@testing-library/react'; +import { render, screen, fireEvent, waitFor } from '@testing-library/react'; import '@testing-library/jest-dom'; +import { MemoryRouter } from 'react-router-dom'; import { QuestionType } from '../../../../Types/QuestionType'; import StudentModeQuiz from '../../../../components/StudentModeQuiz/StudentModeQuiz'; +const mockQuestions: QuestionType[] = [ + { + question: { + id: '1', + type: 'MC', + stem: { format: 'plain', text: 'Sample Question 1' }, + title: 'Sample Question 1', + hasEmbeddedAnswers: false, + globalFeedback: null, + choices: [ + { text: { format: 'plain', text: 'Option A' }, isCorrect: true, weight: 1, feedback: null }, + { text: { format: 'plain', text: 'Option B' }, isCorrect: false, weight: 0, feedback: null }, + ], + }, + }, + { + question: { + id: '2', + type: 'TF', + stem: { format: 'plain', text: 'Sample Question 2' }, + isTrue: true, + incorrectFeedback: null, + correctFeedback: null, + title: 'Question 2', + hasEmbeddedAnswers: false, + globalFeedback: null, + }, + }, +]; + +const mockSubmitAnswer = jest.fn(); +const mockDisconnectWebSocket = jest.fn(); + describe('StudentModeQuiz', () => { - const mockQuestions: QuestionType[] = [ - { - question: { - id: '1', - type: 'MC', - stem: { format: 'plain', text: 'Sample Question 1' }, - title: 'Sample Question 1', - hasEmbeddedAnswers: false, - globalFeedback: null, - choices: [ - { text: { format: 'plain', text: 'Option A' }, isCorrect: true, weight: 1, feedback: null }, - { text: { format: 'plain', text: 'Option B' }, isCorrect: false, weight: 0, feedback: null }, - ], - }, - image: 'Sample Image', - }, - { - question: { - id: '2', - type: 'TF', - stem: { format: 'plain', text: 'Sample Question 2' }, - isTrue: true, - incorrectFeedback: null, - correctFeedback: null, - title: 'Question 2', - hasEmbeddedAnswers: false, - globalFeedback: null, - }, - image: 'sample-image-url-2', - }, - ]; - - const mockSubmitAnswer = jest.fn(); - const mockDisconnectWebSocket = jest.fn(); - - test('renders the initial question', async () => { render( - + + + ); - expect(screen.getByText('Sample Question 1')).toBeInTheDocument(); - expect(screen.getByText('Option A')).toBeInTheDocument(); - expect(screen.getByText('Option B')).toBeInTheDocument(); - expect(screen.getByText('Déconnexion')).toBeInTheDocument(); + // wait for the question to be rendered + await waitFor(() => { + expect(screen.getByText('Sample Question 1')).toBeInTheDocument(); + expect(screen.getByText('Option A')).toBeInTheDocument(); + expect(screen.getByText('Option B')).toBeInTheDocument(); + expect(screen.getByText('Quitter')).toBeInTheDocument(); + }); }); - test('handles answer submission text', () => { + test('handles answer submission text', async () => { render( - + + /> + ); fireEvent.click(screen.getByText('Option A')); fireEvent.click(screen.getByText('Répondre')); - expect(mockSubmitAnswer).toHaveBeenCalledWith('Option A', '1'); + await waitFor(() => { + expect(mockSubmitAnswer).toHaveBeenCalledWith('Option A', '1'); + }); }); - test('handles disconnect button click', () => { + test('handles quit button click', async () => { render( - - ); - fireEvent.click(screen.getByText('Déconnexion')); + + + ); + fireEvent.click(screen.getByText('Quitter')); - expect(mockDisconnectWebSocket).toHaveBeenCalled(); + await waitFor(() => { + expect(mockDisconnectWebSocket).toHaveBeenCalled(); + }); }); - test('navigates to the next question', () => { + test('navigates to the next question', async () => { render( - - ); + + + ); fireEvent.click(screen.getByText('Option A')); fireEvent.click(screen.getByText('Répondre')); fireEvent.click(screen.getByText('Question suivante')); + await waitFor(() => { + const sampleQuestionElements = screen.queryAllByText(/Sample question 2/i); + expect(sampleQuestionElements.length).toBeGreaterThan(0); + expect(screen.getByText('V')).toBeInTheDocument(); + }); - expect(screen.getByText('Sample Question 2')).toBeInTheDocument(); - expect(screen.getByText('T')).toBeInTheDocument(); }); - test('navigates to the previous question', () => { + test('navigates to the previous question', async () => { render( - - ); + + + ); fireEvent.click(screen.getByText('Option A')); fireEvent.click(screen.getByText('Répondre')); - fireEvent.click(screen.getByText('Question précédente')); - - expect(screen.getByText('Sample Question 1')).toBeInTheDocument(); - expect(screen.getByText('Option B')).toBeInTheDocument(); + await waitFor(() => { + expect(screen.getByText('Sample Question 1')).toBeInTheDocument(); + expect(screen.getByText('Option B')).toBeInTheDocument(); + }); }); }); diff --git a/client/src/__tests__/pages/Student/TeacherModeQuiz/TeacherModeQuiz.test.tsx b/client/src/__tests__/pages/Student/TeacherModeQuiz/TeacherModeQuiz.test.tsx index 98fcd65..5e9fd3c 100644 --- a/client/src/__tests__/pages/Student/TeacherModeQuiz/TeacherModeQuiz.test.tsx +++ b/client/src/__tests__/pages/Student/TeacherModeQuiz/TeacherModeQuiz.test.tsx @@ -25,7 +25,7 @@ describe('TeacherModeQuiz', () => { beforeEach(() => { render( @@ -54,4 +54,4 @@ describe('TeacherModeQuiz', () => { expect(mockDisconnectWebSocket).toHaveBeenCalled(); }); -}); \ No newline at end of file +}); diff --git a/client/src/__tests__/pages/Teacher/EditorQuiz/EditorQuiz.test.tsx b/client/src/__tests__/pages/Teacher/EditorQuiz/EditorQuiz.test.tsx index e6e1025..42ef84c 100644 --- a/client/src/__tests__/pages/Teacher/EditorQuiz/EditorQuiz.test.tsx +++ b/client/src/__tests__/pages/Teacher/EditorQuiz/EditorQuiz.test.tsx @@ -33,7 +33,7 @@ describe('QuizForm Component', () => { }); test('renders QuizForm for a new quiz', async () => { - render( + const { container } = render( @@ -41,8 +41,9 @@ describe('QuizForm Component', () => { expect(screen.getByText(/Éditeur de quiz/i)).toBeInTheDocument(); - const editorTextArea = screen.getByRole('textbox'); - fireEvent.change(editorTextArea, { target: { value: 'Sample question?' } }); + // find the 'editor' text area + const editorTextArea = container.querySelector('textarea.editor'); + fireEvent.change(editorTextArea!, { target: { value: 'Sample question?' } }); await waitFor(() => { const sampleQuestionElements = screen.queryAllByText(/Sample question\?/i); diff --git a/client/src/__tests__/services/QuestionService.test.tsx b/client/src/__tests__/services/QuestionService.test.tsx index 8db1ee1..d9990be 100644 --- a/client/src/__tests__/services/QuestionService.test.tsx +++ b/client/src/__tests__/services/QuestionService.test.tsx @@ -1,39 +1,39 @@ -import { QuestionService } from "../../services/QuestionService"; +// import { QuestionService } from "../../services/QuestionService"; -describe('QuestionService', () => { - describe('getImage', () => { - it('should return empty string for text without image tag', () => { - const text = 'This is a sample text without an image tag.'; - const imageUrl = QuestionService.getImage(text); - expect(imageUrl).toBe(''); - }); +describe.skip('QuestionService', () => { + // describe('getImage', () => { + // it('should return empty string for text without image tag', () => { + // const text = 'This is a sample text without an image tag.'; + // const imageUrl = QuestionService.getImage(text); + // expect(imageUrl).toBe(''); + // }); - it('should return the image tag from the text', () => { - const text = 'This is a sample text with an Sample Image tag.'; - const imageUrl = QuestionService.getImage(text); - expect(imageUrl).toBe('Sample Image'); - }); - }); + // it('should return the image tag from the text', () => { + // const text = 'This is a sample text with an Sample Image tag.'; + // const imageUrl = QuestionService.getImage(text); + // expect(imageUrl).toBe('Sample Image'); + // }); + // }); - describe('getImageSource', () => { - it('should return the image source from the image tag in the text', () => { - const text = 'Sample Image'; - const imageUrl = QuestionService.getImageSource(text); - expect(imageUrl).toBe('src="image.jpg" alt="Sample Image" /'); - }); - }); + // describe('getImageSource', () => { + // it('should return the image source from the image tag in the text', () => { + // const text = 'Sample Image'; + // const imageUrl = QuestionService.getImageSource(text); + // expect(imageUrl).toBe('src="image.jpg" alt="Sample Image" /'); + // }); + // }); - describe('ignoreImgTags', () => { - it('should return the same text if it does not contain an image tag', () => { - const text = 'This is a sample text without an image tag.'; - const result = QuestionService.ignoreImgTags(text); - expect(result).toBe(text); - }); + // describe('ignoreImgTags', () => { + // it('should return the same text if it does not contain an image tag', () => { + // const text = 'This is a sample text without an image tag.'; + // const result = QuestionService.ignoreImgTags(text); + // expect(result).toBe(text); + // }); - it('should remove the image tag from the text', () => { - const text = 'This is a sample text with an Sample Image tag.'; - const result = QuestionService.ignoreImgTags(text); - expect(result).toBe('This is a sample text with an tag.'); - }); - }); + // it('should remove the image tag from the text', () => { + // const text = 'This is a sample text with an Sample Image tag.'; + // const result = QuestionService.ignoreImgTags(text); + // expect(result).toBe('This is a sample text with an tag.'); + // }); + // }); }); diff --git a/client/src/components/GiftTemplate/GIFTTemplatePreview.tsx b/client/src/components/GiftTemplate/GIFTTemplatePreview.tsx index 832428f..3aa83f7 100644 --- a/client/src/components/GiftTemplate/GIFTTemplatePreview.tsx +++ b/client/src/components/GiftTemplate/GIFTTemplatePreview.tsx @@ -20,32 +20,31 @@ const GIFTTemplatePreview: React.FC = ({ useEffect(() => { try { let previewHTML = ''; - questions.forEach((item) => { - const isImage = item.includes(']+>/i); - if (imageUrlMatch) { - let imageUrl = imageUrlMatch[0]; - imageUrl = imageUrl.replace('img', 'img style="width:10vw;" src='); - item = item.replace(imageUrlMatch[0], ''); - previewHTML += `${imageUrl}`; - } - } + questions.forEach((giftQuestion) => { + // const isImage = item.includes(']+>/i); + // if (imageUrlMatch) { + // let imageUrl = imageUrlMatch[0]; + // imageUrl = imageUrl.replace('img', 'img style="width:10vw;" src='); + // item = item.replace(imageUrlMatch[0], ''); + // previewHTML += `${imageUrl}`; + // } + // } try { - const parsedItem = parse(item); - previewHTML += Template(parsedItem[0], { + const question = parse(giftQuestion); + previewHTML += Template(question[0], { preview: true, theme: 'light' }); } catch (error) { if (error instanceof Error) { - previewHTML += ErrorTemplate(item + '\n' + error.message); + previewHTML += ErrorTemplate(giftQuestion + '\n' + error.message); } else { - previewHTML += ErrorTemplate(item + '\n' + 'Erreur inconnue'); + previewHTML += ErrorTemplate(giftQuestion + '\n' + 'Erreur inconnue'); } } - previewHTML += ''; }); if (hideAnswers) { diff --git a/client/src/components/GiftTemplate/templates/TextType.ts b/client/src/components/GiftTemplate/templates/TextType.ts index b250637..a38a99d 100644 --- a/client/src/components/GiftTemplate/templates/TextType.ts +++ b/client/src/components/GiftTemplate/templates/TextType.ts @@ -16,23 +16,15 @@ function formatLatex(text: string): string { ); } -function escapeHTML(text: string) { - return text - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); -} - export default function TextType({ text }: TextTypeOptions): string { - const formatText = formatLatex(escapeHTML(text.text.trim())); + const formatText = formatLatex(text.text.trim()); switch (text.format) { case 'moodle': case 'plain': return formatText.replace(/(?:\r\n|\r|\n)/g, '
'); case 'html': + // Strip outer paragraph tags (not a great approach with regex) return formatText.replace(/(^

)(.*?)(<\/p>)$/gm, '$2'); case 'markdown': return ( @@ -42,6 +34,6 @@ export default function TextType({ text }: TextTypeOptions): string { .replace(/(^

)(.*?)(<\/p>)$/gm, '$2') ); default: - return ``; + throw new Error(`Unsupported text format: ${text.format}`); } } diff --git a/client/src/components/GiftTemplate/templates/Title.ts b/client/src/components/GiftTemplate/templates/Title.ts index 50eea98..8e89553 100644 --- a/client/src/components/GiftTemplate/templates/Title.ts +++ b/client/src/components/GiftTemplate/templates/Title.ts @@ -45,7 +45,7 @@ export default function Title({ type, title }: TitleOptions): string { ${ title !== null ? `${title}` - : `Titre optionnel...` + : `(Sans titre)` } diff --git a/client/src/components/GiftTemplate/templates/index.ts b/client/src/components/GiftTemplate/templates/index.ts index bc688f1..f5f5fde 100644 --- a/client/src/components/GiftTemplate/templates/index.ts +++ b/client/src/components/GiftTemplate/templates/index.ts @@ -9,12 +9,12 @@ import TrueFalse from './TrueFalse'; import Error from './Error'; import { GIFTQuestion, - Category as CategoryType, - Description as DescriptionType, + // Category as CategoryType, + // Description as DescriptionType, MultipleChoice as MultipleChoiceType, Numerical as NumericalType, ShortAnswer as ShortAnswerType, - Essay as EssayType, + // Essay as EssayType, TrueFalse as TrueFalseType, Matching as MatchingType, DisplayOptions @@ -29,12 +29,13 @@ export default function Template( Object.assign(state, options); switch (type) { - case 'Category': - return Category({ ...(keys as CategoryType) }); - case 'Description': - return Description({ - ...(keys as DescriptionType) - }); + // Category, Description, Essay are not supported? + // case 'Category': + // return Category({ ...(keys as CategoryType) }); + // case 'Description': + // return Description({ + // ...(keys as DescriptionType) + // }); case 'MC': return MultipleChoice({ ...(keys as MultipleChoiceType) @@ -45,13 +46,15 @@ export default function Template( return ShortAnswer({ ...(keys as ShortAnswerType) }); - case 'Essay': - return Essay({ ...(keys as EssayType) }); + // case 'Essay': + // return Essay({ ...(keys as EssayType) }); case 'TF': return TrueFalse({ ...(keys as TrueFalseType) }); case 'Matching': return Matching({ ...(keys as MatchingType) }); default: + // TODO: throw error for unsupported question types? + // throw new Error(`Unsupported question type: ${type}`); return ``; } } diff --git a/client/src/components/StudentModeQuiz/StudentModeQuiz.tsx b/client/src/components/StudentModeQuiz/StudentModeQuiz.tsx index 3159eb0..0bbd065 100644 --- a/client/src/components/StudentModeQuiz/StudentModeQuiz.tsx +++ b/client/src/components/StudentModeQuiz/StudentModeQuiz.tsx @@ -4,7 +4,7 @@ import QuestionComponent from '../Questions/Question'; import '../../pages/Student/JoinRoom/joinRoom.css'; import { QuestionType } from '../../Types/QuestionType'; -import { QuestionService } from '../../services/QuestionService'; +// import { QuestionService } from '../../services/QuestionService'; import { Button } from '@mui/material'; import QuestionNavigation from '../QuestionNavigation/QuestionNavigation'; import { ChevronLeft, ChevronRight } from '@mui/icons-material'; @@ -23,16 +23,14 @@ const StudentModeQuiz: React.FC = ({ }) => { const [questionInfos, setQuestion] = useState(questions[0]); const [isAnswerSubmitted, setIsAnswerSubmitted] = useState(false); - const [imageUrl, setImageUrl] = useState(''); + // const [imageUrl, setImageUrl] = useState(''); const previousQuestion = () => { setQuestion(questions[Number(questionInfos.question?.id) - 2]); setIsAnswerSubmitted(false); }; - useEffect(() => { - setImageUrl(QuestionService.getImageSource(questionInfos.image)); - }, [questionInfos]); + useEffect(() => {}, [questionInfos]); const nextQuestion = () => { setQuestion(questions[Number(questionInfos.question?.id)]); @@ -68,7 +66,7 @@ const StudentModeQuiz: React.FC = ({ handleOnSubmitAnswer={handleOnSubmitAnswer} question={questionInfos.question} showAnswer={isAnswerSubmitted} - imageUrl={imageUrl} + // imageUrl={imageUrl} />

diff --git a/client/src/components/TeacherModeQuiz/TeacherModeQuiz.tsx b/client/src/components/TeacherModeQuiz/TeacherModeQuiz.tsx index 46e8995..948fee9 100644 --- a/client/src/components/TeacherModeQuiz/TeacherModeQuiz.tsx +++ b/client/src/components/TeacherModeQuiz/TeacherModeQuiz.tsx @@ -5,7 +5,7 @@ import QuestionComponent from '../Questions/Question'; import '../../pages/Student/JoinRoom/joinRoom.css'; import { QuestionType } from '../../Types/QuestionType'; -import { QuestionService } from '../../services/QuestionService'; +// import { QuestionService } from '../../services/QuestionService'; import DisconnectButton from '../../components/DisconnectButton/DisconnectButton'; interface TeacherModeQuizProps { @@ -20,11 +20,10 @@ const TeacherModeQuiz: React.FC = ({ disconnectWebSocket }) => { const [isAnswerSubmitted, setIsAnswerSubmitted] = useState(false); - const [imageUrl, setImageUrl] = useState(''); + // const [imageUrl, setImageUrl] = useState(''); useEffect(() => { setIsAnswerSubmitted(false); - setImageUrl(QuestionService.getImageSource(questionInfos.image)); }, [questionInfos]); const handleOnSubmitAnswer = (answer: string | number | boolean) => { @@ -55,7 +54,7 @@ const TeacherModeQuiz: React.FC = ({
) : ( diff --git a/client/src/pages/Teacher/Dashboard/Dashboard.tsx b/client/src/pages/Teacher/Dashboard/Dashboard.tsx index 2582871..5595cfb 100644 --- a/client/src/pages/Teacher/Dashboard/Dashboard.tsx +++ b/client/src/pages/Teacher/Dashboard/Dashboard.tsx @@ -6,7 +6,7 @@ import { parse } from 'gift-pegjs'; import Template from '../../../components/GiftTemplate/templates'; import { QuizType } from '../../../Types/QuizType'; import { FolderType } from '../../../Types/FolderType'; -import { QuestionService } from '../../../services/QuestionService'; +// import { QuestionService } from '../../../services/QuestionService'; import ApiService from '../../../services/ApiService'; import './dashboard.css'; @@ -178,7 +178,7 @@ const Dashboard: React.FC = () => { // Otherwise the quiz is invalid for (let i = 0; i < questions.length; i++) { try { - questions[i] = QuestionService.ignoreImgTags(questions[i]); + // questions[i] = QuestionService.ignoreImgTags(questions[i]); const parsedItem = parse(questions[i]); Template(parsedItem[0]); } catch (error) { diff --git a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx index 2155911..47c8294 100644 --- a/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx +++ b/client/src/pages/Teacher/ManageRoom/ManageRoom.tsx @@ -5,7 +5,7 @@ import { Socket } from 'socket.io-client'; import { parse } from 'gift-pegjs'; import { QuestionType } from '../../../Types/QuestionType'; import LiveResultsComponent from '../../../components/LiveResults/LiveResults'; -import { QuestionService } from '../../../services/QuestionService'; +// import { QuestionService } from '../../../services/QuestionService'; import webSocketService from '../../../services/WebsocketService'; import { QuizType } from '../../../Types/QuizType'; @@ -160,10 +160,7 @@ const ManageRoom: React.FC = () => { const parsedQuestions = [] as QuestionType[]; quizQuestionArray.forEach((question, index) => { - const imageTag = QuestionService.getImage(question); - const imageUrl = QuestionService.getImageSource(imageTag); - question = QuestionService.ignoreImgTags(question); - parsedQuestions.push({ question: parse(question)[0], image: imageUrl }); + parsedQuestions.push({ question: parse(question)[0] }); parsedQuestions[index].question.id = (index + 1).toString(); }); if (parsedQuestions.length === 0) return null; @@ -285,7 +282,6 @@ const ManageRoom: React.FC = () => { {currentQuestion && ( diff --git a/client/src/services/QuestionService.ts b/client/src/services/QuestionService.ts index afbc919..39f823f 100644 --- a/client/src/services/QuestionService.ts +++ b/client/src/services/QuestionService.ts @@ -1,25 +1,3 @@ export class QuestionService { - static getImage(text: string) { - const imageUrlMatch = text.match(/]+>/i); - if (imageUrlMatch) { - return imageUrlMatch[0]; - } - return ''; - } - static getImageSource = (text: string): string => { - let imageUrl = text.replace('', ''); - return imageUrl; - }; - - static ignoreImgTags(text: string): string { - if (text.includes(']+>/i); - if (imageUrlMatch) { - text = text.replace(imageUrlMatch[0], ''); - } - } - return text; - } } diff --git a/server/package-lock.json b/server/package-lock.json index 7c7ff8c..05f5480 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1612,9 +1612,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -1624,7 +1624,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1734,12 +1734,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2140,6 +2146,22 @@ "node": ">=0.10.0" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2255,9 +2277,9 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -2361,6 +2383,25 @@ "is-arrayish": "^0.2.1" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "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==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -2454,36 +2495,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -2528,12 +2569,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -2689,14 +2730,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2763,20 +2808,23 @@ "node": ">=4" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, - "node_modules/has": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", - "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -2786,10 +2834,21 @@ "node": ">=4" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" }, @@ -2817,7 +2876,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -4046,9 +4104,12 @@ "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge-stream": { "version": "2.0.0", @@ -4440,9 +4501,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz", - "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4576,9 +4640,9 @@ "dev": true }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/picocolors": { "version": "1.0.0", @@ -4706,11 +4770,11 @@ ] }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -4881,9 +4945,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -4903,20 +4967,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -4927,6 +4999,22 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -4954,13 +5042,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb"