Merge pull request #45 from 5jiji/restructure

Fix all path errors (i hope)
Infinite-Chess · Jul 10, 2024 · 9b51956 · 9b51956
2 parents d58b83e + 640fe11
commit 9b51956
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/server/routes/createaccount.js b/src/server/routes/createaccount.js
@@ -7,7 +7,7 @@ const createaccountController = require('../controllers/createaccountController'
 const {getRegisterData, checkEmailAssociated, checkUsernameAssociated} = require('../controllers/createaccountController');
 
 router.get('/', (req, res) => {
-    res.sendFile(path.join(__dirname, '..', 'views', 'createaccount.html'));
+    res.sendFile(path.join(__dirname, '..', '..', '..', 'dist', 'views', 'createaccount.html'));
 })
 
 router.post('/', createaccountController.createNewMember);

diff --git a/src/server/routes/member.js b/src/server/routes/member.js
@@ -7,7 +7,7 @@ const {getMemberData,requestConfirmEmail} = require('../controllers/memberContro
 
 
 router.get('/:member', (req, res) => {
-    res.sendFile(path.join(__dirname, '..', 'views', 'member.html'));
+    res.sendFile(path.join(__dirname, '..', '..', '..', 'dist', 'views', 'member.html'));
 });
 
 router.get('/:member/data', getMemberData);

diff --git a/src/server/utility/HTMLScriptInjector.js b/src/server/utility/HTMLScriptInjector.js
@@ -92,14 +92,14 @@ function getCachedHTML(htmlFilePath) {
 // Inject the scripts we want...
 
 { // Inject into play.html, our OBFUSCATED htmlscript.js script.
-    const htmlFilePath = path.join(__dirname, '..', '..', 'client', 'views', 'play.html');
+    const htmlFilePath = path.join(__dirname, '..', '..', '..', 'dist', 'views', 'play.html');
     const jsFilePath = path.join(__dirname, '..', '..', '..', 'dist', 'scripts', 'game', 'htmlscript.js');
     prepareAndCacheHTML(htmlFilePath, jsFilePath, '<head>');
 }
 
 { // Inject into dev.html, our htmlscript.js script.
-    const htmlFilePath = path.join(__dirname, '..', '..', 'client', 'views', 'dev.html');
-    const jsFilePath = path.join(__dirname, '..', '..', 'client', 'scripts', 'game', 'htmlscript.js');
+    const htmlFilePath = path.join(__dirname, '..', '..', '..', 'dist', 'views', 'dev.html');
+    const jsFilePath = path.join(__dirname, '..', '..', '..', 'dist', 'scripts', 'game', 'htmlscript.js');
     prepareAndCacheHTML(htmlFilePath, jsFilePath, '<head>');
 }