From 198dee45d3575bfa224e78b393076b56e76e1f5d Mon Sep 17 00:00:00 2001
From: minie4 <minie4@gmx.de>
Date: Sun, 21 Aug 2022 23:35:02 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20swipe=20gestures=20for=20chan?=
 =?UTF-8?q?ging=20days?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                | 13 ++++++++++++-
 package.json                     |  3 ++-
 src/App.vue                      | 30 +++++++++++++++++++++---------
 src/components/date-selector.vue | 31 +++----------------------------
 src/main.js                      |  2 ++
 src/util.js                      | 29 ++++++++++++++++++++++++++++-
 6 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f6afb35..b5908b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
         "vite-plugin-git-revision": "^0.1.9",
         "vue": "^3.2.37",
         "vue-i18n": "^9.2.2",
-        "vue-router": "^4.0.15"
+        "vue-router": "^4.0.15",
+        "vue3-touch-events": "^4.1.0"
       },
       "devDependencies": {
         "@rushstack/eslint-patch": "^1.1.0",
@@ -5200,6 +5201,11 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/vue3-touch-events": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vue3-touch-events/-/vue3-touch-events-4.1.0.tgz",
+      "integrity": "sha512-fZKusOiBJzDPsY34tXYl/Wo9c2ONzBuQmF0+oHqVWr+TDbf90CgMWLHZsTv1KaShXjt+oeLow7BDVBpXW6lfXQ=="
+    },
     "node_modules/webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
@@ -9177,6 +9183,11 @@
         "@vue/devtools-api": "^6.0.0"
       }
     },
+    "vue3-touch-events": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vue3-touch-events/-/vue3-touch-events-4.1.0.tgz",
+      "integrity": "sha512-fZKusOiBJzDPsY34tXYl/Wo9c2ONzBuQmF0+oHqVWr+TDbf90CgMWLHZsTv1KaShXjt+oeLow7BDVBpXW6lfXQ=="
+    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
diff --git a/package.json b/package.json
index e21ccd8..49ab415 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
     "vite-plugin-git-revision": "^0.1.9",
     "vue": "^3.2.37",
     "vue-i18n": "^9.2.2",
-    "vue-router": "^4.0.15"
+    "vue-router": "^4.0.15",
+    "vue3-touch-events": "^4.1.0"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.0",
diff --git a/src/App.vue b/src/App.vue
index a35479e..d614a57 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,23 +1,34 @@
 <script setup>
-import { RouterView } from "vue-router";
+import { RouterView, useRoute } from "vue-router";
 import TitleBar from "./components/titlebar-element.vue";
 import BottomNavbar from "./components/bottom-navbar.vue";
 import DateSelector from "./components/date-selector.vue";
 import LoadingElement from "./components/loading-element.vue";
 import { loading } from "./store";
+import { previousDay, nextDay } from "./util";
+import { computed } from "vue";
+
+const route = useRoute();
+const routeName = computed(() => route.name);
+const isDataView = computed(() => {
+  return (
+    routeName.value != "title.settings" && routeName.value != "title.login"
+  );
+});
+
+function swipeHandler(direction) {
+  if (!isDataView.value) return;
+  if (direction == "left") nextDay();
+  else if (direction == "right") previousDay();
+}
 </script>
 
 <template>
   <TitleBar />
-  <div class="center">
+  <div class="center" v-touch:swipe="swipeHandler">
     <main>
-      <DateSelector
-        v-show="$route.name != 'title.settings' && $route.name != 'title.login'"
-      />
-      <LoadingElement
-        :active="loading"
-        v-show="$route.name != 'title.settings' && $route.name != 'title.login'"
-      />
+      <DateSelector v-show="isDataView" />
+      <LoadingElement :active="loading" v-show="isDataView" />
       <RouterView />
     </main>
   </div>
@@ -44,6 +55,7 @@ body {
 .center {
   display: flex;
   justify-content: center;
+  min-height: 100vh;
 }
 
 main {
diff --git a/src/components/date-selector.vue b/src/components/date-selector.vue
index 8925d48..a57e4bf 100644
--- a/src/components/date-selector.vue
+++ b/src/components/date-selector.vue
@@ -1,13 +1,8 @@
 <script setup>
-import {
-  selectedDate,
-  selectedDay,
-  fetchSubstitutions,
-  fetchHistory,
-  loading,
-} from "../store";
-import dayjs from "dayjs";
+import { selectedDate, selectedDay } from "../store";
 import ArrowIcon from "./icons/arrow-icon.vue";
+import dayjs from "dayjs";
+import { changeDate, previousDay, nextDay } from "../util";
 
 const dayNames = [
   "days.sunday",
@@ -18,26 +13,6 @@ const dayNames = [
   "days.friday",
   "days.saturday",
 ];
-
-function nextDay() {
-  var newDate = dayjs(selectedDate.value).add(1, "day");
-  // Skip weekend
-  if (newDate.day() == 6) newDate = newDate.add(2, "day");
-  changeDate(newDate);
-}
-function previousDay() {
-  var newDate = dayjs(selectedDate.value).subtract(1, "day");
-  // Skip weekend
-  if (newDate.day() == 0) newDate = newDate.subtract(2, "day");
-  changeDate(newDate);
-}
-async function changeDate(newDate) {
-  selectedDate.value = new Date(newDate.toDate().setUTCHours(0, 0, 0, 0));
-  loading.value = true;
-  await fetchSubstitutions();
-  await fetchHistory();
-  loading.value = false;
-}
 </script>
 
 <template>
diff --git a/src/main.js b/src/main.js
index 9dbaf23..2139d59 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,7 @@ import { registerSW } from "virtual:pwa-register";
 import { createI18n } from "vue-i18n";
 import { strings } from "./strings";
 import { language } from "./store";
+import Vue3TouchEvents from "vue3-touch-events";
 
 const i18n = createI18n({
   locale: language.value,
@@ -16,6 +17,7 @@ const app = createApp(App);
 
 app.use(router);
 app.use(i18n);
+app.use(Vue3TouchEvents);
 
 app.mount("#app");
 
diff --git a/src/util.js b/src/util.js
index 6254519..d875204 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,4 +1,11 @@
-import { classFilter } from "./store";
+import {
+  classFilter,
+  fetchSubstitutions,
+  fetchHistory,
+  loading,
+  selectedDate,
+} from "./store";
+import dayjs from "dayjs";
 
 export function getSubstitutionText(substitution) {
   const includeClass = !classFilter.value || classFilter.value == "none";
@@ -22,3 +29,23 @@ export function getSubstitutionColor(substitution) {
       return "background-color: var(--substitution-background-cancellation);";
   }
 }
+
+export function nextDay() {
+  var newDate = dayjs(selectedDate.value).add(1, "day");
+  // Skip weekend
+  if (newDate.day() == 6) newDate = newDate.add(2, "day");
+  changeDate(newDate);
+}
+export function previousDay() {
+  var newDate = dayjs(selectedDate.value).subtract(1, "day");
+  // Skip weekend
+  if (newDate.day() == 0) newDate = newDate.subtract(2, "day");
+  changeDate(newDate);
+}
+export async function changeDate(newDate) {
+  selectedDate.value = new Date(newDate.toDate().setUTCHours(0, 0, 0, 0));
+  loading.value = true;
+  await fetchSubstitutions();
+  await fetchHistory();
+  loading.value = false;
+}