Merge pull request #593 from OneCommunityGlobal/development

Backend Release to Main [1.15]
OneCommunityGlobal · Oct 31, 2023 · 1a95807 · 1a95807
2 parents 539c618 + 9d9e084
commit 1a95807
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 289 deletions.
diff --git a/src/controllers/REAL_TIME_timerController.js b/src/controllers/REAL_TIME_timerController.js
diff --git a/src/models/REAL_TIME_timer.js b/src/models/REAL_TIME_timer.js
diff --git a/src/models/oldTimer.js b/src/models/oldTimer.js
diff --git a/src/models/timer.js b/src/models/timer.js
@@ -8,6 +8,8 @@ const timerSchema = new Schema({
   startAt: { type: Date, default: Date.now },
   time: { type: Number, default: 900000 },
   goal: { type: Number, default: 900000 },
+  initialGoal: { type: Number, default: 900000 },
+  chiming: { type: Boolean, default: false },
   paused: { type: Boolean, default: false },
   forcedPause: { type: Boolean, default: false },
   started: { type: Boolean, default: false },

diff --git a/src/routes/timerRouter.js b/src/routes/timerRouter.js
diff --git a/src/startup/routes.js b/src/startup/routes.js
@@ -7,7 +7,6 @@ const actionItem = require('../models/actionItem');
 const notification = require('../models/notification');
 const wbs = require('../models/wbs');
 const task = require('../models/task');
-const timer = require('../models/timer');
 const popup = require('../models/popupEditor');
 const popupBackup = require('../models/popupEditorBackup');
 const taskNotification = require('../models/taskNotification');
@@ -38,7 +37,6 @@ const forcePwdRouter = require('../routes/forcePwdRouter')(userProfile);
 const reportsRouter = require('../routes/reportsRouter')();
 const wbsRouter = require('../routes/wbsRouter')(wbs);
 const taskRouter = require('../routes/taskRouter')(task);
-const timerRouter = require('../routes/timerRouter')(timer);
 const popupRouter = require('../routes/popupEditorRouter')(popup);
 const popupBackupRouter = require('../routes/popupEditorBackupRouter')(popupBackup);
 const taskNotificationRouter = require('../routes/taskNotificationRouter')(taskNotification);
@@ -76,7 +74,6 @@ module.exports = function (app) {
   app.use('/api', reportsRouter);
   app.use('/api', wbsRouter);
   app.use('/api', taskRouter);
-  app.use('/api', timerRouter);
   app.use('/api', popupRouter);
   app.use('/api', popupBackupRouter);
   app.use('/api', taskNotificationRouter);