Fixed merge

src/layouts/DefaultLayout.vue

@@ -67,18 +67,18 @@
 </template>
 
 <script setup>
-import { useAuthStore } from '@/plugins/store/authStore';
+import { auth } from '@/stores/auth.js';
 import { useRouter } from 'vue-router';
 
-const authStore = useAuthStore();
+const store = auth();
 const router = useRouter();
 
 const logout = () => {
-  authStore.logout();
+  store.logout();
   router.push('/login');
 }
 
-const user = authStore.user;
+const user = store.user;
 
 </script>