Skip to content

Commit 199f38b

Browse files
votrungquan1999votrungquan1999
committed
last midify before demo
1 parent 485633b commit 199f38b

File tree

10 files changed

+335
-283
lines changed

10 files changed

+335
-283
lines changed

‎packages/backend/express/app.js‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
1-
const createError = require('http-errors')
2-
const express = require('express')
3-
const path = require('path')
4-
const cookieParser = require('cookie-parser')
5-
const logger = require('morgan')
1+
const createError = require('http-errors');
2+
const express = require('express');
3+
const path = require('path');
4+
const cookieParser = require('cookie-parser');
5+
const logger = require('morgan');
66

7-
const indexRouter = require('./routes/index')
8-
const usersRouter = require('./routes/users')
9-
const clubRouter = require('./routes/club')
7+
const indexRouter = require('./routes/index');
8+
const usersRouter = require('./routes/users');
9+
const clubRouter = require('./routes/club');
1010

1111
const admin = require('firebase-admin');
1212

13-
require("firebase/firestore")
13+
require('firebase/firestore');
1414

15-
const serviceAccount = require('../serviceaccount.json')
15+
const serviceAccount = require('../serviceaccount.json');
1616

1717
admin.initializeApp({
18-
credential: admin.credential.cert(serviceAccount)
19-
20-
18+
credential: admin.credential.cert(serviceAccount)
2119
});
2220

23-
const app = express()
21+
const app = express();
2422

25-
app.use(logger('dev'))
26-
app.use(express.json())
27-
app.use(express.urlencoded({ extended: false }))
28-
app.use(cookieParser())
23+
app.use(logger('dev'));
24+
app.use(express.json());
25+
app.use(express.urlencoded({ extended: false }));
26+
app.use(cookieParser());
2927

30-
app.use('/', indexRouter)
31-
app.use('/users', usersRouter)
32-
app.use ('/club', clubRouter)
28+
app.use('/', indexRouter);
29+
app.use('/users', usersRouter);
30+
app.use('/club', clubRouter);
3331

3432
// catch 404 and forward to error handler
3533
app.use((req, res, next) => {
36-
next(createError(404))
37-
})
34+
next(createError(404));
35+
});
3836

3937
// resolve CORS
4038
app.use((req, res, next) => {
41-
res.header('Access-Control-Allow-Origin', '*')
42-
res.header(
43-
'Access-Control-Allow-Headers',
44-
'Origin, X-Requested-With, Content-Type, Accept'
45-
)
46-
res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS')
47-
next()
48-
})
39+
res.setHeader('Access-Control-Allow-Origin', '*');
40+
res.setHeader(
41+
'Access-Control-Allow-Headers',
42+
'Content-Type, Authorization, Content-Length, X-Requested-With, Accept, Origin'
43+
);
44+
res.setHeader('Content-Type', 'application/json');
45+
res.setHeader('Access-Control-Allow-Methods', 'GET, PUT, POST, OPTIONS, PATCH, DELETE');
46+
next();
47+
});
4948

5049
// error handler
5150
app.use((err, req, res, next) => {
52-
// set locals, only providing error in development
53-
res.locals.message = err.message
54-
res.locals.error = req.app.get('env') === 'development' ? err : {}
51+
// set locals, only providing error in development
52+
res.locals.message = err.message;
53+
res.locals.error = req.app.get('env') === 'development' ? err : {};
5554

56-
// render the error page
57-
res.status(err.status || 500)
58-
res.send('error')
59-
})
55+
// render the error page
56+
res.status(err.status || 500);
57+
res.send('error');
58+
});
6059

61-
module.exports = app
60+
module.exports = app;

‎packages/backend/express/routes/club.js‎

Lines changed: 104 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
11
/* eslint-disable consistent-return */
2-
const express = require("express");
2+
const express = require('express');
33

44
const router = express.Router();
55

6-
const { clubControllers } = require("../../controllers");
6+
const { clubControllers } = require('../../controllers');
77

88
const addClub = clubControllers.addClub;
99
const getAllClub = clubControllers.getAllClubs;
1010
const editClub = clubControllers.editClub;
1111
const deleteClub = clubControllers.deleteClub;
1212
const getClub = clubControllers.getClub;
1313

14-
router.post("/", (req, res) => {
15-
//addClub
16-
addClub(req.body)
17-
.then(result => {
18-
if (result === "successful") {
19-
res.send(result);
20-
return true;
21-
} else {
22-
res.status(400).send({
23-
error:{
24-
message: result.error
25-
}
26-
})
27-
return;
28-
}
29-
})
30-
.catch(e => {
31-
console.log("error:", e, e.message);
32-
res.status(500).send({
33-
error: {
34-
message: "something wrong, contact developer"
35-
}
36-
});
37-
});
14+
router.post('/', (req, res) => {
15+
//addClub
16+
addClub(req.body)
17+
.then((result) => {
18+
if (result === 'successful') {
19+
res.send(result);
20+
return true;
21+
} else {
22+
res.status(400).send({
23+
error: {
24+
message: result.error
25+
}
26+
});
27+
return;
28+
}
29+
})
30+
.catch((e) => {
31+
console.log('error:', e, e.message);
32+
res.status(500).send({
33+
error: {
34+
message: 'something wrong, contact developer'
35+
}
36+
});
37+
});
3838
});
3939

40-
router.get("/:id", (req, res) => {
41-
//gets SINGLE club
42-
//getClub
43-
getClub(req.params.id)
44-
.then(result => {
45-
res.send(result);
46-
return true;
47-
})
48-
.catch(e => {
49-
console.log("error:", e, e.message);
50-
res.status(500).send({
51-
error: {
52-
message: "something wrong, contact developer"
53-
}
54-
});
55-
});
40+
router.get('/:id', (req, res) => {
41+
//gets SINGLE club
42+
//getClub
43+
getClub(req.params.id)
44+
.then((result) => {
45+
res.send(result);
46+
return true;
47+
})
48+
.catch((e) => {
49+
console.log('error:', e, e.message);
50+
res.status(500).send({
51+
error: {
52+
message: 'something wrong, contact developer'
53+
}
54+
});
55+
});
5656
});
5757

58-
router.get("/", (req, res) => {
59-
//ALL Clubs
60-
//getAllClubs
61-
getAllClub()
62-
.then(result => {
63-
res.send(result);
64-
return true;
65-
})
66-
.catch(e => {
67-
console.log("error:", e, e.message);
68-
res.status(500).send({
69-
error: {
70-
message: "something wrong, contact developer"
71-
}
72-
});
73-
});
58+
router.get('/', (req, res) => {
59+
//ALL Clubs
60+
//getAllClubs
61+
getAllClub()
62+
.then((result) => {
63+
res.send(result);
64+
return true;
65+
})
66+
.catch((e) => {
67+
console.log('error:', e, e.message);
68+
res.status(500).send({
69+
error: {
70+
message: 'something wrong, contact developer'
71+
}
72+
});
73+
});
7474
});
7575

76-
router.put("/:id", (req, res) => {
77-
//editClub
78-
console.log({body :req.body})
79-
editClub(req.params.id, req.body)
80-
.then(result => {
81-
if (result === "successful") {
82-
res.send(result);
83-
return true;
84-
} else {
85-
res.status(400).send({
86-
error:{
87-
message: result.error
88-
}
89-
})
90-
return;
91-
}
92-
})
93-
.catch(e => {
94-
console.log("error:", e, e.message);
95-
res.status(500).send({
96-
error: {
97-
message: "something wrong, contact developer"
98-
}
99-
});
100-
});
76+
router.put('/:id', (req, res) => {
77+
//editClub
78+
console.log({ body: req.body });
79+
editClub(req.params.id, req.body)
80+
.then((result) => {
81+
if (result === 'successful') {
82+
res.send(result);
83+
return true;
84+
} else {
85+
res.status(400).send({
86+
error: {
87+
message: result.error
88+
}
89+
});
90+
return;
91+
}
92+
})
93+
.catch((e) => {
94+
console.log('error:', e, e.message);
95+
res.status(500).send({
96+
error: {
97+
message: 'something wrong, contact developer'
98+
}
99+
});
100+
});
101101
});
102102

103-
router.delete("/:id", (req, res) => {
104-
//deleteClub
105-
deleteClub(req.params.id)
106-
.then(result => {
107-
if (result === "successful") {
108-
res.send(result);
109-
return true;
110-
} else {
111-
res.status(400).send({ error: { message: result } });
112-
console.log({ error: result });
113-
return;
114-
}
115-
})
116-
.catch(e => {
117-
console.log("error:", e, e.message);
118-
res.status(500).send({
119-
error: {
120-
message: "something wrong, contact developer"
121-
}
122-
});
123-
});
103+
router.delete('/:id', (req, res) => {
104+
//deleteClub
105+
deleteClub(req.params.id)
106+
.then((result) => {
107+
if (result === 'successful') {
108+
res.send(result);
109+
return true;
110+
} else {
111+
res.status(400).send({ error: { message: result } });
112+
console.log({ error: result });
113+
return;
114+
}
115+
})
116+
.catch((e) => {
117+
console.log('error:', e, e.message);
118+
res.status(500).send({
119+
error: {
120+
message: 'something wrong, contact developer'
121+
}
122+
});
123+
});
124124
});
125125

126126
module.exports = router;

0 commit comments

Comments
 (0)