Skip to content

Commit 78b7f03

Browse files
Venkataramanan VenkateswaranVenkataramanan Venkateswaran
authored andcommitted
fix: merge conflict with routes.js
2 parents 0f8f5bd + 8c5107d commit 78b7f03

1 file changed

Lines changed: 9 additions & 41 deletions

File tree

src/startup/routes.js

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ const bmTimeLog = require('../models/bmdashboard/buildingTimeLogger');
6868
const timeOffRequest = require('../models/timeOffRequest');
6969
const followUp = require('../models/followUp');
7070
const tag = require('../models/tag');
71-
const materialLoss = require('../models/materialLoss');
7271

7372
const bidoverview_Listing = require('../models/lbdashboard/bidoverview/Listing');
7473
const bidoverview_Bid = require('../models/lbdashboard/bidoverview/Bid');
@@ -145,9 +144,8 @@ const followUpRouter = require('../routes/followUpRouter')(followUp);
145144
const form = require('../models/forms');
146145
const formResponse = require('../models/formResponse');
147146
const formRouter = require('../routes/formRouter')(form, formResponse);
148-
const materialLossRouter = require('../routes/materialLossRouter')(materialLoss);
149-
const wastedMaterialRouter = require('../routes/mostWastedRouter');
150147

148+
const wastedMaterialRouter = require('../routes/mostWastedRouter');
151149
// bm dashboard
152150
const bmLoginRouter = require('../routes/bmdashboard/bmLoginRouter')();
153151
const bmMaterialsRouter = require('../routes/bmdashboard/bmMaterialsRouter')(buildingMaterial);
@@ -192,21 +190,18 @@ const blueSquareEmailAssignmentRouter = require('../routes/BlueSquareEmailAssign
192190
userProfile,
193191
);
194192

193+
const weeklySummaryEmailAssignmentRouter = require('../routes/WeeklySummaryEmailAssignmentRoute')(
194+
weeklySummaryEmailAssignment,
195+
userProfile,
196+
);
197+
195198
// Automations
196199
const appAccessRouter = require('../routes/automation/appAccessRouter');
197200
const dropboxRouter = require('../routes/automation/dropboxRouter');
198201
const githubRouter = require('../routes/automation/githubRouter');
199202
const sentryRouter = require('../routes/automation/sentryRouter');
200203
const slackRouter = require('../routes/automation/slackRouter');
201204

202-
//commnunity portal
203-
const cpNoShowRouter = require('../routes/CommunityPortal/NoshowVizRouter')();
204-
205-
const weeklySummaryEmailAssignmentRouter = require('../routes/WeeklySummaryEmailAssignmentRoute')(
206-
weeklySummaryEmailAssignment,
207-
userProfile,
208-
);
209-
210205
//lbdashboard_bidoverview
211206

212207
const bidPropertyRouter = require('../routes/lbdashboard/bidPropertyRouter')(bidoverview_Listing);
@@ -217,6 +212,9 @@ const userBidRouter = require('../routes/lbdashboard/userBidNotificationRouter')
217212
bidoverview_Notification,
218213
);
219214

215+
//commnunity portal
216+
const cpNoShowRouter = require('../routes/CommunityPortal/NoshowVizRouter')();
217+
220218
const registrationRouter = require('../routes/registrationRouter')(registration);
221219

222220
const templateRouter = require('../routes/templateRouter');
@@ -237,9 +235,6 @@ module.exports = function (app) {
237235
app.use('/api', teamRouter);
238236
app.use('/api', wastedMaterialRouter);
239237

240-
app.use('/api', laborCostRouter);
241-
app.use('/api', wastedMaterialRouter);
242-
243238
app.use('/api', laborCostRouter);
244239
// app.use('/api', actionItemRouter);
245240
app.use('/api', notificationRouter);
@@ -273,26 +268,20 @@ module.exports = function (app) {
273268
app.use('/api', blueSquareEmailAssignmentRouter);
274269
app.use('/api', weeklySummaryEmailAssignmentRouter);
275270

276-
app.use('/api', weeklySummaryEmailAssignmentRouter);
277-
278271
app.use('/api', formRouter);
279272
app.use('/api', collaborationRouter);
280273
app.use('/api', userSkillsProfileRouter);
281274
app.use('/api/jobs', jobsRouter);
282275
app.use('/api/questions', hgnformRouter);
283276
app.use('/api/hgnform', hgnFormResponseRouter);
284277
app.use('/api/skills', userSkillTabsRouter);
285-
app.use('/api/skills', userSkillTabsRouter);
286278
app.use('/api/questionnaire-analytics/', questionnaireAnalyticsRouter);
287279
app.use('/api/job-notification-list/', jobNotificationListRouter);
288280

289281
app.use('/api', templateRouter);
290282

291-
app.use('/api', templateRouter);
292-
293283
app.use('/api/help-categories', helpCategoryRouter);
294284
app.use('/api', tagRouter);
295-
app.use('/api/materials', materialLossRouter);
296285

297286
// bm dashboard
298287
app.use('/api/bm', bmLoginRouter);
@@ -309,11 +298,6 @@ module.exports = function (app) {
309298
app.use('/api/sentry', sentryRouter);
310299
app.use('/api/slack', slackRouter);
311300
app.use('/api/accessManagement', appAccessRouter);
312-
app.use('/api/dropbox', dropboxRouter);
313-
app.use('/api/github', githubRouter);
314-
app.use('/api/sentry', sentryRouter);
315-
app.use('/api/slack', slackRouter);
316-
app.use('/api/accessManagement', appAccessRouter);
317301
app.use('/api/bm', bmExternalTeam);
318302

319303
app.use('/api/bm', bmIssueRouter);
@@ -326,29 +310,13 @@ module.exports = function (app) {
326310
//community portal
327311
app.use('/api/communityportal/reports/participation', cpNoShowRouter);
328312

329-
app.use('/api/bm', bmIssueRouter);
330-
app.use('/api/bm', bmActualVsPlannedCostRouter);
331-
app.use('/api/bm', bmTimeLoggerRouter);
332-
333-
app.use('/api/lb', bidPropertyRouter);
334-
app.use('/api/lb', userBidRouter);
335-
336-
//community portal
337-
app.use('/api/communityportal/reports/participation', cpNoShowRouter);
338-
339313
// lb dashboard
340314
app.use('/api/lb', lbListingsRouter);
341315
app.use('/api/villages', require('../routes/lbdashboard/villages'));
342316
app.use('/api/lb', lbMessageRouter);
343317
app.use('/api/lb', lbUserPrefRouter);
344-
app.use('/api/villages', require('../routes/lbdashboard/villages'));
345-
app.use('/api/lb', lbMessageRouter);
346-
app.use('/api/lb', lbUserPrefRouter);
347318
app.use('/api', registrationRouter);
348319
app.use('/api', projectMaterialRouter);
349320
app.use('/api/bm', bmRentalChart);
350321
app.use('/api/lb', lbWishlistsRouter);
351-
app.use('/api', projectMaterialRouter);
352-
app.use('/api/bm', bmRentalChart);
353-
app.use('/api/lb', lbWishlistsRouter);
354322
};

0 commit comments

Comments
 (0)