Lissy93/dashy
1
1
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2024-12-20 23:41:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

✨ Redirects not-found pages to the 404 route

Browse Source
This commit is contained in:
Alicia Sykes 2021-09-24 00:13:25 +01:00
parent 728e39a83d
commit 0e31e9ab4f
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/router.js
View File

@ -9,17 +9,17 @@ import Vue from 'vue';
import Router from 'vue-router'; import Router from 'vue-router';
import ProgressBar from 'rsup-progress'; import ProgressBar from 'rsup-progress';
// Import views // Import views, that are not lazy-loaded
import Home from '@/views/Home.vue'; import Home from '@/views/Home.vue';
import Login from '@/views/Login.vue'; import Login from '@/views/Login.vue';
import Workspace from '@/views/Workspace.vue'; import Workspace from '@/views/Workspace.vue';
import Minimal from '@/views/Minimal.vue'; import Minimal from '@/views/Minimal.vue';
import DownloadConfig from '@/views/DownloadConfig.vue';
// Import helper functions, config data and defaults // Import helper functions, config data and defaults
import { isAuthEnabled, isLoggedIn, isGuestAccessEnabled } from '@/utils/Auth'; import { isAuthEnabled, isLoggedIn, isGuestAccessEnabled } from '@/utils/Auth';
import { config } from '@/utils/ConfigHelpers'; import { config } from '@/utils/ConfigHelpers';
import { metaTagData, startingView, routePaths } from '@/utils/defaults'; import { metaTagData, startingView, routePaths } from '@/utils/defaults';
import ErrorHandler from '@/utils/ErrorHandler';
Vue.use(Router); Vue.use(Router);
const progress = new ProgressBar({ color: 'var(--progress-bar)' }); const progress = new ProgressBar({ color: 'var(--progress-bar)' });
@ -102,16 +102,32 @@ const router = new Router({
{ // The about app page { // The about app page
path: routePaths.about, path: routePaths.about,
name: 'about', // We lazy load the About page so as to not slow down the app name: 'about', // We lazy load the About page so as to not slow down the app
component: () => import(/* webpackChunkName: "about" */ './views/About.vue'), component: () => import('./views/About.vue'),
meta: makeMetaTags('About Dashy'), meta: makeMetaTags('About Dashy'),
}, },
{ // The export config page { // The export config page
path: routePaths.download, path: routePaths.download,
name: 'download', name: 'download',
component: DownloadConfig, component: () => import('./views/DownloadConfig.vue'),
props: config, props: config,
meta: makeMetaTags('Download Config'), meta: makeMetaTags('Download Config'),
}, },
{ // Page not found, any non-defined routes will land here
path: routePaths.notFound,
name: '404',
component: () => import('./views/404.vue'),
meta: makeMetaTags('404 Not Found'),
beforeEnter: (to, from, next) => {
if (to.redirectedFrom) { // Log error, if redirected here from another route
ErrorHandler(`Route not found: '${to.redirectedFrom}'`);
}
next();
},
},
{ // Redirect any not-found routed to the 404 view
path: '*',
redirect: '/404',
},
], ],
}); });