diff --git a/backend/_i18n/en.yml b/backend/_i18n/en.yml index 1f898c46..20a34e77 100644 --- a/backend/_i18n/en.yml +++ b/backend/_i18n/en.yml @@ -17,7 +17,6 @@ strengths: name: Matthias and Bruno affiliation: Grade 10 - curricula_page: title: Our teaching topics read_more: Read more diff --git a/backend/_i18n/nl.yml b/backend/_i18n/nl.yml index 1c1482aa..3a29c50a 100644 --- a/backend/_i18n/nl.yml +++ b/backend/_i18n/nl.yml @@ -10,7 +10,7 @@ strengths: research_based_text: Alle lespakketten van Dwengo vzw zijn gebaseerd op gedegen wetenschappelijk onderzoek. inclusive_text: We richten ons op alle kinderen en jongeren met een specifieke aandacht voor het evenwicht tussen meisjes en jongens en leerlingen uit kansengroepen. socially_relevant_text: We zoeken projecten uit die passen binnen de actualiteit en maatschappelijke thema's. - summary: "" + summary: '' main: Al onze pakketten zijn gebruiksvriendelijk, maatschappelijk relevant, wetenschappelijk onderbouwd, én inclusief. Leerkrachten over de hele wereld gingen hiermee reeds aan de slag. Jij ook? Verken de lesthema's op onze website! quote: text: Je maakt iets praktisch, je leert werken met hardware en je kan zelf iets nieuws creëren. diff --git a/backend/src/controllers/themes.ts b/backend/src/controllers/themes.ts index 4b59751e..8d2e34d7 100644 --- a/backend/src/controllers/themes.ts +++ b/backend/src/controllers/themes.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express'; import { themes } from '../data/themes.js'; -import { loadTranslations } from "../util/translationHelper.js"; +import { loadTranslations } from '../util/translationHelper.js'; import { FALLBACK_LANG } from '../config.js'; interface Translations { diff --git a/backend/src/mikro-orm.config.ts b/backend/src/mikro-orm.config.ts index 8f21745f..05b68fef 100644 --- a/backend/src/mikro-orm.config.ts +++ b/backend/src/mikro-orm.config.ts @@ -24,11 +24,20 @@ import { Answer } from './entities/questions/answer.entity.js'; import { Question } from './entities/questions/question.entity.js'; const entities = [ - User, Student, Teacher, - Assignment, Group, Submission, - Class, ClassJoinRequest, TeacherInvitation, - Attachment, LearningObject, LearningPath, - Answer, Question + User, + Student, + Teacher, + Assignment, + Group, + Submission, + Class, + ClassJoinRequest, + TeacherInvitation, + Attachment, + LearningObject, + LearningPath, + Answer, + Question, ]; function config(testingMode: boolean = false): Options { @@ -41,7 +50,9 @@ function config(testingMode: boolean = false): Options { // Workaround: vitest: `TypeError: Unknown file extension ".ts"` (ERR_UNKNOWN_FILE_EXTENSION) // (see https://mikro-orm.io/docs/guide/project-setup#testing-the-endpoint) - dynamicImportProvider: (id) => {return import(id)}, + dynamicImportProvider: (id) => { + return import(id); + }, }; } return { diff --git a/backend/src/util/translationHelper.ts b/backend/src/util/translationHelper.ts index f4443531..6ac590e6 100644 --- a/backend/src/util/translationHelper.ts +++ b/backend/src/util/translationHelper.ts @@ -1,7 +1,7 @@ import fs from 'fs'; import path from 'path'; import yaml from 'js-yaml'; -import {FALLBACK_LANG} from "../../config"; +import { FALLBACK_LANG } from '../../config'; export function loadTranslations(language: string): T { try { @@ -13,7 +13,11 @@ export function loadTranslations(language: string): T { `Cannot load translation for ${language}, fallen back to dutch` ); console.error(error); - const fallbackPath = path.join(process.cwd(), '_i18n', `${FALLBACK_LANG}.yml`); + const fallbackPath = path.join( + process.cwd(), + '_i18n', + `${FALLBACK_LANG}.yml` + ); return yaml.load(fs.readFileSync(fallbackPath, 'utf8')) as T; } } diff --git a/frontend/src/utils/base64ToImage.ts b/frontend/src/utils/base64ToImage.ts index 9ec9ac34..a5540ce5 100644 --- a/frontend/src/utils/base64ToImage.ts +++ b/frontend/src/utils/base64ToImage.ts @@ -14,7 +14,5 @@ * Learning Path Image */ export function convertBase64ToImageSrc(base64String: string): string { - return base64String.startsWith("data:image") - ? base64String - : `data:image/png;base64,${base64String}`; + return base64String.startsWith("data:image") ? base64String : `data:image/png;base64,${base64String}`; } diff --git a/frontend/tests/base64/base64ToImage.test.ts b/frontend/tests/base64/base64ToImage.test.ts index 3bf1abb9..d2ab4364 100644 --- a/frontend/tests/base64/base64ToImage.test.ts +++ b/frontend/tests/base64/base64ToImage.test.ts @@ -1,24 +1,23 @@ -import { describe, it, expect, beforeAll } from 'vitest'; -import { convertBase64ToImageSrc } from '../../src/utils/base64ToImage.js'; -import fs from 'fs'; -import path from 'path'; +import { describe, it, expect, beforeAll } from "vitest"; +import { convertBase64ToImageSrc } from "../../src/utils/base64ToImage.js"; +import fs from "fs"; +import path from "path"; let sampleBase64: string; beforeAll(() => { // Load base64 sample from text file - const filePath = path.resolve(__dirname, 'base64Sample.txt'); - sampleBase64 = fs.readFileSync(filePath, 'utf8').trim(); + const filePath = path.resolve(__dirname, "base64Sample.txt"); + sampleBase64 = fs.readFileSync(filePath, "utf8").trim(); }); -describe('convertBase64ToImageSrc', () => { - it('should return the same string if it is already a valid data URL', () => { +describe("convertBase64ToImageSrc", () => { + it("should return the same string if it is already a valid data URL", () => { const base64Image = `data:image/png;base64,${sampleBase64}`; expect(convertBase64ToImageSrc(base64Image)).toBe(base64Image); }); - it('should correctly format a raw Base64 string as a PNG image URL', () => { + it("should correctly format a raw Base64 string as a PNG image URL", () => { expect(convertBase64ToImageSrc(sampleBase64)).toBe(`data:image/png;base64,${sampleBase64}`); }); - });