ci: remove prettier and use eslint for formatting

This commit is contained in:
2024-02-02 14:46:42 +01:00
parent 6ff8688760
commit b1e04077f9
20 changed files with 222 additions and 383 deletions
+2 -4
View File
@@ -5,9 +5,7 @@
>
<v-flex xs12 sm6>
<v-icon>mdi-home</v-icon>
<span
><strong>{{ distance.origin }}</strong></span
>
<span><strong>{{ distance.origin }}</strong></span>
</v-flex>
<v-flex xs12 sm6>
<v-icon>mdi-car</v-icon>
@@ -30,7 +28,7 @@ export default defineComponent({
required: true
}
},
setup(props) {
setup (props) {
const numericDistance = computed(() =>
Number(props.distance.distance / 1000).toLocaleString('sv-SE', {
minimumFractionDigits: 2,
+61 -47
View File
@@ -1,102 +1,116 @@
<template>
<v-card flat outlined rounded class='mx-3 my-3 rounded-xl'>
<v-card flat outlined rounded class="mx-3 my-3 rounded-xl">
<v-card-title primary-title>
<h3 class='headline mb-0'>
<h3 class="headline mb-0">
<v-icon
v-if='hasUser'
class='ml-1 mr-1'
v-if="hasUser"
class="ml-1 mr-1"
medium
title="Dölj"
@click="toggleIgnore('band', event.band.name)"
>mdi-eye-off</v-icon
>{{ event.band.name }}
>
mdi-eye-off
</v-icon>{{ event.band.name }}
</h3>
</v-card-title>
<v-container>
<v-layout row wrap>
<v-flex xs12 sm6
><strong class='mr-1' v-text="$t('events.date')" />{{
<v-flex
xs12
sm6
>
<strong class="mr-1" v-text="$t('events.date')" />{{
event.date
}}
({{ weekday }} {{ daysUntil }})
</v-flex
>
<v-flex v-if='event.time' xs12 sm6
><strong class='mr-1' v-text="$t('events.time')" />{{
</v-flex>
<v-flex v-if="event.time" xs12 sm6>
<strong class="mr-1" v-text="$t('events.time')" />{{
event.time
}}
</v-flex
>
</v-flex>
</v-layout>
<v-layout row wrap>
<v-flex xs12 sm6 md3
><strong class='mr-1' v-text="$t('events.hall')" />
<v-flex
xs12
sm6
md3
>
<strong class="mr-1" v-text="$t('events.hall')" />
<v-icon
v-if='hasUser'
class='ml-1 mr-1'
v-if="hasUser"
class="ml-1 mr-1"
small
:title="$t('events.hide')"
@click="toggleIgnore('danceHall', event.danceHall.name)"
>mdi-eye-off
</v-icon
>
mdi-eye-off
</v-icon>
{{ event.danceHall.name }}
</v-flex
</v-flex>
<v-flex
xs12
sm6
md3
>
<v-flex xs12 sm6 md3
><strong class='mr-1' v-text="$t('events.city')" />
<strong class="mr-1" v-text="$t('events.city')" />
<v-icon
v-if='hasUser'
class='ml-1 mr-1'
v-if="hasUser"
class="ml-1 mr-1"
small
:title="$t('events.hide')"
@click="toggleIgnore('city', event.danceHall.city)"
>mdi-eye-off
</v-icon
>
mdi-eye-off
</v-icon>
{{ event.danceHall.city }}
</v-flex
</v-flex>
<v-flex
xs12
sm6
md3
>
<v-flex xs12 sm6 md3
><strong class='mr-1' v-text="$t('events.municipality')" />
<strong class="mr-1" v-text="$t('events.municipality')" />
<v-icon
v-if='hasUser'
class='ml-1 mr-1'
v-if="hasUser"
class="ml-1 mr-1"
small
:title="$t('events.hide')"
@click="
toggleIgnore('municipality', event.danceHall.municipality)
"
>mdi-eye-off
</v-icon
>
mdi-eye-off
</v-icon>
{{ event.danceHall.municipality }}
</v-flex
</v-flex>
<v-flex
xs12
sm6
md3
>
<v-flex xs12 sm6 md3
><strong class='mr-1' v-text="$t('events.state')" />
<strong class="mr-1" v-text="$t('events.state')" />
<v-icon
v-if='hasUser'
class='ml-1 mr-1'
v-if="hasUser"
class="ml-1 mr-1"
small
:title="$t('events.hide')"
@click="toggleIgnore('state', event.danceHall.state)"
>mdi-eye-off
</v-icon
>
mdi-eye-off
</v-icon>
{{ event.danceHall.state }}
</v-flex
>
</v-flex>
</v-layout>
<distance-display v-for='distance in event.distances' :key='distance.origin' :distance='distance'/>
<distance-display v-for="distance in event.distances" :key="distance.origin" :distance="distance" />
</v-container>
</v-card>
</template>
<script lang='ts'>
// eslint-disable-next-line import/no-duplicates
import { format, formatDistanceToNow, parseISO } from 'date-fns'
// eslint-disable-next-line import/no-duplicates
import { enGB, sv } from 'date-fns/locale'
import { computed, defineComponent, getCurrentInstance, PropType } from 'vue'
import { Event } from '~/graphql/generated/operations'
@@ -119,7 +133,7 @@ export default defineComponent({
required: true
}
},
setup(props) {
setup (props) {
const instance = getCurrentInstance()
const locale = computed(() => (instance?.proxy.$i18n.locale ?? 'sv') === 'en' ? enGB : sv)
const time = computed(() => (props.event.time || '').split('-')[0].replace('.', ':'))
+40 -36
View File
@@ -1,36 +1,40 @@
<template>
<div :key='isAuthenticated'>
<v-container :key='range' fluid grid-list-md class='app-fade-in'>
<v-row v-if='!isAuthenticated' wrap>
<v-col xs='12'>
<div :key="isAuthenticated">
<v-container :key="range" fluid grid-list-md class="app-fade-in">
<v-row v-if="!isAuthenticated" wrap>
<v-col xs="12">
<p><b v-text="$t('events.login')" /></p>
</v-col>
</v-row>
<v-row wrap>
<v-col xs='12'>
<v-col xs="12">
<v-text-field
v-model='origin'
v-model="origin"
:label="$t('origins.origin')"
:placeholder="$t('origins.geolocation')"
>
<template #append-outer>
<v-tooltip top>
<template #activator='{ on }'>
<v-icon v-on='on' @click='fetchAddress()'
>mdi-crosshairs-gps
<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-tooltip v-if="isAuthenticated" top>
<template #activator="{ on }">
<v-icon
:disabled='!origin'
v-on='on'
@click='saveOrigin(origin)'
>mdi-bookmark-plus-outline
:disabled="!origin"
v-on="on"
@click="saveOrigin(origin)"
>
mdi-bookmark-plus-outline
</v-icon>
</template>
<span v-text="$t('origins.save')" />
@@ -42,47 +46,47 @@
<v-row wrap>
<v-col>
<v-btn-toggle
v-if='$vuetify.breakpoint.smAndUp'
v-model='state.range'
v-if="$vuetify.breakpoint.smAndUp"
v-model="state.range"
mandatory
>
<v-btn v-for='r in ranges' :key='r.value' text :value='r.value'>
<span v-text='$t(`events.range.${r.value}`)'
/></v-btn>
<v-btn v-for="r in ranges" :key="r.value" text :value="r.value">
<span v-text="$t(`events.range.${r.value}`)" />
</v-btn>
</v-btn-toggle>
<v-select
v-else
v-model='state.range'
v-model="state.range"
outline
:items='ranges'
item-text='name'
item-value='value'
:items="ranges"
item-text="name"
item-value="value"
/>
</v-col>
</v-row>
<v-row wrap>
<v-col cols='12' sm='8'>
<v-col cols="12" sm="8">
<v-text-field
v-model='state.search'
append-outer-icon='mdi-magnify'
v-model="state.search"
append-outer-icon="mdi-magnify"
:label="$t('events.filter')"
:placeholder="$t('events.filter')"
/>
</v-col>
<v-col cols='12' sm='4'>
<v-checkbox v-model='state.includeHidden' :label='$t("events.includeHidden")' />
<v-col cols="12" sm="4">
<v-checkbox v-model="state.includeHidden" :label="$t(&quot;events.includeHidden&quot;)" />
</v-col>
</v-row>
<list
:events='events'
:has-user='isAuthenticated'
:toggle-ignore='toggleIgnore'
:events="events"
:has-user="isAuthenticated"
:toggle-ignore="toggleIgnore"
/>
</v-container>
<v-snackbar
v-model='snackbar.active'
:color='snackbar.color'
:timeout='5000'
v-model="snackbar.active"
:color="snackbar.color"
:timeout="5000"
>
{{ snackbar.text }}
</v-snackbar>
@@ -113,7 +117,7 @@ export default defineComponent({
components: {
List
},
setup() {
setup () {
const state = useState()
const { t } = useTranslation()
state.setTitle(t('app.links.events'))
+9 -7
View File
@@ -1,19 +1,21 @@
<template>
<v-card flat outlined class='mx-3 my-3 rounded-xl'>
<v-card flat outlined class="mx-3 my-3 rounded-xl">
<v-card-title>
<span v-text='$tc(title, model.length)' />
<span v-text="$tc(title, model.length)" />
</v-card-title>
<v-list>
<v-list-item v-for='item in model' :key='item'>
<v-list-item-action @click='toggleIgnore(type, item)'>
<v-list-item v-for="item in model" :key="item">
<v-list-item-action @click="toggleIgnore(type, item)">
<v-tooltip top>
<template #activator='{ on }'>
<v-icon v-on='on'>mdi-delete-outline</v-icon>
<template #activator="{ on }">
<v-icon v-on="on">
mdi-delete-outline
</v-icon>
</template>
<span v-text="$t('filters.remove')" />
</v-tooltip>
</v-list-item-action>
<v-list-item-title><span v-text='item' /></v-list-item-title>
<v-list-item-title><span v-text="item" /></v-list-item-title>
</v-list-item>
</v-list>
</v-card>
+30 -30
View File
@@ -1,45 +1,45 @@
<template>
<div :key='isAuthenticated'>
<v-container fluid grid-list-md class='app-fade-in'>
<div :key="isAuthenticated">
<v-container fluid grid-list-md class="app-fade-in">
<v-row wrap>
<v-col cols='12'>
<v-col cols="12">
<v-card>
<v-container fluid grid-list-md>
<v-row wrap>
<v-col xs='12' sm='12' md='4' lg='4'>
<v-col xs="12" sm="12" md="4" lg="4">
<list
:model='bands || []'
title='filters.band'
type='band'
:toggle-ignore='toggleIgnore'
:model="bands || []"
title="filters.band"
type="band"
:toggle-ignore="toggleIgnore"
/>
</v-col>
<v-col xs='12' sm='12' md='4' lg='4'>
<v-col xs="12" sm="12" md="4" lg="4">
<v-row>
<v-col cols='12'>
<v-col cols="12">
<list
:model='states || []'
title='filters.state'
type='state'
:toggle-ignore='toggleIgnore'
:model="states || []"
title="filters.state"
type="state"
:toggle-ignore="toggleIgnore"
/>
<list
:model='municipalities || []'
title='filters.municipality'
type='municipality'
:toggle-ignore='toggleIgnore'
:model="municipalities || []"
title="filters.municipality"
type="municipality"
:toggle-ignore="toggleIgnore"
/>
<list
:model='cities || []'
title='filters.city'
type='city'
:toggle-ignore='toggleIgnore'
:model="cities || []"
title="filters.city"
type="city"
:toggle-ignore="toggleIgnore"
/>
<list
:model='danceHalls || []'
title='filters.hall'
type='danceHall'
:toggle-ignore='toggleIgnore'
:model="danceHalls || []"
title="filters.hall"
type="danceHall"
:toggle-ignore="toggleIgnore"
/>
</v-col>
</v-row>
@@ -51,9 +51,9 @@
</v-row>
</v-container>
<v-snackbar
v-model='snackbar.active'
:color='snackbar.color'
:timeout='5000'
v-model="snackbar.active"
:color="snackbar.color"
:timeout="5000"
>
{{ snackbar.text }}
</v-snackbar>
@@ -81,7 +81,7 @@ export default {
components: {
List
},
setup() {
setup () {
const state = useState()
const { t } = useTranslation()
state.setTitle(t('app.links.filters'))
+26 -19
View File
@@ -1,18 +1,21 @@
<template>
<div :key='isAuthenticated'>
<v-container fluid grid-list-md class='app-fade-in'>
<div :key="isAuthenticated">
<v-container fluid grid-list-md class="app-fade-in">
<v-layout row wrap>
<v-flex xs12>
<v-text-field
v-model='origin'
v-model="origin"
:label="$t('origins.origin')"
:placeholder="$t('origins.geolocation')"
>
<template #append-outer>
<v-tooltip top>
<template #activator='{ on }'>
<v-icon v-on='on' @click='fetchAddress()'
>mdi-crosshairs-gps
<template #activator="{ on }">
<v-icon
v-on="on"
@click="fetchAddress()"
>
mdi-crosshairs-gps
</v-icon>
</template>
<span v-text="$t('origins.fetchAddress')" />
@@ -20,12 +23,13 @@
</template>
<template #prepend>
<v-tooltip top>
<template #activator='{ on }'>
<template #activator="{ on }">
<v-icon
:disabled='!origin'
v-on='on'
@click='saveOrigin(origin)'
>mdi-bookmark-plus-outline
:disabled="!origin"
v-on="on"
@click="saveOrigin(origin)"
>
mdi-bookmark-plus-outline
</v-icon>
</template>
<span v-text="$t('origins.save')" />
@@ -34,12 +38,15 @@
</v-text-field>
</v-flex>
</v-layout>
<v-layout v-for='o in origins' :key='o' row wrap>
<v-layout v-for="o in origins" :key="o" row wrap>
<v-flex xs12>
<v-tooltip top>
<template #activator='{ on }'>
<v-icon v-on='on' @click='removeOrigin(o)'
>mdi-delete-outline
<template #activator="{ on }">
<v-icon
v-on="on"
@click="removeOrigin(o)"
>
mdi-delete-outline
</v-icon>
</template>
<span v-text="$t('origins.remove')" />
@@ -49,9 +56,9 @@
</v-layout>
</v-container>
<v-snackbar
v-model='snackbar.active'
:color='snackbar.color'
:timeout='5000'
v-model="snackbar.active"
:color="snackbar.color"
:timeout="5000"
>
{{ snackbar.text }}
</v-snackbar>
@@ -72,7 +79,7 @@ import { useState } from '~/store'
export default defineComponent({
name: 'OriginsPage',
setup() {
setup () {
const state = useState()
const { t } = useTranslation()
state.setTitle(t('app.links.origins'))