summaryrefslogtreecommitdiffstats
path: root/src/internal-server
diff options
context:
space:
mode:
authorLibravatar Vijay A <vraravam@users.noreply.github.com>2021-10-01 21:51:55 +0530
committerLibravatar Vijay A <vraravam@users.noreply.github.com>2021-10-01 21:51:55 +0530
commit204a80708e6e0a2189de16438a3eb4b57ef84987 (patch)
treea8fa3afb58dbfec67bced4281837d33fd4e71413 /src/internal-server
parentrefactor: move 'asarRecipesPath' into 'asar-helpers' (diff)
downloadferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.tar.gz
ferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.tar.zst
ferdium-app-204a80708e6e0a2189de16438a3eb4b57ef84987.zip
refactor: split 'environment' into 'environment-remote' with only the remote module dependency
(might be a pre-requisite for the electron v14 upgrade)
Diffstat (limited to 'src/internal-server')
-rw-r--r--src/internal-server/app/Controllers/Http/RecipeController.js2
-rw-r--r--src/internal-server/app/Controllers/Http/UserController.js6
-rw-r--r--src/internal-server/start/migrate.js2
-rw-r--r--src/internal-server/start/routes.js2
4 files changed, 5 insertions, 7 deletions
diff --git a/src/internal-server/app/Controllers/Http/RecipeController.js b/src/internal-server/app/Controllers/Http/RecipeController.js
index 2c7baf2a4..d44839db1 100644
--- a/src/internal-server/app/Controllers/Http/RecipeController.js
+++ b/src/internal-server/app/Controllers/Http/RecipeController.js
@@ -6,7 +6,7 @@ const Env = use('Env');
6const fetch = require('node-fetch'); 6const fetch = require('node-fetch');
7const debug = require('debug')('Ferdi:internalServer:RecipeController'); 7const debug = require('debug')('Ferdi:internalServer:RecipeController');
8const { LIVE_FERDI_API } = require('../../../../config'); 8const { LIVE_FERDI_API } = require('../../../../config');
9const { API_VERSION } = require('../../../../environment'); 9const { API_VERSION } = require('../../../../environment-remote');
10 10
11const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`; 11const RECIPES_URL = `${LIVE_FERDI_API}/${API_VERSION}/recipes`;
12 12
diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js
index 747606da7..9bbd2ff6e 100644
--- a/src/internal-server/app/Controllers/Http/UserController.js
+++ b/src/internal-server/app/Controllers/Http/UserController.js
@@ -7,10 +7,8 @@ const btoa = require('btoa');
7const fetch = require('node-fetch'); 7const fetch = require('node-fetch');
8const { v4: uuid } = require('uuid'); 8const { v4: uuid } = require('uuid');
9const crypto = require('crypto'); 9const crypto = require('crypto');
10const { 10const { DEFAULT_APP_SETTINGS } = require('../../../../environment');
11 DEFAULT_APP_SETTINGS, 11const { API_VERSION } = require('../../../../environment-remote');
12 API_VERSION,
13} = require('../../../../environment');
14const { default: userAgent } = require('../../../../helpers/userAgent-helpers'); 12const { default: userAgent } = require('../../../../helpers/userAgent-helpers');
15 13
16const apiRequest = (url, route, method, auth) => 14const apiRequest = (url, route, method, auth) =>
diff --git a/src/internal-server/start/migrate.js b/src/internal-server/start/migrate.js
index 0f25240cc..97cefcc54 100644
--- a/src/internal-server/start/migrate.js
+++ b/src/internal-server/start/migrate.js
@@ -1,4 +1,4 @@
1const { ferdiVersion } = require('../../environment'); 1const { ferdiVersion } = require('../../environment-remote');
2 2
3/** 3/**
4 * Migrate server database to work with current Ferdi version 4 * Migrate server database to work with current Ferdi version
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js
index e75380ccd..db74479c9 100644
--- a/src/internal-server/start/routes.js
+++ b/src/internal-server/start/routes.js
@@ -8,7 +8,7 @@
8/** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */ 8/** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
9const Route = use('Route'); 9const Route = use('Route');
10 10
11const { API_VERSION } = require('../../environment'); 11const { API_VERSION } = require('../../environment-remote');
12// Run latest database migration 12// Run latest database migration
13const migrate = require('./migrate'); 13const migrate = require('./migrate');
14 14