Merge pull request #3336 from Loui-Molina/develop

DesktopReact has now an individual package.json and eliminated dependencies on package.json root
merolaika · Jan 2, 2022 · 18968a5 · 18968a5
2 parents 42849c6 + 5b19f21
commit 18968a5
Show file tree

Hide file tree

Showing 10 changed files with 58,588 additions and 39,784 deletions.
diff --git a/DesktopRootReactBackend.js → DesktopReact/DesktopRootReactBackend.js b/DesktopRootReactBackend.js → DesktopReact/DesktopRootReactBackend.js
@@ -22,7 +22,7 @@ exports.newDesktopBackendRoot = function newDesktopBackendRoot() {
         */
         global.SA = {}
         /* Load Environment Variables */
-        let ENVIRONMENT = require('./Environment.js');
+        let ENVIRONMENT = require('../Environment.js');
         let ENVIRONMENT_MODULE = ENVIRONMENT.newEnvironment()
         global.env = ENVIRONMENT_MODULE
 
@@ -36,7 +36,7 @@ exports.newDesktopBackendRoot = function newDesktopBackendRoot() {
         /* 
         Setting up the modules that will be available, defined at the Project Schema file. 
         */
-        let MULTI_PROJECT = require('./MultiProject.js');
+        let MULTI_PROJECT = require('../MultiProject.js');
         let MULTI_PROJECT_MODULE = MULTI_PROJECT.newMultiProject()
         MULTI_PROJECT_MODULE.initialize(DK, 'DK')
         MULTI_PROJECT_MODULE.initialize(SA, 'SA')
@@ -57,17 +57,17 @@ exports.newDesktopBackendRoot = function newDesktopBackendRoot() {
             graphql: require("@octokit/graphql"),
             axios: require('axios')
         }
-        SA.version = require('./package.json').version
+        SA.version = require('../package.json').version
         /*
         Setting up Secrets.
         */
-        let SECRETS = require('./Secrets.js').newSecrets()
+        let SECRETS = require('../Secrets.js').newSecrets()
         SECRETS.initialize()
 
         run()
 
         async function run() {
-            DK.app = require('./DesktopReact/DesktopAppBackend.js').newDesktopAppBackend()
+            DK.app = require('./DesktopAppBackend.js').newDesktopAppBackend()
             await DK.app.run()
             console.log('Superalgos Desktop Backend App is Running!')
         }

diff --git a/DesktopRootReactFrontend.js → DesktopReact/DesktopRootReactFrontend.js b/DesktopRootReactFrontend.js → DesktopReact/DesktopRootReactFrontend.js
@@ -11,7 +11,7 @@ exports.newDesktopFrontendRoot = function newDesktopFrontendRoot() {
         run()
 
         async function run() {
-            let app = require('./DesktopReact/DesktopAppFrontend').newDesktopAppFrontend()
+            let app = require('./DesktopAppFrontend').newDesktopAppFrontend()
             await app.run()
             console.log('Superalgos Desktop Frontend App is Running!')
         }

diff --git a/desktop-react-backend.js → DesktopReact/desktop-react-backend.js b/desktop-react-backend.js → DesktopReact/desktop-react-backend.js
diff --git a/desktop-react-frontend.js → DesktopReact/desktop-react-frontend.js b/desktop-react-frontend.js → DesktopReact/desktop-react-frontend.js
diff --git a/DesktopReact/frontend/config/paths.js b/DesktopReact/frontend/config/paths.js
@@ -56,11 +56,11 @@ module.exports = {
     dotenv: resolveApp('.env'),
     appPath: resolveApp('.'),
     appBuild: resolveApp(buildPath),
-    appPublic: resolveApp('DesktopReact/frontend/public'),
-    appHtml: resolveApp('DesktopReact/frontend/public/index.html'),
-    appIndexJs: resolveModule(resolveApp, 'DesktopReact/frontend/src/index'),
+    appPublic: resolveApp('./frontend/public'),
+    appHtml: resolveApp('./frontend/public/index.html'),
+    appIndexJs: resolveModule(resolveApp, './frontend/src/index'),
     appPackageJson: resolveApp('package.json'),
-    appSrc: resolveApp('DesktopReact/frontend/src'),
+    appSrc: resolveApp('./frontend/src'),
     appNodeModules: resolveApp('node_modules'),
     publicUrlOrPath,
 };