Merge remote-tracking branch 'origin/master'

src/layout/components/Sidebar/components/SidebarLogo.vue

@@ -1,23 +1,19 @@
 <template>
   <div class="logo-container">
     <transition enter-active-class="animate__animated animate__fadeInLeft">
-      <router-link v-if="collapse" class="wh-full flex-center" to="/">
-        <img v-if="settingsStore.sidebarLogo" :src="logo" class="logo-image" />
-      </router-link>
-
-      <router-link v-else class="wh-full flex-center" to="/">
-        <img v-if="settingsStore.sidebarLogo" :src="logo" class="logo-image" />
-        <span class="logo-title"> {{ defaultSettings.title }}</span>
+      <router-link class="wh-full flex-center" to="/" :key="+collapse">
+        <img :src="logo" class="logo-image" />
+        <span class="logo-title" v-if="!collapse">
+          {{ defaultSettings.title }}
+        </span>
       </router-link>
     </transition>
   </div>
 </template>
 
 <script lang="ts" setup>
+import logo from "@/assets/logo.png";
 import defaultSettings from "@/settings";
-import { useSettingsStore } from "@/store";
-
-const settingsStore = useSettingsStore();
 
 defineProps({
   collapse: {
@@ -25,8 +21,6 @@ defineProps({
     required: true,
   },
 });
-
-const logo = ref(new URL(`../../../../assets/logo.png`, import.meta.url).href);
 </script>
 
 <style lang="scss" scoped>