From 0696dddaaf65efedc7e536c6edaaa9d2a0665579 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sun, 10 Jul 2022 10:33:03 -0400 Subject: [PATCH] handlebars looks for main layout by default --- src/routers/account.js | 5 ----- src/routers/aprilfools.js | 4 +--- src/routers/blog.js | 3 +-- src/routers/docs.js | 6 ++---- src/routers/home.js | 1 - src/routers/localization.js | 4 +--- src/routers/progress.js | 1 - 7 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/routers/account.js b/src/routers/account.js index 10f4423..61bf36d 100644 --- a/src/routers/account.js +++ b/src/routers/account.js @@ -32,7 +32,6 @@ router.get('/', async (request, response) => { // Setup the data to be sent to the handlebars renderer const renderData = { - layout: 'main', success: request.cookies.success, error: request.cookies.error }; @@ -203,7 +202,6 @@ router.get('/', async (request, response) => { router.get('/login', async (request, response) => { const renderData = { - layout: 'main', error: request.cookies.error }; @@ -253,7 +251,6 @@ router.post('/login', async (request, response) => { router.get('/register', async (request, response) => { const renderData = { - layout: 'main', error: request.cookies.error, email: request.cookies.email, username: request.cookies.username, @@ -510,7 +507,6 @@ router.get('/miieditor', async (request, response) => { }; response.render('account/miieditor', { - layout: 'main', encodedUserMiiData, editorToHex }); @@ -561,7 +557,6 @@ router.get('/upgrade', async (request, response) => { const pnid = await database.PNID.findOne({ pid }); const renderData = { - layout: 'main', error: request.cookies.error, currentTier: pnid.get('connections.stripe.price_id'), donationCache: await cache.getStripeDonationCache() diff --git a/src/routers/aprilfools.js b/src/routers/aprilfools.js index 394bc96..0cbdcf2 100644 --- a/src/routers/aprilfools.js +++ b/src/routers/aprilfools.js @@ -4,9 +4,7 @@ const router = new Router(); router.get('/', async (request, response) => { - const renderData = { - layout: 'main' - }; + const renderData = {}; renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token && request.cookies.ph; diff --git a/src/routers/blog.js b/src/routers/blog.js index 9a3fee6..78823f5 100644 --- a/src/routers/blog.js +++ b/src/routers/blog.js @@ -37,8 +37,7 @@ const postList = () => { router.get('/', async (request, response) => { const renderData = { - layout: 'main', - postList, + postList }; renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token && request.cookies.ph; diff --git a/src/routers/docs.js b/src/routers/docs.js index ca2bb15..2002ae8 100644 --- a/src/routers/docs.js +++ b/src/routers/docs.js @@ -12,8 +12,7 @@ router.get('/', async (request, response) => { router.get('/search', async (request, response) => { const renderData = { - layout: 'main', - currentPage: request.params.slug, + currentPage: request.params.slug }; renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token && request.cookies.ph; @@ -28,8 +27,7 @@ router.get('/search', async (request, response) => { router.get('/:slug', async (request, response, next) => { const renderData = { - layout: 'main', - currentPage: request.params.slug, + currentPage: request.params.slug }; renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token && request.cookies.ph; diff --git a/src/routers/home.js b/src/routers/home.js index 05a17e7..66cd61e 100644 --- a/src/routers/home.js +++ b/src/routers/home.js @@ -8,7 +8,6 @@ const { getTrelloCache } = require('../cache'); router.get('/', async (request, response) => { const renderData = { - layout: 'main', boards }; diff --git a/src/routers/localization.js b/src/routers/localization.js index f6178f2..598ffcc 100644 --- a/src/routers/localization.js +++ b/src/routers/localization.js @@ -3,9 +3,7 @@ const util = require('../util'); const router = new Router(); router.get('/', async (request, response) => { - const renderData = { - layout: 'main' - }; + const renderData = {}; renderData.isLoggedIn = request.cookies.access_token && request.cookies.refresh_token && request.cookies.ph; diff --git a/src/routers/progress.js b/src/routers/progress.js index c1edb92..ebbaf2a 100644 --- a/src/routers/progress.js +++ b/src/routers/progress.js @@ -7,7 +7,6 @@ const { getTrelloCache, getStripeDonationCache } = require('../cache'); router.get('/', async (request, response) => { const renderData = { - layout: 'main', boards };