Skip to content

Commit 353f9aa

Browse files
committed
async/await for 404 sketch
1 parent d72fa53 commit 353f9aa

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

server/routes/server.routes.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ router.get('/signup', (req, res) => {
2929

3030
router.get('/projects/:project_id', async (req, res) => {
3131
const exists = await projectExists(req.params.project_id);
32-
sendHtml(req, res, exists);
32+
await sendHtml(req, res, exists);
3333
});
3434

3535
router.get(
@@ -39,7 +39,7 @@ router.get(
3939
req.params.username,
4040
req.params.project_id
4141
);
42-
sendHtml(req, res, exists);
42+
await sendHtml(req, res, exists);
4343
}
4444
);
4545

@@ -52,26 +52,26 @@ router.get('/:username/sketches/:project_id', async (req, res) => {
5252
if (project.exists) {
5353
res.send(renderProjectIndex(req.params.username, project.userProject.name));
5454
} else {
55-
sendHtml(req, res, project.exists);
55+
await sendHtml(req, res, project.exists);
5656
}
5757
});
5858

5959
router.get('/:username/sketches', async (req, res) => {
6060
const exists = await userExists(req.params.username);
61-
sendHtml(req, res, exists);
61+
await sendHtml(req, res, exists);
6262
});
6363

6464
router.get('/:username/full/:project_id', async (req, res) => {
6565
const exists = await projectForUserExists(
6666
req.params.username,
6767
req.params.project_id
6868
);
69-
sendHtml(req, res, exists);
69+
await sendHtml(req, res, exists);
7070
});
7171

7272
router.get('/full/:project_id', async (req, res) => {
7373
const exists = await projectExists(req.params.project_id);
74-
sendHtml(req, res, exists);
74+
await sendHtml(req, res, exists);
7575
});
7676

7777
router.get('/login', (req, res) => {
@@ -119,7 +119,7 @@ router.get('/:username/assets', async (req, res) => {
119119
const exists = await userExists(req.params.username);
120120
const isLoggedInUser = req.user && req.user.username === req.params.username;
121121
const canAccess = exists && isLoggedInUser;
122-
sendHtml(req, res, canAccess);
122+
await sendHtml(req, res, canAccess);
123123
});
124124

125125
router.get('/account', (req, res) => {
@@ -139,12 +139,12 @@ router.get('/:username/collections/:id', async (req, res) => {
139139
req.params.username,
140140
req.params.id
141141
);
142-
sendHtml(req, res, exists);
142+
await sendHtml(req, res, exists);
143143
});
144144

145145
router.get('/:username/collections', async (req, res) => {
146146
const exists = await userExists(req.params.username);
147-
sendHtml(req, res, exists);
147+
await sendHtml(req, res, exists);
148148
});
149149

150150
router.get('/privacy-policy', (req, res) => {

server/views/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,11 @@ export function renderProjectIndex(username, projectName) {
102102
* @param {import('express').e.Response} res
103103
* @param {boolean} [exists]
104104
*/
105-
export default function sendHtml(req, res, exists = true) {
105+
export default async function sendHtml(req, res, exists = true) {
106106
if (!exists) {
107107
res.status(404);
108-
get404Sketch((html) => res.send(html));
108+
const html = await get404Sketch();
109+
res.send(html);
109110
} else {
110111
res.send(renderIndex());
111112
}

0 commit comments

Comments
 (0)