Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ranasobeid95 committed Apr 4, 2020
2 parents 61153a2 + d951cc5 commit 3154dcb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
4 changes: 0 additions & 4 deletions server/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const express = require('express');
const compression = require('compression');
const { join } = require('path');
const cookieParser = require('cookie-parser');

const controller = require('./controllers');
const { clientError } = require('./controllers/middlewares/errorHandle');
Expand All @@ -10,14 +9,11 @@ const { serverError } = require('./controllers/middlewares/errorHandle');
const app = express();

app.use(compression());

app.disable('x-powered-by');
app.set('port', process.env.PORT || 5000);

app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());

app.use('/api/v1/', controller);

app.use(express.static(join(__dirname, '..', 'client', 'build')));
Expand Down
3 changes: 0 additions & 3 deletions server/controllers/routes/admin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ const {
deleteProjectData,
getCohortProjects,
} = require('./project');

const logout = require('./logout');
const getStats = require('./stats');

router.post('/cohorts', addCohort);
Expand All @@ -35,7 +33,6 @@ router.get('/cohorts/:cohortId/projects', getCohortProjects);
router.delete('/alumni/:studentId', deleteStudent);
router.put('/alumni/:studentId', putStudentData);
router.delete('/projects/:projectId', deleteProjectData);
router.get('/logout', logout);
router.get('/stats', getStats);

module.exports = router;

0 comments on commit 3154dcb

Please sign in to comment.