From 268128c2f4ebbd09943d6e99adc234bd40dbdb1b Mon Sep 17 00:00:00 2001
From: Max Nuding <max.nuding@icloud.com>
Date: Tue, 11 Apr 2023 15:49:50 +0200
Subject: [PATCH] Improve layout for smaller devices

---
 src/lib/components/FooterComponent.svelte |  65 +++--
 src/routes/+layout.svelte                 |  10 +-
 src/routes/+page.svelte                   | 310 ++++++++++++----------
 3 files changed, 217 insertions(+), 168 deletions(-)

diff --git a/src/lib/components/FooterComponent.svelte b/src/lib/components/FooterComponent.svelte
index 9247577..9fc201e 100644
--- a/src/lib/components/FooterComponent.svelte
+++ b/src/lib/components/FooterComponent.svelte
@@ -4,24 +4,28 @@
 </script>
 
 <div class="footer">
-    <div>
-        <span>Made with &#x1F918; by&nbsp;</span>
-        <a href="https://metalhead.club/@aymm" rel="me">@aymm@metalhead.club</a>
-    </div>
-    |
-    <div>
-        <a href="https://phlaym.net/git/phlaym/moshing-mammut">
-            <img alt="Git branch" src={git} class="icon" />
-            Source Code
-        </a>
-    </div>
-    |
-    <div>
-        <a href="/feed.xml">
-            <img alt="RSS" src={rss} class="icon" />
-            RSS Feed
-        </a>
-    </div>
+  <div>
+    <span class="label"
+      >Made<span class="secretIngredient">&nbsp;with &#x1F918;</span>&nbsp;by&nbsp;</span
+    >
+    <a href="https://metalhead.club/@aymm" rel="me"
+      >@aymm<span class="mastodonInstance">@metalhead.club</span></a
+    >
+  </div>
+  |
+  <div>
+    <a href="https://phlaym.net/git/phlaym/moshing-mammut">
+      <img alt="Git branch" src={git} class="icon" />
+      <span class="label">Source Code</span>
+    </a>
+  </div>
+  |
+  <div>
+    <a href="/feed.xml">
+      <img alt="RSS" src={rss} class="icon" />
+      <span class="label">RSS<span class="feedSuffix">&nbsp;Feed</span></span>
+    </a>
+  </div>
 </div>
 
 <style>
@@ -53,4 +57,27 @@
       background-color: var(--color-grey-translucent);
     }
   }
-</style>
\ No newline at end of file
+  @media only screen and (max-device-width: 620px) {
+    .mastodonInstance,
+    .feedSuffix {
+      display: none;
+    }
+    .footer {
+      justify-content: center;
+    }
+  }
+
+  @media only screen and (max-device-width: 430px) {
+    .mastodonInstance,
+    .feedSuffix,
+    .secretIngredient {
+      display: none;
+    }
+  }
+
+  @media only screen and (max-device-width: 370px) {
+    .label {
+      display: none;
+    }
+  }
+</style>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index af1013c..cb8a848 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FooterComponent from '$lib/components/FooterComponent.svelte'
+  import FooterComponent from '$lib/components/FooterComponent.svelte';
   import { SvelteToast } from '@zerodevx/svelte-toast';
 
   const options = {
@@ -7,6 +7,7 @@
     classes: ['toast']
   };
 </script>
+
 <slot />
 <SvelteToast {options} />
 <div class="footer">
@@ -33,4 +34,9 @@
     align-items: center;
     gap: 10px;
   }
-</style>
\ No newline at end of file
+  @media only screen and (max-device-width: 620px) {
+    .footer {
+      width: calc(100% + 16px);
+    }
+  }
+</style>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index bd4e83e..19f7b81 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,174 +1,184 @@
 <script lang="ts">
-import { onMount } from "svelte";
-import type { PageData } from './$types';
-import type { Post } from '$lib/mastodon/response';
-import { PUBLIC_REFRESH_INTERVAL, PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME } from '$env/static/public';
-import PostComponent from '$lib/components/PostComponent.svelte';
-import LoadMoreComponent from '$lib/components/LoadMoreComponent.svelte';
-import { fly, type FlyParams } from 'svelte/transition';
-import { cubicInOut } from 'svelte/easing';
-import { errorToast } from '$lib/errorToast'
+  import { onMount } from 'svelte';
+  import type { PageData } from './$types';
+  import type { Post } from '$lib/mastodon/response';
+  import {
+    PUBLIC_REFRESH_INTERVAL,
+    PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME
+  } from '$env/static/public';
+  import PostComponent from '$lib/components/PostComponent.svelte';
+  import LoadMoreComponent from '$lib/components/LoadMoreComponent.svelte';
+  import { fly, type FlyParams } from 'svelte/transition';
+  import { cubicInOut } from 'svelte/easing';
+  import { errorToast } from '$lib/errorToast';
 
+  export let data: PageData;
 
-export let data: PageData;
-
-interface FetchOptions {
-  since?: string,
-  before?: string,
-  count?: number
-}
-
-interface EdgeFlyParams extends FlyParams {
-  created_at: string
-}
-
-const refreshInterval = parseInt(PUBLIC_REFRESH_INTERVAL);
-let interval: NodeJS.Timer | null = null;
-let moreOlderPostsAvailable = true;
-let loadingOlderPosts = false;
-
-// Needed, so that edgeFly() can do its thing:
-// To determine whether a newly loaded post is older than the existing ones, is required to know what the oldest
-// post was, before the fetch happened.
-let oldestBeforeLastFetch: number | null = null;
-
-/**
- * Animate either from the top, or the bottom of the window, depending if the post is
- * newer than the existing ones or older.
- */
-function edgeFly(node: Element, opts: EdgeFlyParams) {
-  const createdAt =  new Date(opts.created_at).getTime();
-  const diffNewest = Math.abs(new Date(data.posts[0].created_at).getTime() - createdAt);
-  const oldest = oldestBeforeLastFetch !== null
-    ? oldestBeforeLastFetch
-    : new Date(data.posts[data.posts.length - 1].created_at).getTime();
-  const diffOldest = Math.abs(oldest - createdAt);
-  const fromTop = diffNewest <= diffOldest;
-
-  const rect = node.getBoundingClientRect();
-  const paramY = +`${opts.y}`;
-  let offset = isNaN(paramY) ? 0 : paramY + rect.height;
-  opts.y = fromTop ? -offset : window.innerHeight + offset;
-  return fly(node, opts);
-}
-
-async function fetchPosts(options: FetchOptions): Promise<Post[]> {
-  const params = new URLSearchParams();
-  if (options?.since !== undefined) {
-    params.set('since', options.since);
-  }
-  if (options?.before !== undefined) {
-    params.set('before', options.before);
-  }
-  if (options?.count !== undefined) {
-    params.set('count', options.count.toFixed(0));
+  interface FetchOptions {
+    since?: string;
+    before?: string;
+    count?: number;
   }
 
-  const response = await fetch(`/api/posts?${params}`);
-  return await response.json();
-}
-
-function filterDuplicates(posts: Post[]): Post[] {
-  return posts.filter((obj, index, arr) => {
-    return arr.map(mapObj => mapObj.url).indexOf(obj.url) === index;
-  });
-}
-
-function refresh() {
-  let filter: FetchOptions = {};
-  if (data.posts.length > 0) {
-    filter = { since: data.posts[0].created_at };
+  interface EdgeFlyParams extends FlyParams {
+    created_at: string;
   }
-  fetchPosts(filter).then(resp => {
-    if (resp.length > 0) {
-      // Prepend new posts, filter dupes
-      // There shouldn't be any duplicates, but better be safe than sorry
-      data.posts = filterDuplicates(resp.concat(data.posts));
+
+  const refreshInterval = parseInt(PUBLIC_REFRESH_INTERVAL);
+  let interval: NodeJS.Timer | null = null;
+  let moreOlderPostsAvailable = true;
+  let loadingOlderPosts = false;
+
+  // Needed, so that edgeFly() can do its thing:
+  // To determine whether a newly loaded post is older than the existing ones, is required to know what the oldest
+  // post was, before the fetch happened.
+  let oldestBeforeLastFetch: number | null = null;
+
+  /**
+   * Animate either from the top, or the bottom of the window, depending if the post is
+   * newer than the existing ones or older.
+   */
+  function edgeFly(node: Element, opts: EdgeFlyParams) {
+    const createdAt = new Date(opts.created_at).getTime();
+    const diffNewest = Math.abs(new Date(data.posts[0].created_at).getTime() - createdAt);
+    const oldest =
+      oldestBeforeLastFetch !== null
+        ? oldestBeforeLastFetch
+        : new Date(data.posts[data.posts.length - 1].created_at).getTime();
+    const diffOldest = Math.abs(oldest - createdAt);
+    const fromTop = diffNewest <= diffOldest;
+
+    const rect = node.getBoundingClientRect();
+    const paramY = +`${opts.y}`;
+    let offset = isNaN(paramY) ? 0 : paramY + rect.height;
+    opts.y = fromTop ? -offset : window.innerHeight + offset;
+    return fly(node, opts);
+  }
+
+  async function fetchPosts(options: FetchOptions): Promise<Post[]> {
+    const params = new URLSearchParams();
+    if (options?.since !== undefined) {
+      params.set('since', options.since);
     }
-  })
-  .catch((e: Error) => {
-    errorToast('Error loading newest posts: ' + e.message);
-  });
-}
-
-onMount(async () => {
-  if (data.posts.length > 0) {
-    oldestBeforeLastFetch = new Date(data.posts[data.posts.length - 1].created_at).getTime();
-  }
-  interval = setInterval(refresh, refreshInterval);
-
-  // - If the page is hidden, slow down refresh rate
-  // - If the page is shown, bump up refresh rate
-  document.addEventListener('visibilitychange', () => {
-    const delay = document.hidden ? refreshInterval * 10 : refreshInterval;
-    if (interval) {
-      clearInterval(interval);
+    if (options?.before !== undefined) {
+      params.set('before', options.before);
     }
-    interval = setInterval(refresh, delay);
+    if (options?.count !== undefined) {
+      params.set('count', options.count.toFixed(0));
+    }
+
+    const response = await fetch(`/api/posts?${params}`);
+    return await response.json();
+  }
+
+  function filterDuplicates(posts: Post[]): Post[] {
+    return posts.filter((obj, index, arr) => {
+      return arr.map((mapObj) => mapObj.url).indexOf(obj.url) === index;
+    });
+  }
+
+  function refresh() {
+    let filter: FetchOptions = {};
+    if (data.posts.length > 0) {
+      filter = { since: data.posts[0].created_at };
+    }
+    fetchPosts(filter)
+      .then((resp) => {
+        if (resp.length > 0) {
+          // Prepend new posts, filter dupes
+          // There shouldn't be any duplicates, but better be safe than sorry
+          data.posts = filterDuplicates(resp.concat(data.posts));
+        }
+      })
+      .catch((e: Error) => {
+        errorToast('Error loading newest posts: ' + e.message);
+      });
+  }
+
+  onMount(async () => {
+    if (data.posts.length > 0) {
+      oldestBeforeLastFetch = new Date(data.posts[data.posts.length - 1].created_at).getTime();
+    }
+    interval = setInterval(refresh, refreshInterval);
+
+    // - If the page is hidden, slow down refresh rate
+    // - If the page is shown, bump up refresh rate
+    document.addEventListener('visibilitychange', () => {
+      const delay = document.hidden ? refreshInterval * 10 : refreshInterval;
+      if (interval) {
+        clearInterval(interval);
+      }
+      interval = setInterval(refresh, delay);
+    });
+
+    return () => {
+      if (interval !== null) {
+        clearInterval(interval);
+      }
+    };
   });
 
-  return () => {
-    if (interval !== null) {
-      clearInterval(interval)
+  function loadOlderPosts() {
+    loadingOlderPosts = true;
+    const filter: FetchOptions = { count: 20 };
+    if (data.posts.length > 0) {
+      const before = data.posts[data.posts.length - 1].created_at;
+      filter.before = before;
+      oldestBeforeLastFetch = new Date(before).getTime();
     }
+
+    fetchPosts(filter)
+      .then((resp) => {
+        if (resp.length > 0) {
+          // Append old posts, filter dupes
+          // There shouldn't be any duplicates, but better be safe than sorry
+          data.posts = filterDuplicates(data.posts.concat(resp));
+          // If we got less than we expected, there are no older posts available
+          moreOlderPostsAvailable = resp.length >= (filter.count ?? 20);
+        } else {
+          moreOlderPostsAvailable = false;
+        }
+        loadingOlderPosts = false;
+      })
+      .catch((e) => {
+        loadingOlderPosts = false;
+        errorToast('Error loading older posts: ' + e.message);
+      });
   }
-});
-
-function loadOlderPosts() {
-  loadingOlderPosts = true;
-  const filter: FetchOptions = { count: 20 };
-  if (data.posts.length > 0) {
-    const before = data.posts[data.posts.length - 1].created_at;
-    filter.before = before;
-    oldestBeforeLastFetch = new Date(before).getTime();
-  }
-
-
-  fetchPosts(filter).then(resp => {
-    if (resp.length > 0) {
-      // Append old posts, filter dupes
-      // There shouldn't be any duplicates, but better be safe than sorry
-      data.posts = filterDuplicates(data.posts.concat(resp));
-      // If we got less than we expected, there are no older posts available
-      moreOlderPostsAvailable = resp.length >= (filter.count ?? 20);
-    } else {
-      moreOlderPostsAvailable = false;
-    }
-    loadingOlderPosts = false;
-  })
-  .catch(e => {
-    loadingOlderPosts = false;
-    errorToast('Error loading older posts: ' + e.message);
-  });
-
-}
-
 </script>
+
 <svelte:head>
   <title>{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list</title>
 </svelte:head>
 <h2>{PUBLIC_MASTODON_INSTANCE_DISPLAY_NAME} music list</h2>
 <div class="wrapper">
-  <div></div>
+  <div />
   <div class="posts">
-  {#if data.posts.length === 0}
-    Sorry, no posts recommending music aave been found yet
-  {/if}
-  {#each data.posts as post (post.url)}
+    {#if data.posts.length === 0}
+      Sorry, no posts recommending music aave been found yet
+    {/if}
+    {#each data.posts as post (post.url)}
       <div
         class="post"
-        transition:edgeFly="{{ y: 10, created_at: post.created_at, duration: 300, easing: cubicInOut }}"
+        transition:edgeFly={{
+          y: 10,
+          created_at: post.created_at,
+          duration: 300,
+          easing: cubicInOut
+        }}
       >
         <PostComponent {post} />
       </div>
-  {/each}
-  <LoadMoreComponent
-    on:loadOlderPosts={loadOlderPosts}
-    moreAvailable={moreOlderPostsAvailable}
-    isLoading={loadingOlderPosts}/>
-  </div>
-  <div></div>
+    {/each}
+    <LoadMoreComponent
+      on:loadOlderPosts={loadOlderPosts}
+      moreAvailable={moreOlderPostsAvailable}
+      isLoading={loadingOlderPosts}
+    />
   </div>
+  <div />
+</div>
+
 <style>
   .posts {
     display: flex;
@@ -191,4 +201,10 @@ function loadOlderPosts() {
     text-align: center;
     z-index: 100;
   }
-</style>
\ No newline at end of file
+
+  @media only screen and (max-device-width: 650px) {
+    .post {
+      max-width: 100vw;
+    }
+  }
+</style>