Skip to content

A self-hosted media server and file management system

fix: types and code smells

aminnausin36906780ed5f
diff --git a/resources/js/components/profile/ProfileHeader.vue b/resources/js/components/profile/ProfileHeader.vue
index bbcc733b..68955389 100644
--- a/resources/js/components/profile/ProfileHeader.vue
+++ b/resources/js/components/profile/ProfileHeader.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { ProfileResource } from '@/types/resources';
-import { getProfileByName } from '@/service/ProfileService';
+import { getProfileByName } from '@/service/profileService';
import { onMounted, ref } from 'vue';
import { toTimeSpan } from '@/service/util';
import { useRoute } from 'vue-router';
@@ -21,16 +21,16 @@ onMounted(async () => {
<section
id="banner"
style="background-image: url('https://s4.anilist.co/file/anilistcdn/user/banner/b6792701-mBLPRvzr3xPL.jpg')"
- class="bg-cover flex rounded-md h-52 lg:h-64 text-white"
+ class="bg-cover flex rounded-md overflow-clip h-52 lg:h-64 text-white items-end"
>
- <section id="user-header" class="mt-auto p-3 flex gap-4 bg-gradient-to-b from-transparent to-neutral-950/40 w-full items-end flex-wrap text-center">
+ <section id="user-header" class="p-3 flex gap-4 bg-gradient-to-b from-transparent to-neutral-950/40 w-full items-end flex-wrap text-center">
<img
:src="
userProfile?.name[0] === 'a'
? '/storage/avatars/default.jpg'
: (userProfile?.avatar ?? `https://ui-avatars.com/api/?name=${userProfile?.name[0]}&amp;color=7F9CF5&amp;background=random`)
"
- class="h-32 w-32 min-w-24 rounded-full ring-2 ring-violet-700/70 object-cover aspect-square mx-auto"
+ class="md:h-32 md:w-32 w-24 min-w-24 rounded-full ring-2 ring-violet-700/70 object-cover aspect-square mx-auto"
alt="profile"
/>
<section class="text-centre flex flex-wrap flex-1 justify-center items-end sm:pb-2 xl:pb-4">
diff --git a/resources/js/components/video/VideoLyrics.vue b/resources/js/components/video/VideoLyrics.vue
index 5e088fe9..97f5f334 100644
--- a/resources/js/components/video/VideoLyrics.vue
+++ b/resources/js/components/video/VideoLyrics.vue
@@ -206,11 +206,6 @@ watch(() => props.rawLyrics, resetComponent);
:index="0"
@clicked="handleGenerateLyrics"
/>
- <!-- <div :class="['transition-all ease-in w-full hover:bg-neutral-800/30', 'cursor-pointer', 'opacity-85']">
- <button class="px-4 sm:px-0 py-1 sm:mx-auto sm:w-4/5 break-normal pointer-events-auto" @click="handleGenerateLyrics">
- {{ '' }}
- </button>
- </div> -->
<div class="shrink-0" style="height: 45%"></div>
</section>
<div class="absolute top-0 left-0 right-0 h-12 pointer-events-auto" style="z-index: 6"></div>
diff --git a/resources/js/composables/useMetaData.ts b/resources/js/composables/useMetaData.ts
index 8410486c..ab0fc24d 100644
--- a/resources/js/composables/useMetaData.ts
+++ b/resources/js/composables/useMetaData.ts
@@ -9,9 +9,10 @@ import { reactive } from 'vue';
export default function useMetaData(data: VideoResource, skipBaseURL: boolean = false) {
const route = useRoute();
+ const episodeTag = data.episode && data.metadata?.media_type === MediaType.AUDIO ? `${data.episode}. ` : '';
const metadata = reactive({
fields: {
- title: `${data.episode && data.metadata?.media_type === MediaType.AUDIO ? `${data.episode}. ` : ''}${data?.title ?? data?.name}`,
+ title: `${generateEpisodeTag(data)}${data?.title ?? data?.name}`,
duration: toFormattedDuration(data?.duration) ?? 'N/A',
views: data?.view_count ? `${data?.view_count} view${data?.view_count !== 1 ? 's' : ''}` : '0 views',
description: data?.description ?? '',
@@ -21,8 +22,7 @@ export default function useMetaData(data: VideoResource, skipBaseURL: boolean =
updateData(props: VideoResource) {
this.fields = {
...this.fields,
-
- title: `${props.episode && props.metadata?.media_type === MediaType.AUDIO ? `${props.episode}. ` : ''}${props?.title ?? props?.name}`,
+ title: `${generateEpisodeTag(props)}${props?.title ?? props?.name}`,
duration: toFormattedDuration(props?.duration) ?? 'N/A',
views: props?.view_count ? `${props?.view_count} view${props?.view_count !== 1 ? 's' : ''}` : '0 views',
description: props?.description ?? '',
@@ -32,5 +32,9 @@ export default function useMetaData(data: VideoResource, skipBaseURL: boolean =
},
});
+ function generateEpisodeTag(episodeData: VideoResource) {
+ return episodeData.episode && episodeData.metadata?.media_type === MediaType.AUDIO ? `${episodeData.episode}. ` : '';
+ }
+
return metadata;
}
diff --git a/resources/js/views/ProfileView.vue b/resources/js/views/ProfileView.vue
index e8bdbd91..e7eb48f3 100755
--- a/resources/js/views/ProfileView.vue
+++ b/resources/js/views/ProfileView.vue
@@ -22,9 +22,23 @@ onMounted(() => {
<ProfileHeader />
<section id="user-info" class="w-full flex justify-between">
<div class="flex flex-col gap-1">
- <!-- <p>Views: 2343</p>
- <p>Tags: 20</p>
- <p>Edits: 20</p> -->
+ <p class="whitespace-pre">
+ {{
+ `Recently Watched:
+[Video] [Video] [Video]
+
+Recently Listended:
+[Song] [Song] [Song]
+
+Favorites:
+[Video] [Folder] [Song]
+
+Socials:
+[Anilist]
+
+Stats: 12 items watched | 9 hours total`
+ }}
+ </p>
</div>
<div class="h-6 flex gap-2 text-sm">
<ButtonText text="Add Friend" />