Skip to content

Commit 498b66a

Browse files
fixed missing file
1 parent 5baf9b0 commit 498b66a

File tree

1 file changed

+67
-67
lines changed

1 file changed

+67
-67
lines changed

app/server.js

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -23,82 +23,82 @@ const {
2323
const {
2424
workoutRouter
2525
} = require('./workout/workout.router');
26-
const {
2726

2827

29-
let server;
30-
const app = express(); //Initialize express server
31-
passport.use(localStrategy);
32-
passport.use(jwtStrategy);
3328

34-
//MIDLEWARE
35-
app.use(morgan('combined'));
36-
app.use(express.json());
37-
app.use(express.static('./public'));
38-
app.use(express.urlencoded({ extended: true }));
29+
let server;
30+
const app = express(); //Initialize express server
31+
passport.use(localStrategy);
32+
passport.use(jwtStrategy);
33+
34+
//MIDLEWARE
35+
app.use(morgan('combined'));
36+
app.use(express.json());
37+
app.use(express.static('./public'));
38+
app.use(express.urlencoded({ extended: true }));
3939

40-
//ROUTER SETUP
41-
app.use('/api/auth', authRouter);
42-
app.use('/api/user', userRouter);
43-
app.use('/api/home', workoutRouter);
40+
//ROUTER SETUP
41+
app.use('/api/auth', authRouter);
42+
app.use('/api/user', userRouter);
43+
app.use('/api/home', workoutRouter);
4444

45-
app.use(express.static('./public', {
46-
extensions: ['html', 'htm']
45+
app.use(express.static('./public', {
46+
extensions: ['html', 'htm']
4747

48-
}));
48+
}));
4949

5050

51-
app.use('*', function(req, res) {
52-
res.status(HTTP_STATUS_CODES.NOT_FOUND).json({
53-
error: 'Not Found.'
54-
});
51+
app.use('*', function(req, res) {
52+
res.status(HTTP_STATUS_CODES.NOT_FOUND).json({
53+
error: 'Not Found.'
5554
});
55+
});
56+
57+
module.exports = {
58+
app,
59+
startServer,
60+
stopServer
61+
};
5662

57-
module.exports = {
58-
app,
59-
startServer,
60-
stopServer
61-
};
62-
63-
function startServer(testEnv) {
64-
return new Promise((resolve, reject) => {
65-
let mongoUrl;
66-
67-
if (testEnv) {
68-
mongoUrl = TEST_MONGO_URL;
69-
} else {
70-
mongoUrl = MONGO_URL;
71-
}
72-
mongoose.connect(mongoUrl, { useNewUrlParser: true },
73-
err => {
74-
if (err) {
75-
console.error(err);
76-
return reject(err);
77-
} else {
78-
server = app.listen(PORT, () => {
79-
console.log(`Express sever listining on http://localhost:${PORT}`);
80-
resolve();
81-
}).on('error', err => {
82-
mongoose.disconnect();
83-
reject(err);
84-
});
85-
}
86-
});
87-
});
88-
}
89-
90-
function stopServer() {
91-
return mongoose
92-
.disconnect()
93-
.then(() => new Promise((resolve, reject) => {
94-
server.close(err => {
95-
if (err) {
96-
console.error(err);
97-
return reject(err);
98-
} else {
63+
function startServer(testEnv) {
64+
return new Promise((resolve, reject) => {
65+
let mongoUrl;
9966

67+
if (testEnv) {
68+
mongoUrl = TEST_MONGO_URL;
69+
} else {
70+
mongoUrl = MONGO_URL;
71+
}
72+
mongoose.connect(mongoUrl, { useNewUrlParser: true },
73+
err => {
74+
if (err) {
75+
console.error(err);
76+
return reject(err);
77+
} else {
78+
server = app.listen(PORT, () => {
79+
console.log(`Express sever listining on http://localhost:${PORT}`);
10080
resolve();
101-
}
102-
});
103-
}));
104-
}
81+
}).on('error', err => {
82+
mongoose.disconnect();
83+
reject(err);
84+
});
85+
}
86+
});
87+
});
88+
}
89+
90+
function stopServer() {
91+
return mongoose
92+
.disconnect()
93+
.then(() => new Promise((resolve, reject) => {
94+
server.close(err => {
95+
if (err) {
96+
console.error(err);
97+
return reject(err);
98+
} else {
99+
100+
resolve();
101+
}
102+
});
103+
}));
104+
}

0 commit comments

Comments
 (0)