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

Backend Release to Main [1.15] #593

Merged
merged 5 commits into from
Oct 31, 2023
Merged

Backend Release to Main [1.15] #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
701be25
cleanup old timer related code and files
wang9hu Oct 26, 2023
467cbb8
remove 2h default time when clear timer
wang9hu Oct 26, 2023
29e9bb2
make timer keep remaining time as goal after log time, and add initia…
wang9hu Oct 26, 2023
bd8f4de
make timer chime consistent over all tabs
wang9hu Oct 29, 2023
9d9e084
Merge pull request #586 from OneCommunityGlobal/xiaow_cleanup_old_timer
one-community Oct 31, 2023
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
155 changes: 0 additions & 155 deletions src/controllers/REAL_TIME_timerController.js
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/models/REAL_TIME_timer.js
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/models/oldTimer.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/models/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
15 changes: 0 additions & 15 deletions src/routes/timerRouter.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/startup/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading
Loading