Author SHA1 Message Date
lucast 522e062a36 Got lyrics editing working for PATCH 2026-03-07 14:44:47 +01:00
lucast 4754d61279 Added gap between sliders 2026-02-25 16:56:21 +01:00
lucast dbb91a3918 Update image prefix in albums and change audio suffix in songs 2026-02-25 16:53:23 +01:00
lucast 6a3dffae7d Add cursor pointer style to index in Track Row component 2026-02-25 16:40:51 +01:00
lucast c1079dcbba Added h1 to index and added styling for it 2026-02-25 16:39:27 +01:00
lucast 5f572e769e Implement signout functionality to clear authentication tokens 2026-02-25 16:35:50 +01:00
lucast 464bbaef9e Updated fetch to actually retry on 401 with new token 2026-02-24 19:27:14 +01:00
lucast 581c522b00 Fixed some types and wrong types 2026-02-24 19:02:40 +01:00
lucast 470cf122a3 Small fix for visual bug with Modal 2026-02-24 18:50:36 +01:00
lucast 464b016fcb Added play functionality to album page 2026-02-24 18:49:04 +01:00
lucast e5ee065468 Merge branch 'feat/player' 2026-02-24 18:30:56 +01:00
lucast 49d4bd86f1 Updated ToastContainer to move above player when visible 2026-02-24 18:30:39 +01:00
lucast 6c10a53a75 Made small architectural change for TrackRow 2026-02-24 18:26:19 +01:00
lucast 1060eeba58 Added TrackRow to album page 2026-02-22 16:09:01 +01:00
lucast 6e54868cc3 Added TrackRow 2026-02-22 16:08:53 +01:00
lucast fcd12aa27d Updated track to be correct 2026-02-22 16:08:39 +01:00
lucast b7262be0a6 Merge branch 'master' into feat/album-page 2026-02-22 15:26:21 +01:00
lucast e1f5077c20 Added DropdownMenu 2026-02-21 16:48:05 +01:00
lucast 5b2d1bb977 Moved to Nuxt Image for album page 2026-02-04 14:04:33 +01:00
lucast bd0fc5394f Merge branch 'master' into feat/album-page 2026-02-04 14:03:50 +01:00
lucast 2012e7f566 Added simple details panel to /album/:id 2026-02-04 13:39:45 +01:00
lucast 9c3f6af7b3 Add GET_FILE function to construct file URLs from backend server 2026-02-04 13:38:26 +01:00
22 changed files with 615 additions and 56 deletions

No files matched your search

+60 -11
View File
@@ -1,8 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { type Option } from "~/ui/SearchSelect.vue" import { type Option } from "~/ui/SearchSelect.vue"
type InputType = "text" | "file" | "search-select"
interface BaseField<T> { interface BaseField<T> {
key: keyof T key: keyof T
label?: string label?: string
@@ -12,6 +10,11 @@ interface TextField<T> extends BaseField<T> {
type?: "text" type?: "text"
} }
interface TextAreaField<T> extends BaseField<T> {
type?: "textarea"
rows: number
}
interface FileField<T> extends BaseField<T> { interface FileField<T> extends BaseField<T> {
type: "file" type: "file"
} }
@@ -26,11 +29,17 @@ interface SearchSelectArrayField<T> extends BaseField<T> {
fetchOptions: (q?: string) => Promise<Option[]> fetchOptions: (q?: string) => Promise<Option[]>
} }
interface CheckboxField<T> extends BaseField<T> {
type?: "checkbox"
}
export type Field<T = any> = export type Field<T = any> =
| TextField<T> | TextField<T>
| TextAreaField<T>
| FileField<T> | FileField<T>
| SearchSelectField<T> | SearchSelectField<T>
| SearchSelectArrayField<T> | SearchSelectArrayField<T>
| CheckboxField<T>
interface ModalFormProps<T> { interface ModalFormProps<T> {
item?: T item?: T
@@ -44,27 +53,60 @@ const open = defineModel("open", { required: true })
let localItem = reactive<any>({}) let localItem = reactive<any>({})
const getNestedValue = (obj: any, path: string) =>
path.split(".").reduce((acc, key) => acc?.[key], obj)
const setNestedValue = (obj: any, path: string, value: any) => {
const keys = path.split(".")
keys.reduce((acc, key, i) => {
if (i === keys.length - 1) acc[key] = value
else acc[key] ??= {}
return acc[key]
}, obj)
}
const expandDotKeys = (flat: Record<string, any>) => {
const result: any = {}
for (const [key, value] of Object.entries(flat)) {
setNestedValue(result, key, toRaw(value))
}
return result
}
const save = async () => {
const expanded = expandDotKeys(localItem)
Object.keys(expanded).forEach((k) => {
if (expanded[k] == undefined || expanded[k] == null) delete expanded[k]
})
if (await props.onSave(expanded)) open.value = false
}
watch( watch(
() => props.item, () => props.item,
(item) => { (item) => {
Object.keys(localItem).forEach((k) => delete localItem[k]) Object.keys(localItem).forEach((k) => delete localItem[k])
if (!item) return if (item)
for (const [key, value] of Object.entries(item))
for (const [key, value] of Object.entries(item)) {
localItem[key] = value localItem[key] = value
}
for (const field of props.fields) { for (const field of props.fields) {
if (field.type == "file") localItem[field.key as string] = null const key = field.key as string
if (field.type === "file") {
localItem[key] = null
} else if (field.type === "checkbox") {
localItem[key] = item
? (getNestedValue(item, key) ?? false)
: false
} else {
localItem[key] = item ? getNestedValue(item, key) : undefined
}
} }
}, },
{ immediate: true }, { immediate: true },
) )
const save = async () => {
if (await props.onSave(localItem)) open.value = false
}
</script> </script>
<template> <template>
@@ -84,12 +126,19 @@ const save = async () => {
:predefined="props.item?.[field.key]" :predefined="props.item?.[field.key]"
:multiple="field.type == 'search-select-array'" :multiple="field.type == 'search-select-array'"
/> />
<Checkbox
v-else-if="field.type == 'checkbox'"
:label="field.label || field.key"
@change="(v) => (localItem[field.key] = v)"
/>
<Input <Input
v-else v-else
:type="field.type" :type="field.type"
:key="field.key" :key="field.key"
:label="field.label || field.key" :label="field.label || field.key"
v-model:value="localItem[field.key]" v-model:value="localItem[field.key]"
:textarea="field.type == 'textarea'"
:rows="field.type == 'textarea' ? field.rows : 0"
full full
/> />
</template> </template>
+10
View File
@@ -27,6 +27,7 @@ const { data, pending, refresh } = useAsyncData("random-albums", async () => {
</script> </script>
<template> <template>
<section class="slider">
<template v-for="item in data" :key="item.genre._id"> <template v-for="item in data" :key="item.genre._id">
<Slider v-if="item.albums.length" :title="item.genre.name"> <Slider v-if="item.albums.length" :title="item.genre.name">
<AlbumCard <AlbumCard
@@ -39,4 +40,13 @@ const { data, pending, refresh } = useAsyncData("random-albums", async () => {
/> />
</Slider> </Slider>
</template> </template>
</section>
</template> </template>
<style lang="scss" scoped>
.slider {
display: flex;
flex-direction: column;
gap: 1rem;
}
</style>
+1 -1
View File
@@ -127,7 +127,7 @@ const toast = useToast()
position: fixed; position: fixed;
bottom: 1rem; bottom: 1rem;
height: 72px; height: $player-height;
border-radius: $border-radius-lg; border-radius: $border-radius-lg;
border: 1px solid $color-border; border: 1px solid $color-border;
+1 -1
View File
@@ -29,7 +29,7 @@ const computeIfScroll = () => {
onMounted(() => { onMounted(() => {
computeIfScroll() computeIfScroll()
window.addEventListener("reisze", computeIfScroll) window.addEventListener("resize", computeIfScroll)
onUnmounted(() => { onUnmounted(() => {
window.removeEventListener("resize", computeIfScroll) window.removeEventListener("resize", computeIfScroll)
+124
View File
@@ -0,0 +1,124 @@
<script setup lang="ts">
import type { DropdownMenuItem } from "~/ui/DropdownMenu.vue"
interface TrackRowProps {
track: Track
index: number
extendedInfo?: boolean
}
const { track, index, extendedInfo } = defineProps<TrackRowProps>()
const emit = defineEmits<{ (e: "playAlbumAtIndex"): void }>()
const hovering = ref(false)
const toast = useToast()
const dropdownMenuItems: DropdownMenuItem[] = [
{
label: "Play only this",
icon: "lucide:play",
onSelect() {},
},
{
label: "Play next",
icon: "lucide:list-start",
onSelect() {
toast.show("Playing next")
},
},
{
label: "Add to queue",
icon: "lucide:list-end",
onSelect() {
toast.show("Added to queue")
},
},
]
const durationFormatted = computed(() =>
new Date(track.durationInSeconds * 1000).toISOString().slice(14, 19),
)
</script>
<template>
<article
class="track"
:class="{ extended: extendedInfo, odd: index % 2 == 1 }"
@mouseover="hovering = true"
@mouseleave="hovering = false"
>
<div class="index">
<Icon
name="lucide:play"
@click="emit('playAlbumAtIndex')"
v-if="hovering"
/>
<p v-else>{{ index + 1 }}</p>
</div>
<p>{{ track.name }}</p>
<template v-if="extendedInfo">
<ArtistName :artists="track.artists" class="artists" />
<NuxtLink :to="`/album/${track.album._id}`">
<p>{{ track.album.name }}</p>
</NuxtLink>
</template>
<p>{{ durationFormatted }}</p>
<DropdownMenu :items="dropdownMenuItems">
<Icon name="lucide:ellipsis" class="dropdown-icon" />
</DropdownMenu>
</article>
</template>
<style lang="scss" scoped>
@use "@/styles/variables" as *;
@use "@/styles/util" as *;
@use "sass:color";
.track {
display: grid;
grid-template-columns: 30px 1fr 50px 30px;
gap: 0.5rem;
align-items: center;
padding: 0.6rem 1rem;
border-radius: $border-radius-standard;
background-color: $color-background;
line-height: 1;
&.odd {
background-color: color.adjust($color-background, $lightness: 5%);
}
&.extended {
grid-template-columns: 30px 2fr 1fr 1fr 50px 30px;
}
p {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.index {
display: flex;
justify-content: center;
align-items: center;
font-size: 20px;
height: 20px;
cursor: pointer;
}
.artists {
opacity: 1;
}
.dropdown-icon {
font-size: 20px;
}
</style>
+10 -11
View File
@@ -4,7 +4,7 @@ import defu from "defu"
export function useApiFetch<DataT = any, ErrorT = any>( export function useApiFetch<DataT = any, ErrorT = any>(
url: string | Request | Ref<string | Request> | (() => string | Request), url: string | Request | Ref<string | Request> | (() => string | Request),
options?: UseFetchOptions<DataT, ErrorT>, options?: UseFetchOptions<DataT, ErrorT>,
authorize: boolean = true authorize: boolean = true,
): ReturnType<typeof useFetch<DataT, ErrorT>> { ): ReturnType<typeof useFetch<DataT, ErrorT>> {
const baseUrl = import.meta.env.VITE_PUBLIC_BACKEND const baseUrl = import.meta.env.VITE_PUBLIC_BACKEND
@@ -15,26 +15,25 @@ export function useApiFetch<DataT = any, ErrorT = any>(
const defaults: UseFetchOptions<DataT, ErrorT> = { const defaults: UseFetchOptions<DataT, ErrorT> = {
baseURL: baseUrl, baseURL: baseUrl,
retry: 1,
retryDelay: 0,
retryStatusCodes: [401],
headers: headers:
authorize && sessionToken.value authorize && sessionToken.value
? { Authorization: `Bearer ${sessionToken.value}` } ? { Authorization: `Bearer ${sessionToken.value}` }
: {}, : {},
onResponseError: async ({ response, options }) => { onResponseError: async ({ request, response, options }) => {
if (response.status == 401 && authorize) { if (response.status == 401 && authorize) {
const newToken = await refreshSessionToken() const newToken = await refreshSessionToken()
if (!newToken) return if (!newToken) return
const newOptions = { options.headers = {
...options, ...(options.headers as unknown as Record<string, string>),
headers: {
...(options.headers || {}),
Authorization: `Bearer ${newToken}`,
},
}
// @ts-ignore // @ts-ignore
return await $fetch<DataT, ErrorT>(url, newOptions) Authorization: `Bearer ${newToken}`,
}
} }
}, },
} }
+4 -1
View File
@@ -79,7 +79,10 @@ export const useAuth = () => {
const signup = async (name: string, email: string, password: string) => {} const signup = async (name: string, email: string, password: string) => {}
const signout = () => {} const signout = () => {
refreshToken.value = null
sessionToken.value = null
}
const refreshSessionToken = async () => { const refreshSessionToken = async () => {
if (waitForPromise) { if (waitForPromise) {
+3 -3
View File
@@ -14,7 +14,7 @@ const tableRows: Row[] = [
name: "file", name: "file",
displayName: "Cover", displayName: "Cover",
type: "image", type: "image",
prefix: `${BACKEND_SERVE}/static/`, prefix: `${BACKEND_SERVE}`,
}, },
{ {
name: "name", name: "name",
@@ -31,7 +31,7 @@ const tableRows: Row[] = [
import { type Option } from "~/ui/SearchSelect.vue" import { type Option } from "~/ui/SearchSelect.vue"
const { data: artistData } = useApiFetch<Genre[]>("/all/artists") const { data: artistData } = useApiFetch<Artist[]>("/all/artists")
const artistFetchOptions = async (q?: string): Promise<Option[]> => { const artistFetchOptions = async (q?: string): Promise<Option[]> => {
return artistData.value.map<Option>((g) => ({ return artistData.value.map<Option>((g) => ({
label: g.name, label: g.name,
@@ -65,7 +65,7 @@ const modalFields: Field[] = [
] ]
const showModal = ref<boolean>(false) const showModal = ref<boolean>(false)
const item = ref<Track | undefined>(undefined) const item = ref<Album | undefined>(undefined)
const save = async (value: any) => { const save = async (value: any) => {
if (value._id) { if (value._id) {
+2 -2
View File
@@ -2,7 +2,7 @@
import type { Field } from "~/components/Admin/ModalForm.vue" import type { Field } from "~/components/Admin/ModalForm.vue"
import type { Row } from "~/ui/Table.vue" import type { Row } from "~/ui/Table.vue"
const { data, refresh } = useApiFetch<Track[]>("/all/artists") const { data, refresh } = useApiFetch<Artist[]>("/all/artists")
const toast = useToast() const toast = useToast()
const tableRows: Row[] = [ const tableRows: Row[] = [
@@ -31,7 +31,7 @@ const modalFields: Field[] = [
] ]
const showModal = ref<boolean>(false) const showModal = ref<boolean>(false)
const item = ref<Track | undefined>(undefined) const item = ref<Artist | undefined>(undefined)
const save = async (value: any) => { const save = async (value: any) => {
if (value._id) { if (value._id) {
+2 -2
View File
@@ -2,7 +2,7 @@
import type { Field } from "~/components/Admin/ModalForm.vue" import type { Field } from "~/components/Admin/ModalForm.vue"
import type { Row } from "~/ui/Table.vue" import type { Row } from "~/ui/Table.vue"
const { data, refresh } = useApiFetch<Track[]>("/all/genres") const { data, refresh } = useApiFetch<Genre[]>("/all/genres")
const toast = useToast() const toast = useToast()
const tableRows: Row[] = [ const tableRows: Row[] = [
@@ -22,7 +22,7 @@ const tableRows: Row[] = [
const modalFields: Field[] = [{ key: "name", label: "Name" }] const modalFields: Field[] = [{ key: "name", label: "Name" }]
const showModal = ref<boolean>(false) const showModal = ref<boolean>(false)
const item = ref<Track | undefined>(undefined) const item = ref<Genre | undefined>(undefined)
const save = async (value: any) => { const save = async (value: any) => {
if (value._id) { if (value._id) {
+14 -8
View File
@@ -2,7 +2,7 @@
import type { Field } from "~/components/Admin/ModalForm.vue" import type { Field } from "~/components/Admin/ModalForm.vue"
import type { Row } from "~/ui/Table.vue" import type { Row } from "~/ui/Table.vue"
const { data, refresh } = useApiFetch<Album[]>("/all/tracks") const { data, refresh } = useApiFetch<Track[]>("/all/tracks")
const toast = useToast() const toast = useToast()
const tableRows: Row[] = [ const tableRows: Row[] = [
@@ -15,7 +15,7 @@ const tableRows: Row[] = [
displayName: "Audio File", displayName: "Audio File",
type: "audio", type: "audio",
prefix: `${BACKEND_SERVE}`, prefix: `${BACKEND_SERVE}`,
suffix: "/original.m4a", suffix: "/high.m4a",
}, },
{ {
name: "name", name: "name",
@@ -32,7 +32,7 @@ const tableRows: Row[] = [
import { type Option } from "~/ui/SearchSelect.vue" import { type Option } from "~/ui/SearchSelect.vue"
const { data: artistData } = useApiFetch<Genre[]>("/all/artists") const { data: artistData } = useApiFetch<Artist[]>("/all/artists")
const artistFetchOptions = async (q?: string): Promise<Option[]> => { const artistFetchOptions = async (q?: string): Promise<Option[]> => {
return artistData.value.map<Option>((g) => ({ return artistData.value.map<Option>((g) => ({
label: g.name, label: g.name,
@@ -40,7 +40,7 @@ const artistFetchOptions = async (q?: string): Promise<Option[]> => {
})) }))
} }
const { data: albumData } = useApiFetch<Genre[]>("/all/albums") const { data: albumData } = useApiFetch<Album[]>("/all/albums")
const albumFetchOptions = async (q?: string): Promise<Option[]> => { const albumFetchOptions = async (q?: string): Promise<Option[]> => {
return albumData.value.map<Option>((g) => ({ return albumData.value.map<Option>((g) => ({
label: g.name, label: g.name,
@@ -63,6 +63,8 @@ const modalFields: Field[] = [
type: "search-select", type: "search-select",
fetchOptions: albumFetchOptions, fetchOptions: albumFetchOptions,
}, },
{ key: "lyrics.text", label: "Lyrics", type: "textarea", rows: 6 },
{ key: "lyrics.synced", label: "Synced lyrics", type: "checkbox" },
] ]
const showModal = ref<boolean>(false) const showModal = ref<boolean>(false)
@@ -73,7 +75,10 @@ const save = async (value: any) => {
try { try {
await cfetch("/admin/track", { await cfetch("/admin/track", {
method: "PATCH", method: "PATCH",
data: value, data: {
...value,
lyrics: JSON.stringify(value.lyrics),
},
params: { id: value._id }, params: { id: value._id },
forceFormData: true, forceFormData: true,
}) })
@@ -88,7 +93,10 @@ const save = async (value: any) => {
try { try {
await cfetch("/admin/track", { await cfetch("/admin/track", {
method: "POST", method: "POST",
data: value, data: {
...value,
lyrics: JSON.stringify(value.lyrics),
},
}) })
toast.show("Song added successfully", "success") toast.show("Song added successfully", "success")
@@ -137,8 +145,6 @@ const show = (id?: string) => {
showModal.value = true showModal.value = true
} }
watch(data, () => console.log(data))
</script> </script>
<template> <template>
+96 -1
View File
@@ -1 +1,96 @@
<template></template> <script setup lang="ts">
const route = useRoute()
const id = computed(() => route.params.id)
const { data: albumData } = await useApiFetch<Album>(`/albums/${id.value}`)
const { data: tracksData } = await useApiFetch<Track[]>(
`/albums/${id.value}/tracks`,
)
const { playAlbum, playShuffledAlbum, playAlbumAtIndex } = usePlayer()
</script>
<template>
<section class="info" v-if="albumData">
<NuxtImg
:src="GET_FILE(albumData.file)"
width="300"
height="300"
placeholder
/>
<div class="details">
<h1>{{ albumData.name }}</h1>
<ArtistName :artists="albumData.artists" class="artist" />
<div class="buttons">
<Button
icon-name="lucide:play"
@click="() => playAlbum(tracksData)"
>Play</Button
>
<Button
icon-name="lucide:shuffle"
@click="() => playShuffledAlbum(tracksData)"
>Shuffle</Button
>
</div>
</div>
</section>
<section class="tracks">
<TrackRow
v-for="(track, i) in tracksData"
:key="track._id"
:track="track"
:index="i"
@play-album-at-index="() => playAlbumAtIndex(tracksData, i)"
/>
</section>
</template>
<style lang="scss" scoped>
@use "@/styles/variables" as *;
@use "@/styles/util";
.info {
display: flex;
gap: 1rem;
margin-bottom: 2rem;
& img {
border-radius: $border-radius-standard;
}
.details {
padding-top: 3.5rem;
display: flex;
flex-direction: column;
gap: 0.2rem;
& h1 {
@include util.fontSize(32px);
font-weight: 700;
line-height: 2.4rem;
}
.artist {
@include util.fontSize(18px);
}
.buttons {
margin-top: auto;
display: flex;
gap: 1rem;
}
}
}
.tracks {
display: flex;
flex-direction: column;
gap: 0.4rem;
}
</style>
+1 -3
View File
@@ -10,9 +10,7 @@ const play = () => {
</script> </script>
<template> <template>
<Button @click="play">Test play</Button> <h1>Home</h1>
<AlbumSlider /> <AlbumSlider />
<div :style="{ height: '100vh' }"></div>
</template> </template>
+40 -2
View File
@@ -138,7 +138,7 @@ export default defineNuxtPlugin((nuxtApp) => {
updateMediaSession() updateMediaSession()
} }
const next = async () => { const next = async (autoplay: boolean = true) => {
if (currentSong.value) { if (currentSong.value) {
prevQueue.value.unshift(currentSong.value) prevQueue.value.unshift(currentSong.value)
} }
@@ -153,7 +153,7 @@ export default defineNuxtPlugin((nuxtApp) => {
currentSong.value = queue.value.shift() || null currentSong.value = queue.value.shift() || null
} }
if (currentSong.value) await play() if (currentSong.value && autoplay) await play()
updateMediaSession() updateMediaSession()
} }
@@ -184,6 +184,11 @@ export default defineNuxtPlugin((nuxtApp) => {
currentQueue.value.push(song) currentQueue.value.push(song)
} }
const addToFrontOfQueue = (song: Track) => {
queue.value.unshift(song)
currentQueue.value.unshift(song)
}
const clear = () => { const clear = () => {
queue.value = [] queue.value = []
currentQueue.value = [] currentQueue.value = []
@@ -196,6 +201,35 @@ export default defineNuxtPlugin((nuxtApp) => {
queue.value.sort(() => Math.random() - 0.5) queue.value.sort(() => Math.random() - 0.5)
} }
// Album
const playAlbum = async (songs: Track[]) => {
clear()
songs.forEach((song) => addToQueue(song))
await next()
}
const playShuffledAlbum = async (songs: Track[]) => {
clear()
songs.forEach((song) => addToQueue(song))
shuffle()
await next()
}
const playAlbumAtIndex = async (songs: Track[], index: number) => {
clear()
songs.forEach((song) => addToQueue(song))
for (let i = 0; i < index + 1; i++) {
await next(false)
}
await play()
}
// Info // Info
const getDuration = () => const getDuration = () =>
new Promise<number>((resolve) => { new Promise<number>((resolve) => {
@@ -218,8 +252,12 @@ export default defineNuxtPlugin((nuxtApp) => {
next, next,
prev, prev,
addToQueue, addToQueue,
addToFrontOfQueue,
clear, clear,
shuffle, shuffle,
playAlbum,
playShuffledAlbum,
playAlbumAtIndex,
getDuration, getDuration,
secondsPlayed, secondsPlayed,
duration, duration,
+2
View File
@@ -10,3 +10,5 @@ $color-attention: #fc8181;
$border-radius-standard: 0.3rem; $border-radius-standard: 0.3rem;
$border-radius-lg: 0.6rem; $border-radius-lg: 0.6rem;
$player-height: 72px;
+10 -1
View File
@@ -1,7 +1,16 @@
@use "reset" as *; @use "reset" as *;
@use "util" as *;
html { html {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial,
sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
color: white; color: white;
} }
main > h1 {
@include fontSize(32px);
font-weight: 700;
margin-bottom: 1.5rem;
}
+196
View File
@@ -0,0 +1,196 @@
<script setup lang="ts">
export interface DropdownMenuItem {
label: string
icon: string
onSelect?: () => void
}
interface DropdownMenuProps {
items: DropdownMenuItem[]
}
const props = defineProps<DropdownMenuProps>()
const open = ref(false)
const placement = ref<"bottom" | "top">("bottom")
const root = useTemplateRef("root")
const toggle = async () => {
open.value = !open.value
if (open.value) {
await nextTick()
updatePlacement()
}
}
const close = () => (open.value = false)
const updatePlacement = () => {
const el = root.value
if (!el) return
const rect = el.getBoundingClientRect()
const spaceBelow = window.innerHeight - rect.bottom
const spaceAbove = rect.top
// TODO: Calculate height instead
const menuHeight = 220
console.log(
spaceBelow,
menuHeight,
spaceAbove,
spaceBelow < menuHeight && spaceAbove > spaceBelow,
spaceBelow < menuHeight && spaceAbove > spaceBelow ? "top" : "bottom",
)
placement.value =
spaceBelow < menuHeight && spaceAbove > spaceBelow ? "top" : "bottom"
}
const handleOutsideClick = (e: MouseEvent) => {
if (!root.value) return
if (!root.value.contains(e.target as Node)) close()
}
const handleKey = (e: KeyboardEvent) => {
if (e.key == "Escape") close()
}
const handleReposition = () => {
if (open.value) updatePlacement()
}
onMounted(() => {
document.addEventListener("click", handleOutsideClick)
document.addEventListener("keydown", handleKey)
window.addEventListener("resize", handleReposition)
window.addEventListener("scroll", handleReposition, true)
})
onBeforeMount(() => {
document.removeEventListener("click", handleOutsideClick)
document.removeEventListener("keydown", handleKey)
window.removeEventListener("resize", handleReposition)
window.removeEventListener("scroll", handleReposition, true)
})
</script>
<template>
<div ref="root" class="dropdown">
<div @click="toggle" class="trigger">
<slot />
</div>
<Transition name="dropdown">
<div v-show="open" class="menu" :class="placement">
<button
v-for="(item, i) in items"
:key="i"
class="item"
@click="
() => {
item.onSelect?.()
close()
}
"
>
<Icon :name="item.icon" class="icon" />
<span>{{ item.label }}</span>
</button>
</div>
</Transition>
</div>
</template>
<style lang="scss" scoped>
@use "@/styles/variables" as *;
.dropdown {
position: relative;
display: inline-block;
.menu {
position: absolute;
right: 0;
min-width: 180px;
padding: 0.5rem;
background-color: $color-secondary-background;
border-radius: $border-radius-standard;
box-shadow: 0 8px 30px rgba(0, 0, 0, 0.25);
display: flex;
flex-direction: column;
gap: 2px;
z-index: 1000;
&.bottom {
top: calc(100% + 0.5rem);
transform-origin: top right;
}
&.top {
bottom: calc(100% + 0.5rem);
transform-origin: bottom right;
}
}
.item {
display: flex;
align-items: center;
gap: 8px;
padding: 0.5rem;
border-radius: $border-radius-standard;
background: transparent;
border: none;
cursor: pointer;
transition: background-color 0.2s ease;
}
.item:hover {
background-color: $color-button-hover;
}
.icon {
font-size: 16px;
}
}
.dropdown-enter-active,
.dropdown-leave-active {
transition:
opacity 0.14s ease-out,
transform 0.14s ease-out;
}
/* Starting state */
.dropdown-enter-from {
opacity: 0;
transform: translateY(-6px) scale(0.96);
}
/* End state */
.dropdown-enter-to {
opacity: 1;
transform: translateY(0) scale(1);
}
/* Leaving */
.dropdown-leave-from {
opacity: 1;
transform: translateY(0) scale(1);
}
.dropdown-leave-to {
opacity: 0;
transform: translateY(-4px) scale(0.98);
}
</style>
+23 -2
View File
@@ -11,6 +11,8 @@ interface InputProps {
required?: boolean required?: boolean
autocomplete?: AutocompleteType autocomplete?: AutocompleteType
label?: string label?: string
textarea?: boolean
rows?: number
} }
const value = defineModel<string | File | File[] | null>("value") const value = defineModel<string | File | File[] | null>("value")
@@ -63,7 +65,7 @@ const onFileChange = (e: Event) => {
</span> </span>
<input <input
v-if="props.type != 'file'" v-if="props.type != 'file' && props.type != 'textarea'"
:placeholder="props.placeholder" :placeholder="props.placeholder"
v-model="value" v-model="value"
@input="(e) => emit('input', e.target?.value)" @input="(e) => emit('input', e.target?.value)"
@@ -76,6 +78,20 @@ const onFileChange = (e: Event) => {
:autocomplete="props.autocomplete" :autocomplete="props.autocomplete"
/> />
<textarea
v-else-if="props.textarea"
:placeholder="props.placeholder"
v-model="value"
@input="(e) => emit('input', e.target?.value)"
@focus="emit('focus')"
@blur="emit('blur')"
:name="props.name"
:id="props.name"
:required="props.required"
:autocomplete="props.autocomplete"
:rows="props.rows"
/>
<input <input
v-else v-else
@focus="emit('focus')" @focus="emit('focus')"
@@ -120,7 +136,8 @@ const onFileChange = (e: Event) => {
outline: 2px solid $color-accent; outline: 2px solid $color-accent;
} }
& input { & input,
& textarea {
width: 100%; width: 100%;
background: none; background: none;
@@ -132,6 +149,10 @@ const onFileChange = (e: Event) => {
} }
} }
& textarea:focus {
outline: none;
}
& input:focus { & input:focus {
outline: none; outline: none;
} }
-1
View File
@@ -39,7 +39,6 @@
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
padding: 2rem 3rem; padding: 2rem 3rem;
position: relative;
} }
} }
</style> </style>
+12 -3
View File
@@ -1,9 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
const { toasts, remove } = useToast() const { toasts, remove } = useToast()
const song = useSong()
</script> </script>
<template> <template>
<div class="toast-container"> <div class="toast-container" :class="{ playerShown: song != undefined }">
<TransitionGroup name="toast"> <TransitionGroup name="toast">
<div <div
v-for="toast in toasts" v-for="toast in toasts"
@@ -27,11 +28,17 @@ const { toasts, remove } = useToast()
right: 0; right: 0;
z-index: 100; z-index: 100;
padding: 20px; padding: 2rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
transition: trasnform 0.2s ease-out;
}
.playerShown {
transform: translateY(-$player-height);
} }
.toast { .toast {
@@ -44,7 +51,9 @@ const { toasts, remove } = useToast()
cursor: pointer; cursor: pointer;
transition: transform 0.2s ease, opacity 0.2s ease; transition:
transform 0.2s ease,
opacity 0.2s ease;
} }
.toast-enter-from { .toast-enter-from {
+3 -3
View File
@@ -62,13 +62,13 @@ export const cfetch = async (
let response let response
try { try {
response = await axios(url, config) response = await axios(url, config)
} catch { } catch (error: any) {
if (response?.status == 401) { if (error.response?.status == 401) {
if (!config.headers) config.headers = {} if (!config.headers) config.headers = {}
config.headers.Authorization = `Bearer ${await refreshSessionToken()}` config.headers.Authorization = `Bearer ${await refreshSessionToken()}`
response = await axios(url, config) response = await axios(url, config)
} } else throw error
} }
if (!response) throw new Error("Something went wrong. Please try again") if (!response) throw new Error("Something went wrong. Please try again")
+1
View File
@@ -27,4 +27,5 @@ export interface Track extends Base {
} }
album: Album album: Album
artists: Artist[] artists: Artist[]
durationInSeconds: number
} }