Skip to content

A self-hosted media server and file management system

feat: add app version info card to settings

aminnausin1b182ff59ae9
diff --git a/resources/js/components/cards/AppManifestCard.vue b/resources/js/components/cards/AppManifestCard.vue
new file mode 100644
index 00000000..8e59d92c
--- /dev/null
+++ b/resources/js/components/cards/AppManifestCard.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { useAppStore } from '@/stores/AppStore';
+import { storeToRefs } from 'pinia';
+
+const { appManifest } = storeToRefs(useAppStore());
+</script>
+
+<template>
+ <SidebarCard
+ :to="`${appManifest?.commit ? `https://github.com/aminnausin/mediaServer/commit/${appManifest?.commit}` : ''}`"
+ target="_blank"
+ :class="`
+ items-center justify-between
+ capitalize overflow-hidden bg-white hover:bg-primary-800
+ ring-inset ring-purple-600 hover:ring-purple-600/50 hover:ring-[0.125rem]
+ aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:opacity-60
+ `"
+ :aria-disabled="false"
+ >
+ <template #header>
+ <h3 class="text-gray-900 dark:text-white" :title="'Source Code'">MediaServer</h3>
+ <ProiconsGithub class="ml-auto w-6 h-6" />
+ </template>
+ <template #body>
+ <h4 title="App Version" class="w-full text-wrap truncate sm:text-nowrap flex-1">V{{ appManifest.version ?? '0.1.15b' }}</h4>
+ <h4 v-if="appManifest.commit" title="Information" class="truncate text-nowrap sm:text-right w-fit">#{{ appManifest.commit }}</h4>
+ </template>
+ </SidebarCard>
+</template>
diff --git a/resources/js/service/api.ts b/resources/js/service/api.ts
index 164633a8..fa89befb 100644
--- a/resources/js/service/api.ts
+++ b/resources/js/service/api.ts
@@ -35,7 +35,7 @@ const handleError = async (error: AxiosError<{ message?: string }>) => {
auth.clearAuthState(true, status);
- if (!!currentRoute.meta?.protected) {
+ if (currentRoute.meta?.protected) {
router.replace({ path: '/' });
}
diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.ts
index 8156b3f3..ec95549a 100644
--- a/resources/js/stores/AuthStore.ts
+++ b/resources/js/stores/AuthStore.ts
@@ -1,8 +1,8 @@
import type { UserResource } from '@/types/resources';
-import { AxiosError, isAxiosError } from 'axios';
import { authenticate } from '@/service/authAPI';
import { defineStore } from 'pinia';
+import { AxiosError } from 'axios';
import { toast } from '@/service/toaster/toastService';
import { ref } from 'vue';
diff --git a/resources/js/views/DashboardView.vue b/resources/js/views/DashboardView.vue
index 9c47f152..58fd7e82 100644
--- a/resources/js/views/DashboardView.vue
+++ b/resources/js/views/DashboardView.vue
@@ -12,6 +12,7 @@ import { useRoute } from 'vue-router';
import DashboardAnalytics from '@/components/dashboard/DashboardAnalytics.vue';
import DashboardLibraries from '@/components/dashboard/DashboardLibraries.vue';
import DashboardActivity from '@/components/dashboard/DashboardActivity.vue';
+import AppManifestCard from '@/components/cards/AppManifestCard.vue';
import DashboardUsers from '@/components/dashboard/DashboardUsers.vue';
import DashboardTasks from '@/components/dashboard/DashboardTasks.vue';
import SidebarCard from '@/components/cards/SidebarCard.vue';
@@ -19,7 +20,6 @@ import LayoutBase from '@/layouts/LayoutBase.vue';
import ProiconsSettings from '~icons/proicons/settings';
import ProiconsLibrary from '~icons/proicons/library';
-import ProiconsGithub from '~icons/proicons/github';
import ProiconsGraph from '~icons/proicons/graph';
import CircumServer from '~icons/circum/server';
import LucideUsers from '~icons/lucide/users';
@@ -30,7 +30,7 @@ const { stateTaskStats, stateTotalLibrariesSize, stateLibraryId, stateActiveSess
stateLibraryId: Ref<number>;
stateActiveSessions: Ref<number>;
};
-const { pageTitle, selectedSideBar, appManifest } = storeToRefs(useAppStore());
+const { pageTitle, selectedSideBar } = storeToRefs(useAppStore());
const { cycleSideBar } = useAppStore();
const { userData } = storeToRefs(useAuthStore());
@@ -167,26 +167,7 @@ watch(
<h4 title="App Version" class="w-full text-wrap truncate sm:text-nowrap flex-1">Configurable Options</h4>
</template>
</SidebarCard>
- <SidebarCard
- :to="`${appManifest?.commit ? `https://github.com/aminnausin/mediaServer/commit/${appManifest?.commit}` : ''}`"
- target="_blank"
- :class="`
- items-center justify-between
- capitalize overflow-hidden bg-white hover:bg-primary-800
- ring-inset ring-purple-600 hover:ring-purple-600/50 hover:ring-[0.125rem]
- aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:opacity-60
- `"
- :aria-disabled="false"
- >
- <template #header>
- <h3 class="text-gray-900 dark:text-white" :title="'Source Code'">MediaServer</h3>
- <ProiconsGithub class="ml-auto w-6 h-6" />
- </template>
- <template #body>
- <h4 title="App Version" class="w-full text-wrap truncate sm:text-nowrap flex-1">V{{ appManifest.version ?? '0.1.15b' }}</h4>
- <h4 v-if="appManifest.commit" title="Information" class="truncate text-nowrap sm:text-right w-fit">#{{ appManifest.commit }}</h4>
- </template>
- </SidebarCard>
+ <AppManifestCard />
</section>
</template>
</LayoutBase>
diff --git a/resources/js/views/SettingsView.vue b/resources/js/views/SettingsView.vue
index ebe826c8..96ee5592 100755
--- a/resources/js/views/SettingsView.vue
+++ b/resources/js/views/SettingsView.vue
@@ -9,6 +9,7 @@ import { useRoute } from 'vue-router';
import SettingsPreferences from '@/components/settings/SettingsPreferences.vue';
import SettingsAccount from '@/components/settings/SettingsAccount.vue';
+import AppManifestCard from '@/components/cards/AppManifestCard.vue';
import SidebarCard from '@/components/cards/SidebarCard.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
@@ -141,6 +142,7 @@ watch(
<h4 title="App Dashboard" class="w-full text-wrap truncate sm:text-nowrap flex-1">Server Analytics</h4>
</template>
</SidebarCard>
+ <AppManifestCard />
</section>
</template>
</LayoutBase>