diff --git a/Dockerfile b/Dockerfile index 784aed56b..09211830a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,6 @@ COPY --from=builder /app/apps/client/build ./client/ # Prepare Backend COPY --from=builder /app/apps/server/dist/ ./server/ -COPY ./demo-db/ ./preloaded-db/ COPY --from=builder /app/apps/server/src/external/ ./external/ # Export default ports diff --git a/apps/server/package.json b/apps/server/package.json index 6226b8e93..74e772a60 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -47,19 +47,16 @@ }, "scripts": { "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js", - "set:demoproject": "shx cp ../../demo-db/db.json src/preloaded-db/db.json", - "set:testproject": "shx cp ../../demo-db/db.json test-db/db.json", - "postinstall": "pnpm addversion && pnpm set:demoproject && pnpm set:testproject", + "postinstall": "pnpm addversion", "dev": "cross-env NODE_ENV=development tsx watch ./src/index.ts", "dev:inspect": "cross-env NODE_ENV=development tsx watch --inspect ./src/index.ts", "dev:test": "cross-env IS_TEST=true tsx ./src/index.ts", - "prebuild": "pnpm set:demoproject", - "build": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", - "build:electron": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", - "build:local": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", - "build:docker": "pnpm prebuild && esbuild src/index.ts --log-level=error --platform=node --format=cjs --minify --bundle --legal-comments=external --outfile=dist/docker.cjs", - "build:localdocker": "cross-env NODE_ENV=local pnpm prebuild && esbuild src/index.ts --log-level=error --platform=node --format=cjs --minify --bundle --legal-comments=external --outfile=dist/docker.cjs", - "build:debug": "pnpm prebuild && esbuild src/app.ts --platform=node --format=cjs --bundle --legal-comments=external --outfile=dist/index.cjs", + "build": "esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", + "build:electron": "esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", + "build:local": "esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs", + "build:docker": "esbuild src/index.ts --log-level=error --platform=node --format=cjs --minify --bundle --legal-comments=external --outfile=dist/docker.cjs", + "build:localdocker": "cross-env NODE_ENV=local esbuild src/index.ts --log-level=error --platform=node --format=cjs --minify --bundle --legal-comments=external --outfile=dist/docker.cjs", + "build:debug": "esbuild src/app.ts --platform=node --format=cjs --bundle --legal-comments=external --outfile=dist/index.cjs", "lint": "eslint . --quiet", "test": "cross-env IS_TEST=true vitest", "test:pipeline": "cross-env IS_TEST=true vitest run", diff --git a/apps/server/src/preloaded-db/.keep b/apps/server/src/preloaded-db/.keep deleted file mode 100644 index 1eb607c2f..000000000 --- a/apps/server/src/preloaded-db/.keep +++ /dev/null @@ -1 +0,0 @@ -This directory holds the demo file shipped with Ontime diff --git a/apps/server/src/setup/config.ts b/apps/server/src/setup/config.ts index 33033a886..ede8593e1 100644 --- a/apps/server/src/setup/config.ts +++ b/apps/server/src/setup/config.ts @@ -5,7 +5,6 @@ export const config = { demoProject: 'demo project.json', newProject: 'new project.json', database: { - testdb: 'test-db', directory: 'db', filename: 'db.json', }, diff --git a/apps/server/src/setup/index.ts b/apps/server/src/setup/index.ts index 35a2e7dc4..d121108a5 100644 --- a/apps/server/src/setup/index.ts +++ b/apps/server/src/setup/index.ts @@ -73,7 +73,6 @@ export const resolvedPath = (): string => { export const resolvePublicDirectoy = getAppDataPath(); ensureDirectory(resolvePublicDirectoy); -const testDbStartDirectory = isTest ? '../' : resolvePublicDirectoy; export const externalsStartDirectory = isProduction ? resolvePublicDirectoy : join(srcDirectory, 'external'); // TODO: we only need one when they are all in the same folder export const resolveExternalsDirectory = join(isProduction ? resolvePublicDirectoy : srcDirectory, 'external'); @@ -82,13 +81,6 @@ export const resolveExternalsDirectory = join(isProduction ? resolvePublicDirect export const appStatePath = join(resolvePublicDirectoy, config.appState); export const uploadsFolderPath = join(resolvePublicDirectoy, config.uploads); -// path to public db -export const resolveDbDirectory = join(testDbStartDirectory, isTest ? `../${config.database.testdb}` : config.projects); - -export const pathToStartDb = isTest - ? join(srcDirectory, '..', config.database.testdb, config.database.filename) - : join(srcDirectory, '/preloaded-db/', config.database.filename); - // path to public styles export const resolveStylesDirectory = join(externalsStartDirectory, config.styles.directory); export const resolveStylesPath = join(resolveStylesDirectory, config.styles.filename); diff --git a/demo-db/db.json b/demo-db/db.json deleted file mode 100644 index ddf9e09be..000000000 --- a/demo-db/db.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "rundown": [ - { - "title": "Albania", - "note": "SF1.01", - "endAction": "none", - "timerType": "count-down", - "timeStart": 36000000, - "timeEnd": 37200000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "32d31", - "cue": "SF1.01", - "custom": { - "song": "Sekret", - "artist": "Ronela Hajati" - } - }, - { - "title": "Latvia", - "note": "SF1.02", - "endAction": "none", - "timerType": "count-down", - "timeStart": 37500000, - "timeEnd": 38700000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "21cd2", - "cue": "SF1.02", - "custom": { - "song": "Eat Your Salad", - "artist": "Citi Zeni" - } - }, - { - "title": "Lithuania", - "note": "SF1.03", - "endAction": "none", - "timerType": "count-down", - "timeStart": 39000000, - "timeEnd": 40200000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "0b371", - "cue": "SF1.03", - "custom": { - "song": "Sentimentai", - "artist": "Monika Liu" - } - }, - { - "title": "Switzerland", - "note": "SF1.04", - "endAction": "none", - "timerType": "count-down", - "timeStart": 40500000, - "timeEnd": 41700000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "3cd28", - "cue": "SF1.04", - "custom": { - "song": "Boys Do Cry", - "artist": "Marius Bear" - } - }, - { - "title": "Slovenia", - "note": "SF1.05", - "endAction": "none", - "timerType": "count-down", - "timeStart": 42000000, - "timeEnd": 43200000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "e457f", - "cue": "SF1.05", - "custom": { - "song": "Disko", - "artist": "LPS" - } - }, - { - "title": "Lunch break", - "type": "block", - "id": "01e85" - }, - { - "title": "Ukraine", - "note": "SF1.06", - "endAction": "none", - "timerType": "count-down", - "timeStart": 47100000, - "timeEnd": 48300000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "1c420", - "cue": "SF1.06", - "custom": { - "song": "Stefania", - "artist": "Kalush Orchestra" - } - }, - { - "title": "Bulgaria", - "note": "SF1.07", - "endAction": "none", - "timerType": "count-down", - "timeStart": 48600000, - "timeEnd": 49800000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "b7737", - "cue": "SF1.07", - "custom": { - "song": "Intention", - "artist": "Intelligent Music Project" - } - }, - { - "title": "Netherlands", - "note": "SF1.08", - "endAction": "none", - "timerType": "count-down", - "timeStart": 50100000, - "timeEnd": 51300000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "d3a80", - "cue": "SF1.08", - "custom": { - "song": "De Diepte", - "artist": "S10" - } - }, - { - "title": "Moldova", - "note": "SF1.09", - "endAction": "none", - "timerType": "count-down", - "timeStart": 51600000, - "timeEnd": 52800000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "8276c", - "cue": "SF1.09", - "custom": { - "song": "Trenuletul", - "artist": "Zdob si Zdub" - } - }, - { - "title": "Portugal", - "note": "SF1.10", - "endAction": "none", - "timerType": "count-down", - "timeStart": 53100000, - "timeEnd": 54300000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "2340b", - "cue": "SF1.10", - "custom": { - "song": "Saudade Saudade", - "artist": "Maro" - } - }, - { - "title": "Afternoon break", - "type": "block", - "id": "cb90b" - }, - { - "title": "Croatia", - "note": "SF1.11", - "endAction": "none", - "timerType": "count-down", - "timeStart": 56100000, - "timeEnd": 57300000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "503c4", - "cue": "SF1.11", - "custom": { - "song": "Guilty Pleasure", - "artist": "Mia Dimsic" - } - }, - { - "title": "Denmark", - "note": "SF1.12", - "endAction": "none", - "timerType": "count-down", - "timeStart": 57600000, - "timeEnd": 58800000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "5e965", - "cue": "SF1.12", - "custom": { - "song": "The Show", - "artist": "Reddi" - } - }, - { - "title": "Austria", - "note": "SF1.13", - "endAction": "none", - "timerType": "count-down", - "timeStart": 59100000, - "timeEnd": 60300000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "bab4a", - "cue": "SF1.13", - "custom": { - "song": "Halo", - "artist": "LUM!X & Pia Maria" - } - }, - { - "title": "Greece", - "note": "SF1.14", - "endAction": "none", - "timerType": "count-down", - "timeStart": 60600000, - "timeEnd": 61800000, - "duration": 1200000, - "isPublic": true, - "skip": false, - "colour": "", - "type": "event", - "revision": 0, - "id": "d3eb1", - "cue": "SF1.14", - "custom": { - "song": "Die Together", - "artist": "Amanda Tenfjord" - } - } - ], - "project": { - "title": "Eurovision Song Contest", - "description": "Turin 2022", - "publicUrl": "www.getontime.no", - "publicInfo": "Rehearsal Schedule - Turin 2022", - "backstageUrl": "www.github.com/cpvalente/ontime", - "backstageInfo": "Rehearsal Schedule - Turin 2022\nAll performers to wear full costumes for 1st rehearsal" - }, - "settings": { - "app": "ontime", - "version": "2.0.0", - "serverPort": 4001, - "editorKey": null, - "operatorKey": null, - "timeFormat": "24", - "language": "en" - }, - "viewSettings": { - "overrideStyles": false, - "normalColor": "#ffffffcc", - "warningColor": "#FFAB33", - "warningThreshold": 120000, - "dangerColor": "#ED3333", - "dangerThreshold": 60000, - "endMessage": "" - }, - "urlPresets": [ - { - "enabled": true, - "alias": "test", - "pathAndParams": "lower?bg=ff2&text=f00&size=0.6&transition=5" - } - ], - "osc": { - "portIn": 8888, - "portOut": 9999, - "targetIP": "127.0.0.1", - "enabledIn": true, - "enabledOut": true, - "subscriptions": [] - }, - "http": { - "enabledOut": true, - "subscriptions": [] - } -} \ No newline at end of file diff --git a/test-db/db.json b/test-db/db.json deleted file mode 100644 index eca88496d..000000000 --- a/test-db/db.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "rundown": [], - "project": { - "title": "", - "description": "", - "publicUrl": "", - "publicInfo": "", - "backstageUrl": "", - "backstageInfo": "" - }, - "settings": { - "app": "ontime", - "version": "3.0.0-beta.3", - "serverPort": 4001, - "editorKey": null, - "operatorKey": null, - "timeFormat": "24", - "language": "en" - }, - "viewSettings": { - "dangerColor": "#ED3333", - "endMessage": "", - "freezeEnd": false, - "normalColor": "#ffffffcc", - "overrideStyles": false, - "warningColor": "#FFAB33" - }, - "urlPresets": [], - "customFields": {}, - "osc": { - "portIn": 8888, - "portOut": 9999, - "targetIP": "127.0.0.1", - "enabledIn": false, - "enabledOut": false, - "subscriptions": [] - }, - "http": { - "enabledOut": false, - "subscriptions": [] - } -} \ No newline at end of file