Merge pull request #24 from NFDI4Chem/development

Development
NFDI4Chem · Mar 7, 2024 · e14db44 · e14db44
2 parents 3cf2b68 + cdefe14
commit e14db44
Show file tree

Hide file tree

Showing 7 changed files with 308 additions and 198 deletions.
diff --git a/.env.example b/.env.example
@@ -2,4 +2,6 @@ PORT=3333
 HOST=0.0.0.0
 NODE_ENV=production
 APP_KEY=NZu-mbqukZjV_65cT3ckDB21exh17-ws
-DRIVE_DISK=local
+DRIVE_DISK=local
+NMRIUM_DEV_URL=https://nmriumdev.nmrxiv.org
+NMRIUM_PROD_URL=https://nmrium.nmrxiv.org/
diff --git a/.env.test b/.env.test
@@ -1 +1,3 @@
 NODE_ENV=test
+NMRIUM_DEV_URL=https://nmriumdev.nmrxiv.org
+NMRIUM_PROD_URL=https://nmrium.nmrxiv.org/
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -28,4 +28,4 @@ jobs:
           release-type: node
           package-name: release-please-action
           token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: true
+          prerelease: false
diff --git a/app/Controllers/Http/SpectraController.ts b/app/Controllers/Http/SpectraController.ts
@@ -54,8 +54,8 @@ export default class SpectraController {
   private generateNMRiumURL() {
     const baseURL =
       Env.get('NODE_ENV') === 'development'
-        ? 'https://nmriumdev.nmrxiv.org'
-        : 'https://nmrium.nmrxiv.org/'
+        ? Env.get('NMRIUM_DEV_URL')
+        : Env.get('NMRIUM_PROD_URL')
 
     const url = new URL(baseURL)
     const preferences = JSON.stringify({

diff --git a/env.ts b/env.ts
@@ -21,4 +21,6 @@ export default Env.rules({
   APP_NAME: Env.schema.string(),
   DRIVE_DISK: Env.schema.enum(['local'] as const),
   NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const),
+  NMRIUM_DEV_URL: Env.schema.string(),
+  NMRIUM_PROD_URL: Env.schema.string(),
 })