From 49c8148fd22878938b7563cc61bd85ca54a2bec5 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 4 May 2022 13:09:56 +0200
Subject: [PATCH] Remove layouts

---
 client/src/App.vue                        |  5 +---
 client/src/layouts/AppLayout.vue          | 35 -----------------------
 client/src/layouts/AppLayoutDefault.vue   | 12 --------
 client/src/layouts/NoNavbarDemoLayout.vue |  5 ----
 client/src/router/learningpath.routes.ts  |  8 ------
 client/src/views/CircleView.vue           | 24 ++++++++++++++++
 client/src/views/LearningPath.vue         | 14 ---------
 7 files changed, 25 insertions(+), 78 deletions(-)
 delete mode 100644 client/src/layouts/AppLayout.vue
 delete mode 100644 client/src/layouts/AppLayoutDefault.vue
 delete mode 100644 client/src/layouts/NoNavbarDemoLayout.vue
 delete mode 100644 client/src/router/learningpath.routes.ts
 create mode 100644 client/src/views/CircleView.vue
 delete mode 100644 client/src/views/LearningPath.vue

diff --git a/client/src/App.vue b/client/src/App.vue
index 47eaf6eb..4036fbd1 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,11 +1,8 @@
 <template>
   <div id="app">
-    <AppLayout>
-      <RouterView />
-    </AppLayout>
+    <RouterView />
   </div>
 </template>
 
 <script setup lang="ts">
-import AppLayout from "@/layouts/AppLayout.vue";
 </script>
diff --git a/client/src/layouts/AppLayout.vue b/client/src/layouts/AppLayout.vue
deleted file mode 100644
index 8bec807f..00000000
--- a/client/src/layouts/AppLayout.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <component :is="layout">
-    <slot />
-  </component>
-</template>
-
-<script>
-import AppLayoutDefault from './AppLayoutDefault.vue'
-import { markRaw, watch, shallowRef } from 'vue'
-import { useRoute } from 'vue-router'
-export default {
-  name: 'AppLayout',
-  setup() {
-    // https://stackoverflow.com/questions/69048657/dynamic-layout-in-vue-3-with-vite
-    const layout = shallowRef(AppLayoutDefault)
-    const route = useRoute()
-    watch(
-      () => route.meta?.layout,
-      async metaLayout => {
-        try {
-          if (metaLayout === undefined) {
-            return false
-          }
-          const component = await import(/* @vite-ignore */ `./${metaLayout}.vue`)
-          layout.value = markRaw(component?.default || AppLayoutDefault)
-        } catch (e) {
-          layout.value = markRaw(AppLayoutDefault)
-        }
-      },
-      { immediate: true }
-    )
-    return { layout }
-  }
-}
-</script>
diff --git a/client/src/layouts/AppLayoutDefault.vue b/client/src/layouts/AppLayoutDefault.vue
deleted file mode 100644
index 1b32a007..00000000
--- a/client/src/layouts/AppLayoutDefault.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-  <VBVNavigationBar />
-  <MainNavigationBar />
-  <div>
-    <slot />
-  </div>
-</template>
-
-<script setup lang="ts">
-  import VBVNavigationBar from '@/components/VBVNavigationBar.vue'
-  import MainNavigationBar from '@/components/MainNavigationBar.vue'
-</script>
diff --git a/client/src/layouts/NoNavbarDemoLayout.vue b/client/src/layouts/NoNavbarDemoLayout.vue
deleted file mode 100644
index 56a8b72d..00000000
--- a/client/src/layouts/NoNavbarDemoLayout.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div>
-    <slot />
-  </div>
-</template>
diff --git a/client/src/router/learningpath.routes.ts b/client/src/router/learningpath.routes.ts
deleted file mode 100644
index 6caf45a8..00000000
--- a/client/src/router/learningpath.routes.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-const LearningPathOverview = () => import('../views/LearningPathOverview.vue')
-
-export default [
-  {
-    path: ':id',
-    component: LearningPathOverview,
-  },
-]
diff --git a/client/src/views/CircleView.vue b/client/src/views/CircleView.vue
new file mode 100644
index 00000000..85f242ba
--- /dev/null
+++ b/client/src/views/CircleView.vue
@@ -0,0 +1,24 @@
+<template>
+  <VBVNavigationBar />
+  <MainNavigationBar />
+  <div>
+    Sidebar
+  </div>
+  <main>
+    main
+  </main>
+</template>
+
+<script>
+import MainNavigationBar from "../components/MainNavigationBar.vue";
+import VBVNavigationBar from "../components/VBVNavigationBar.vue";
+export default {
+  name: "CircleView",
+  components: {MainNavigationBar, VBVNavigationBar}
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/client/src/views/LearningPath.vue b/client/src/views/LearningPath.vue
deleted file mode 100644
index 0b060f1e..00000000
--- a/client/src/views/LearningPath.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <h1>Lernpfad</h1>
-  <router-view></router-view>
-</template>
-
-<script>
-export default {
-  name: 'LearningPath'
-}
-</script>
-
-<style scoped>
-
-</style>