From e709d74f74b6e56e55ea4a161ff60cea41789787 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 24 Feb 2022 15:47:24 +0000 Subject: [PATCH] Moved data from view to route in preparation of db integration --- routes/admin.js | 54 ++++++++++++++++++++++++++++- views/dashboard.hbs | 84 +++++++++++---------------------------------- 2 files changed, 73 insertions(+), 65 deletions(-) diff --git a/routes/admin.js b/routes/admin.js index 0fb9bd8..259ae28 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -11,7 +11,59 @@ router.get('/dashboard', (req, res) => { return res.render('dashboard', { title: 'Stratos - Dashboard', current: 'Dashboard', - name: req.session.fullName + name: req.session.fullName, + stats: [ + { + value: 5, + text: 'Classes' + }, + { + value: 11, + text: 'Completed Tests' + }, + { + value: 1, + text: 'Upcoming Test' + }, + { + value: '90%', + text: 'Pass rate' + } + ], + recentTests: [ + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + }, + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + }, + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + } + ], + upcomingTests: [ + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + }, + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + }, + { + id: 1, + date: '08/01/2022', + name: 'Lagged homework 8' + } + ] }); }); diff --git a/views/dashboard.hbs b/views/dashboard.hbs index e7c982d..3c0b686 100644 --- a/views/dashboard.hbs +++ b/views/dashboard.hbs @@ -1,51 +1,24 @@
-
-

5

- Classes -
-
-

11

- Completed Tests -
-
-

1

- Upcoming Test -
-
-

90%

- Pass Rate -
+ {{#each stats}} +
+

{{value}}

+ {{text}} +
+ {{/each}}

Recent Tests

- - - - - - - - - - - - + {{#each recentTests}} + {{> dashboardTest + id=id + name=name + date=date + }} + {{/each}}
- 08/01/2022 - - Lagged homework 8 -
- 08/01/2022 - - Lagged homework 8 -
- 08/01/2022 - - Lagged homework 8 -
@@ -55,30 +28,13 @@

Upcoming Tests

- - - - - - - - - - - - + {{#each upcomingTests}} + {{> dashboardTest + id=id + name=name + date=date + }} + {{/each}}
- 08/01/2022 - - Lagged homework 8 -
- 08/01/2022 - - Lagged homework 8 -
- 08/01/2022 - - Lagged homework 8 -