diff --git a/.eslintrc.js b/.eslintrc.cjs similarity index 57% rename from .eslintrc.js rename to .eslintrc.cjs index 9bf39af..b0ff5c3 100644 --- a/.eslintrc.js +++ b/.eslintrc.cjs @@ -17,7 +17,20 @@ module.exports = { '@nuxtjs/eslint-config-typescript', 'plugin:nuxt/recommended' ], - ignorePatterns: ['graphql/generated/*'], // add your custom rules here - rules: {} + rules: {}, + overrides: [ + { + files: ['pages/**/*.vue', 'layouts/*.vue'], + rules: { + 'vue/multi-word-component-names': 'off' + } + }, + { + files: ['graphql/generated/*.ts'], + rules: { + 'no-use-before-define': 'off' + } + } + ] } diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 3e3dc36..0000000 --- a/.prettierignore +++ /dev/null @@ -1,106 +0,0 @@ -### -# Place your Prettier ignore content here - -### -# .gitignore content is duplicated here due to https://github.com/prettier/prettier/issues/8506 - -# Created by .ignore support plugin (hsz.mobi) -### Node template -# Logs -/logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# Nuxt generate -dist - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - -# IDE / Editor -.idea - -# Service worker -sw.* - -# macOS -.DS_Store - -# Vim swap files -*.swp - -.eslintrc.js -.gitlab-ci.yml -.gitlab/dependabot.yml -.prettierignore -codegen.yml -graphql/generated/* -k8s/* -nuxt.config.js -tsconfig.json diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index b2095be..0000000 --- a/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "semi": false, - "singleQuote": true -} diff --git a/graphql/generated/operations.ts b/graphql/generated/operations.ts index 2d350f5..da71215 100644 --- a/graphql/generated/operations.ts +++ b/graphql/generated/operations.ts @@ -1,6 +1,6 @@ -import { gql } from '@/utils/gql'; -import * as VueApolloComposable from '@vue/apollo-composable'; -import * as VueCompositionApi from 'vue'; +import * as VueApolloComposable from '@vue/apollo-composable' +import * as VueCompositionApi from 'vue' +import { gql } from '@/utils/gql' export type Maybe = T | null | undefined; export type InputMaybe = T | null | undefined; export type Exact = { [K in keyof T]: T[K] }; @@ -86,37 +86,30 @@ export type Mutation = { ToggleIgnoreState: Scalars['Boolean']['output']; }; - export type MutationRemoveOriginArgs = { origin: Scalars['String']['input']; }; - export type MutationSaveOriginArgs = { origin: Scalars['String']['input']; }; - export type MutationToggleIgnoreBandArgs = { name: Scalars['String']['input']; }; - export type MutationToggleIgnoreCityArgs = { name: Scalars['String']['input']; }; - export type MutationToggleIgnoreDanceHallArgs = { name: Scalars['String']['input']; }; - export type MutationToggleIgnoreMunicipalityArgs = { name: Scalars['String']['input']; }; - export type MutationToggleIgnoreStateArgs = { name: Scalars['String']['input']; }; @@ -145,12 +138,10 @@ export type Query = { Origins: Array; }; - export type QueryAddressFromLatLngArgs = { latlng: Scalars['String']['input']; }; - export type QueryEventsArgs = { includeHidden?: InputMaybe; origins?: InputMaybe>; @@ -170,61 +161,52 @@ export type RemoveOriginMutationVariables = Exact<{ origin: Scalars['String']['input']; }>; - export type RemoveOriginMutation = { __typename?: 'Mutation', removed: boolean }; export type SaveOriginMutationVariables = Exact<{ origin: Scalars['String']['input']; }>; - export type SaveOriginMutation = { __typename?: 'Mutation', saved: boolean }; export type ToggleIgnoreBandMutationVariables = Exact<{ name: Scalars['String']['input']; }>; - export type ToggleIgnoreBandMutation = { __typename?: 'Mutation', ignore: boolean }; export type ToggleIgnoreCityMutationVariables = Exact<{ name: Scalars['String']['input']; }>; - export type ToggleIgnoreCityMutation = { __typename?: 'Mutation', ignore: boolean }; export type ToggleIgnoreDanceHallMutationVariables = Exact<{ name: Scalars['String']['input']; }>; - export type ToggleIgnoreDanceHallMutation = { __typename?: 'Mutation', ignore: boolean }; export type ToggleIgnoreMunicipalityMutationVariables = Exact<{ name: Scalars['String']['input']; }>; - export type ToggleIgnoreMunicipalityMutation = { __typename?: 'Mutation', ignore: boolean }; export type ToggleIgnoreStateMutationVariables = Exact<{ name: Scalars['String']['input']; }>; - export type ToggleIgnoreStateMutation = { __typename?: 'Mutation', ignore: boolean }; export type FetchAddressQueryVariables = Exact<{ latlng: Scalars['String']['input']; }>; - export type FetchAddressQuery = { __typename?: 'Query', address: string }; export type FetchFiltersQueryVariables = Exact<{ [key: string]: never; }>; - export type FetchFiltersQuery = { __typename?: 'Query', bands: Array, cities: Array, states: Array, danceHalls: Array, municipalities: Array }; export type FindEventsQueryVariables = Exact<{ @@ -235,20 +217,17 @@ export type FindEventsQueryVariables = Exact<{ includeHidden?: InputMaybe; }>; - export type FindEventsQuery = { __typename?: 'Query', origins: Array, events: Array<{ __typename?: 'Event', date: string, time: string | null | undefined, extraInfo: string | null | undefined, band: { __typename?: 'Band', name: string } | null | undefined, danceHall: { __typename?: 'DanceHall', name: string | null | undefined, city: string | null | undefined, municipality: string | null | undefined, state: string | null | undefined } | null | undefined, distances: Array<{ __typename?: 'DanceHallDistance', origin: string, distance: number, duration: string }> }> }; export type FindOriginsQueryVariables = Exact<{ [key: string]: never; }>; - export type FindOriginsQuery = { __typename?: 'Query', origins: Array }; - export const RemoveOriginDocument = gql` mutation RemoveOrigin($origin: String!) { removed: RemoveOrigin(origin: $origin) } - `; + ` /** * __useRemoveOriginMutation__ @@ -267,15 +246,15 @@ export const RemoveOriginDocument = gql` * }, * }); */ -export function useRemoveOriginMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(RemoveOriginDocument, options); +export function useRemoveOriginMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(RemoveOriginDocument, options) } export type RemoveOriginMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const SaveOriginDocument = gql` mutation SaveOrigin($origin: String!) { saved: SaveOrigin(origin: $origin) } - `; + ` /** * __useSaveOriginMutation__ @@ -294,15 +273,15 @@ export const SaveOriginDocument = gql` * }, * }); */ -export function useSaveOriginMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(SaveOriginDocument, options); +export function useSaveOriginMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(SaveOriginDocument, options) } export type SaveOriginMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ToggleIgnoreBandDocument = gql` mutation ToggleIgnoreBand($name: String!) { ignore: ToggleIgnoreBand(name: $name) } - `; + ` /** * __useToggleIgnoreBandMutation__ @@ -321,15 +300,15 @@ export const ToggleIgnoreBandDocument = gql` * }, * }); */ -export function useToggleIgnoreBandMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(ToggleIgnoreBandDocument, options); +export function useToggleIgnoreBandMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(ToggleIgnoreBandDocument, options) } export type ToggleIgnoreBandMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ToggleIgnoreCityDocument = gql` mutation ToggleIgnoreCity($name: String!) { ignore: ToggleIgnoreCity(name: $name) } - `; + ` /** * __useToggleIgnoreCityMutation__ @@ -348,15 +327,15 @@ export const ToggleIgnoreCityDocument = gql` * }, * }); */ -export function useToggleIgnoreCityMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(ToggleIgnoreCityDocument, options); +export function useToggleIgnoreCityMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(ToggleIgnoreCityDocument, options) } export type ToggleIgnoreCityMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ToggleIgnoreDanceHallDocument = gql` mutation ToggleIgnoreDanceHall($name: String!) { ignore: ToggleIgnoreDanceHall(name: $name) } - `; + ` /** * __useToggleIgnoreDanceHallMutation__ @@ -375,15 +354,15 @@ export const ToggleIgnoreDanceHallDocument = gql` * }, * }); */ -export function useToggleIgnoreDanceHallMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(ToggleIgnoreDanceHallDocument, options); +export function useToggleIgnoreDanceHallMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(ToggleIgnoreDanceHallDocument, options) } export type ToggleIgnoreDanceHallMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ToggleIgnoreMunicipalityDocument = gql` mutation ToggleIgnoreMunicipality($name: String!) { ignore: ToggleIgnoreMunicipality(name: $name) } - `; + ` /** * __useToggleIgnoreMunicipalityMutation__ @@ -402,15 +381,15 @@ export const ToggleIgnoreMunicipalityDocument = gql` * }, * }); */ -export function useToggleIgnoreMunicipalityMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(ToggleIgnoreMunicipalityDocument, options); +export function useToggleIgnoreMunicipalityMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(ToggleIgnoreMunicipalityDocument, options) } export type ToggleIgnoreMunicipalityMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const ToggleIgnoreStateDocument = gql` mutation ToggleIgnoreState($name: String!) { ignore: ToggleIgnoreState(name: $name) } - `; + ` /** * __useToggleIgnoreStateMutation__ @@ -429,15 +408,15 @@ export const ToggleIgnoreStateDocument = gql` * }, * }); */ -export function useToggleIgnoreStateMutation(options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { - return VueApolloComposable.useMutation(ToggleIgnoreStateDocument, options); +export function useToggleIgnoreStateMutation (options: VueApolloComposable.UseMutationOptions | ReactiveFunction> = {}) { + return VueApolloComposable.useMutation(ToggleIgnoreStateDocument, options) } export type ToggleIgnoreStateMutationCompositionFunctionResult = VueApolloComposable.UseMutationReturn; export const FetchAddressDocument = gql` query FetchAddress($latlng: String!) { address: AddressFromLatLng(latlng: $latlng) } - `; + ` /** * __useFetchAddressQuery__ @@ -454,11 +433,11 @@ export const FetchAddressDocument = gql` * latlng: // value for 'latlng' * }); */ -export function useFetchAddressQuery(variables: FetchAddressQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useQuery(FetchAddressDocument, variables, options); +export function useFetchAddressQuery (variables: FetchAddressQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useQuery(FetchAddressDocument, variables, options) } -export function useFetchAddressLazyQuery(variables: FetchAddressQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useLazyQuery(FetchAddressDocument, variables, options); +export function useFetchAddressLazyQuery (variables: FetchAddressQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useLazyQuery(FetchAddressDocument, variables, options) } export type FetchAddressQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; export const FetchFiltersDocument = gql` @@ -469,7 +448,7 @@ export const FetchFiltersDocument = gql` danceHalls: IgnoredDanceHalls municipalities: IgnoredMunicipalities } - `; + ` /** * __useFetchFiltersQuery__ @@ -483,11 +462,11 @@ export const FetchFiltersDocument = gql` * @example * const { result, loading, error } = useFetchFiltersQuery(); */ -export function useFetchFiltersQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useQuery(FetchFiltersDocument, {}, options); +export function useFetchFiltersQuery (options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useQuery(FetchFiltersDocument, {}, options) } -export function useFetchFiltersLazyQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useLazyQuery(FetchFiltersDocument, {}, options); +export function useFetchFiltersLazyQuery (options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useLazyQuery(FetchFiltersDocument, {}, options) } export type FetchFiltersQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; export const FindEventsDocument = gql` @@ -518,7 +497,7 @@ export const FindEventsDocument = gql` } origins: Origins @include(if: $includeOrigins) } - `; + ` /** * __useFindEventsQuery__ @@ -539,18 +518,18 @@ export const FindEventsDocument = gql` * includeHidden: // value for 'includeHidden' * }); */ -export function useFindEventsQuery(variables: FindEventsQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useQuery(FindEventsDocument, variables, options); +export function useFindEventsQuery (variables: FindEventsQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useQuery(FindEventsDocument, variables, options) } -export function useFindEventsLazyQuery(variables: FindEventsQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useLazyQuery(FindEventsDocument, variables, options); +export function useFindEventsLazyQuery (variables: FindEventsQueryVariables | VueCompositionApi.Ref | ReactiveFunction, options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useLazyQuery(FindEventsDocument, variables, options) } export type FindEventsQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; export const FindOriginsDocument = gql` query FindOrigins { origins: Origins } - `; + ` /** * __useFindOriginsQuery__ @@ -564,21 +543,20 @@ export const FindOriginsDocument = gql` * @example * const { result, loading, error } = useFindOriginsQuery(); */ -export function useFindOriginsQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useQuery(FindOriginsDocument, {}, options); +export function useFindOriginsQuery (options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useQuery(FindOriginsDocument, {}, options) } -export function useFindOriginsLazyQuery(options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { - return VueApolloComposable.useLazyQuery(FindOriginsDocument, {}, options); +export function useFindOriginsLazyQuery (options: VueApolloComposable.UseQueryOptions | VueCompositionApi.Ref> | ReactiveFunction> = {}) { + return VueApolloComposable.useLazyQuery(FindOriginsDocument, {}, options) } export type FindOriginsQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn; - export interface PossibleTypesResultData { +export interface PossibleTypesResultData { possibleTypes: { [key: string]: string[] } } - const result: PossibleTypesResultData = { - "possibleTypes": {} -}; - export default result; - \ No newline at end of file +const result: PossibleTypesResultData = { + possibleTypes: {} +} +export default result diff --git a/package.json b/package.json index 47d18fd..9d7b4fa 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ "dev": "nuxi dev", "build": "nuxi generate", "start": "nuxi preview", - "lint:js": "eslint --ext \".ts,.js,.vue\" --ignore-path .gitignore .", + "lint:js": "eslint --ext \".ts,.js,.cjs,.vue\" --ignore-path .gitignore .", "lint:style": "stylelint \"**/*.{css,scss,sass,html,vue}\" --ignore-path .gitignore", "lint": "yarn lint:js && yarn lint:style", "lintfix": "yarn lint:js --fix && yarn lint:style --fix", "prepare": "husky install", "test": "jest", - "codegen": "graphql-codegen" + "codegen": "graphql-codegen && eslint --ext \".ts\" --ignore-path .gitignore graphql/generated/operations.ts --fix" }, "dependencies": { "@apollo/client": "^3.9.2", @@ -62,7 +62,6 @@ "cypress": "^13.6.4", "eslint": "^8.56.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-prettier": "^9.1.0", "eslint-loader": "^4.0.2", "eslint-plugin-import": "^2.29.1", "eslint-plugin-nuxt": "^4.0.0", diff --git a/stylelint.config.js b/stylelint.config.cjs similarity index 100% rename from stylelint.config.js rename to stylelint.config.cjs diff --git a/yarn.lock b/yarn.lock index ca06f6d..251802a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8106,11 +8106,6 @@ eslint-config-airbnb-base@^15.0.0: object.entries "^1.1.5" semver "^6.3.0" -eslint-config-prettier@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" - integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== - eslint-config-standard@^17.0.0: version "17.1.0" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975"