From 3924370b3ec95baa0ba804ce78f896a54959f6fe Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Mon, 17 Aug 2020 16:07:36 +0530 Subject: [PATCH 1/6] Introduce component wrapper for svg icons --- components/collections/add-collection.vue | 6 +- components/collections/add-folder.vue | 6 +- components/collections/collection.vue | 7 +- components/collections/edit-collection.vue | 6 +- components/collections/edit-folder.vue | 6 +- components/collections/edit-request.vue | 6 +- components/collections/folder.vue | 4 +- .../collections/import-export-collections.vue | 6 +- components/collections/request.vue | 8 +- components/collections/save-request-as.vue | 6 +- components/environments/add-environment.vue | 6 +- components/environments/edit-environment.vue | 10 +- components/environments/environment.vue | 6 +- .../import-export-environment.vue | 6 +- components/firebase/feeds.vue | 4 +- components/firebase/inputform.vue | 4 +- components/firebase/logout.vue | 4 +- components/layout/history.vue | 10 +- components/layout/pw-header.vue | 10 +- components/layout/sidenav.vue | 28 +++-- nuxt.config.js | 2 + package-lock.json | 103 ++++++++++++++++++ package.json | 1 + pages/doc.vue | 7 +- pages/graphql.vue | 4 +- pages/index.vue | 27 +++-- static/icons/add-24px.svg | 1 + static/icons/close-24px.svg | 1 + static/icons/cloud_upload-24px.svg | 1 + static/icons/delete-24px.svg | 1 + static/icons/exit_to_app-24px.svg | 1 + static/icons/folder-24px.svg | 1 + static/icons/icon-144x144.png | Bin 6861 -> 0 bytes static/icons/icon-192x192.png | Bin 8990 -> 0 bytes static/icons/icon-48x48.png | Bin 2563 -> 0 bytes static/icons/icon-512x512.png | Bin 28102 -> 0 bytes static/icons/icon-72x72.png | Bin 3525 -> 0 bytes static/icons/icon-96x96.png | Bin 4603 -> 0 bytes test/index.spec.js | 37 +++++++ 39 files changed, 284 insertions(+), 52 deletions(-) create mode 100644 static/icons/add-24px.svg create mode 100644 static/icons/close-24px.svg create mode 100644 static/icons/cloud_upload-24px.svg create mode 100644 static/icons/delete-24px.svg create mode 100644 static/icons/exit_to_app-24px.svg create mode 100644 static/icons/folder-24px.svg delete mode 100644 static/icons/icon-144x144.png delete mode 100644 static/icons/icon-192x192.png delete mode 100644 static/icons/icon-48x48.png delete mode 100644 static/icons/icon-512x512.png delete mode 100644 static/icons/icon-72x72.png delete mode 100644 static/icons/icon-96x96.png create mode 100644 test/index.spec.js diff --git a/components/collections/add-collection.vue b/components/collections/add-collection.vue index a55a3ab38..f77490a38 100644 --- a/components/collections/add-collection.vue +++ b/components/collections/add-collection.vue @@ -7,7 +7,7 @@

{{ $t("new_collection") }}

@@ -44,8 +44,12 @@ diff --git a/nuxt.config.js b/nuxt.config.js index 61a3032ef..37f5686f4 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -133,6 +133,8 @@ export default { "@nuxtjs/google-analytics", // Doc: https://github.com/nuxt-community/gtm-module "@nuxtjs/gtm", + // Doc: https://github.com/nuxt-community/svg-module + "@nuxtjs/svg", ], /* ** Nuxt.js modules diff --git a/package-lock.json b/package-lock.json index 127072a83..ba539c8ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2196,6 +2196,67 @@ } } }, + "@nuxtjs/svg": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@nuxtjs/svg/-/svg-0.1.11.tgz", + "integrity": "sha512-XZ0tTl+cFWi99fe8hZDN83bSoEpUhmoJxvDV72s/2qcPTDl2R5eOBTpy1gcsIc24DW5ZREc1UCH8KyC1sv7Rzw==", + "dev": true, + "requires": { + "file-loader": "^6.0.0", + "raw-loader": "^4.0.0", + "url-loader": "^4.1.0", + "vue-svg-loader": "^0.16.0" + }, + "dependencies": { + "file-loader": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", + "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "mime-db": { + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", + "dev": true + }, + "mime-types": { + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "dev": true, + "requires": { + "mime-db": "1.44.0" + } + }, + "url-loader": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz", + "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "mime-types": "^2.1.26", + "schema-utils": "^2.6.5" + } + } + } + }, "@nuxtjs/toast": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/@nuxtjs/toast/-/toast-3.3.1.tgz", @@ -10605,6 +10666,29 @@ "unpipe": "1.0.0" } }, + "raw-loader": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.1.tgz", + "integrity": "sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "rc9": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/rc9/-/rc9-1.0.0.tgz", @@ -12046,6 +12130,15 @@ "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=" }, + "svg-to-vue": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/svg-to-vue/-/svg-to-vue-0.7.0.tgz", + "integrity": "sha512-Tg2nMmf3BQorYCAjxbtTkYyWPVSeox5AZUFvfy4MoWK/5tuQlnA/h3LAlTjV3sEvOC5FtUNovRSj3p784l4KOA==", + "dev": true, + "requires": { + "svgo": "^1.3.2" + } + }, "svgo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", @@ -12948,6 +13041,16 @@ } } }, + "vue-svg-loader": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/vue-svg-loader/-/vue-svg-loader-0.16.0.tgz", + "integrity": "sha512-2RtFXlTCYWm8YAEO2qAOZ2SuIF2NvLutB5muc3KDYoZq5ZeCHf8ggzSan3ksbbca7CJ/Aw57ZnDF4B7W/AkGtw==", + "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "svg-to-vue": "^0.7.0" + } + }, "vue-template-compiler": { "version": "2.6.11", "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", diff --git a/package.json b/package.json index 4b8c7e8b1..be506aace 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "@nuxtjs/dotenv": "^1.4.1", "@nuxtjs/google-analytics": "^2.4.0", "@nuxtjs/pwa": "^3.0.0", + "@nuxtjs/svg": "^0.1.11", "eslint": "^7.7.0", "eslint-plugin-vue": "^6.2.2", "husky": "^4.2.5", diff --git a/pages/doc.vue b/pages/doc.vue index 760953c61..2b7779aed 100644 --- a/pages/doc.vue +++ b/pages/doc.vue @@ -19,7 +19,7 @@ @click="$refs.collectionUpload.click()" v-tooltip="$t('json')" > - folder + {{ $t("import_collections") }} @@ -75,7 +75,7 @@

- folder + {{ collection.name || $t("none") }}

@@ -326,7 +326,10 @@