@@ -24,83 +24,81 @@ const {
2424 workoutRouter
2525} = require ( './workout/workout.router' ) ;
2626const {
27- exerciseRouter
28- } = require ( './exercise/exercise.router' )
2927
3028
31- let server ;
32- const app = express ( ) ; //Initialize express server
33- passport . use ( localStrategy ) ;
34- passport . use ( jwtStrategy ) ;
29+ let server ;
30+ const app = express ( ) ; //Initialize express server
31+ passport . use ( localStrategy ) ;
32+ passport . use ( jwtStrategy ) ;
3533
36- //MIDLEWARE
37- app . use ( morgan ( 'combined' ) ) ;
38- app . use ( express . json ( ) ) ;
39- app . use ( express . static ( './public' ) ) ;
40- app . use ( express . urlencoded ( { extended : true } ) ) ;
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 } ) ) ;
4139
42- //ROUTER SETUP
43- app . use ( '/api/auth' , authRouter ) ;
44- app . use ( '/api/user' , userRouter ) ;
45- 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 ) ;
4644
47- app . use ( express . static ( './public' , {
48- extensions : [ 'html' , 'htm' ]
45+ app . use ( express . static ( './public' , {
46+ extensions : [ 'html' , 'htm' ]
4947
50- } ) ) ;
48+ } ) ) ;
5149
5250
53- app . use ( '*' , function ( req , res ) {
54- res . status ( HTTP_STATUS_CODES . NOT_FOUND ) . json ( {
55- error : 'Not Found.'
51+ app . use ( '*' , function ( req , res ) {
52+ res . status ( HTTP_STATUS_CODES . NOT_FOUND ) . json ( {
53+ error : 'Not Found.'
54+ } ) ;
5655 } ) ;
57- } ) ;
5856
59- module . exports = {
60- app,
61- startServer,
62- stopServer
63- } ;
57+ module . exports = {
58+ app,
59+ startServer,
60+ stopServer
61+ } ;
6462
65- function startServer ( testEnv ) {
66- return new Promise ( ( resolve , reject ) => {
67- let mongoUrl ;
63+ function startServer ( testEnv ) {
64+ return new Promise ( ( resolve , reject ) => {
65+ let mongoUrl ;
6866
69- if ( testEnv ) {
70- mongoUrl = TEST_MONGO_URL ;
71- } else {
72- mongoUrl = MONGO_URL ;
73- }
74- mongoose . connect ( mongoUrl , { useNewUrlParser : true } ,
75- err => {
76- if ( err ) {
77- console . error ( err ) ;
78- return reject ( err ) ;
79- } else {
80- server = app . listen ( PORT , ( ) => {
81- console . log ( `Express sever listining on http://localhost:${ PORT } ` ) ;
82- resolve ( ) ;
83- } ) . on ( 'error' , err => {
84- mongoose . disconnect ( ) ;
85- reject ( err ) ;
86- } ) ;
87- }
88- } ) ;
89- } ) ;
90- }
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+ }
9189
92- function stopServer ( ) {
93- return mongoose
94- . disconnect ( )
95- . then ( ( ) => new Promise ( ( resolve , reject ) => {
96- server . close ( err => {
97- if ( err ) {
98- console . error ( err ) ;
99- return reject ( err ) ;
100- } else {
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 {
10199
102- resolve ( ) ;
103- }
104- } ) ;
105- } ) ) ;
106- }
100+ resolve ( ) ;
101+ }
102+ } ) ;
103+ } ) ) ;
104+ }
0 commit comments