fix: lint-error

This commit is contained in:
2020-06-21 19:06:41 +02:00
parent 84843cc3ed
commit 27ff91ed0b
6 changed files with 253 additions and 232 deletions
+32 -22
View File
@@ -1,10 +1,10 @@
<template> <template>
<div :key="isAuthenticated"> <div :key="isAuthenticated">
<span v-text="isAuthenticated"/> <span v-text="isAuthenticated" />
<v-container fluid grid-list-md class="app-fade-in" :key="range"> <v-container fluid grid-list-md class="app-fade-in" :key="range">
<v-layout row wrap v-if="!isAuthenticated"> <v-layout row wrap v-if="!isAuthenticated">
<v-flex xs12> <v-flex xs12>
<p><b v-text="$t('events.login')"/></p> <p><b v-text="$t('events.login')" /></p>
</v-flex> </v-flex>
</v-layout> </v-layout>
<v-layout row wrap> <v-layout row wrap>
@@ -18,10 +18,9 @@
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
<v-icon v-on="on" v-on:click="fetchAddress()" <v-icon v-on="on" v-on:click="fetchAddress()"
>mdi-crosshairs-gps >mdi-crosshairs-gps
</v-icon </v-icon>
>
</template> </template>
<span v-text="$t('origins.fetchAddress')"/> <span v-text="$t('origins.fetchAddress')" />
</v-tooltip> </v-tooltip>
<v-tooltip top slot="prepend" v-if="isAuthenticated"> <v-tooltip top slot="prepend" v-if="isAuthenticated">
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
@@ -30,10 +29,9 @@
:disabled="!origin" :disabled="!origin"
v-on:click="saveOrigin(origin)" v-on:click="saveOrigin(origin)"
>mdi-bookmark-plus-outline >mdi-bookmark-plus-outline
</v-icon </v-icon>
>
</template> </template>
<span v-text="$t('origins.save')"/> <span v-text="$t('origins.save')" />
</v-tooltip> </v-tooltip>
</v-text-field> </v-text-field>
</v-flex> </v-flex>
@@ -80,13 +78,13 @@
</template> </template>
<script> <script>
import { useMutations, useRouter } from '@u3u/vue-hooks' import { useMutations, useRouter } from '@u3u/vue-hooks'
import { computed, ref, watch } from '@vue/composition-api' import { computed, ref, watch } from '@vue/composition-api'
import { useAuth } from '../../../plugins/auth' import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
import { useAuth } from '../../../plugins/auth'
import List from './List' import List from './List'
import { useMutation, useQuery, useResult } from '@vue/apollo-composable' import {
import {
fetchAddress, fetchAddress,
findEvents, findEvents,
saveOrigin, saveOrigin,
@@ -95,10 +93,10 @@
toggleIgnoreDanceHall, toggleIgnoreDanceHall,
toggleIgnoreMunicipality, toggleIgnoreMunicipality,
toggleIgnoreState toggleIgnoreState
} from '../../../utils/graph-client' } from '../../../utils/graph-client'
import { useTranslation } from '../../../plugins/i18n' import { useTranslation } from '../../../plugins/i18n'
export default { export default {
components: { components: {
List List
}, },
@@ -113,7 +111,11 @@
set: value => router.push(`/?range=${value}`) set: value => router.push(`/?range=${value}`)
}) })
const enabled = ref(false) const enabled = ref(false)
const { result: data, refetch } = useQuery(findEvents, { includeOrigins: false }, () => ({ enabled: enabled.value })) const { result: data, refetch } = useQuery(
findEvents,
{ includeOrigins: false },
() => ({ enabled: enabled.value })
)
const events = useResult(data, [], result => result.events) const events = useResult(data, [], result => result.events)
const origins = useResult(data, [], result => result.origins) const origins = useResult(data, [], result => result.origins)
watch( watch(
@@ -153,9 +155,13 @@
} }
const { mutate: doToggleIgnoreBand } = useMutation(toggleIgnoreBand) const { mutate: doToggleIgnoreBand } = useMutation(toggleIgnoreBand)
const { mutate: doToggleIgnoreDanceHall } = useMutation(toggleIgnoreDanceHall) const { mutate: doToggleIgnoreDanceHall } = useMutation(
toggleIgnoreDanceHall
)
const { mutate: doToggleIgnoreCity } = useMutation(toggleIgnoreCity) const { mutate: doToggleIgnoreCity } = useMutation(toggleIgnoreCity)
const { mutate: doToggleIgnoreMunicipality } = useMutation(toggleIgnoreMunicipality) const { mutate: doToggleIgnoreMunicipality } = useMutation(
toggleIgnoreMunicipality
)
const { mutate: doToggleIgnoreState } = useMutation(toggleIgnoreState) const { mutate: doToggleIgnoreState } = useMutation(toggleIgnoreState)
const toggleIgnoreSuccess = name => { const toggleIgnoreSuccess = name => {
@@ -208,7 +214,11 @@
const { mutate: doSaveOrigin } = useMutation(saveOrigin) const { mutate: doSaveOrigin } = useMutation(saveOrigin)
const addressEnabled = ref(false) const addressEnabled = ref(false)
const { result: address, refetch: doFetchAddress } = useQuery(fetchAddress, {}, () => ({ enabled: addressEnabled.value })) const { result: address, refetch: doFetchAddress } = useQuery(
fetchAddress,
{},
() => ({ enabled: addressEnabled.value })
)
const fetchAddressFn = () => { const fetchAddressFn = () => {
if (window.navigator) { if (window.navigator) {
window.navigator.geolocation.getCurrentPosition(pos => { window.navigator.geolocation.getCurrentPosition(pos => {
@@ -243,5 +253,5 @@
saveOrigin: saveOriginFn saveOrigin: saveOriginFn
} }
} }
} }
</script> </script>
+10 -6
View File
@@ -59,6 +59,7 @@
<script> <script>
import { ref } from '@vue/composition-api' import { ref } from '@vue/composition-api'
import { useMutations } from '@u3u/vue-hooks' import { useMutations } from '@u3u/vue-hooks'
import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
import { import {
fetchFilters, fetchFilters,
toggleIgnoreBand, toggleIgnoreBand,
@@ -69,7 +70,6 @@ import {
} from '~/utils/graph-client' } from '~/utils/graph-client'
import List from './List' import List from './List'
import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
import { useAuth } from '../../../plugins/auth' import { useAuth } from '../../../plugins/auth'
import { useTranslation } from '../../../plugins/i18n' import { useTranslation } from '../../../plugins/i18n'
@@ -89,11 +89,15 @@ export default {
const municipalities = useResult(data, [], result => result.municipalities) const municipalities = useResult(data, [], result => result.municipalities)
const states = useResult(data, [], result => result.states) const states = useResult(data, [], result => result.states)
const snackbar = ref({ active: false, color: 'success', text: '' }) const snackbar = ref({ active: false, color: 'success', text: '' })
const {mutate: doToggleIgnoreBand} = useMutation(toggleIgnoreBand) const { mutate: doToggleIgnoreBand } = useMutation(toggleIgnoreBand)
const {mutate: doToggleIgnoreDanceHall} = useMutation(toggleIgnoreDanceHall) const { mutate: doToggleIgnoreDanceHall } = useMutation(
const {mutate: doToggleIgnoreCity} = useMutation(toggleIgnoreCity) toggleIgnoreDanceHall
const {mutate: doToggleIgnoreMunicipality} = useMutation(toggleIgnoreMunicipality) )
const {mutate: doToggleIgnoreState} = useMutation(toggleIgnoreState) const { mutate: doToggleIgnoreCity } = useMutation(toggleIgnoreCity)
const { mutate: doToggleIgnoreMunicipality } = useMutation(
toggleIgnoreMunicipality
)
const { mutate: doToggleIgnoreState } = useMutation(toggleIgnoreState)
const toggleIgnoreSuccess = name => { const toggleIgnoreSuccess = name => {
return () => { return () => {
+26 -20
View File
@@ -12,10 +12,9 @@
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
<v-icon v-on="on" v-on:click="fetchAddress()" <v-icon v-on="on" v-on:click="fetchAddress()"
>mdi-crosshairs-gps >mdi-crosshairs-gps
</v-icon </v-icon>
>
</template> </template>
<span v-text="$t('origins.fetchAddress')"/> <span v-text="$t('origins.fetchAddress')" />
</v-tooltip> </v-tooltip>
<v-tooltip top slot="prepend"> <v-tooltip top slot="prepend">
<template v-slot:activator="{ on }"> <template v-slot:activator="{ on }">
@@ -24,10 +23,9 @@
:disabled="!origin" :disabled="!origin"
v-on:click="saveOrigin(origin)" v-on:click="saveOrigin(origin)"
>mdi-bookmark-plus-outline >mdi-bookmark-plus-outline
</v-icon </v-icon>
>
</template> </template>
<span v-text="$t('origins.save')"/> <span v-text="$t('origins.save')" />
</v-tooltip> </v-tooltip>
</v-text-field> </v-text-field>
</v-flex> </v-flex>
@@ -41,7 +39,7 @@
>mdi-delete-outline >mdi-delete-outline
</v-icon> </v-icon>
</template> </template>
<span v-text="$t('origins.remove')"/> <span v-text="$t('origins.remove')" />
</v-tooltip> </v-tooltip>
<span>{{ origin }}</span> <span>{{ origin }}</span>
</v-flex> </v-flex>
@@ -59,14 +57,19 @@
</template> </template>
<script> <script>
import { ref } from '@vue/composition-api' import { ref } from '@vue/composition-api'
import { useMutations } from '@u3u/vue-hooks' import { useMutations } from '@u3u/vue-hooks'
import { fetchAddress, findOrigins, removeOrigin, saveOrigin } from '../../../utils/graph-client' import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
import { useMutation, useQuery, useResult } from '@vue/apollo-composable' import {
import { useAuth } from '../../../plugins/auth' fetchAddress,
import { useTranslation } from '../../../plugins/i18n' findOrigins,
removeOrigin,
saveOrigin
} from '../../../utils/graph-client'
import { useAuth } from '../../../plugins/auth'
import { useTranslation } from '../../../plugins/i18n'
export default { export default {
setup() { setup() {
const { setTitle } = useMutations(['setTitle']) const { setTitle } = useMutations(['setTitle'])
const { t } = useTranslation() const { t } = useTranslation()
@@ -75,17 +78,20 @@
const { result: data, loading, refetch } = useQuery(findOrigins) const { result: data, loading, refetch } = useQuery(findOrigins)
const origins = useResult(data, []) const origins = useResult(data, [])
const snackbar = ref({ active: false, color: 'success', text: '' }) const snackbar = ref({ active: false, color: 'success', text: '' })
const {mutate: doSaveOrigin} = useMutation(saveOrigin) const { mutate: doSaveOrigin } = useMutation(saveOrigin)
const {mutate: doRemoveOrigin} = useMutation(removeOrigin) const { mutate: doRemoveOrigin } = useMutation(removeOrigin)
const enabled = ref(false) const enabled = ref(false)
const { refetch: doFetchAddress } = useQuery(fetchAddress, {}, () => ({ enabled: enabled.value })) const { refetch: doFetchAddress } = useQuery(fetchAddress, {}, () => ({
enabled: enabled.value
}))
const origin = ref('') const origin = ref('')
const fetchAddressFn = () => { const fetchAddressFn = () => {
if (window.navigator) { if (window.navigator) {
window.navigator.geolocation.getCurrentPosition(pos => { window.navigator.geolocation.getCurrentPosition(pos => {
enabled.value = true enabled.value = true
doFetchAddress({ latlng: `${pos.coords.latitude},${pos.coords.longitude}` }) doFetchAddress({
.then(res => { latlng: `${pos.coords.latitude},${pos.coords.longitude}`
}).then(res => {
origin.value = res.address origin.value = res.address
}) })
}) })
@@ -109,5 +115,5 @@
fetchAddress: fetchAddressFn fetchAddress: fetchAddressFn
} }
} }
} }
</script> </script>
+1 -3
View File
@@ -18,9 +18,7 @@ export default {
} }
} }
}, },
buildModules: [ buildModules: ['nuxt-composition-api'],
'nuxt-composition-api'
],
css: ['vuetify/dist/vuetify.css', '~/assets/scss/global.scss'], css: ['vuetify/dist/vuetify.css', '~/assets/scss/global.scss'],
env: { env: {
graphqlApi: process.env.GRAPHQL_API graphqlApi: process.env.GRAPHQL_API
+7 -4
View File
@@ -1,13 +1,16 @@
import { ApolloClient } from 'apollo-client' import { ApolloClient } from 'apollo-client'
import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory' import {
InMemoryCache,
IntrospectionFragmentMatcher
} from 'apollo-cache-inmemory'
import { createHttpLink } from 'apollo-link-http' import { createHttpLink } from 'apollo-link-http'
import { setContext } from 'apollo-link-context' import { setContext } from 'apollo-link-context'
import { useAuth } from './auth'
import { provide } from '@vue/composition-api' import { provide } from '@vue/composition-api'
import introspectionQueryResultData from '../fragmentTypes.json'
import { onGlobalSetup } from 'nuxt-composition-api' import { onGlobalSetup } from 'nuxt-composition-api'
import { DefaultApolloClient } from '@vue/apollo-composable' import { DefaultApolloClient } from '@vue/apollo-composable'
import Vue from 'vue' import Vue from 'vue'
import introspectionQueryResultData from '../fragmentTypes.json'
import { useAuth } from './auth'
const apiUrl = process.env.graphqlApi || '/query' const apiUrl = process.env.graphqlApi || '/query'
@@ -21,7 +24,7 @@ const httpLink = createHttpLink({
uri: apiUrl uri: apiUrl
}) })
const getToken = async (options) => { const getToken = async options => {
const { getTokenSilently } = useAuth() const { getTokenSilently } = useAuth()
return getTokenSilently.value(options) return getTokenSilently.value(options)
} }
+2 -2
View File
@@ -10,6 +10,7 @@ let instance
const params = new URL(window.location).searchParams const params = new URL(window.location).searchParams
const domain = params.get('domain') || 'unbound.eu.auth0.com' const domain = params.get('domain') || 'unbound.eu.auth0.com'
// eslint-disable-next-line import/prefer-default-export
export const useAuth = (onRedirectCallback = DEFAULT_REDIRECT_CALLBACK) => { export const useAuth = (onRedirectCallback = DEFAULT_REDIRECT_CALLBACK) => {
if (instance) { if (instance) {
return toRefs(instance) return toRefs(instance)
@@ -105,14 +106,12 @@ export const useAuth = (onRedirectCallback = DEFAULT_REDIRECT_CALLBACK) => {
instance.auth0Client = createAuth0Client(options) instance.auth0Client = createAuth0Client(options)
instance.auth0Client.then(client => { instance.auth0Client.then(client => {
instance.loading = true instance.loading = true
// instance.auth0Client = client
try { try {
// If the user is returning to the app after authentication.. // If the user is returning to the app after authentication..
if ( if (
window.location.search.includes('code=') && window.location.search.includes('code=') &&
window.location.search.includes('state=') window.location.search.includes('state=')
) { ) {
console.log('location search', window.location.search)
// handle the redirect and retrieve tokens // handle the redirect and retrieve tokens
client client
.handleRedirectCallback() .handleRedirectCallback()
@@ -123,6 +122,7 @@ export const useAuth = (onRedirectCallback = DEFAULT_REDIRECT_CALLBACK) => {
// Initialize our internal authentication state // Initialize our internal authentication state
fetchUser() fetchUser()
}) })
// eslint-disable-next-line no-console
.catch(e => console.error('error handling redirect callback', e)) .catch(e => console.error('error handling redirect callback', e))
} else { } else {
fetchUser() fetchUser()