Skip to content
Snippets Groups Projects
Commit d2bd3756 authored by Heine Mærde Brakstad's avatar Heine Mærde Brakstad
Browse files

Merge branch 'minor-fix' into 'main'

fixed issues in app.vue, missing template and imports

See merge request !38
parents 13976d4b e343e969
No related branches found
No related tags found
1 merge request!38fixed issues in app.vue, missing template and imports
Pipeline #269509 passed
......@@ -2,11 +2,14 @@
import { RouterLink, RouterView } from 'vue-router';
import { onMounted, onUnmounted, watch } from 'vue';
import { getToken, setToken, removeToken, refreshAndStoreToken } from '@/tokenController.js';
import Sidebar from "@/components/shared/sidebar/Sidebar.vue"
import { sidebarWidth} from "@/components/shared/sidebar/state.js";
export default {
components: { RouterLink, RouterView },
components: { RouterLink, RouterView, Sidebar },
setup() {
let intervalId = null;
return {sidebarWidth}
// Start interval for token refresh
const startInterval = () => {
......@@ -64,3 +67,10 @@ export default {
}
};
</script>
<template>
<Sidebar/>
<div style="{'margin-left': sidebarWidth}">
<RouterView />
</div>
</template>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment