From bbaa48c1eccb04a0334c700f58b45968f773bb94 Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Fri, 24 Jan 2020 17:50:30 +0530 Subject: [PATCH 1/7] :rotating_light: Removing linter warnings --- assets/css/styles.scss | 1 - components/collections/addCollection.vue | 2 +- components/collections/editCollection.vue | 2 +- components/graphql/queryeditor.vue | 23 +++++++++++------------ functions/utils/debounce.js | 14 +++++++------- layouts/default.vue | 5 ++--- pages/graphql.vue | 2 -- 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/assets/css/styles.scss b/assets/css/styles.scss index 574f57c94..7f6c9d5ec 100644 --- a/assets/css/styles.scss +++ b/assets/css/styles.scss @@ -592,7 +592,6 @@ pre { select { height: 37px; - background-color: var(--bg-dark-color); cursor: pointer; -webkit-appearance: none; -moz-appearance: none; diff --git a/components/collections/addCollection.vue b/components/collections/addCollection.vue index c39b7b257..39b7a7675 100644 --- a/components/collections/addCollection.vue +++ b/components/collections/addCollection.vue @@ -57,7 +57,7 @@ export default { methods: { addNewCollection() { if (!this.$data.name) { - this.$toast.info('Please provide a valid name for the collection') + this.$toast.info("Please provide a valid name for the collection"); return; } this.$store.commit("postwoman/addNewCollection", { diff --git a/components/collections/editCollection.vue b/components/collections/editCollection.vue index 98c9154be..084bb78bf 100644 --- a/components/collections/editCollection.vue +++ b/components/collections/editCollection.vue @@ -60,7 +60,7 @@ export default { methods: { saveCollection() { if (!this.$data.name) { - this.$toast.info('Please provide a valid name for the collection'); + this.$toast.info("Please provide a valid name for the collection"); return; } const collectionUpdated = { diff --git a/components/graphql/queryeditor.vue b/components/graphql/queryeditor.vue index 7f1084b85..7a4e90c65 100644 --- a/components/graphql/queryeditor.vue +++ b/components/graphql/queryeditor.vue @@ -34,7 +34,7 @@ export default { return { editor: null, cacheValue: "", - validationSchema: null + validationSchema: null }; }, @@ -88,7 +88,7 @@ export default { ); } }, - + setValidationSchema(schema) { this.validationSchema = schema; this.parseContents(this.cacheValue); @@ -101,16 +101,15 @@ export default { if (this.validationSchema) { this.editor.session.setAnnotations( - gql.validate(this.validationSchema, doc) - .map((err) => { - return { - row: err.locations[0].line - 1, - column: err.locations[0].column - 1, - text: err.message, - type: "error" - } - }) - ) + gql.validate(this.validationSchema, doc).map(err => { + return { + row: err.locations[0].line - 1, + column: err.locations[0].column - 1, + text: err.message, + type: "error" + }; + }) + ); } } catch (e) { this.editor.session.setAnnotations([ diff --git a/functions/utils/debounce.js b/functions/utils/debounce.js index 09acda07d..dffe3f098 100644 --- a/functions/utils/debounce.js +++ b/functions/utils/debounce.js @@ -3,13 +3,13 @@ // functions which might be called frequently // NOTE : Don't use lambda functions as this doesn't get bound properly in them, use the 'function (args) {}' format const debounce = (func, delay) => { - let inDebounce + let inDebounce; return function() { - const context = this - const args = arguments - clearTimeout(inDebounce) - inDebounce = setTimeout(() => func.apply(context, args), delay) - } -} + const context = this; + const args = arguments; + clearTimeout(inDebounce); + inDebounce = setTimeout(() => func.apply(context, args), delay); + }; +}; export default debounce; diff --git a/layouts/default.vue b/layouts/default.vue index 15626a247..ce6bdc753 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -664,9 +664,8 @@ import intializePwa from "../assets/js/pwa"; import * as version from "../.postwoman/version.json"; import { hasChromeExtensionInstalled } from "../functions/strategies/ChromeStrategy"; - -import firebase from 'firebase/app'; -import { fb } from '../functions/fb'; +import firebase from "firebase/app"; +import { fb } from "../functions/fb"; export default { components: { diff --git a/pages/graphql.vue b/pages/graphql.vue index 606796472..d4129796c 100644 --- a/pages/graphql.vue +++ b/pages/graphql.vue @@ -812,9 +812,7 @@ export default { } } this.gqlTypes = types; - this.$refs.queryEditor.setValidationSchema(schema); - this.$nuxt.$loading.finish(); const duration = Date.now() - startTime; this.$toast.info(this.$t("finished_in", { duration }), { From c057c7ea24ce3e809dd0327fb80af497fd6cd331 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 25 Jan 2020 00:14:47 +0000 Subject: [PATCH 2/7] chore(deps-dev): bump cypress from 3.8.2 to 3.8.3 Bumps [cypress](https://github.com/cypress-io/cypress) from 3.8.2 to 3.8.3. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Commits](https://github.com/cypress-io/cypress/compare/v3.8.2...v3.8.3) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb672b789..9e1034681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4068,9 +4068,9 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" }, "cypress": { - "version": "3.8.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.2.tgz", - "integrity": "sha512-aTs0u3+dfEuLe0Ct0FVO5jD1ULqxbuqWUZwzBm0rxdLgLxIAOI/A9f/WkgY5Cfy1TEXe8pKC6Wal0ZpnkdGRSw==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz", + "integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==", "dev": true, "requires": { "@cypress/listr-verbose-renderer": "0.4.1", diff --git a/package.json b/package.json index 73776225d..9f11bc9aa 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "yargs-parser": "^16.1.0" }, "devDependencies": { - "cypress": "^3.8.2", + "cypress": "^3.8.3", "node-sass": "^4.13.1", "sass-loader": "^8.0.2", "start-server-and-test": "^1.10.6" From 254b500f03d04f346210a1373dd89eee289c5d1b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 25 Jan 2020 00:16:15 +0000 Subject: [PATCH 3/7] chore(deps): bump nuxt-i18n from 6.4.1 to 6.5.0 Bumps [nuxt-i18n](https://github.com/nuxt-community/nuxt-i18n) from 6.4.1 to 6.5.0. - [Release notes](https://github.com/nuxt-community/nuxt-i18n/releases) - [Changelog](https://github.com/nuxt-community/nuxt-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/nuxt-community/nuxt-i18n/compare/v6.4.1...v6.5.0) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb672b789..98cb48884 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1203,12 +1203,12 @@ } }, "@kazupon/vue-i18n-loader": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@kazupon/vue-i18n-loader/-/vue-i18n-loader-0.4.1.tgz", - "integrity": "sha512-hVznmhnyoUKozGY7pwq/UtPL76UDzb+aiN2YksZZIzCY/MkEqih0MSyEmTGw7+HVWzJRPAlDyoRNR4tWKmkCRw==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@kazupon/vue-i18n-loader/-/vue-i18n-loader-0.5.0.tgz", + "integrity": "sha512-Tp2mXKemf9/RBhI9CW14JjR9oKjL2KH7tV6S0eKEjIBuQBAOFNuPJu3ouacmz9hgoXbNp+nusw3MVQmxZWFR9g==", "requires": { "js-yaml": "^3.13.1", - "json5": "^2.1.0" + "json5": "^2.1.1" } }, "@nuxt/babel-preset-app": { @@ -8098,13 +8098,13 @@ } }, "nuxt-i18n": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/nuxt-i18n/-/nuxt-i18n-6.4.1.tgz", - "integrity": "sha512-SHAK5eA9oci8AtqOCDvPgWKp+W7SIBbbxW5xraPO0YTdyJWuA1gmUuo24w7MSms4d/cUcWoJaNiEYZHqxidUTA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/nuxt-i18n/-/nuxt-i18n-6.5.0.tgz", + "integrity": "sha512-JNg5rJl/8/b5ruX1ZXPHGk2hXFFefaSgUgg19vaNPMpSWt4UqP2X47ShSv6UdRvUw8TZvcDjDBieZsyfsx+GEg==", "requires": { "@babel/parser": "^7.5.5", "@babel/traverse": "^7.5.5", - "@kazupon/vue-i18n-loader": "^0.4.0", + "@kazupon/vue-i18n-loader": "^0.5.0", "cookie": "^0.4.0", "is-https": "^1.0.0", "js-cookie": "^2.2.1", @@ -11914,9 +11914,9 @@ "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==" }, "vue-i18n": { - "version": "8.15.1", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.1.tgz", - "integrity": "sha512-GBbz8qYCu0U2LNu4IcuFLZiuyninG4k26knvhL7GZG5Ncp4RR2VKDEH6g8gQ6I+UUBCvH2MBQVPSdxWe4DBkPw==" + "version": "8.15.3", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.15.3.tgz", + "integrity": "sha512-PVNgo6yhOmacZVFjSapZ314oewwLyXHjJwAqjnaPN1GJAJd/dvsrShGzSiJuCX4Hc36G4epJvNXUwO8y7wEKew==" }, "vue-i18n-extensions": { "version": "0.2.1", diff --git a/package.json b/package.json index 73776225d..f37158aa0 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "firebase": "^7.7.0", "graphql": "^14.5.8", "nuxt": "^2.11.0", - "nuxt-i18n": "^6.4.1", + "nuxt-i18n": "^6.5.0", "v-tooltip": "^2.0.2", "vue-virtual-scroll-list": "^1.4.4", "vuefire": "^2.2.1", From 54e4dbc4ac65743855fff1f6998a25ea1f55dcd6 Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Sat, 25 Jan 2020 07:00:07 +0530 Subject: [PATCH 4/7] :green_heart: Fixing CI Build --- .travis.yml | 38 ++++++++++++++++++++------------------ build.js | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0223e03ab..92275152d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,38 +13,40 @@ language: node_js node_js: - - "12" + - "12" + +os: linux addons: - apt: - packages: - - libgconf-2-4 # cypress binary dependency + apt: + packages: + - libgconf-2-4 # cypress binary dependency env: - - DEPLOY_ENV=POSTWOMAN_IO + - DEPLOY_ENV=POSTWOMAN_IO cache: - npm: true - directories: - - "node_modules" - - ~/.cache + npm: true + directories: + - "node_modules" + - ~/.cache branches: - only: - - "master" + only: + - "master" install: - - "npm install firebase-tools" - - "npm install" + - "npm install firebase-tools" + - "npm install" before_script: - - "npm run test" + - "npm run test" script: - - "cd functions" - - "npm install" - - "cd .." - - "npm run generate" + - "cd functions" + - "npm install" + - "cd .." + - "npm run generate" notifications: webhooks: https://www.travisbuddy.com diff --git a/build.js b/build.js index be7f3f4c3..c19eb2987 100644 --- a/build.js +++ b/build.js @@ -53,7 +53,7 @@ try { // Write version data into a file fs.writeFileSync( - PW_BUILD_DATA_DIR + "/version.json", + `${PW_BUILD_DATA_DIR}/version.json`, JSON.stringify(version) ); })(); From 2077dc2eee954c86919ed6a82c442a648776ad55 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 25 Jan 2020 03:05:07 +0000 Subject: [PATCH 5/7] chore(deps): bump v-tooltip from 2.0.2 to 2.0.3 Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/Akryum/vue-tooltip/releases) - [Commits](https://github.com/Akryum/vue-tooltip/compare/v2.0.2...v2.0.3) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2bf91a7c..6f8a63f52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8592,9 +8592,9 @@ } }, "popper.js": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz", - "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==" + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "posix-character-classes": { "version": "0.1.1", @@ -11848,12 +11848,12 @@ "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, "v-tooltip": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.2.tgz", - "integrity": "sha512-xQ+qzOFfywkLdjHknRPgMMupQNS8yJtf9Utd5Dxiu/0n4HtrxqsgDtN2MLZ0LKbburtSAQgyypuE/snM8bBZhw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.3.tgz", + "integrity": "sha512-KZZY3s+dcijzZmV2qoDH4rYmjMZ9YKGBVoUznZKQX0e3c2GjpJm3Sldzz8HHH2Ud87JqhZPB4+4gyKZ6m98cKQ==", "requires": { - "lodash": "^4.17.11", - "popper.js": "^1.15.0", + "lodash": "^4.17.15", + "popper.js": "^1.16.0", "vue-resize": "^0.4.5" } }, diff --git a/package.json b/package.json index 44a956449..bf05f59ac 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "graphql": "^14.5.8", "nuxt": "^2.11.0", "nuxt-i18n": "^6.5.0", - "v-tooltip": "^2.0.2", + "v-tooltip": "^2.0.3", "vue-virtual-scroll-list": "^1.4.4", "vuefire": "^2.2.1", "vuejs-auto-complete": "^0.9.0", From 3e126cdfa4ffc3b1b6e29a4d60d417dec28507fd Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Sat, 25 Jan 2020 12:21:47 +0530 Subject: [PATCH 6/7] :bug: Fixed a bug with Collection sync --- .../collections/importExportCollections.vue | 102 ++++++++++++------ components/collections/index.vue | 14 +++ functions/fb.js | 79 ++++++++------ lang/en-US.js | 3 +- pages/settings.vue | 16 +-- store/postwoman.js | 12 +-- 6 files changed, 148 insertions(+), 78 deletions(-) diff --git a/components/collections/importExportCollections.vue b/components/collections/importExportCollections.vue index 254bdc684..8df70d36d 100644 --- a/components/collections/importExportCollections.vue +++ b/components/collections/importExportCollections.vue @@ -11,6 +11,54 @@ +
+ + + + + +
@@ -18,39 +66,6 @@
-
- - - - - -
@@ -71,7 +86,14 @@