From fe619505b8b3b91f940ea6dbeb8079ffe4812897 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sat, 4 Aug 2018 04:11:39 +0000 Subject: [webapp+server] switched from hash mode routing to history mode --- server/app.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server/app.js') diff --git a/server/app.js b/server/app.js index 8a18b58..6ae77e5 100644 --- a/server/app.js +++ b/server/app.js @@ -26,11 +26,12 @@ app.use(cookieParser()) // ############################################################################ // ########################### setup routes ################################## -app.use(express.static('public')) - var apiRouter = require(path.join(__dirname, 'router')) app.use('/api', apiRouter) +app.use(express.static('public')) +app.use('*', express.static('public/index.html')) + // ############################################################################ // ######################### handle http errors ############################### -- cgit v1.2.3-55-g7522 From 7fd2c7287794440653b589c3c662e0d582d35a80 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sat, 4 Aug 2018 04:18:48 +0000 Subject: [server] revert unnecessary change --- server/app.js | 5 ++--- server/router.js | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'server/app.js') diff --git a/server/app.js b/server/app.js index 6ae77e5..8a18b58 100644 --- a/server/app.js +++ b/server/app.js @@ -26,12 +26,11 @@ app.use(cookieParser()) // ############################################################################ // ########################### setup routes ################################## +app.use(express.static('public')) + var apiRouter = require(path.join(__dirname, 'router')) app.use('/api', apiRouter) -app.use(express.static('public')) -app.use('*', express.static('public/index.html')) - // ############################################################################ // ######################### handle http errors ############################### diff --git a/server/router.js b/server/router.js index 53caca8..e460771 100644 --- a/server/router.js +++ b/server/router.js @@ -42,8 +42,4 @@ function mapApi (method) { router.get('/:api/:action', auth.verifyToken, mapApi('get')) router.post('/:api/:action', auth.verifyToken, mapApi('post')) -router.use('*', (req, res) => { - res.status(404).end() -}) - module.exports = router -- cgit v1.2.3-55-g7522 From 5758ff03f30e03f6d077e227cc9118a8f9ff8096 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sat, 4 Aug 2018 04:34:45 +0000 Subject: nvm --- server/app.js | 5 +++-- server/router.js | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'server/app.js') diff --git a/server/app.js b/server/app.js index 8a18b58..6ae77e5 100644 --- a/server/app.js +++ b/server/app.js @@ -26,11 +26,12 @@ app.use(cookieParser()) // ############################################################################ // ########################### setup routes ################################## -app.use(express.static('public')) - var apiRouter = require(path.join(__dirname, 'router')) app.use('/api', apiRouter) +app.use(express.static('public')) +app.use('*', express.static('public/index.html')) + // ############################################################################ // ######################### handle http errors ############################### diff --git a/server/router.js b/server/router.js index e460771..53caca8 100644 --- a/server/router.js +++ b/server/router.js @@ -42,4 +42,8 @@ function mapApi (method) { router.get('/:api/:action', auth.verifyToken, mapApi('get')) router.post('/:api/:action', auth.verifyToken, mapApi('post')) +router.use('*', (req, res) => { + res.status(404).end() +}) + module.exports = router -- cgit v1.2.3-55-g7522 From ebb9336648072ae56ff5bdc324645b21406c16f4 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sat, 4 Aug 2018 07:07:56 +0000 Subject: small changes --- server/app.js | 2 +- webapp/src/components/DashboardPage.vue | 4 ++-- webapp/src/components/GroupModule.vue | 39 ++++++++++++++++----------------- webapp/src/config/i18n.js | 12 +++++----- webapp/src/router.js | 8 +++++-- 5 files changed, 34 insertions(+), 31 deletions(-) (limited to 'server/app.js') diff --git a/server/app.js b/server/app.js index 6ae77e5..cb2823f 100644 --- a/server/app.js +++ b/server/app.js @@ -30,7 +30,7 @@ var apiRouter = require(path.join(__dirname, 'router')) app.use('/api', apiRouter) app.use(express.static('public')) -app.use('*', express.static('public/index.html')) +app.use('*', express.static('public')) // ############################################################################ // ######################### handle http errors ############################### diff --git a/webapp/src/components/DashboardPage.vue b/webapp/src/components/DashboardPage.vue index d9dfcb6..3d8c62f 100644 --- a/webapp/src/components/DashboardPage.vue +++ b/webapp/src/components/DashboardPage.vue @@ -47,12 +47,12 @@ >
- + - + diff --git a/webapp/src/components/GroupModule.vue b/webapp/src/components/GroupModule.vue index 4d4c765..c163b5a 100644 --- a/webapp/src/components/GroupModule.vue +++ b/webapp/src/components/GroupModule.vue @@ -11,26 +11,25 @@ - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/webapp/src/config/i18n.js b/webapp/src/config/i18n.js index 12aece9..078245d 100644 --- a/webapp/src/config/i18n.js +++ b/webapp/src/config/i18n.js @@ -23,9 +23,9 @@ export default { 'noDataText': 'No data available' }, '$dashboardModules': { - 'groups': 'Groups / Clients', - 'backends': 'External Backends', - 'permissions': 'Permission Manager' + 'GroupModule': 'Groups / Clients', + 'BackendModule': 'External Backends', + 'PermissionModule': 'Permission Manager' } }, 'de': { @@ -52,9 +52,9 @@ export default { 'noDataText': 'Keine Daten verfügbar' }, '$dashboardModules': { - 'groups': 'Gruppen / Clienten', - 'backends': 'Externe Backends', - 'permissions': 'Rechteverwaltung' + 'GroupModule': 'Gruppen / Clienten', + 'BackendModule': 'Externe Backends', + 'PermissionModule': 'Rechteverwaltung' } } } diff --git a/webapp/src/router.js b/webapp/src/router.js index 35d0d6a..7c530a9 100644 --- a/webapp/src/router.js +++ b/webapp/src/router.js @@ -4,6 +4,10 @@ import LoginPage from '@/components/LoginPage' import DashboardPage from '@/components/DashboardPage' import dashboardModules from '@/config/dashboard' +dashboardModules.forEach(item => { + item.name = item.component.name +}) + Vue.use(Router) function setChildren (routes, parent) { @@ -12,7 +16,7 @@ function setChildren (routes, parent) { route.children = setChildren(route.component.routes(), route.component) } if (route.name && parent && parent.name) route.name = parent.name + '.' + route.name - else delete route.name + else if (parent) delete route.name }) return routes } @@ -29,7 +33,7 @@ var router = new Router({ path: '/dashboard', name: 'dashboard', component: DashboardPage, - children: setChildren(dashboardModules.concat(DashboardPage.routes()), DashboardPage) + children: setChildren(dashboardModules.concat(DashboardPage.routes())) }, { path: '*', -- cgit v1.2.3-55-g7522