From ea3e503d13b7be477c064b02b9b2e5a9ef06c9a9 Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 29 Mar 2019 00:35:58 +0900 Subject: Added middleware for pages and switched to $axios --- src/site/middleware/admin.js | 5 +++++ src/site/middleware/auth.js | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 src/site/middleware/admin.js create mode 100644 src/site/middleware/auth.js (limited to 'src/site/middleware') diff --git a/src/site/middleware/admin.js b/src/site/middleware/admin.js new file mode 100644 index 0000000..fcac9c6 --- /dev/null +++ b/src/site/middleware/admin.js @@ -0,0 +1,5 @@ +export default function({ store, redirect }) { + // If the user is not authenticated + if (!store.state.user) return redirect('/login'); + if (!store.state.user.isAdmin) return redirect('/dashboard'); +} diff --git a/src/site/middleware/auth.js b/src/site/middleware/auth.js new file mode 100644 index 0000000..58a372e --- /dev/null +++ b/src/site/middleware/auth.js @@ -0,0 +1,6 @@ +export default function({ store, redirect }) { + // If the user is not authenticated + if (!store.state.loggedIn) { + return redirect('/login'); + } +} -- cgit v1.2.3 From 720ffaf0083564c85a07d66a6d303f34706add41 Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Thu, 2 Jul 2020 02:50:55 +0300 Subject: feat: start refactoring the code to actually use vuex This includes creating multiple stores as needed for components and removing all complex states from components (since all those states should be stored in vuex) --- src/site/middleware/admin.js | 4 ++-- src/site/middleware/auth.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/site/middleware') diff --git a/src/site/middleware/admin.js b/src/site/middleware/admin.js index fcac9c6..5c09220 100644 --- a/src/site/middleware/admin.js +++ b/src/site/middleware/admin.js @@ -1,5 +1,5 @@ export default function({ store, redirect }) { // If the user is not authenticated - if (!store.state.user) return redirect('/login'); - if (!store.state.user.isAdmin) return redirect('/dashboard'); + if (!store.state.auth.user) return redirect('/login'); + if (!store.state.auth.user.isAdmin) return redirect('/dashboard'); } diff --git a/src/site/middleware/auth.js b/src/site/middleware/auth.js index 58a372e..c3f339c 100644 --- a/src/site/middleware/auth.js +++ b/src/site/middleware/auth.js @@ -1,6 +1,6 @@ export default function({ store, redirect }) { // If the user is not authenticated - if (!store.state.loggedIn) { + if (!store.state.auth.loggedIn) { return redirect('/login'); } } -- cgit v1.2.3 From ad852de51a0d2dd5d29c08838d5a430c58849e74 Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Wed, 8 Jul 2020 04:00:12 +0300 Subject: chore: linter the entire project using the new rules --- src/site/middleware/admin.js | 3 ++- src/site/middleware/auth.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/site/middleware') diff --git a/src/site/middleware/admin.js b/src/site/middleware/admin.js index 5c09220..1a94b75 100644 --- a/src/site/middleware/admin.js +++ b/src/site/middleware/admin.js @@ -1,5 +1,6 @@ -export default function({ store, redirect }) { +export default function ({ store, redirect }) { // If the user is not authenticated if (!store.state.auth.user) return redirect('/login'); if (!store.state.auth.user.isAdmin) return redirect('/dashboard'); + return true; } diff --git a/src/site/middleware/auth.js b/src/site/middleware/auth.js index c3f339c..b2ecc68 100644 --- a/src/site/middleware/auth.js +++ b/src/site/middleware/auth.js @@ -1,6 +1,7 @@ -export default function({ store, redirect }) { +export default function ({ store, redirect }) { // If the user is not authenticated if (!store.state.auth.loggedIn) { return redirect('/login'); } + return true; } -- cgit v1.2.3 From fb2c27086f570fec60f4d52dcc9ca80e53186293 Mon Sep 17 00:00:00 2001 From: Pitu Date: Thu, 24 Dec 2020 23:45:16 +0900 Subject: Fix ESLint rules once and for all --- src/site/middleware/admin.js | 2 +- src/site/middleware/auth.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/site/middleware') diff --git a/src/site/middleware/admin.js b/src/site/middleware/admin.js index 1a94b75..9a99153 100644 --- a/src/site/middleware/admin.js +++ b/src/site/middleware/admin.js @@ -1,4 +1,4 @@ -export default function ({ store, redirect }) { +export default function({ store, redirect }) { // If the user is not authenticated if (!store.state.auth.user) return redirect('/login'); if (!store.state.auth.user.isAdmin) return redirect('/dashboard'); diff --git a/src/site/middleware/auth.js b/src/site/middleware/auth.js index b2ecc68..020326f 100644 --- a/src/site/middleware/auth.js +++ b/src/site/middleware/auth.js @@ -1,4 +1,4 @@ -export default function ({ store, redirect }) { +export default function({ store, redirect }) { // If the user is not authenticated if (!store.state.auth.loggedIn) { return redirect('/login'); -- cgit v1.2.3