From 637523a77fa0811ab632a2f75b198b2916458740 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 2 Apr 2023 17:21:08 +0200
Subject: [PATCH] chore: move ProjectsNavigationWrapper back to navigation.vue

---
 .../home/ProjectsNavigationWrapper.vue        | 28 -------------------
 src/components/home/navigation.vue            | 21 ++++++++++++--
 2 files changed, 19 insertions(+), 30 deletions(-)
 delete mode 100644 src/components/home/ProjectsNavigationWrapper.vue

diff --git a/src/components/home/ProjectsNavigationWrapper.vue b/src/components/home/ProjectsNavigationWrapper.vue
deleted file mode 100644
index 2dd150a6b..000000000
--- a/src/components/home/ProjectsNavigationWrapper.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-	<nav class="menu" v-if="favoriteProjects">
-		<ProjectsNavigation :model-value="favoriteProjects" :can-edit-order="false"/>
-	</nav>
-
-	<nav class="menu">
-		<ProjectsNavigation :model-value="projects" :can-edit-order="true"/>
-	</nav>
-</template>
-
-<script setup lang="ts">
-import {computed} from 'vue'
-import {useProjectStore} from '@/stores/projects'
-import ProjectsNavigation from '@/components/home/ProjectsNavigation.vue'
-
-const projectStore = useProjectStore()
-
-const projects = computed(() => projectStore.notArchivedRootProjects
-	.sort((a, b) => a.position - b.position))
-const favoriteProjects = computed(() => projectStore.favoriteProjects
-	.sort((a, b) => a.position - b.position))
-</script>
-
-<style lang="scss" scoped>
-.menu + .menu{
-	padding-top: math.div($navbar-padding, 2);
-}
-</style>
\ No newline at end of file
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index 45b1249c8..e777b462d 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -49,7 +49,15 @@
 		</nav>
 
 		<Loading variant="small" v-if="projectsLoading"/>
-		<ProjectsNavigationWrapper v-else/>
+		<template v-else>
+			<nav class="menu" v-if="favoriteProjects">
+				<ProjectsNavigation :model-value="favoriteProjects" :can-edit-order="false"/>
+			</nav>
+
+			<nav class="menu">
+				<ProjectsNavigation :model-value="projects" :can-edit-order="true"/>
+			</nav>
+		</template>
 
 		<PoweredByLink/>
 	</aside>
@@ -64,12 +72,17 @@ import Loading from '@/components/misc/loading.vue'
 
 import {useBaseStore} from '@/stores/base'
 import {useProjectStore} from '@/stores/projects'
-import ProjectsNavigationWrapper from '@/components/home/ProjectsNavigationWrapper.vue'
+import ProjectsNavigation from '@/components/home/ProjectsNavigation.vue'
 
 const baseStore = useBaseStore()
 const projectStore = useProjectStore()
 const menuActive = computed(() => baseStore.menuActive)
 const projectsLoading = computed(() => projectStore.isLoading)
+
+const projects = computed(() => projectStore.notArchivedRootProjects
+	.sort((a, b) => a.position - b.position))
+const favoriteProjects = computed(() => projectStore.favoriteProjects
+	.sort((a, b) => a.position - b.position))
 </script>
 
 <style lang="scss" scoped>
@@ -126,4 +139,8 @@ const projectsLoading = computed(() => projectStore.isLoading)
 		}
 	}
 }
+
+.menu + .menu{
+	padding-top: math.div($navbar-padding, 2);
+}
 </style>