chore: refactor a lot, add codegen and upgrade vue

2022-08-03 18:40:05 +02:00
parent 0e1ce42af2
commit e24b65c85b
42 changed files with 3854 additions and 1073 deletions
@@ -1,42 +1,46 @@
 <template>
  <div :key='isAuthenticated'>
    <v-container :key='range' fluid grid-list-md class='app-fade-in'>
-      <v-layout v-if='!isAuthenticated' row wrap>
-        <v-flex xs12>
+      <v-row v-if='!isAuthenticated' wrap>
+        <v-col xs='12'>
          <p><b v-text="$t('events.login')" /></p>
-        </v-flex>
-      </v-layout>
-      <v-layout row wrap>
-        <v-flex xs12>
+        </v-col>
+      </v-row>
+      <v-row wrap>
+        <v-col xs='12'>
          <v-text-field
            v-model='origin'
            :label="$t('origins.origin')"
            :placeholder="$t('origins.geolocation')"
          >
-            <v-tooltip slot='append-outer' top>
-              <template #activator='{ on }'>
-                <v-icon v-on='on' @click='fetchAddress()'
-                >mdi-crosshairs-gps
-                </v-icon>
-              </template>
-              <span v-text="$t('origins.fetchAddress')" />
-            </v-tooltip>
-            <v-tooltip v-if='isAuthenticated' slot='prepend' top>
-              <template #activator='{ on }'>
-                <v-icon
-                  :disabled='!origin'
-                  v-on='on'
-                  @click='saveOrigin(origin)'
-                >mdi-bookmark-plus-outline
-                </v-icon>
-              </template>
-              <span v-text="$t('origins.save')" />
-            </v-tooltip>
+            <template #append-outer>
+              <v-tooltip top>
+                <template #activator='{ on }'>
+                  <v-icon v-on='on' @click='fetchAddress()'
+                  >mdi-crosshairs-gps
+                  </v-icon>
+                </template>
+                <span v-text="$t('origins.fetchAddress')" />
+              </v-tooltip>
+            </template>
+            <template #prepend>
+              <v-tooltip v-if='isAuthenticated' top>
+                <template #activator='{ on }'>
+                  <v-icon
+                    :disabled='!origin'
+                    v-on='on'
+                    @click='saveOrigin(origin)'
+                  >mdi-bookmark-plus-outline
+                  </v-icon>
+                </template>
+                <span v-text="$t('origins.save')" />
+              </v-tooltip>
+            </template>
          </v-text-field>
-        </v-flex>
-      </v-layout>
-      <v-layout row wrap>
-        <v-flex>
+        </v-col>
+      </v-row>
+      <v-row wrap>
+        <v-col>
          <v-btn-toggle
            v-if='$vuetify.breakpoint.smAndUp'
            v-model='range'
@@ -47,17 +51,17 @@
              /></v-btn>
          </v-btn-toggle>
          <v-select
-            v-if='$vuetify.breakpoint.xsOnly'
+            v-else
            v-model='range'
            outline
            :items='ranges'
            item-text='name'
            item-value='value'
          />
-        </v-flex>
-      </v-layout>
+        </v-col>
+      </v-row>
      <list
-        :events='events || []'
+        :events='events'
        :has-user='isAuthenticated'
        :toggle-ignore='toggleIgnore'
      />
@@ -72,58 +76,61 @@
  </div>
 </template>

-<script>
-import { useMutations, useRouter } from '@u3u/vue-hooks'
-import { computed, ref, watch } from '@vue/composition-api'
-import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
+<script lang='ts'>
+import { computed, defineComponent, ref, watch } from 'vue'
+import { useRoute, useRouter, useStore } from '@nuxtjs/composition-api'
+
+import List from './List/index.vue'
 import { useAuth } from '~/plugins/auth'
-
-import List from './List'
-import {
-  fetchAddress,
-  findEvents,
-  saveOrigin,
-  toggleIgnoreBand,
-  toggleIgnoreCity,
-  toggleIgnoreDanceHall,
-  toggleIgnoreMunicipality,
-  toggleIgnoreState
-} from '~/utils/graph-client'
 import { useTranslation } from '~/plugins/i18n'
+import {
+  FindEventsQueryVariables,
+  Range,
+  useFetchAddressLazyQuery,
+  useFindEventsLazyQuery,
+  useSaveOriginMutation,
+  useToggleIgnoreBandMutation,
+  useToggleIgnoreCityMutation,
+  useToggleIgnoreDanceHallMutation,
+  useToggleIgnoreMunicipalityMutation,
+  useToggleIgnoreStateMutation
+} from '~/graphql/generated/operations'

-export default {
+export default defineComponent({
  name: 'EventsPage',
  components: {
    List
  },
  setup() {
-    const { setTitle } = useMutations(['setTitle'])
+    const store = useStore()
    const { t } = useTranslation()
-    setTitle(t('app.links.events'))
+    store.commit('setTitle', t('app.links.events'))
    const { loading: authLoading, isAuthenticated } = useAuth()
-    const { route, router } = useRouter()
+    const route = useRoute()
+    const router = useRouter()
    const range = computed({
-      get: () => route.value.query.range || 'ONE_WEEK',
-      set: (value) => router.push(`/?range=${value}`)
+      get: () => route.value.query.range ? route.value.query.range as Range : undefined,
+      set: (value) => {
+        router.push(`/?range=${value}`)
+      }
    })
-    const enabled = ref(false)
-    const { result: data, refetch } = useQuery(
-      findEvents,
-      { includeOrigins: false },
-      () => ({ enabled: enabled.value })
-    )
-    const events = useResult(data, [], (result) => result.events)
-    const origins = useResult(data, [], (result) => result.origins)
+    const variables = ref<FindEventsQueryVariables>({ includeOrigins: false})
+    const { result, refetch, load } = useFindEventsLazyQuery(variables)
+    const events = computed(() => result.value?.events ?? [])
+    const origins = computed(() => result.value?.origins ?? [])
    watch(
-      range,
+      () => route.value.query.range,
      (r) => {
-        enabled.value = true
-        refetch({
-          range: r,
-          includeOrigins: isAuthenticated.value || false
-        })
+        if (!authLoading.value) {
+          variables.value = {
+            range: r ? r as Range : Range.OneWeek,
+            includeOrigins: isAuthenticated.value || false
+          }
+          load()
+          refetch(variables.value)
+        }
      },
-      { lazy: false }
+      { immediate: true }
    )
    const submitting = ref(true)
    const ranges = [
@@ -141,25 +148,22 @@ export default {
      if (origin.value) {
        originsTemp.push(origin.value)
      }
-      enabled.value = true
-      refetch({
+      variables.value = {
        range: range.value,
        origins: originsTemp,
        includeOrigins: isAuthenticated.value || false
-      })
+      }
+      load()
+      refetch(variables.value)
    }

-    const { mutate: doToggleIgnoreBand } = useMutation(toggleIgnoreBand)
-    const { mutate: doToggleIgnoreDanceHall } = useMutation(
-      toggleIgnoreDanceHall
-    )
-    const { mutate: doToggleIgnoreCity } = useMutation(toggleIgnoreCity)
-    const { mutate: doToggleIgnoreMunicipality } = useMutation(
-      toggleIgnoreMunicipality
-    )
-    const { mutate: doToggleIgnoreState } = useMutation(toggleIgnoreState)
+    const { mutate: doToggleIgnoreBand } = useToggleIgnoreBandMutation({})
+    const { mutate: doToggleIgnoreDanceHall } = useToggleIgnoreDanceHallMutation({})
+    const { mutate: doToggleIgnoreCity } = useToggleIgnoreCityMutation({})
+    const { mutate: doToggleIgnoreMunicipality } = useToggleIgnoreMunicipalityMutation({})
+    const { mutate: doToggleIgnoreState } = useToggleIgnoreStateMutation({})

-    const toggleIgnoreSuccess = (name) => {
+    const toggleIgnoreSuccess = (name: string) => {
      return () => {
        fetchEvents()
        snackbar.value.color = 'success'
@@ -168,7 +172,7 @@ export default {
      }
    }

-    const toggleIgnoreFailed = (name) => {
+    const toggleIgnoreFailed = (name: string) => {
      return () => {
        snackbar.value.color = 'error'
        snackbar.value.text = `${name} kunde inte döljas`
@@ -176,7 +180,7 @@ export default {
      }
    }

-    const toggleIgnore = (type, name) => {
+    const toggleIgnore = (type: string, name: string) => {
      switch (type) {
        case 'band':
          doToggleIgnoreBand({ name })
@@ -207,26 +211,21 @@ export default {
      }
    }

-    const { mutate: doSaveOrigin } = useMutation(saveOrigin)
-    const addressEnabled = ref(false)
-    const { result: address, refetch: doFetchAddress } = useQuery(
-      fetchAddress,
-      {},
-      () => ({ enabled: addressEnabled.value })
-    )
+    const { mutate: doSaveOrigin } = useSaveOriginMutation({})
+    const { refetch: doFetchAddress, load: loadFetchAddress } = useFetchAddressLazyQuery({ latlng: '' })
    const fetchAddressFn = () => {
      if (window.navigator) {
        window.navigator.geolocation.getCurrentPosition((pos) => {
-          addressEnabled.value = true
+          loadFetchAddress()
          doFetchAddress({
            latlng: `${pos.coords.latitude},${pos.coords.longitude}`
-          }).then(() => {
-            origin.value = address.value.address
+          })?.then((result) => {
+            origin.value = result.data.address
          })
        })
      }
    }
-    const saveOriginFn = (o) =>
+    const saveOriginFn = (o: string) =>
      doSaveOrigin({ origin: o }).then(() => {
        origin.value = ''
        fetchEvents()
@@ -238,7 +237,6 @@ export default {
      range,
      events,
      origins,
-      query: fetchEvents,
      submitting,
      ranges,
      snackbar,
@@ -248,5 +246,5 @@ export default {
      saveOrigin: saveOriginFn
    }
  }
-}
+})
 </script>