From ae6a892f39d91ae7d966b78940276fbc20fbe9ba Mon Sep 17 00:00:00 2001 From: les Date: Wed, 25 Sep 2019 21:14:33 +0200 Subject: [PATCH] fix #32 --- CHANGELOG | 5 +++++ package.json | 6 +++--- pages/export.vue | 6 ++++++ yarn.lock | 37 +++++++++++++++++++++++-------------- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e69de29b..1bc7cd63 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -0,0 +1,5 @@ +All notable changes to this project will be documented in this file. + + +[unreleased] + diff --git a/package.json b/package.json index 87265d0b..99405022 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "consola": "^2.10.1", "cookie-parser": "^1.4.4", "cors": "^2.8.5", - "cross-env": "^5.2.1", + "cross-env": "^6.0.0", "dayjs": "^1.8.16", "element-ui": "^2.12.0", "email-templates": "^6.0.2", @@ -70,7 +70,7 @@ "nuxt-express-module": "^0.0.11", "pg": "^7.12.1", "sass-loader": "^8.0.0", - "sequelize": "^5.18.4", + "sequelize": "^5.19.0", "sequelize-cli": "^5.5.1", "sharp": "^0.23.0", "sqlite3": "^4.1.0", @@ -92,7 +92,7 @@ "eslint-plugin-jest": ">=22.17.0", "eslint-plugin-node": ">=10.0.0", "eslint-plugin-nuxt": ">=0.4.2", - "eslint-plugin-prettier": "^3.1.0", + "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-promise": ">=4.0.1", "eslint-plugin-standard": ">=4.0.1", "eslint-plugin-vue": "^5.2.2", diff --git a/pages/export.vue b/pages/export.vue index d8b898fc..8518ca1e 100644 --- a/pages/export.vue +++ b/pages/export.vue @@ -71,6 +71,12 @@ export default { title: `${this.settings.title} - ${this.$t('common.export')}` } }, + async asyncData ({ $axios, params, store }) { + // get metadata just in case we are not coming from home + if (store.state.tags.length) return + const { tags, places } = await $axios.$get('/event/meta') + store.commit('update', { tags, places }) + }, data () { return { type: 'rss', diff --git a/yarn.lock b/yarn.lock index dce2ec45..e4c7a5b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2905,12 +2905,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-env@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d" - integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ== +cross-env@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.0.tgz#3c8e71440ea20aa6faaf5aec541235efc565dac6" + integrity sha512-G/B6gtkjgthT8AP/xN1wdj5Xe18fVyk58JepK8GxpUbqcz3hyWxegocMbvnZK+KoTslwd0ACZ3woi/DVUdVjyQ== dependencies: - cross-spawn "^6.0.5" + cross-spawn "^7.0.0" cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" @@ -2932,6 +2932,15 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.0.tgz#21ef9470443262f33dba80b2705a91db959b2e03" + integrity sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw== + dependencies: + path-key "^3.1.0" + shebang-command "^1.2.0" + which "^1.2.9" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -3854,10 +3863,10 @@ eslint-plugin-nuxt@>=0.4.2: eslint-plugin-vue "^5.2.2" vue-eslint-parser "^5.0.0" -eslint-plugin-prettier@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d" - integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA== +eslint-plugin-prettier@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba" + integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA== dependencies: prettier-linter-helpers "^1.0.0" @@ -7326,7 +7335,7 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= -path-key@^3.0.0: +path-key@^3.0.0, path-key@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3" integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg== @@ -9084,10 +9093,10 @@ sequelize-pool@^2.3.0: resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== -sequelize@^5.18.4: - version "5.18.4" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.18.4.tgz#1e2c7eabe4c554fa257a0115fad39f271bd56150" - integrity sha512-bBmJqpO1H8Z7L0xzITqVo5KHXFI7GmKfGl/5SIPDKsuUMbuZT98s+gyGeaLXpOWGH1ZUO79hvJ8z74vNcxBWHg== +sequelize@^5.19.0: + version "5.19.0" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.19.0.tgz#96d610cf3afc499fb1ba27c77a9eb3c6e7060812" + integrity sha512-1LsPa++R37USE3LWYKkw//kSAKORXogItoSrPahOTVEuCj+v+/BxGX+49M2d9oYtkxvwUnHgCFMx2Kzku9RhSg== dependencies: bluebird "^3.5.0" cls-bluebird "^2.1.0"