From a07e3a925c50af8ab07160aaf895e2015e0362cf Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 10 Mar 2019 10:40:41 +0200 Subject: [PATCH] Remove routes/index.js. Just include the routes directly in app.js. --- app.js | 51 ++++++++++++++++++++++++++++++++----------------- routes/index.js | 42 ---------------------------------------- 2 files changed, 34 insertions(+), 59 deletions(-) delete mode 100644 routes/index.js diff --git a/app.js b/app.js index 1060d8408..3f4440849 100644 --- a/app.js +++ b/app.js @@ -38,7 +38,24 @@ const staticify = require('staticify')(PUBLIC_DIR, { const config = require('./config'); const CSP = require('./config/helmet-csp'); const helpers = require('./lib/helpers'); -const routes = require('./routes'); + +// routes +const notFoundRoute = require('./routes/404'); +const aboutRoute = require('./routes/about'); +const booksRoute = require('./routes/books'); +const bootlintRoute = require('./routes/bootlint'); +const bootswatch4Route = require('./routes/bootswatch4'); +const bootswatchRoute = require('./routes/bootswatch'); +const dataRoute = require('./routes/data'); +const fontawesomeRoute = require('./routes/fontawesome'); +const indexRoute = require('./routes/home'); +const integrationsRoute = require('./routes/integrations'); +const jobsRoute = require('./routes/jobs'); +const legacyRoutes = require('./routes/legacy'); +const privacyPolicyRoute = require('./routes/privacyPolicy'); +const redirectToRoot = require('./routes/redirectToRoot'); +const showcaseRoute = require('./routes/showcase'); +const themesRoute = require('./routes/themes'); const app = express(); @@ -154,21 +171,21 @@ app.locals.getVersionedPath = staticify.getVersionedPath; app.locals.semver = semver; // routes -app.use('/', routes.indexRoute); -app.use('/about/', routes.aboutRoute); -app.use('/alpha/?|/beta/?', routes.redirectToRoot); -app.use('/books/', routes.booksRoute); -app.use('/bootlint/', routes.bootlintRoute); -app.use('/bootswatch/', routes.bootswatchRoute); -app.use('/bootswatch4/', routes.bootswatch4Route); -app.use('/data/bootstrapcdn.json', routes.dataRoute); -app.use('/fontawesome/', routes.fontawesomeRoute); -app.use('/integrations/', routes.integrationsRoute); -app.use('/jobs/', routes.jobsRoute); -app.use('/legacy', routes.legacyRoutes); -app.use('/privacy-policy/', routes.privacyPolicyRoute); -app.use('/showcase/', routes.showcaseRoute); -app.use('/themes/', routes.themesRoute); +app.use('/', indexRoute); +app.use('/about/', aboutRoute); +app.use('/alpha/?|/beta/?', redirectToRoot); +app.use('/books/', booksRoute); +app.use('/bootlint/', bootlintRoute); +app.use('/bootswatch/', bootswatchRoute); +app.use('/bootswatch4/', bootswatch4Route); +app.use('/data/bootstrapcdn.json', dataRoute); +app.use('/fontawesome/', fontawesomeRoute); +app.use('/integrations/', integrationsRoute); +app.use('/jobs/', jobsRoute); +app.use('/legacy', legacyRoutes); +app.use('/privacy-policy/', privacyPolicyRoute); +app.use('/showcase/', showcaseRoute); +app.use('/themes/', themesRoute); const map = sitemap({ url: 'www.bootstrapcdn.com', @@ -229,7 +246,7 @@ if (ENV.ENABLE_CRAWLING) { app.get('/robots.txt', (req, res) => map.TXTtoWeb(res)); -app.use('*', routes.notFoundRoute); +app.use('*', notFoundRoute); module.exports = app; diff --git a/routes/index.js b/routes/index.js deleted file mode 100644 index d306bf0ac..000000000 --- a/routes/index.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -// This file just holds all route requires -const notFoundRoute = require('./404'); -const aboutRoute = require('./about'); -const booksRoute = require('./books'); -const bootlintRoute = require('./bootlint'); -const bootswatch4Route = require('./bootswatch4'); -const bootswatchRoute = require('./bootswatch'); -const dataRoute = require('./data'); -const fontawesomeRoute = require('./fontawesome'); -const indexRoute = require('./home'); -const integrationsRoute = require('./integrations'); -const jobsRoute = require('./jobs'); -const legacyRoutes = require('./legacy'); -const privacyPolicyRoute = require('./privacyPolicy'); -const redirectToRoot = require('./redirectToRoot'); -const showcaseRoute = require('./showcase'); -const themesRoute = require('./themes'); - -const routes = { - notFoundRoute, - aboutRoute, - booksRoute, - bootlintRoute, - bootswatch4Route, - bootswatchRoute, - dataRoute, - fontawesomeRoute, - indexRoute, - integrationsRoute, - jobsRoute, - legacyRoutes, - privacyPolicyRoute, - redirectToRoot, - showcaseRoute, - themesRoute -}; - -module.exports = routes; - -// vim: ft=javascript sw=4 sts=4 et: