From 9b17add4e247a22d35551ddbbb9dbe07f3ab2ba8 Mon Sep 17 00:00:00 2001
From: Niels Simenon <niels.simenon@gmail.com>
Date: Wed, 18 Dec 2019 02:42:55 +0100
Subject: [PATCH] Re-added date ranges.

---
 assets/components/header/filter-bar.vue | 28 +++++++++++-----------
 assets/components/tags/tag.vue          |  2 ++
 assets/components/tile/actor.vue        |  3 ++-
 assets/js/fragments.js                  | 31 ++++++++++++++++---------
 assets/js/releases/actions.js           | 18 +++++++-------
 assets/js/ui/getters.js                 | 10 ++++----
 migrations/20190325001339_releases.js   |  2 +-
 7 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/assets/components/header/filter-bar.vue b/assets/components/header/filter-bar.vue
index 7de8cb71..1da233fc 100644
--- a/assets/components/header/filter-bar.vue
+++ b/assets/components/header/filter-bar.vue
@@ -1,20 +1,6 @@
 <template>
     <div class="filter-bar noselect">
         <span>
-            <label class="range">
-                <input
-                    :id="`${_uid}-all`"
-                    :checked="range === 'all'"
-                    type="radio"
-                    class="range-input"
-                    @click="setRange('all')"
-                >
-                <label
-                    :for="`${_uid}-all`"
-                    class="range-button"
-                >All</label>
-            </label>
-
             <label class="range">
                 <input
                     :id="`${_uid}-new`"
@@ -42,6 +28,20 @@
                     class="range-button"
                 >Upcoming</label>
             </label>
+
+            <label class="range">
+                <input
+                    :id="`${_uid}-all`"
+                    :checked="range === 'all'"
+                    type="radio"
+                    class="range-input"
+                    @click="setRange('all')"
+                >
+                <label
+                    :for="`${_uid}-all`"
+                    class="range-button"
+                >All</label>
+            </label>
         </span>
 
         <span>
diff --git a/assets/components/tags/tag.vue b/assets/components/tags/tag.vue
index d7f4020d..34e6982a 100644
--- a/assets/components/tags/tag.vue
+++ b/assets/components/tags/tag.vue
@@ -16,6 +16,7 @@
                 >
                     <img
                         :src="`/img/${tag.poster.thumbnail}`"
+                        :alt="tag.poster.comment"
                         class="poster"
                     >
                 </a>
@@ -43,6 +44,7 @@
                     >
                         <img
                             :src="`/img/${photo.thumbnail}`"
+                            :alt="photo.comment"
                             class="photo"
                         >
                     </a>
diff --git a/assets/components/tile/actor.vue b/assets/components/tile/actor.vue
index 74f87ec4..ee61347a 100644
--- a/assets/components/tile/actor.vue
+++ b/assets/components/tile/actor.vue
@@ -27,8 +27,9 @@
                 v-if="actor.age || actor.origin"
                 class="details"
             >
-                <span v-if="actor.age">
+                <span>
                     <span
+                        v-if="actor.age"
                         v-tooltip="`Born on ${formatDate(actor.birthdate, 'MMMM D, YYYY')}`"
                         class="age"
                     >{{ actor.age }}</span>
diff --git a/assets/js/fragments.js b/assets/js/fragments.js
index 2e4c24d7..26af807b 100644
--- a/assets/js/fragments.js
+++ b/assets/js/fragments.js
@@ -71,17 +71,26 @@ const releaseTrailerFragment = `
 `;
 
 const releasesFragment = `
-  releases(first:$limit, orderBy: DATE_DESC) {
-    id
-    title
-    date
-    createdAt
-    url
-    ${releaseActorsFragment}
-    ${releaseTagsFragment}
-    ${releasePosterFragment}
-    ${siteFragment}
-  }
+    releases(
+        filter: {
+            date: {
+                lessThan: $before,
+                greaterThan: $after,
+            }
+        },
+        first: $limit,
+        orderBy: DATE_DESC,
+    ) {
+        id
+        title
+        date
+        createdAt
+        url
+        ${releaseActorsFragment}
+        ${releaseTagsFragment}
+        ${releasePosterFragment}
+        ${siteFragment}
+    }
 `;
 
 const releaseFragment = `
diff --git a/assets/js/releases/actions.js b/assets/js/releases/actions.js
index 39116d10..f5a1d484 100644
--- a/assets/js/releases/actions.js
+++ b/assets/js/releases/actions.js
@@ -2,22 +2,22 @@ import { graphql } from '../api';
 import { releasesFragment, releaseFragment } from '../fragments';
 import { curateRelease } from '../curate';
 
-function initReleasesActions(_store, _router) {
+function initReleasesActions(store, _router) {
     async function fetchReleases({ _commit }, { limit = 100 }) {
-        /*
-        const releases = await get('/releases', {
-            filter: store.state.ui.filter,
-            after: store.getters.after,
-            before: store.getters.before,
-        });
-        */
+        console.log(store.state.ui.filter, store.getters.after, store.getters.before);
 
         const { releases } = await graphql(`
-            query Releases($limit:Int!) {
+            query Releases(
+                $limit:Int = 1000,
+                $after:Date = "1900-01-01",
+                $before:Date = "2100-01-01",
+            ) {
                 ${releasesFragment}
             }
         `, {
             limit,
+            after: store.getters.after,
+            before: store.getters.before,
         });
 
         return releases.map(release => curateRelease(release));
diff --git a/assets/js/ui/getters.js b/assets/js/ui/getters.js
index e8c9888e..b55316e0 100644
--- a/assets/js/ui/getters.js
+++ b/assets/js/ui/getters.js
@@ -2,16 +2,16 @@ import dayjs from 'dayjs';
 
 const dateRanges = {
     new: () => ({
-        after: dayjs(new Date(0)).format('YYYY-MM-DD'),
-        before: dayjs(new Date()).format('YYYY-MM-DD'),
+        after: '1900-01-01',
+        before: dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD'),
     }),
     upcoming: () => ({
         after: dayjs(new Date()).format('YYYY-MM-DD'),
-        before: dayjs(new Date(2 ** 42)).format('YYYY-MM-DD'),
+        before: '2100-01-01',
     }),
     all: () => ({
-        after: dayjs(new Date(0)).format('YYYY-MM-DD'),
-        before: dayjs(new Date(2 ** 42)).format('YYYY-MM-DD'),
+        after: '1900-01-01',
+        before: '2100-01-01',
     }),
 };
 
diff --git a/migrations/20190325001339_releases.js b/migrations/20190325001339_releases.js
index c159f0f6..696d7639 100644
--- a/migrations/20190325001339_releases.js
+++ b/migrations/20190325001339_releases.js
@@ -294,7 +294,7 @@ exports.up = knex => Promise.resolve()
         CREATE VIEW actors_media AS SELECT * FROM media WHERE domain = 'actors';
         CREATE VIEW tags_media AS SELECT * FROM media WHERE domain = 'tags';
 
-        CREATE VIEW releases_tags AS SELECT * FROM tags_associated WHERE domain = 'releases';
+        CREATE VIEW releases_tags AS SELECT tags_associated.*,tags.slug FROM tags_associated LEFT JOIN tags ON tags_associated.tag_id = tags.id WHERE domain = 'releases';
         /* used for sorting release actors and tags */
         CREATE VIEW releases_actors AS SELECT actors_associated.*,actors.gender,actors.birthdate FROM actors_associated LEFT JOIN actors ON actors_associated.actor_id = actors.id;