Lots of layout changes

This commit is contained in:
Eclypsed
2024-01-15 02:18:49 -05:00
parent 951575c284
commit fd08867628
18 changed files with 217 additions and 75 deletions

View File

@@ -37,3 +37,9 @@
--jellyfin-blue: #00a4dc;
--youtube-red: #ff0000;
}
@media screen and (max-width: 640px) {
:root {
font-size: 0.7rem;
}
}

View File

@@ -3,6 +3,7 @@
import Services from '$lib/services.json'
import IconButton from '$lib/components/utility/iconButton.svelte'
import { backgroundImage } from '$lib/utils/stores.js'
const iconClasses = {
song: 'fa-solid fa-music',
@@ -29,7 +30,7 @@
</script>
<a id="card-wrapper" on:mousedown|preventDefault on:mousemove={(event) => rotateCard(event)} on:mouseleave={() => (card.style.transform = null)} href="/details?id={mediaData.id}&service={mediaData.connectionId}">
<div bind:this={card} id="card" class="relative h-60 transition-all duration-200 ease-out">
<div bind:this={card} id="card" class="relative h-56 transition-all duration-200 ease-out">
{#if mediaData.image}
<img id="card-image" class="h-full max-w-none rounded-lg transition-all" src={mediaData.image} alt="{mediaData.name} thumbnail" />
{:else}
@@ -39,7 +40,7 @@
{/if}
<div bind:this={cardGlare} id="card-glare" class="absolute top-0 grid h-full w-full place-items-center rounded-lg opacity-0 transition-opacity duration-200 ease-out">
<span class="relative h-12">
<IconButton on:click={() => console.log(`Play ${mediaData.name}`)}>
<IconButton on:click={() => ($backgroundImage = mediaData.image)}>
<i slot="icon" class="fa-solid fa-play text-xl" />
</IconButton>
</span>

View File

@@ -3,13 +3,31 @@
export let cardDataList
import Card from '$lib/components/media/mediaCard.svelte'
import IconButton from '$lib/components/utility/iconButton.svelte'
let scrollable,
scrollpos = 0
</script>
<section class="overflow-visible">
{#if header}
<h1 class="text-4xl"><strong>{header}</strong></h1>
{/if}
<div class="no-scrollbar flex gap-6 overflow-y-hidden overflow-x-scroll py-4">
<section>
<div class="flex h-10 items-center justify-between">
{#if header}
<h1 class="text-4xl"><strong>{header}</strong></h1>
{/if}
<div class="flex h-full gap-2">
<IconButton disabled={scrollpos < 0.01} on:click={() => (scrollable.scrollLeft -= scrollable.clientWidth)}>
<i slot="icon" class="fa-solid fa-angle-left" />
</IconButton>
<IconButton disabled={scrollpos > 0.99} on:click={() => (scrollable.scrollLeft += scrollable.clientWidth)}>
<i slot="icon" class="fa-solid fa-angle-right" />
</IconButton>
</div>
</div>
<div
bind:this={scrollable}
on:scroll={() => (scrollpos = scrollable.scrollLeft / (scrollable.scrollWidth - scrollable.clientWidth))}
class="no-scrollbar flex gap-6 overflow-y-hidden overflow-x-scroll scroll-smooth py-4"
>
{#each cardDataList as cardData}
<Card mediaData={cardData} />
{/each}

View File

@@ -30,7 +30,7 @@
{#if show}
<div in:fly={{ duration: 300, x: 500 }} out:slide={{ duration: 300, axis: 'y' }} class="py-1">
<div class="flex gap-1 overflow-hidden rounded-md">
<div class="flex min-h-[3.5rem] w-full items-center px-4 py-2 {bgColors[alertType]}">
<div class="flex w-full items-center p-4 {bgColors[alertType]}">
{alertMessage}
</div>
<button class="w-16 {bgColors[alertType]}" on:click={() => triggerClose()}>

View File

@@ -27,4 +27,4 @@
}
</script>
<div bind:this={alertBox} class="fixed right-4 top-4 z-50 max-h-screen w-full max-w-sm overflow-hidden"></div>
<div bind:this={alertBox} class="fixed right-0 top-0 z-50 max-h-screen w-full max-w-sm overflow-hidden p-4"></div>

View File

@@ -1,15 +1,22 @@
<script>
export let disabled = false
import { createEventDispatcher } from 'svelte'
const dispatch = createEventDispatcher()
</script>
<button class="relative grid aspect-square h-full place-items-center transition-transform duration-75 active:scale-90" on:click|preventDefault={() => dispatch('click')}>
<button
class:disabled
class="relative grid aspect-square h-full place-items-center transition-transform duration-75 active:scale-90 {disabled ? 'text-neutral-600' : ''}"
on:click|preventDefault={() => dispatch('click')}
{disabled}
>
<slot name="icon" />
</button>
<style>
button::before {
button:not(.disabled)::before {
content: '';
width: 0;
height: 0;
@@ -19,14 +26,14 @@
transition-duration: 200ms;
position: absolute;
}
button:hover::before {
button:not(.disabled):hover::before {
width: 130%;
height: 130%;
}
button :global(> :first-child) {
transition: color 200ms;
}
button:hover :global(> :first-child) {
button:not(.disabled):hover :global(> :first-child) {
color: var(--lazuli-primary);
}
</style>

View File

@@ -1,38 +1,48 @@
<script>
import IconButton from './iconButton.svelte'
import SearchBar from './searchBar.svelte'
import { goto, afterNavigate } from '$app/navigation'
import { goto } from '$app/navigation'
import { page } from '$app/stores'
import { fade } from 'svelte/transition'
let previousPage = null
afterNavigate(({ from }) => {
if (from) previousPage = from.url
})
let windowY = 0
</script>
<svelte:window bind:scrollY={windowY} />
<nav id="navbar" class="sticky left-0 top-0 isolate z-10 h-16">
<div class="flex h-full items-center justify-between gap-6 px-6">
<div class="w-full max-w-2xl">
<SearchBar />
</div>
<div class="flex h-full gap-4 py-4">
{#if previousPage && $page.url.pathname !== '/'}
<IconButton on:click={() => history.back()}>
<i slot="icon" class="fa-solid fa-arrow-left text-xl" />
</IconButton>
{/if}
{#if $page.url.pathname !== '/'}
<IconButton on:click={() => goto('/')}>
<i slot="icon" class="fa-solid fa-house text-xl" />
</IconButton>
{/if}
</div>
</div>
{#if windowY > 0}
<div transition:fade={{ duration: 150 }} id="navbar-background" class="absolute left-0 top-0 -z-10 h-full w-full bg-neutral-925" />
{/if}
<nav class="sticky top-0 z-10 flex items-center justify-between px-8 duration-300" class:background-active={windowY > 0}>
<section class="flex h-full">
<IconButton>
<i slot="icon" class="fa-solid fa-gear" />
</IconButton>
{#if $page.url.pathname !== '/'}
<IconButton on:click={() => goto('/')}>
<i slot="icon" class="fa-solid fa-house" />
</IconButton>
<IconButton on:click={() => history.back()}>
<i slot="icon" class="fa-solid fa-arrow-left" />
</IconButton>
{/if}
</section>
<section class="flex h-full">
<IconButton>
<i slot="icon" class="fa-solid fa-magnifying-glass" />
</IconButton>
<IconButton>
<i slot="icon" class="fa-solid fa-user" />
</IconButton>
</section>
</nav>
<style>
nav {
height: 64px;
padding-top: 16px;
padding-bottom: 16px;
font-size: 20px;
line-height: 28px;
}
nav.background-active {
background-color: rgb(10, 10, 10);
}
section {
gap: 24px;
}
</style>

View File

@@ -0,0 +1,27 @@
<script>
export let open = false
import IconButton from './iconButton.svelte'
import { slide } from 'svelte/transition'
export const toggleOpen = () => (open = !open)
let sidebar
</script>
<svelte:document
on:mouseup={(event) => {
if (sidebar && open) {
if (!sidebar.contains(event.target)) open = false
}
}}
/>
{#if open}
<section bind:this={sidebar} transition:slide={{ axis: 'x' }} class="fixed left-0 top-0 z-20 h-full w-full max-w-sm bg-slate-600 p-2" style="width: calc(100% - 4rem);">
<div class="float-right h-8">
<IconButton on:click={toggleOpen}>
<i slot="icon" class="fa-solid fa-x" />
</IconButton>
</div>
</section>
{/if}

View File

@@ -1,3 +1,5 @@
import { writable } from 'svelte/store'
export const newestAlert = writable([null, null])
export const backgroundImage = writable(null)

View File

@@ -1 +1,8 @@
export const trailingSlash = 'never'
/** @type {import('./$types').PageServerLoad} */
export const load = ({ url }) => {
return {
url: url.pathname,
}
}

View File

@@ -1,13 +1,14 @@
<script>
import '../app.css'
import '@fortawesome/fontawesome-free/css/all.min.css'
import Navbar from '$lib/components/utility/navbar.svelte'
import AlertBox from '$lib/components/utility/alertBox.svelte'
import { page } from '$app/stores'
import { newestAlert } from '$lib/stores/alertStore.js'
import SubLayouts from './subLayouts.svelte'
import { newestAlert, backgroundImage } from '$lib/utils/stores.js'
import { fade } from 'svelte/transition'
import { onMount } from 'svelte'
export let data
let alertBox
$: addAlert($newestAlert)
@@ -16,35 +17,27 @@
}
// Might want to change this functionallity to a fetch/preload/await for the image
const backgroundImage = 'https://www.gstatic.com/youtube/media/ytm/images/sbg/wsbg@4000x2250.png' // <-- Default youtube music background
const ytBg = 'https://www.gstatic.com/youtube/media/ytm/images/sbg/wsbg@4000x2250.png' // <-- Default youtube music background
let loaded = false
onMount(() => (loaded = true))
</script>
<main class="h-screen font-notoSans text-white">
<div class="fixed isolate -z-10 h-full w-full bg-black">
<div class="no-scrollbar h-screen font-notoSans text-white">
<div class="fixed isolate -z-10 h-full w-screen bg-black">
<!-- This whole bg is a complete copy of ytmusic, design own at some point (Place for customization w/ album art etc?) (EDIT: Ok, it looks SICK with album art!) -->
<div id="background-gradient" class="absolute z-10 h-1/2 w-full bg-cover" />
{#if loaded}
<!-- May want to add a small blur filter in the event that the album/song image is below a certain resolution -->
<img id="background-image" src={backgroundImage} alt="" class="h-1/2 w-full object-cover blur-xl" in:fade={{ duration: 1000 }} />
{#key $backgroundImage}
<!-- May want to add a small blur filter in the event that the album/song image is below a certain resolution -->
<img id="background-image" src={$backgroundImage ? $backgroundImage : ytBg} alt="" class="absolute h-1/2 w-full object-cover blur-lg" transition:fade={{ duration: 1000 }} />
{/key}
{/if}
</div>
{#if $page.url.pathname === '/login'}
<slot />
{:else}
<div class="grid h-full grid-cols-[5rem_auto]">
<div class="h-full bg-slate-600" />
<div class="grid h-full grid-rows-[4rem_auto] gap-8">
<Navbar />
<div class="no-scrollbar overflow-y-scroll">
<slot />
</div>
</div>
</div>
<AlertBox bind:this={alertBox} />
{/if}
</main>
<SubLayouts currentPage={data.url}>
<slot slot="innerContent" />
</SubLayouts>
<AlertBox bind:this={alertBox} />
</div>
<style>
#background-gradient {

View File

@@ -3,7 +3,7 @@ import { SECRET_INTERNAL_API_KEY } from '$env/static/private'
export const prerender = false
/** @type {import('./$types').PageServerLoad} */
export const load = async ({ locals, fetch }) => {
export const load = async ({ locals, fetch, url }) => {
const recommendationResponse = await fetch(`/api/user/recommendations?userId=${locals.userId}&limit=10`, {
headers: {
apikey: SECRET_INTERNAL_API_KEY,
@@ -13,6 +13,7 @@ export const load = async ({ locals, fetch }) => {
const { recommendations, errors } = recommendationsData
return {
url: url.pathname,
user: locals.user,
recommendations,
fetchingErrors: errors,

View File

@@ -1,6 +1,6 @@
<script>
import { onMount } from 'svelte'
import { newestAlert } from '$lib/stores/alertStore.js'
import { newestAlert } from '$lib/utils/stores.js'
import ScrollableCardMenu from '$lib/components/media/scrollableCardMenu.svelte'
export let data
@@ -25,7 +25,7 @@
<p class="text-neutral-400">Click the menu in the top left corner and go to Settings &gt; Connections to link to your accounts</p>
</main>
{:else}
<main id="recommendations-wrapper" class="h-screen px-8">
<main id="recommendations-wrapper" class="h-[200vh] w-full">
<ScrollableCardMenu header={'Listen Again'} cardDataList={data.recommendations} />
</main>
{/if}

View File

@@ -0,0 +1 @@
<h1>This is where library items will go</h1>

View File

@@ -2,7 +2,7 @@
import { enhance } from '$app/forms'
import { goto } from '$app/navigation'
import { fade } from 'svelte/transition'
import { newestAlert } from '$lib/stores/alertStore.js'
import { newestAlert } from '$lib/utils/stores.js'
export let data
@@ -77,11 +77,7 @@
Sign In
<i class="fa-solid fa-right-to-bracket ml-1" />
</button>
<button
formaction="?/newUser"
class="h-12 w-1/3 rounded-md transition-all active:scale-[97%]"
style="background-color: {formMode === 'newUser' ? 'var(--lazuli-primary)' : '#262626'};"
>
<button formaction="?/newUser" class="h-12 w-1/3 rounded-md transition-all active:scale-[97%]" style="background-color: {formMode === 'newUser' ? 'var(--lazuli-primary)' : '#262626'};">
Create New User
<i class="fa-solid fa-user-plus ml-1" />
</button>

View File

@@ -0,0 +1 @@
<main>Hello this is where playlist go</main>

View File

@@ -4,7 +4,7 @@
import { JellyfinUtils } from '$lib/utils/utils'
import Services from '$lib/services.json'
import JellyfinAuthBox from './jellyfinAuthBox.svelte'
import { newestAlert } from '$lib/stores/alertStore.js'
import { newestAlert } from '$lib/utils/stores.js'
import IconButton from '$lib/components/utility/iconButton.svelte'
import Toggle from '$lib/components/utility/toggle.svelte'

View File

@@ -0,0 +1,72 @@
<script>
export let currentPage
import Navbar from '$lib/components/utility/navbar.svelte'
import { fly } from 'svelte/transition'
const contentTabs = {
Home: '/',
Artists: '/artist',
Playlists: '/playlist',
Libray: '/library',
}
let previousPage = currentPage
let direction = 1
$: calculateDirection(currentPage)
const calculateDirection = (newPage) => {
const contentLinks = Object.values(contentTabs)
const newPageIndex = contentLinks.indexOf(newPage)
const previousPageIndex = contentLinks.indexOf(previousPage)
if (newPageIndex > previousPageIndex) {
direction = 1
} else {
direction = -1
}
previousPage = currentPage
}
let activeTab, indicatorBar, tabList
$: calculateBar(activeTab)
const calculateBar = (activeTab) => {
if (activeTab) {
const listRect = tabList.getBoundingClientRect()
const tabRec = activeTab.getBoundingClientRect()
indicatorBar.style.top = `${listRect.height}px`
if (direction === 1) {
indicatorBar.style.right = `${listRect.right - tabRec.right}px`
setTimeout(() => (indicatorBar.style.left = `${tabRec.left - listRect.left}px`), 350)
} else {
indicatorBar.style.left = `${tabRec.left - listRect.left}px`
setTimeout(() => (indicatorBar.style.right = `${listRect.right - tabRec.right}px`), 350)
}
}
}
</script>
{#if Object.values(contentTabs).includes(currentPage)}
<Navbar />
<div class="flex justify-center py-4">
<h1 bind:this={tabList} class="relative flex justify-center gap-12 text-lg">
{#each Object.entries(contentTabs) as [header, page]}
{#if currentPage === page}
<span bind:this={activeTab} class="pointer-events-none">{header}</span>
{:else}
<a class="text-neutral-400 hover:text-lazuli-primary" href={page}>{header}</a>
{/if}
{/each}
<div bind:this={indicatorBar} class="absolute h-0.5 bg-lazuli-primary transition-all duration-300 ease-in-out" />
</h1>
</div>
<div class="overflow-x-hidden px-8 sm:px-32">
{#key previousPage}
<div in:fly={{ x: 200 * direction, duration: 300, delay: 300 }} out:fly={{ x: -200 * direction, duration: 300 }}>
<slot name="innerContent" />
</div>
{/key}
</div>
{:else}
<slot name="innerContent" />
{/if}