Merge pull request #254 from WeebDev/feature/ssr

Feature/ssr

5 files changed, 20 insertions, 39 deletions

diff --git a/src/site/pages/dashboard/admin/file/_id.vue b/src/site/pages/dashboard/admin/file/_id.vue
index 135d066..2d7607f 100644
--- a/src/site/pages/dashboard/admin/file/_id.vue
+++ b/src/site/pages/dashboard/admin/file/_id.vue
@@ -129,15 +129,11 @@ export default {
 	components: {
 		Sidebar
 	},
-	middleware: ['auth', 'admin', ({ route, store }) => {
-		try {
-			store.dispatch('admin/fetchFile', route.params.id);
-		} catch (e) {
-			// eslint-disable-next-line no-console
-			console.error(e);
-		}
-	}],
+	middleware: ['auth', 'admin'],
 	computed: mapState(['admin', 'auth']),
+	async asyncData({ app, params }) {
+		await app.store.dispatch('admin/fetchFile', params.id);
+	},
 	methods: {
 		promptDisableUser() {
 			this.$buefy.dialog.confirm({
diff --git a/src/site/pages/dashboard/admin/settings.vue b/src/site/pages/dashboard/admin/settings.vue
index 0a43dcd..038c495 100644
--- a/src/site/pages/dashboard/admin/settings.vue
+++ b/src/site/pages/dashboard/admin/settings.vue
@@ -133,17 +133,13 @@ export default {
 	components: {
 		Sidebar
 	},
-	middleware: ['auth', 'admin', ({ store }) => {
-		try {
-			store.dispatch('admin/fetchSettings');
-		} catch (e) {
-			// eslint-disable-next-line no-console
-			console.error(e);
-		}
-	}],
+	middleware: ['auth', 'admin'],
 	computed: mapState({
 		settings: state => state.admin.settings
 	}),
+	async asyncData({ app }) {
+		await app.store.dispatch('admin/fetchSettings');
+	},
 	methods: {
 		promptRestartService() {
 			this.$buefy.dialog.confirm({
diff --git a/src/site/pages/dashboard/admin/statistics.vue b/src/site/pages/dashboard/admin/statistics.vue
index c1e79fc..1b951fc 100644
--- a/src/site/pages/dashboard/admin/statistics.vue
+++ b/src/site/pages/dashboard/admin/statistics.vue
@@ -78,16 +78,13 @@ export default {
 		detailed,
 		generic
 	},
-	middleware: ['auth', 'admin', ({ store }) => {
-		try {
-			store.dispatch('admin/fetchStatistics');
-		} catch (e) {
-			console.error(e);
-		}
-	}],
+	middleware: ['auth', 'admin'],
 	computed: mapState({
 		stats: state => state.admin.statistics
 	}),
+	async asyncData({ app }) {
+		await app.store.dispatch('admin/fetchStatistics');
+	},
 	methods: {
 		refresh(category) {
 			try {
diff --git a/src/site/pages/dashboard/admin/user/_id.vue b/src/site/pages/dashboard/admin/user/_id.vue
index 6079bab..7e0b182 100644
--- a/src/site/pages/dashboard/admin/user/_id.vue
+++ b/src/site/pages/dashboard/admin/user/_id.vue
@@ -95,14 +95,7 @@ export default {
 		Sidebar,
 		Grid
 	},
-	middleware: ['auth', 'admin', ({ route, store }) => {
-		try {
-			store.dispatch('admin/fetchUser', { id: route.params.id });
-		} catch (e) {
-			// eslint-disable-next-line no-console
-			console.error(e);
-		}
-	}],
+	middleware: ['auth', 'admin'],
 	data() {
 		return {
 			options: {},
@@ -121,6 +114,9 @@ export default {
 	watch: {
 		current: 'fetchPaginate'
 	},
+	async asyncData({ app, params }) {
+		await app.store.dispatch('admin/fetchUser', { id: params.id });
+	},
 	methods: {
 		...mapActions({
 			fetch: 'admin/fetchUser'
diff --git a/src/site/pages/dashboard/admin/users.vue b/src/site/pages/dashboard/admin/users.vue
index 5195e5d..556049d 100644
--- a/src/site/pages/dashboard/admin/users.vue
+++ b/src/site/pages/dashboard/admin/users.vue
@@ -143,14 +143,7 @@ export default {
 	components: {
 		Sidebar
 	},
-	middleware: ['auth', 'admin', ({ route, store }) => {
-		try {
-			store.dispatch('admin/fetchUsers', route.params.id);
-		} catch (e) {
-			// eslint-disable-next-line no-console
-			console.error(e);
-		}
-	}],
+	middleware: ['auth', 'admin'],
 	data() {
 		return {
 			isCreateUserOpen: false,
@@ -163,6 +156,9 @@ export default {
 		users: state => state.admin.users,
 		config: state => state.config
 	}),
+	async asyncData({ app, params }) {
+		await app.store.dispatch('admin/fetchUsers', params.id);
+	},
 	methods: {
 		async changeEnabledStatus(row) {
 			if (row.enabled) {