diff --git a/src/routers/progress.js b/src/routers/progress.js
index 2a9e499..c5ac56e 100644
--- a/src/routers/progress.js
+++ b/src/routers/progress.js
@@ -2,14 +2,16 @@ const getLocale = require('../../util/getLocale');
const { Router } = require('express');
const router = new Router();
-const progressLists = require('../progress-lists');
+const { getTrelloCache } = require('../../util/trello');
-router.get('/', (req, res) => {
+router.get('/', async (request, response) => {
const tmpLocale = getLocale('US', 'en');
- res.render('progress', {
+ const cache = await getTrelloCache();
+
+ response.render('progress', {
layout: 'main',
locale: tmpLocale,
- progressLists
+ progressLists: cache
});
});
diff --git a/util/trello.js b/util/trello.js
new file mode 100644
index 0000000..7388f9f
--- /dev/null
+++ b/util/trello.js
@@ -0,0 +1,67 @@
+const Trello = require('trello');
+const Redis = require('ioredis');
+const JSONCache = require('redis-json');
+const config = require('../config.json');
+
+const trello = new Trello(config.trello.api_key, config.trello.api_token);
+const redis = new Redis();
+const trelloCache = new JSONCache(redis, { prefix: 'trello:' });
+
+async function getTrelloCache() {
+ let cache = await trelloCache.get('latest');
+ if (!cache) {
+ cache = await updateTrelloCache();
+ }
+
+ if (cache.update_time < Date.now() - (1000 * 60 * 60)) {
+ cache = await updateTrelloCache();
+ }
+
+ return cache;
+}
+
+async function updateTrelloCache() {
+ const progressData = {
+ update_time: Date.now(),
+ sections: []
+ };
+
+ const boards = await trello.getOrgBoards(config.trello.board_name);
+
+ for (const board of boards) {
+ const meta = {
+ title: '',
+ progress: {
+ not_started: [],
+ started: [],
+ completed: []
+ }
+ };
+
+ meta.title = board.name;
+
+ const lists = await trello.getListsOnBoard(board.id);
+ const cards = await trello.getCardsOnBoard(board.id);
+
+ for (const card of cards) {
+ const cardList = lists.find(({ id }) => id === card.idList);
+ const listName = cardList.name.toLowerCase().replace(' ', '_');
+
+ if (meta.progress[listName]) {
+ meta.progress[listName].push(card.name);
+ }
+ }
+
+ if (meta.progress.not_started.length !== 0 && meta.progress.started.length !== 0 && meta.progress.completed.length !== 0) {
+ progressData.sections.push(meta);
+ }
+ }
+
+ await trelloCache.set('latest', progressData);
+ return progressData;
+}
+
+module.exports = {
+ getTrelloCache,
+ updateTrelloCache
+};
\ No newline at end of file
diff --git a/views/partials/progress-list.handlebars b/views/partials/progress-list.handlebars
index ce64362..ace5e7c 100644
--- a/views/partials/progress-list.handlebars
+++ b/views/partials/progress-list.handlebars
@@ -13,10 +13,24 @@
{{ data.title }}
- {{#each data.features}}
+ {{#each data.progress.completed}}
- {{> custom-checkbox status=status }}
- {{ name }}
+ {{> custom-checkbox status="completed" }}
+ {{ this }}
+
+ {{/each}}
+
+ {{#each data.progress.started}}
+
+ {{> custom-checkbox status="started" }}
+ {{ this }}
+
+ {{/each}}
+
+ {{#each data.progress.not_started}}
+
+ {{> custom-checkbox status="not_started" }}
+ {{ this }}
{{/each}}