aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/api/routes/albums/albumGET.js2
-rw-r--r--src/site/pages/dashboard/account.vue7
-rw-r--r--src/site/pages/dashboard/admin/file/_id.vue12
-rw-r--r--src/site/pages/dashboard/admin/settings.vue12
-rw-r--r--src/site/pages/dashboard/admin/statistics.vue11
-rw-r--r--src/site/pages/dashboard/admin/user/_id.vue12
-rw-r--r--src/site/pages/dashboard/admin/users.vue12
-rw-r--r--src/site/pages/dashboard/albums/_id.vue4
-rw-r--r--src/site/pages/dashboard/albums/index.vue11
-rw-r--r--src/site/pages/dashboard/index.vue6
10 files changed, 36 insertions, 53 deletions
diff --git a/src/api/routes/albums/albumGET.js b/src/api/routes/albums/albumGET.js
index 3949fc7..4ac7089 100644
--- a/src/api/routes/albums/albumGET.js
+++ b/src/api/routes/albums/albumGET.js
@@ -25,7 +25,7 @@ class albumGET extends Route {
.select('files.name', 'files.id')
.orderBy('files.id', 'desc');
- const { page, limit = 100 } = req.query;
+ const { page, limit = 50 } = req.query;
if (page && page >= 0) {
files = await files.offset((page - 1) * limit).limit(limit);
diff --git a/src/site/pages/dashboard/account.vue b/src/site/pages/dashboard/account.vue
index 05b969b..5d5d775 100644
--- a/src/site/pages/dashboard/account.vue
+++ b/src/site/pages/dashboard/account.vue
@@ -104,9 +104,7 @@ export default {
components: {
Sidebar
},
- middleware: ['auth', ({ store }) => {
- store.dispatch('auth/fetchCurrentUser');
- }],
+ middleware: ['auth'],
data() {
return {
password: '',
@@ -120,6 +118,9 @@ export default {
user: state => state.auth.user
})
},
+ async asyncData({ app }) {
+ await app.store.dispatch('auth/fetchCurrentUser');
+ },
methods: {
...mapActions({
getUserSetttings: 'auth/fetchCurrentUser'
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) {
diff --git a/src/site/pages/dashboard/albums/_id.vue b/src/site/pages/dashboard/albums/_id.vue
index faaf27c..446d3ac 100644
--- a/src/site/pages/dashboard/albums/_id.vue
+++ b/src/site/pages/dashboard/albums/_id.vue
@@ -76,7 +76,6 @@ export default {
},
middleware: ['auth', ({ route, store }) => {
store.commit('images/resetState');
- store.dispatch('images/fetchByAlbumId', { id: route.params.id });
}],
data() {
return {
@@ -101,6 +100,9 @@ export default {
watch: {
current: 'fetchPaginate'
},
+ async asyncData({ app, params }) {
+ await app.store.dispatch('images/fetchByAlbumId', { id: params.id });
+ },
methods: {
...mapActions({
fetch: 'images/fetchByAlbumId'
diff --git a/src/site/pages/dashboard/albums/index.vue b/src/site/pages/dashboard/albums/index.vue
index 2ebfb3f..686edc3 100644
--- a/src/site/pages/dashboard/albums/index.vue
+++ b/src/site/pages/dashboard/albums/index.vue
@@ -55,13 +55,7 @@ export default {
Sidebar,
AlbumEntry
},
- middleware: ['auth', ({ store }) => {
- try {
- store.dispatch('albums/fetch');
- } catch (e) {
- this.alert({ text: e.message, error: true });
- }
- }],
+ middleware: ['auth'],
data() {
return {
newAlbumName: null,
@@ -69,6 +63,9 @@ export default {
};
},
computed: mapState(['config', 'albums']),
+ async asyncData({ app }) {
+ await app.store.dispatch('albums/fetch');
+ },
methods: {
...mapActions({
alert: 'alert/set'
diff --git a/src/site/pages/dashboard/index.vue b/src/site/pages/dashboard/index.vue
index 4877e15..bd7b745 100644
--- a/src/site/pages/dashboard/index.vue
+++ b/src/site/pages/dashboard/index.vue
@@ -68,7 +68,6 @@ export default {
},
middleware: ['auth', ({ store }) => {
store.commit('images/resetState');
- store.dispatch('images/fetch');
}],
data() {
return {
@@ -88,7 +87,10 @@ export default {
watch: {
current: 'fetchPaginate'
},
- created() {
+ async asyncData({ app }) {
+ await app.store.dispatch('images/fetch');
+ },
+ mounted() {
this.filteredHints = this.hints; // fixes the issue where on pageload, suggestions wont load
},
methods: {
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-23 07:25:47 +0000