From 6a1933178985e23825d8453449ca99bb0e5cfcb6 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 13 Jan 2024 18:56:25 -0800 Subject: refactor(home): move layout to home --- src/lib/HeadTitle.svelte | 18 -------- src/lib/Home/HeadTitle.svelte | 18 ++++++++ src/lib/Home/LastActivity.svelte | 73 ++++++++++++++++++++++++++++++ src/lib/Home/Root.svelte | 26 +++++++++++ src/lib/LastActivity.svelte | 73 ------------------------------ src/lib/Root.svelte | 26 ----------- src/lib/Tools/Schedule/Tool.svelte | 2 +- src/routes/+layout.svelte | 4 +- src/routes/+page.svelte | 4 +- src/routes/completed/+page.svelte | 4 +- src/routes/settings/+page.svelte | 2 +- src/routes/tools/+page.svelte | 2 +- src/routes/tools/[tool]/+page.svelte | 2 +- src/routes/updates/+page.svelte | 2 +- src/routes/user/+page.svelte | 2 +- src/routes/user/[user]/+page.svelte | 2 +- src/routes/user/[user]/badges/+page.svelte | 2 +- 17 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 src/lib/HeadTitle.svelte create mode 100644 src/lib/Home/HeadTitle.svelte create mode 100644 src/lib/Home/LastActivity.svelte create mode 100644 src/lib/Home/Root.svelte delete mode 100644 src/lib/LastActivity.svelte delete mode 100644 src/lib/Root.svelte diff --git a/src/lib/HeadTitle.svelte b/src/lib/HeadTitle.svelte deleted file mode 100644 index 39d6b4ef..00000000 --- a/src/lib/HeadTitle.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - {title} - diff --git a/src/lib/Home/HeadTitle.svelte b/src/lib/Home/HeadTitle.svelte new file mode 100644 index 00000000..39d6b4ef --- /dev/null +++ b/src/lib/Home/HeadTitle.svelte @@ -0,0 +1,18 @@ + + + + + + + + + + + + {title} + diff --git a/src/lib/Home/LastActivity.svelte b/src/lib/Home/LastActivity.svelte new file mode 100644 index 00000000..67125476 --- /dev/null +++ b/src/lib/Home/LastActivity.svelte @@ -0,0 +1,73 @@ + + +{#if !lastActivityWasToday} +
+ You don't have any new activity statuses from the past day! Create one within {timeLeftToday()} + to keep your streak! +
+{/if} diff --git a/src/lib/Home/Root.svelte b/src/lib/Home/Root.svelte new file mode 100644 index 00000000..d65a9832 --- /dev/null +++ b/src/lib/Home/Root.svelte @@ -0,0 +1,26 @@ + + +{#if $settings.displayDisableAnimations} + +{:else} + {#key data.url} +
+ +
+ {/key} +{/if} diff --git a/src/lib/LastActivity.svelte b/src/lib/LastActivity.svelte deleted file mode 100644 index b4e8afa4..00000000 --- a/src/lib/LastActivity.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - -{#if !lastActivityWasToday} -
- You don't have any new activity statuses from the past day! Create one within {timeLeftToday()} - to keep your streak! -
-{/if} diff --git a/src/lib/Root.svelte b/src/lib/Root.svelte deleted file mode 100644 index d65a9832..00000000 --- a/src/lib/Root.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - -{#if $settings.displayDisableAnimations} - -{:else} - {#key data.url} -
- -
- {/key} -{/if} diff --git a/src/lib/Tools/Schedule/Tool.svelte b/src/lib/Tools/Schedule/Tool.svelte index fb5a8828..70433012 100644 --- a/src/lib/Tools/Schedule/Tool.svelte +++ b/src/lib/Tools/Schedule/Tool.svelte @@ -9,7 +9,7 @@ import { scheduleMediaListCollection } from '$lib/AniList/schedule'; import { season } from '$lib/Media/Anime/season'; import { findClosestMedia } from '$lib/Media/Anime/Airing/Subtitled/match'; - import HeadTitle from '$lib/HeadTitle.svelte'; + import HeadTitle from '$lib/Home/HeadTitle.svelte'; import Crunchyroll from '$lib/Tools/Schedule/Crunchyroll.svelte'; import Loading from '$lib/Loading.svelte'; import './container.css'; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 44a9de84..88f1d268 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -5,13 +5,13 @@ import userIdentity from '$stores/userIdentity'; import settings from '$stores/settings'; import { browser } from '$app/environment'; - import HeadTitle from '$lib/HeadTitle.svelte'; + import HeadTitle from '$lib/Home/HeadTitle.svelte'; import '../app.css'; import { readable, type Readable } from 'svelte/store'; import { navigating } from '$app/stores'; import Notifications from 'svelte-notifications'; import Notification from '$lib/Notification/Notification.svelte'; - import Root from '$lib/Root.svelte'; + import Root from '$lib/Home/Root.svelte'; export let data; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b65c254f..9d31b7a5 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -7,8 +7,8 @@ import userIdentity from '$stores/userIdentity'; import settings from '$stores/settings'; import ListTitle from '$lib/List/ListTitle.svelte'; - import HeadTitle from '$lib/HeadTitle.svelte'; - import LastActivity from '$lib/LastActivity.svelte'; + import HeadTitle from '$lib/Home/HeadTitle.svelte'; + import LastActivity from '$lib/Home/LastActivity.svelte'; import { createHeightObserver } from '$lib/Utility/html.js'; export let data; diff --git a/src/routes/completed/+page.svelte b/src/routes/completed/+page.svelte index 50dc3ae8..a1b190f3 100644 --- a/src/routes/completed/+page.svelte +++ b/src/routes/completed/+page.svelte @@ -6,8 +6,8 @@ import WatchingAnimeList from '$lib/List/Anime/CompletedAnimeList.svelte'; import ListTitle from '$lib/List/ListTitle.svelte'; import MangaListTemplate from '$lib/List/Manga/MangaListTemplate.svelte'; - import HeadTitle from '$lib/HeadTitle.svelte'; - import LastActivity from '$lib/LastActivity.svelte'; + import HeadTitle from '$lib/Home/HeadTitle.svelte'; + import LastActivity from '$lib/Home/LastActivity.svelte'; import { createHeightObserver } from '$lib/Utility/html.js'; export let data; diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 7ddeb68e..31880ee8 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -4,7 +4,7 @@ import SettingHint from '$lib/Settings/SettingHint.svelte'; import Attributions from '$lib/Settings/Attributions.svelte'; import { env } from '$env/dynamic/public'; - import HeadTitle from '$lib/HeadTitle.svelte'; + import HeadTitle from '$lib/Home/HeadTitle.svelte'; import Display from '$lib/Settings/Categories/Display.svelte'; import Calculation from '$lib/Settings/Categories/Calculation.svelte'; import Debug from '$lib/Settings/Categories/Debug.svelte'; diff --git a/src/routes/tools/+page.svelte b/src/routes/tools/+page.svelte index 6293d0b1..6c37d857 100644 --- a/src/routes/tools/+page.svelte +++ b/src/routes/tools/+page.svelte @@ -1,5 +1,5 @@