Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #24

Merged
merged 12 commits into from
Mar 7, 2024
Merged

Development #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5fe70ab
build: set prerelease to false
NishaSharma14 Oct 25, 2023
3f32b01
fix: move nmrium url to ENV.
NishaSharma14 Oct 25, 2023
811e7eb
Merge pull request #17 from NFDI4Chem/dev-nisha
CS76 Oct 25, 2023
b72a7a9
feat: update nmr-load-save to version 0.23.3
hamed-musallam Nov 21, 2023
d5ee2bf
fix: serialize spectra object
hamed-musallam Nov 22, 2023
b1f072d
chore: update nmr-load-save
hamed-musallam Nov 27, 2023
4268f51
feat: update nmr-load-save to version 0.23.8
hamed-musallam Nov 30, 2023
8d9ab83
chore: not omit 'logger' or 'keepSource'
hamed-musallam Nov 30, 2023
c0326dc
chore: update dependencies
hamed-musallam Dec 14, 2023
97bbc2d
feat: update nmr-load-save to version 0.23.11
hamed-musallam Dec 14, 2023
a8755fb
Merge branch 'main' of https://github.com/NFDI4Chem/nmrxiv-nodejs-mic…
NishaSharma14 Mar 7, 2024
cdefe14
feat: update nmr-load-save to version 0.27.3
hamed-musallam Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 2 additions & 0 deletions .env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
NODE_ENV=test
NMRIUM_DEV_URL=https://nmriumdev.nmrxiv.org
NMRIUM_PROD_URL=https://nmrium.nmrxiv.org/
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
release-type: node
package-name: release-please-action
token: ${{ secrets.GITHUB_TOKEN }}
prerelease: true
prerelease: false
4 changes: 2 additions & 2 deletions app/Controllers/Http/SpectraController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 2 additions & 0 deletions env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
})
Loading
Loading