dancefinder/dancefinder-app
5
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Activity

fix: complete upgrade to vuetify 2.x which was started by Snyk :)

Browse Source
This commit is contained in:
Joakim Olsson
2019-11-07 12:45:09 +01:00
parent c02168f02c
commit 3cc64c63b2
6 changed files with 131 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/pages/events/index.vue
+8 -7
View File
@@ -20,11 +20,15 @@
placeholder="Address/geokoordinat" placeholder="Address/geokoordinat"
> >
<v-tooltip top slot="append-outer"> <v-tooltip top slot="append-outer">
<v-icon slot="activator" v-on:click="fetchAddress()">mdi-crosshairs-gps</v-icon> <template v-slot:activator="{ on }">
<v-icon v-on="on" v-on:click="fetchAddress()">mdi-crosshairs-gps</v-icon>
</template>
<span>Hämta nuvarande position</span> <span>Hämta nuvarande position</span>
</v-tooltip> </v-tooltip>
<v-tooltip top slot="prepend" v-if="hasUser"> <v-tooltip top slot="prepend" v-if="hasUser">
<v-icon slot="activator" :disabled="!origin" v-on:click="saveOrigin(origin)">mdi-bookmark-plus-outline</v-icon> <template v-slot:activator="{ on }">
<v-icon v-on="on" :disabled="!origin" v-on:click="saveOrigin(origin)">mdi-bookmark-plus-outline</v-icon>
</template>
<span>Spara startpunkt</span> <span>Spara startpunkt</span>
</v-tooltip> </v-tooltip>
</v-text-field> </v-text-field>
@@ -33,7 +37,7 @@
<v-layout row wrap> <v-layout row wrap>
<v-flex> <v-flex>
<v-btn-toggle v-if="$vuetify.breakpoint.smAndUp" v-model="range" mandatory @change="changeRange"> <v-btn-toggle v-if="$vuetify.breakpoint.smAndUp" v-model="range" mandatory @change="changeRange">
<v-btn flat v-for="r in ranges" :key="r.value" :value="r.value">{{r.name}}</v-btn> <v-btn text v-for="r in ranges" :key="r.value" :value="r.value">{{r.name}}</v-btn>
</v-btn-toggle> </v-btn-toggle>
<v-select outline v-if="$vuetify.breakpoint.xsOnly" v-model="range" @change="changeRange" :items="ranges" item-text="name" item-value="value"></v-select> <v-select outline v-if="$vuetify.breakpoint.xsOnly" v-model="range" @change="changeRange" :items="ranges" item-text="name" item-value="value"></v-select>
</v-flex> </v-flex>
@@ -57,16 +61,13 @@
<script> <script>
import { import {
findEvents, findEvents,
findEventsAndOrigins,
fetchAddress, fetchAddress,
toggleIgnoreBand, toggleIgnoreBand,
toggleIgnoreDanceHall, toggleIgnoreDanceHall,
toggleIgnoreCity, toggleIgnoreCity,
toggleIgnoreMunicipality, toggleIgnoreMunicipality,
toggleIgnoreState, toggleIgnoreState,
saveOrigin, saveOrigin} from "~/utils/graph-client";
removeOrigin
} from "~/utils/graph-client";
import auth from "~/utils/auth"; import auth from "~/utils/auth";
components/pages/origins/index.vue
+6 -2
View File
@@ -15,11 +15,15 @@
placeholder="Address/geokoordinat" placeholder="Address/geokoordinat"
> >
<v-tooltip top slot="append-outer"> <v-tooltip top slot="append-outer">
<v-icon slot="activator" v-on:click="fetchAddress()">mdi-crosshairs-gps</v-icon> <template v-slot:activator="{ on }">
<v-icon v-on="on" v-on:click="fetchAddress()">mdi-crosshairs-gps</v-icon>
</template>
<span>Hämta nuvarande position</span> <span>Hämta nuvarande position</span>
</v-tooltip> </v-tooltip>
<v-tooltip top slot="prepend"> <v-tooltip top slot="prepend">
<v-icon slot="activator" :disabled="!origin" v-on:click="saveOrigin(origin)">mdi-bookmark-plus-outline</v-icon> <template v-slot:activator="{ on }">
<v-icon v-on="on" :disabled="!origin" v-on:click="saveOrigin(origin)">mdi-bookmark-plus-outline</v-icon>
</template>
<span>Spara startpunkt</span> <span>Spara startpunkt</span>
</v-tooltip> </v-tooltip>
</v-text-field> </v-text-field>
layouts/default.vue
+50 -50
View File
@@ -6,68 +6,68 @@
app app
> >
<v-list dense> <v-list dense>
<v-list-tile v-if="!hasUser" @click="() => { doLogin(); }"> <v-list-item v-if="!hasUser" @click="() => { doLogin(); }">
<v-list-tile-content> <v-list-item>
<v-list-tile-title>Login</v-list-tile-title> <v-list-item>Login</v-list-item>
</v-list-tile-content> </v-list-item>
</v-list-tile> </v-list-item>
<v-list-tile avatar v-if="hasUser"> <v-list-item avatar v-if="hasUser">
<v-list-tile-avatar> <v-list-item-avatar>
<v-img :src="user.picture" :alt="user.name"></v-img> <v-img :src="user.picture" :alt="user.name"></v-img>
</v-list-tile-avatar> </v-list-item-avatar>
<v-list-tile-content> <v-list-item-content>
<v-list-tile-title v-html="user.name"></v-list-tile-title> <v-list-item-title v-html="user.name"></v-list-item-title>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
<v-list-tile> <v-list-item>
<v-list-tile-action> <v-list-item-action>
<v-icon>mdi-calendar-outline</v-icon> <v-icon>mdi-calendar-outline</v-icon>
</v-list-tile-action> </v-list-item-action>
<v-list-tile-content> <v-list-item-content>
<nuxt-link to="/"><v-list-tile-title>Evenemang</v-list-tile-title></nuxt-link> <nuxt-link to="/"><v-list-item-title>Evenemang</v-list-item-title></nuxt-link>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
<v-list-tile v-if="hasUser"> <v-list-item v-if="hasUser">
<v-list-tile-action> <v-list-item-action>
<v-icon>mdi-home</v-icon> <v-icon>mdi-home</v-icon>
</v-list-tile-action> </v-list-item-action>
<v-list-tile-content> <v-list-item-content>
<nuxt-link to="/origins/"><v-list-tile-title>Hantera startpunkter</v-list-tile-title></nuxt-link> <nuxt-link to="/origins/"><v-list-item-title>Hantera startpunkter</v-list-item-title></nuxt-link>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
<v-list-tile v-if="hasUser"> <v-list-item v-if="hasUser">
<v-list-tile-action> <v-list-item-action>
<v-icon>mdi-magnify</v-icon> <v-icon>mdi-magnify</v-icon>
</v-list-tile-action> </v-list-item-action>
<v-list-tile-content> <v-list-item-content>
<nuxt-link to="/filters/"><v-list-tile-title>Hantera filter</v-list-tile-title></nuxt-link> <nuxt-link to="/filters/"><v-list-item-title>Hantera filter</v-list-item-title></nuxt-link>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
<v-list-tile v-if="hasUser"> <v-list-item v-if="hasUser">
<v-list-tile-action> <v-list-item-action>
<v-icon>exit_to_app</v-icon> <v-icon>exit_to_app</v-icon>
</v-list-tile-action> </v-list-item-action>
<v-list-tile-content> <v-list-item-content>
<nuxt-link to="/logout/"><v-list-tile-title>Logga ut</v-list-tile-title></nuxt-link> <nuxt-link to="/logout/"><v-list-item-title>Logga ut</v-list-item-title></nuxt-link>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
</v-list> </v-list>
</v-navigation-drawer> </v-navigation-drawer>
<v-toolbar app scroll-off-screen> <v-app-bar app scroll-off-screen>
<v-toolbar-side-icon v-on:click="left = !left"></v-toolbar-side-icon> <v-app-bar-nav-icon v-on:click="left = !left"></v-app-bar-nav-icon>
<v-toolbar-title v-html="title"></v-toolbar-title> <v-toolbar-title v-html="title"></v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-toolbar-items> <v-toolbar-items>
<v-list-tile avatar v-if="hasUser"> <v-list-item avatar v-if="hasUser">
<v-list-tile-avatar> <v-list-item-avatar>
<v-img :src="user.picture" :alt="user.name"></v-img> <v-img :src="user.picture" :alt="user.name"></v-img>
</v-list-tile-avatar> </v-list-item-avatar>
<v-list-tile-content> <v-list-item-content>
<v-list-tile-title v-html="user.name"></v-list-tile-title> <v-list-item-title v-html="user.name"></v-list-item-title>
</v-list-tile-content> </v-list-item-content>
</v-list-tile> </v-list-item>
</v-toolbar-items> </v-toolbar-items>
</v-toolbar> </v-app-bar>
<v-content> <v-content>
<v-container fluid> <v-container fluid>
<nuxt /> <nuxt />
nuxt.config.js
+3
View File
@@ -19,6 +19,9 @@ module.exports = {
], ],
}, },
mode: 'spa', mode: 'spa',
buildModules: [
['@nuxtjs/vuetify', { /* module options */ }]
],
modules: [ modules: [
['@nuxtjs/moment', { locales: ['sv'], defaultLocale: 'sv' }], ['@nuxtjs/moment', { locales: ['sv'], defaultLocale: 'sv' }],
], ],
package.json
+1
View File
@@ -44,6 +44,7 @@
"prepublish": "npm run snyk-protect" "prepublish": "npm run snyk-protect"
}, },
"devDependencies": { "devDependencies": {
"@nuxtjs/vuetify": "^1.9.0",
"cypress": "^3.1.0", "cypress": "^3.1.0",
"express-http-proxy": "^1.5.0", "express-http-proxy": "^1.5.0",
"wait-on": "^3.2.0" "wait-on": "^3.2.0"
yarn.lock
+63 -19
View File
@@ -1002,6 +1002,18 @@
moment "^2.24.0" moment "^2.24.0"
moment-locales-webpack-plugin "^1.1.0" moment-locales-webpack-plugin "^1.1.0"
"@nuxtjs/vuetify@^1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@nuxtjs/vuetify/-/vuetify-1.9.0.tgz#296e1b5874253cbd7b504ec1b85648744d585761"
integrity sha512-yilQ0HMmD15IB2pI7SaN8RPWJK86ga14RgihZyi+ioCV/ayIABkX3IiwEc3lmUto6umAjoPpylJ97blu/iyVJg==
dependencies:
deepmerge "^4.0.0"
fibers "^4.0.1"
sass "^1.23.0"
sass-loader "^8.0.0"
vuetify "^2.1.0"
vuetify-loader "^1.3.0"
"@nuxtjs/youch@^4.2.3": "@nuxtjs/youch@^4.2.3":
version "4.2.3" version "4.2.3"
resolved "https://registry.yarnpkg.com/@nuxtjs/youch/-/youch-4.2.3.tgz#36f8b22df5a0efaa81373109851e1d857aca6bed" resolved "https://registry.yarnpkg.com/@nuxtjs/youch/-/youch-4.2.3.tgz#36f8b22df5a0efaa81373109851e1d857aca6bed"
@@ -2387,6 +2399,21 @@ check-types@^8.0.3:
resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552" resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ== integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
"chokidar@>=2.0.0 <4.0.0", chokidar@^3.2.2:
version "3.3.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.2.0"
optionalDependencies:
fsevents "~2.1.1"
chokidar@^2.0.2: chokidar@^2.0.2:
version "2.1.8" version "2.1.8"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2406,21 +2433,6 @@ chokidar@^2.0.2:
optionalDependencies: optionalDependencies:
fsevents "^1.2.7" fsevents "^1.2.7"
chokidar@^3.2.2:
version "3.3.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
dependencies:
anymatch "~3.1.1"
braces "~3.0.2"
glob-parent "~5.1.0"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
readdirp "~3.2.0"
optionalDependencies:
fsevents "~2.1.1"
chownr@^1.1.1, chownr@^1.1.2: chownr@^1.1.1, chownr@^1.1.2:
version "1.1.3" version "1.1.3"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
@@ -3319,7 +3331,7 @@ detect-indent@^5.0.0:
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
detect-libc@^1.0.2: detect-libc@^1.0.2, detect-libc@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
@@ -4011,6 +4023,13 @@ fd-slicer@~1.1.0:
dependencies: dependencies:
pend "~1.2.0" pend "~1.2.0"
fibers@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/fibers/-/fibers-4.0.2.tgz#d04f9ccd0aba179588202202faeb4fed65d497f5"
integrity sha512-FhICi1K4WZh9D6NC18fh2ODF3EWy1z0gzIdV9P7+s2pRjfRBnCkMDJ6x3bV1DkVymKH8HGrQa/FNOBjYvnJ/tQ==
dependencies:
detect-libc "^1.0.3"
figgy-pudding@^3.5.1: figgy-pudding@^3.5.1:
version "3.5.1" version "3.5.1"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -5636,7 +5655,7 @@ loader-utils@^0.2.16:
json5 "^0.5.0" json5 "^0.5.0"
object-assign "^4.0.1" object-assign "^4.0.1"
loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.0, loader-utils@^1.2.3:
version "1.2.3" version "1.2.3"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -8324,6 +8343,24 @@ sass-loader@^7.0.3:
pify "^4.0.1" pify "^4.0.1"
semver "^6.3.0" semver "^6.3.0"
sass-loader@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797"
integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==
dependencies:
clone-deep "^4.0.1"
loader-utils "^1.2.3"
neo-async "^2.6.1"
schema-utils "^2.1.0"
semver "^6.3.0"
sass@^1.23.0:
version "1.23.3"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.3.tgz#f07503b9e8d2bcf06ef69e8beea5d085589b1620"
integrity sha512-1DKRZxJMOh4Bme16AbWTyYeJAjTlrvw2+fWshHHaepeJfGq2soFZTnt0YhWit+bohtDu4LdyPoEj6VFD4APHog==
dependencies:
chokidar ">=2.0.0 <4.0.0"
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -8338,7 +8375,7 @@ schema-utils@^1.0.0:
ajv-errors "^1.0.0" ajv-errors "^1.0.0"
ajv-keywords "^3.1.0" ajv-keywords "^3.1.0"
schema-utils@^2.0.0, schema-utils@^2.4.1, schema-utils@^2.5.0: schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.4.1, schema-utils@^2.5.0:
version "2.5.0" version "2.5.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==
@@ -9983,7 +10020,14 @@ vue@^2.5.22, vue@^2.6.10:
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ== integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==
vuetify@^2.1.9: vuetify-loader@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.3.0.tgz#759f1d16f3f211eddbeeffc5c0b24105f2582b07"
integrity sha512-emKS3GWpx+0kWRHfoxpDpLR4HaXvhDn9bYNQf+IaaD5iU5S3xktDyS0egG7dp/oHLQr1U/Ui9g2ElhZUkdgRqw==
dependencies:
loader-utils "^1.2.0"
vuetify@^2.1.0, vuetify@^2.1.9:
version "2.1.9" version "2.1.9"
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.1.9.tgz#2c91163090675cde2cd1b6208829ac434d7d8877" resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.1.9.tgz#2c91163090675cde2cd1b6208829ac434d7d8877"
integrity sha512-52CgEyPoGYHba5yocYKBB/LXcikoWzj9jCDTH8LlzH/hvjzkgsuEtFwUustGHyV9GstRaNZOrk4nuUWbPZc3kQ== integrity sha512-52CgEyPoGYHba5yocYKBB/LXcikoWzj9jCDTH8LlzH/hvjzkgsuEtFwUustGHyV9GstRaNZOrk4nuUWbPZc3kQ==