diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index 4749f23..979a310 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -41,20 +41,19 @@ export default defineComponent({ }, setup(props, { root }) { - let title = props.title; - if (props.title.includes('loadFromStore')) { - const startIndex = props.title.indexOf('(') + 1; - const endIndex = props.title.indexOf(')'); - const substring = props.title - .substring(startIndex, endIndex) - .replace(/"/g, ''); - console.log(substring); - console.log(root.$store.getters[substring]); - console.log('loadFromStore'); - title = computed(() => { - return root.$store.getters[substring]; - }); - } + let title = computed(() => { + if (props.title.includes('loadFromStore')) { + const startIndex = props.title.indexOf('(') + 1; + const endIndex = props.title.indexOf(')'); + const substring = props.title + .substring(startIndex, endIndex) + .replace(/"/g, ''); + console.log(substring); + console.log('loadFromStore'); + return root.$store.getters[substring]; + } + return props.title; + }); return { realTitle: title }; } }); diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index 76d7126..e460b28 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -22,10 +22,7 @@ />
- +
@@ -41,18 +38,22 @@ export default defineComponent({ components: { CircularProgress, Sessions, Main }, setup(_, { root }) { onBeforeMount(() => { - root.$store.dispatch('sessions/getSessions'); + root.$store.dispatch('sessions/getSessions').catch(error => { + console.warn(error); + }); }); - const sessions = computed(() => root.$store.getters['sessions/sessions']); + const sessions = computed( + () => root.$store.getters['sessions/sessions'] + ); function showRootGetters() { //ctx.root.$store.dispatch('sessions/getSessions'); console.log(sessions.value); } - const sessionsLoading = computed(() => { - return root.$store.getters['sessions/loading']; - }); + const sessionsLoading = computed( + () => root.$store.getters['sessions/loading'] + ); return { showRootGetters,