Update timeline

src/data/timeline.js

@@ -11,6 +11,31 @@ export const eventsData = [
         'https://webstatic-sea.mihoyo.com/ys/event/e20210316cooking-sea/index.html?lang=en-us?utm_source=hoyolab&utm_medium=banner',
       showOnHome: true,
     },
+    {
+      name: 'A Thousand Questions With Paimon',
+      pos: '60% 30%',
+      image: 'a_thousand_questions_with_paimon.jpg',
+      start: '2021-04-06 06:00:00',
+      end: '2021-04-13 04:00:00',
+      color: '#EFDEB4',
+      zoom: '180%',
+      url: 'https://www.hoyolab.com/genshin/article/278505',
+      startOnly: true,
+      showOnHome: true,
+    },
+  ],
+  [
+    {
+      name: 'Outland Gastronomy - Daily Login Event',
+      pos: '0% 50%',
+      image: 'outland_gastronomy.jpg',
+      start: '2021-03-17 06:00:00',
+      end: '2021-04-01 04:00:00',
+      color: '#DDD7E8',
+      zoom: '180%',
+      url: 'https://genshin.mihoyo.com/en/news/detail/9262',
+      showOnHome: true,
+    },
     {
       name: 'Contending Tides Event',
       pos: '0% 10%',
@@ -22,18 +47,19 @@ export const eventsData = [
       url: 'https://www.hoyolab.com/genshin/article/275307',
       showOnHome: true,
     },
+    {
+      name: 'Marvelous Merchandise',
+      pos: '0% 60%',
+      image: 'marvelous_merchandise_event.jpg',
+      start: '2021-04-16 10:00:00',
+      end: '2021-04-23 04:00:00',
+      color: '#93E05A',
+      zoom: '170%',
+      url: 'https://genshin.mihoyo.com/en/news/detail/9741',
+      showOnHome: true,
+    },
   ],
-  {
-    name: 'Outland Gastronomy - Daily Login Event',
-    pos: '0% 50%',
-    image: 'outland_gastronomy.jpg',
-    start: '2021-03-17 06:00:00',
-    end: '2021-04-01 04:00:00',
-    color: '#DDD7E8',
-    zoom: '180%',
-    url: 'https://genshin.mihoyo.com/en/news/detail/9262',
-    showOnHome: true,
-  },
+  [
   {
     name: 'Invitation of Windblume - 1.4 Event',
     pos: '0% 20%',
@@ -45,16 +71,19 @@ export const eventsData = [
     url: 'https://genshin.mihoyo.com/en/news/detail/9407',
     showOnHome: true,
   },
+  {
+    name: 'Wishful Drops - Oceanid Event',
+    pos: '0% 20%',
+    image: 'wishful_drops.jpg',
+    start: '2021-04-09 10:00:00',
+    end: '2021-04-16 04:00:00',
+    color: '#579DE5',
+    zoom: '170%',
+    url: 'https://genshin.mihoyo.com/en/news/detail/9741',
+    showOnHome: true,
+  },
+],
   [
-    {
-      name: 'Vishaps and Where to Find Them',
-      image: 'vishaps_and_where_to_find_them.jpg',
-      pos: '0% 30%',
-      start: '2021-03-05 04:00:00',
-      end: '2021-03-12 04:00:00',
-      color: '#F6AD55',
-      showOnHome: true,
-    },
     {
       name: 'Act I',
       pos: '0% 20%',
@@ -100,15 +129,6 @@ export const eventsData = [
     },
   ],
   [
-    {
-      name: 'Moment of Bloom - Hu Tao Banner',
-      pos: '50% 20%',
-      image: 'moment_of_bloom.jpg',
-      start: '2021-03-02 18:00:00',
-      end: '2021-03-16 15:00:00',
-      color: '#FC8181',
-      showOnHome: true,
-    },
     {
       name: 'Ballad in Goblets - Venti Banner',
       pos: '20% 20%',
@@ -119,17 +139,18 @@ export const eventsData = [
       url: 'https://genshin.mihoyo.com/en/news/detail/9269',
       showOnHome: true,
     },
-  ],
-  [
     {
-      name: 'Epitome Invocation - Weapon Banner',
-      image: 'epitome_invocation.jpg',
-      pos: '50% 20%',
-      start: '2021-02-23 18:00:00',
-      end: '2021-03-16 15:00:00',
-      color: '#F56565',
+      name: 'Farewell of Snezhnaya - Tartaglia Banner',
+      pos: '30% 15%',
+      image: 'farewell_of_snezhnaya_2.jpg',
+      start: '2021-04-06 18:00:00',
+      end: '2021-04-27 15:00:00',
+      color: '#07E4FD',
+      url: 'https://genshin.mihoyo.com/en/news/detail/9714',
       showOnHome: true,
     },
+  ],
+  [
     {
       name: 'Epitome Invocation - Weapon Banner',
       image: 'epitome_invocation_2.jpg',
@@ -140,16 +161,19 @@ export const eventsData = [
       url: 'https://genshin.mihoyo.com/en/news/detail/9278',
       showOnHome: true,
     },
+    {
+      name: 'Epitome Invocation - Weapon Banner',
+      image: 'epitome_Invocation_10.jpg',
+      pos: '30% 30%',
+      start: '2021-04-06 18:00:00',
+      end: '2021-04-27 15:00:00',
+      color: '#FFAA4B',
+      zoom: '170%',
+      url: 'https://genshin.mihoyo.com/en/news/detail/9739',
+      showOnHome: true,
+    },
   ],
   [
-    {
-      name: 'Spiral Abyss',
-      image: 'spiral_abyss.jpg',
-      pos: '50% 20%',
-      start: '2021-03-01 04:00:00',
-      end: '2021-03-16 04:00:00',
-      color: '#63B3ED',
-    },
     {
       name: 'Spiral Abyss',
       image: 'spiral_abyss.jpg',
@@ -203,14 +227,6 @@ export const eventsData = [
     },
   ],
   [
-    {
-      name: 'Battle Pass',
-      image: 'lantern-lit_sky.jpg',
-      pos: '0% 12%',
-      start: '2021-02-03 11:00:00',
-      end: '2021-03-15 04:00:00',
-      color: '#68D391',
-    },
     {
       name: 'Battle Pass',
       image: 'windborne_blossoms.jpg',

src/routes/index.svelte

@@ -42,7 +42,7 @@
   <Masonry bind:refreshLayout gridGap="1rem">
     <Welcome on:done={onDone} />
     <Wish on:done={onDone} />
-    <Reminder on:done={onDone} />
+    <!-- <Reminder on:done={onDone} /> -->
     <Event on:done={onDone} />
     <Item on:done={onDone} />
     <Banner on:done={onDone} featured="venti" bannerId={300010} />

src/routes/timeline/_item.svelte

@@ -20,8 +20,8 @@
   $: ended = now.isAfter(event.end);
   $: diffStart = event.start.diff(now);
   $: diffEnd = event.end.diff(now);
-  $: attachedNext = next !== null && next.start.diff(event.end, 'hour') < 1;
-  $: attachedPrev = prev !== null && event.start.diff(prev.end, 'hour') < 1;
+  $: attachedNext = next !== null && next.start.diff(event.end, 'hour') < 3;
+  $: attachedPrev = prev !== null && event.start.diff(prev.end, 'hour') < 3;
   $: prevEnded = prev !== null && now.isAfter(prev.end);
   $: shouldShowHourStart = diffStart <= 86400000 || event.duration > 8 || !prevNearby;
   $: shouldShowHourEnd = diffEnd <= 86400000 || event.duration > 8 || !prevNearby;