Skip to content
Snippets Groups Projects
Verified Commit 9fcfa3b3 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Fix up recent merge

parent e55ca161
No related branches found
No related tags found
2 merge requests!1123Resolve "Finalise Vuetify app as SPA",!1066Translations update from Weblate
Checking pipeline status
......@@ -35,13 +35,7 @@ const apolloClient = new ApolloClient({
});
import App from "./App.vue";
import CacheNotification from "./components/CacheNotification.vue";
import LanguageForm from "./components/LanguageForm.vue";
import MessageBox from "./components/MessageBox.vue";
import NotificationList from "./components/notifications/NotificationList.vue";
import SidenavSearch from "./components/SidenavSearch.vue";
import CeleryProgressBottom from "./components/celery_progress/CeleryProgressBottom.vue";
import gqlSystemProperties from "./systemProperties.graphql";
Vue.component(MessageBox.name, MessageBox); // Load MessageBox globally as other components depend on it
......@@ -69,22 +63,6 @@ const app = new Vue({
// FIXME: maybe just use window.django in every component or find a suitable way to access this property everywhere
showCacheAlert: false,
}),
apollo: {
systemProperties: gqlSystemProperties,
},
watch: {
systemProperties: function (newProperties) {
this.$i18n.locale = newProperties.currentLanguage;
this.$vuetify.lang.current = newProperties.currentLanguage;
},
},
components: {
"cache-notification": CacheNotification,
"language-form": LanguageForm,
"notification-list": NotificationList,
"sidenav-search": SidenavSearch,
CeleryProgressBottom,
},
router,
i18n,
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment