Routes redirects fix (#1719)

* Refactor themes,books,integrations, showcase redirects * Fix index header test * Remove xo ecmaVersion 3 override * Fix tests end Co-authored-by: Dmitriy Akulov <[email protected]>
jsdelivr · Jun 30, 2021 · 4a02282 · 4a02282
1 parent 478f589
commit 4a02282
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 91 deletions.
diff --git a/app.js b/app.js
@@ -124,18 +124,14 @@ app.locals.semver = semver;
 // routes
 app.use('/', routes.indexRoute);
 app.use('/about/', routes.aboutRoute);
-app.use('/alpha/?|/beta/?|/jobs/?|/privacy-policy/?', routes.redirectToRoot);
+app.use('/alpha/?|/beta/?|/jobs/?|/privacy-policy/?|/themes/?|/books/?|/integrations/?|/showcase/?', routes.redirectToRoot);
 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('/legacy', routes.legacyRoutes);
 app.use('/bootstrapicons/', routes.bootstrapIconsRoute);
-app.use('/themes/', routes.themesRoute);
-app.use('/books/', routes.booksRoute);
-app.use('/integrations/', routes.integrationsRoute);
-app.use('/showcase/', routes.showcaseRoute);
 
 const map = sitemap({
     url: 'www.bootstrapcdn.com',
@@ -163,18 +159,6 @@ const map = sitemap({
         },
         '/sitemap.xml': {
             hide: true
-        },
-        '/themes/': {
-            hide: true
-        },
-        '/books/': {
-            hide: true
-        },
-        '/integrations/': {
-            hide: true
-        },
-        '/showcase/': {
-            hide: true
         }
     }
 });

diff --git a/config/_app.yml b/config/_app.yml
@@ -57,3 +57,15 @@ redirects:
   - name: privacy-policy
     from: /privacy-policy/
     to: /
+  - name: themes
+    from: /themes/
+    to: /
+  - name: books
+    from: /books/
+    to: /
+  - name: integrations
+    from: /integrations/
+    to: /
+  - name: showcase
+    from: /showcase/
+    to: /
diff --git a/package.json b/package.json
@@ -136,10 +136,6 @@
                 "envs": [
                     "browser"
                 ],
-                "parserOptions": {
-                    "ecmaVersion": 3,
-                    "sourceType": "script"
-                },
                 "strict": true,
                 "rules": {
                     "unicorn/no-abusive-eslint-disable": "off",

diff --git a/public/assets/js/google-tag-manager.js b/public/assets/js/google-tag-manager.js
@@ -5,6 +5,7 @@
     function gtag(...params) {
         window.dataLayer.push(params);
     }
+
     gtag('js', new Date());
     gtag('config', 'G-WWCYVX0YTQ');
 })();
diff --git a/routes/books.js b/routes/books.js
diff --git a/routes/index.js b/routes/index.js
@@ -12,10 +12,6 @@ const indexRoute = require('./home');
 const legacyRoutes = require('./legacy');
 const redirectToRoot = require('./redirectToRoot');
 const bootstrapIconsRoute = require('./bootstrapIcons');
-const themesRoute = require('./themes');
-const booksRoute = require('./books');
-const integrationsRoute = require('./integrations');
-const showcaseRoute = require('./showcase');
 
 const routes = {
     notFoundRoute,
@@ -28,11 +24,7 @@ const routes = {
     indexRoute,
     legacyRoutes,
     redirectToRoot,
-    bootstrapIconsRoute,
-    themesRoute,
-    booksRoute,
-    integrationsRoute,
-    showcaseRoute
+    bootstrapIconsRoute
 };
 
 module.exports = routes;

diff --git a/routes/integrations.js b/routes/integrations.js
diff --git a/routes/showcase.js b/routes/showcase.js
diff --git a/routes/themes.js b/routes/themes.js
diff --git a/test/index_test.js b/test/index_test.js
@@ -39,7 +39,7 @@ describe('index', () => {
     });
 
     it('has page header', (done) => {
-        helpers.assert.pageHeader('Official CDN of Bootstrap and Font Awesome', response, done);
+        helpers.assert.pageHeader('Quick Start', response, done);
     });
 
     it('has body class', (done) => {

diff --git a/test/sitemap_test.js b/test/sitemap_test.js
@@ -16,4 +16,8 @@ describe('sitemap.xml', () => {
     it('works', (done) => {
         helpers.assert.itWorks(response.statusCode, done);
     });
+
+    after((done) => {
+        helpers.stopServer(done);
+    });
 });