diff --git a/inc/initRedditApi.js b/inc/initRedditApi.js index 02d5ef5..06e98aa 100644 --- a/inc/initRedditApi.js +++ b/inc/initRedditApi.js @@ -30,7 +30,7 @@ module.exports = function(fetch) { } else { console.error(`Something went wrong while trying to get an access token from reddit API. ${result.status} – ${result.statusText}`) console.error(reddit_api_error_text) - return res.render('index', { json: null, http_status_code: result.status }) + return res.render('frontpage', { json: null, http_status_code: result.status }) } }).catch(error => { console.log(`Error while obtaining a reddit API key.`, error) @@ -66,7 +66,7 @@ module.exports = function(fetch) { } else { console.error(`Something went wrong while fetching data from reddit API. ${result.status} – ${result.statusText}`) console.error(reddit_api_error_text) - return res.render('index', { json: null, http_status_code: result.status }) + return res.render('frontpage', { json: null, http_status_code: result.status }) } }).catch(error => { console.log(`Error while refreshing the reddit API key.`, error) diff --git a/routes/home.js b/routes/home.js index 8b8b3b9..66c9d72 100644 --- a/routes/home.js +++ b/routes/home.js @@ -122,7 +122,7 @@ homeRoute.get('/:sort?', async (req, res, next) => { redis.get(key, (error, json) => { if (error) { console.error('Error getting the frontpage key from redis.', error); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -148,7 +148,7 @@ homeRoute.get('/:sort?', async (req, res, next) => { null, req.cookies ); - return res.render('index', { + return res.render('frontpage', { json: processed_json, sortby: sortby, past: past, @@ -184,7 +184,7 @@ homeRoute.get('/:sort?', async (req, res, next) => { 'Error setting the frontpage key to redis.', error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -209,7 +209,7 @@ homeRoute.get('/:sort?', async (req, res, next) => { null, req.cookies ); - return res.render('index', { + return res.render('frontpage', { json: processed_json, sortby: sortby, past: past, @@ -227,7 +227,7 @@ homeRoute.get('/:sort?', async (req, res, next) => { `Something went wrong while fetching data from Reddit. ${result.status} – ${result.statusText}` ); console.error(config.reddit_api_error_text); - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, diff --git a/routes/preferences.js b/routes/preferences.js index 86d1500..d438603 100644 --- a/routes/preferences.js +++ b/routes/preferences.js @@ -42,7 +42,7 @@ preferenceRoutes.get('/import_prefs/:key', (req, res, next) => { `Error getting the preferences import key ${key} from redis.`, error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); diff --git a/routes/save.js b/routes/save.js index 9479700..ee6fabe 100644 --- a/routes/save.js +++ b/routes/save.js @@ -214,7 +214,7 @@ saveRoutes.get( 'Error getting the short URL for post key from redis.', error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -257,7 +257,7 @@ saveRoutes.get( 'Error setting the short URL for post key to redis.', error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -287,7 +287,7 @@ saveRoutes.get( `Something went wrong while fetching data from Reddit. ${result.status} – ${result.statusText}` ); console.error(config.reddit_api_error_text); - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, diff --git a/routes/subreddit.js b/routes/subreddit.js index e220322..22241e6 100644 --- a/routes/subreddit.js +++ b/routes/subreddit.js @@ -65,7 +65,7 @@ subredditRoutes.get('/r/:subreddit/search', (req, res, next) => { redis.get(key, (error, json) => { if (error) { console.error('Error getting the search key from redis.', error); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -126,7 +126,7 @@ subredditRoutes.get('/r/:subreddit/search', (req, res, next) => { 'Error setting the searches key to redis.', error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -162,7 +162,7 @@ subredditRoutes.get('/r/:subreddit/search', (req, res, next) => { `Something went wrong while fetching data from Reddit. ${result.status} – ${result.statusText}` ); console.error(config.reddit_api_error_text); - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -206,7 +206,7 @@ subredditRoutes.get( `Error getting the ${subreddit} wiki key from redis.`, error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -271,7 +271,7 @@ subredditRoutes.get( ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -339,7 +339,7 @@ subredditRoutes.get('/r/random', (req, res, next) => { ); } else { console.error(`Fetching random subreddit failed.`, json); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -354,7 +354,7 @@ subredditRoutes.get('/r/random', (req, res, next) => { ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -420,7 +420,7 @@ subredditRoutes.get('/r/:subreddit/:sort?', (req, res, next) => { redis.get(key, (error, json) => { if (error) { console.error(`Error getting the ${subreddit} key from redis.`, error); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -557,7 +557,7 @@ subredditRoutes.get('/r/:subreddit/:sort?', (req, res, next) => { ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -620,7 +620,7 @@ subredditRoutes.get( `Error getting the ${comments_url} key from redis.`, error ); - return res.render('index', { + return res.render('frontpage', { post: null, user_preferences: req.cookies, }); @@ -759,7 +759,7 @@ subredditRoutes.get( ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, http_statustext: result.statusText, @@ -841,7 +841,7 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { redis.get(key, (error, json) => { if (error) { console.error(`Error getting the subreddits key from redis.`, error); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -942,7 +942,7 @@ subredditRoutes.get('/subreddits/:sort?', (req, res, next) => { ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, diff --git a/routes/user.js b/routes/user.js index d2402c0..6dd87f7 100644 --- a/routes/user.js +++ b/routes/user.js @@ -91,7 +91,7 @@ userRoutes.get('/u/:user/:kind?', (req, res, next) => { redis.get(key, (error, json) => { if (error) { console.error(`Error getting the user ${key} key from redis.`, error); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -163,7 +163,7 @@ userRoutes.get('/u/:user/:kind?', (req, res, next) => { `Error setting the user ${key} key to redis.`, error ); - return res.render('index', { + return res.render('frontpage', { post: null, user_preferences: req.cookies, }); @@ -208,7 +208,7 @@ userRoutes.get('/u/:user/:kind?', (req, res, next) => { `Something went wrong while fetching data from Reddit. ${result.status} – ${result.statusText}` ); console.error(config.reddit_api_error_text); - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -220,7 +220,7 @@ userRoutes.get('/u/:user/:kind?', (req, res, next) => { `Error fetching the overview JSON file from reddit.com/u/${user}`, error ); - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, @@ -236,7 +236,7 @@ userRoutes.get('/u/:user/:kind?', (req, res, next) => { ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, http_statustext: result.statusText, @@ -311,7 +311,7 @@ userRoutes.get('/u/:user/m/:custom_feed/:sort?', (req, res, next) => { `Error getting the ${user} custom_feed key from redis.`, error ); - return res.render('index', { + return res.render('frontpage', { json: null, user_preferences: req.cookies, }); @@ -436,7 +436,7 @@ userRoutes.get('/u/:user/m/:custom_feed/:sort?', (req, res, next) => { ); console.error(config.reddit_api_error_text); } - return res.render('index', { + return res.render('frontpage', { json: null, http_status_code: result.status, user_preferences: req.cookies, diff --git a/views/index.pug b/views/frontend.pug similarity index 100% rename from views/index.pug rename to views/frontend.pug