diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts index d8733eb..ec573f5 100644 --- a/src/modules/api/api.ts +++ b/src/modules/api/api.ts @@ -94,7 +94,6 @@ function GetApp(): ModuleType { } // files in public dirs - const questionDbsDir = publicDir + 'questionDbs' const dbsFile = publicDir + 'questionDbs.json' const savedQuestionsDir = publicDir + 'savedQuestions' const recivedFiles = publicDir + 'recivedfiles' @@ -147,7 +146,7 @@ function GetApp(): ModuleType { }) ) - const questionDbs = loadJSON(dataFiles, questionDbsDir) + const questionDbs = loadJSON(dataFiles, publicDir) let version = '' let rootRedirectURL = '' let motd = '' @@ -289,7 +288,7 @@ function GetApp(): ModuleType { res.json( dataFiles.map((df) => { return { - path: df.path.split('/').pop(), + path: df.path, name: df.name, } }) @@ -1051,7 +1050,6 @@ function GetApp(): ModuleType { function saveQuestion(questions, subj, location, userid) { // TODO: clear folder every now and then, check if saved questions exist - // TODO: group questions by suject const questionsToSave = { questions: questions, subj: subj, diff --git a/src/modules/qmining/qmining.ts b/src/modules/qmining/qmining.ts index ce1ab35..485e503 100644 --- a/src/modules/qmining/qmining.ts +++ b/src/modules/qmining/qmining.ts @@ -143,10 +143,13 @@ function GetApp(): ModuleType { to: '/', }, { - // to be backwards compatible from: '/legacy', to: '/allQuestions.html', }, + { + from: '/subjectBrowser', + to: '/allQuestions.html', + }, { from: '/lred', to: '/allQuestions', diff --git a/submodules/qmining-page b/submodules/qmining-page index d798a83..5a1bd25 160000 --- a/submodules/qmining-page +++ b/submodules/qmining-page @@ -1 +1 @@ -Subproject commit d798a8322d33cdaf0b38771f78a5fb7b7207eefc +Subproject commit 5a1bd258bcdeba3f268c802fe1a81632ce57f035