From c3d25e3a382165599f5d4b4a638eccf670f32286 Mon Sep 17 00:00:00 2001
From: Axolotle <nchesnais@mailoo.org>
Date: Sat, 29 Aug 2020 19:05:56 +0200
Subject: [PATCH] update router folder

---
 app/src/main.js          |  8 ++++++--
 app/src/router/hooks.js  | 12 ++++++++++++
 app/src/router/index.js  | 17 ++---------------
 app/src/router/routes.js | 14 +++++++-------
 4 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 app/src/router/hooks.js

diff --git a/app/src/main.js b/app/src/main.js
index fefd6083..8329e43a 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -1,14 +1,18 @@
 import Vue from 'vue'
 import App from './App.vue'
-import './plugins/bootstrap-vue'
+import BootstrapVue from 'bootstrap-vue'
+
 import i18n from './i18n'
-import router from './plugins/router'
+import router from './router'
 import store from './store'
 
 import * as globalsComponents from './components/globals'
 
 Vue.config.productionTip = false
 
+// Styles are imported in `src/App.vue` <style>
+Vue.use(BootstrapVue)
+
 // Register global components
 for (const component of Object.values(globalsComponents)) {
   Vue.component(component.name, component)
diff --git a/app/src/router/hooks.js b/app/src/router/hooks.js
new file mode 100644
index 00000000..c1044b68
--- /dev/null
+++ b/app/src/router/hooks.js
@@ -0,0 +1,12 @@
+import router from './index.js'
+import store from '@/store'
+
+// Before each route request hook
+router.beforeEach((to, from, next) => {
+  // Allow if connected or route is not protected
+  if (store.getters.connected || to.meta.noAuth) {
+    next()
+  } else {
+    next({ name: 'login', query: { redirect: to.path } })
+  }
+})
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 5fc3c738..9cecada5 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -1,24 +1,11 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import routes from '../routes'
-import store from '@/store'
+import routes from './routes'
 
 Vue.use(VueRouter)
 
-const router = new VueRouter({
+export default new VueRouter({
   // mode: 'history', // this allow all routes to be real ones (without '#')
   base: process.env.BASE_URL,
   routes
 })
-
-// Before each route request hook
-router.beforeEach((to, from, next) => {
-  // Allow if connected or route is not protected
-  if (store.getters.connected || to.meta.noAuth) {
-    next()
-  } else {
-    next({ name: 'login', query: { redirect: to.path } })
-  }
-})
-
-export default router
diff --git a/app/src/router/routes.js b/app/src/router/routes.js
index ac95f279..99d8064b 100644
--- a/app/src/router/routes.js
+++ b/app/src/router/routes.js
@@ -1,10 +1,10 @@
-import Home from './views/Home'
-import Login from './views/Login'
-import { UserList, UserCreate, UserInfo, UserEdit } from './views/user'
-import { GroupList, GroupCreate } from './views/group'
-import { DomainList, DomainAdd, DomainInfo, DomainDns, DomainCert } from './views/domain'
-import { ServiceList, ServiceInfo } from './views/service'
-import { ToolList, ToolLogs } from './views/tool'
+import Home from '@/views/Home'
+import Login from '@/views/Login'
+import { UserList, UserCreate, UserInfo, UserEdit } from '@/views/user'
+import { GroupList, GroupCreate } from '@/views/group'
+import { DomainList, DomainAdd, DomainInfo, DomainDns, DomainCert } from '@/views/domain'
+import { ServiceList, ServiceInfo } from '@/views/service'
+import { ToolList, ToolLogs } from '@/views/tool'
 
 const routes = [
   { name: 'home', path: '/', component: Home },