Finish debugging lms rebase

kipr · Oct 2, 2024 · 4ddd5cb · 4ddd5cb
1 parent e8174b1
commit 4ddd5cb
Show file tree

Hide file tree

Showing 5 changed files with 379 additions and 519 deletions.
diff --git a/configs/webpack/common.js b/configs/webpack/common.js
@@ -36,8 +36,7 @@ try {
 module.exports = {
   entry: {
     app: './index.tsx',
-    // login: './components/Login/index.tsx', // was current on main
-    login: './login/index.tsx',
+    login: './components/Login/index.tsx', 
     plugin: './lms/plugin/index.tsx',
     'editor.worker': 'monaco-editor/esm/vs/editor/editor.worker.js',
     'ts.worker': 'monaco-editor/esm/vs/language/typescript/ts.worker.js',
@@ -65,10 +64,11 @@ module.exports = {
       path: false,
     },
     alias: {
+      state: resolve(__dirname, '../../src/state'),
       '@i18n': resolve(__dirname, '../../src/util/i18n'),
     },
     symlinks: false,
-    modules
+    modules //: [resolve(__dirname, '../../src'), 'node_modules']
   },
   context: resolve(__dirname, '../../src'),
   module: {
@@ -138,7 +138,7 @@ module.exports = {
   },
   plugins: [
     new HtmlWebpackPlugin({ template: 'index.html.ejs', excludeChunks: ['login', 'plugin'] }),
-    new HtmlWebpackPlugin({ template: 'login/login.html.ejs', filename: 'login.html', chunks: ['login'] }),
+    new HtmlWebpackPlugin({ template: 'components/Login/login.html.ejs', filename: 'login.html', chunks: ['login'] }),
     new HtmlWebpackPlugin({ template: 'lms/plugin/plugin.html.ejs', filename: 'plugin.html', chunks: ['plugin'] }),
     new DefinePlugin({
       SIMULATOR_VERSION: JSON.stringify(require('../../package.json').version),

diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-loading": "^2.0.3",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "^8.0.1",
     "react-redux": "^7.2.4",
     "react-reverse-portal": "^2.0.1",
     "react-router": "^5.0.0",

diff --git a/src/state/reducer/assignments.ts b/src/state/reducer/assignments.ts
@@ -1,6 +1,6 @@
 import Assignment, { AssignmentBrief, AsyncAssignment } from '../State/Assignment';
 import construct from '../../util/redux/construct';
-import db from 'db';
+import db from '../../db';
 import { ASSIGNMENT_COLLECTION } from '../../db/constants';
 import Dict from '../../util/objectOps/Dict';
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -11,6 +11,7 @@
     "baseUrl": "src",
     "paths": {
       "@i18n": ["util/i18n"],
+      "state/*": ["state/*"]
     }
   },
   "types": [