From aa53f2c9cfa381de3e8f2d25d863688fc4c45f76 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Fri, 28 May 2021 13:16:34 +0200 Subject: [PATCH] folder restructure --- server/data/eventsData.json | 57 ------------------- server/jsconfig.json | 3 + server/{ => src}/app.js | 2 +- server/{ => src}/classes/EventTimer.js | 0 server/{ => src}/classes/Timer.js | 0 server/{ => src/config}/config.js | 0 server/{ => src}/controllers/OscController.js | 0 .../{ => src}/controllers/eventController.js | 0 .../{ => src}/controllers/eventsController.js | 0 .../{ => src}/controllers/ontimeController.js | 2 +- .../controllers/playbackController.js | 22 +++---- server/{ => src}/data/dataModel.js | 0 server/{ => src}/data/eventsDefinition.js | 0 server/{ => src}/routes/eventRouter.js | 0 server/{ => src}/routes/eventsRouter.js | 0 server/{ => src}/routes/ontimeRouter.js | 0 server/{ => src}/routes/playbackRouter.js | 0 server/{ => src}/utils/upload.js | 2 +- 18 files changed, 17 insertions(+), 71 deletions(-) delete mode 100644 server/data/eventsData.json create mode 100644 server/jsconfig.json rename server/{ => src}/app.js (97%) rename server/{ => src}/classes/EventTimer.js (100%) rename server/{ => src}/classes/Timer.js (100%) rename server/{ => src/config}/config.js (100%) rename server/{ => src}/controllers/OscController.js (100%) rename server/{ => src}/controllers/eventController.js (100%) rename server/{ => src}/controllers/eventsController.js (100%) rename server/{ => src}/controllers/ontimeController.js (99%) rename server/{ => src}/controllers/playbackController.js (71%) rename server/{ => src}/data/dataModel.js (100%) rename server/{ => src}/data/eventsDefinition.js (100%) rename server/{ => src}/routes/eventRouter.js (100%) rename server/{ => src}/routes/eventsRouter.js (100%) rename server/{ => src}/routes/ontimeRouter.js (100%) rename server/{ => src}/routes/playbackRouter.js (100%) rename server/{ => src}/utils/upload.js (94%) diff --git a/server/data/eventsData.json b/server/data/eventsData.json deleted file mode 100644 index f5aadad75..000000000 --- a/server/data/eventsData.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "id":"xxxxx0", - "duration": 300000, - "type": "delay" - }, - { - "id":"xxxxx1", - "title": "Is the internet a fad?", - "subtitle": "It is", - "presenter": "Carlos Valente", - "timeStart": 32400000, - "timeEnd": 34200000, - "type": "event" - }, - { - "id":"xxxxx2", - "duration": 1500000, - "type": "delay" - }, - { - "id":"xxxxx3", - "title": "Is reddit a dictatorship?", - "subtitle": "It is", - "presenter": "Carlos Valente", - "timeStart": 34200000, - "timeEnd": 36000000, - "type": "event" - }, - { - "id":"xxxxx4", - "title": "Out of words", - "subtitle": "", - "presenter": "Carlos Valente", - "timeStart": 36000000, - "timeEnd": 39600000, - "type": "event" - }, - { - "id":"xxxxx5", - "title": "Really", - "subtitle": "", - "presenter": "Carlos Valente", - "timeStart": 39600000, - "timeEnd": 41400000, - "type": "event" - }, - { - "id":"xxxxx6", - "title": "...", - "subtitle": "", - "presenter": "Carlos Valente", - "timeStart": null, - "timeEnd": null, - "type": "event" - } -] \ No newline at end of file diff --git a/server/jsconfig.json b/server/jsconfig.json new file mode 100644 index 000000000..bbf408cd7 --- /dev/null +++ b/server/jsconfig.json @@ -0,0 +1,3 @@ +{ + "exclude": ["node_modules", "dist"] +} diff --git a/server/app.js b/server/src/app.js similarity index 97% rename from server/app.js rename to server/src/app.js index 6a1acc63e..a7882c50d 100644 --- a/server/app.js +++ b/server/src/app.js @@ -1,5 +1,5 @@ // get config -import { config } from './config.js'; +import { config } from './config/config.js'; // init database import { Low, JSONFile } from 'lowdb'; diff --git a/server/classes/EventTimer.js b/server/src/classes/EventTimer.js similarity index 100% rename from server/classes/EventTimer.js rename to server/src/classes/EventTimer.js diff --git a/server/classes/Timer.js b/server/src/classes/Timer.js similarity index 100% rename from server/classes/Timer.js rename to server/src/classes/Timer.js diff --git a/server/config.js b/server/src/config/config.js similarity index 100% rename from server/config.js rename to server/src/config/config.js diff --git a/server/controllers/OscController.js b/server/src/controllers/OscController.js similarity index 100% rename from server/controllers/OscController.js rename to server/src/controllers/OscController.js diff --git a/server/controllers/eventController.js b/server/src/controllers/eventController.js similarity index 100% rename from server/controllers/eventController.js rename to server/src/controllers/eventController.js diff --git a/server/controllers/eventsController.js b/server/src/controllers/eventsController.js similarity index 100% rename from server/controllers/eventsController.js rename to server/src/controllers/eventsController.js diff --git a/server/controllers/ontimeController.js b/server/src/controllers/ontimeController.js similarity index 99% rename from server/controllers/ontimeController.js rename to server/src/controllers/ontimeController.js index 7dabf952e..2d74bb73f 100644 --- a/server/controllers/ontimeController.js +++ b/server/src/controllers/ontimeController.js @@ -66,7 +66,7 @@ async function parsev1(jsonData) { publicInfo: e.publicInfo, backstageInfo: e.backstageInfo, }; - console.log(event); + // write to db db.data.event = event; db.write(); diff --git a/server/controllers/playbackController.js b/server/src/controllers/playbackController.js similarity index 71% rename from server/controllers/playbackController.js rename to server/src/controllers/playbackController.js index 4dcc45cb3..b8a72f5a5 100644 --- a/server/controllers/playbackController.js +++ b/server/src/controllers/playbackController.js @@ -1,64 +1,64 @@ // Create controller for GET request to '/playback' // Returns ACK message -exports.pbGet = async (req, res) => { +export const pbGet = async (req, res) => { res.send(global.timer.playState); }; // Create controller for GET request to '/playback/start' // Starts timer object -exports.pbStart = async (req, res) => { +export const pbStart = async (req, res) => { global.timer.start(); res.sendStatus(200); }; // Create controller for GET request to '/playback/pause' // Pauses timer object -exports.pbPause = async (req, res) => { +export const pbPause = async (req, res) => { global.timer.pause(); res.sendStatus(200); }; // Create controller for GET request to '/playback/stop' // Stops timer object -exports.pbStop = async (req, res) => { +export const pbStop = async (req, res) => { global.timer.stop(); res.sendStatus(200); }; // Create controller for GET request to '/playback/roll' // Sets timer object to roll mode -exports.pbRoll = async (req, res) => { +export const pbRoll = async (req, res) => { global.timer.roll(); res.sendStatus(501); }; // Create controller for GET request to '/playback/previous' // Sets timer object to roll mode -exports.pbPrevious = async (req, res) => { +export const pbPrevious = async (req, res) => { global.timer.previous(); res.sendStatus(200); }; // Create controller for GET request to '/playback/next' // Sets timer object to roll mode -exports.pbNext = async (req, res) => { +export const pbNext = async (req, res) => { global.timer.next(); res.sendStatus(200); }; // Create controller for GET request to '/playback/unload' // Unloads any events -exports.pbUnload = async (req, res) => { +export const pbUnload = async (req, res) => { global.timer.unload(); - console.log('debug: unload called') + console.log('debug: unload called'); res.sendStatus(200); }; // Create controller for GET request to '/playback/reload' // Reloads current event -exports.pbReload = async (req, res) => { +export const pbReload = async (req, res) => { global.timer.reload(); - console.log('debug: reload called') + console.log('debug: reload called'); res.sendStatus(200); }; diff --git a/server/data/dataModel.js b/server/src/data/dataModel.js similarity index 100% rename from server/data/dataModel.js rename to server/src/data/dataModel.js diff --git a/server/data/eventsDefinition.js b/server/src/data/eventsDefinition.js similarity index 100% rename from server/data/eventsDefinition.js rename to server/src/data/eventsDefinition.js diff --git a/server/routes/eventRouter.js b/server/src/routes/eventRouter.js similarity index 100% rename from server/routes/eventRouter.js rename to server/src/routes/eventRouter.js diff --git a/server/routes/eventsRouter.js b/server/src/routes/eventsRouter.js similarity index 100% rename from server/routes/eventsRouter.js rename to server/src/routes/eventsRouter.js diff --git a/server/routes/ontimeRouter.js b/server/src/routes/ontimeRouter.js similarity index 100% rename from server/routes/ontimeRouter.js rename to server/src/routes/ontimeRouter.js diff --git a/server/routes/playbackRouter.js b/server/src/routes/playbackRouter.js similarity index 100% rename from server/routes/playbackRouter.js rename to server/src/routes/playbackRouter.js diff --git a/server/utils/upload.js b/server/src/utils/upload.js similarity index 94% rename from server/utils/upload.js rename to server/src/utils/upload.js index f53a492c0..e489ac26f 100644 --- a/server/utils/upload.js +++ b/server/src/utils/upload.js @@ -2,7 +2,7 @@ import multer from 'multer'; const storage = multer.diskStorage({ destination: function (req, file, cb) { - cb(null, './uploads'); + cb(null, 'uploads/'); }, filename: function (req, file, cb) { cb(null, Date.now() + '--' + file.originalname);