From e8b649facfdad4ab00a15dc3629067ff641c1bcc Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 24 Jan 2018 11:38:34 -0200 Subject: [PATCH] Replaces cards with tables in Collection and Items list. Adds vue-material-icons. --- package-lock.json | 40 +++++++-- package.json | 1 + src/admin/admin.vue | 7 +- src/admin/components/collections-list.vue | 85 ++++++++---------- src/admin/components/itens-list.vue | 80 ++++++++--------- src/admin/js/router.js | 4 +- .../{components => pages}/collection-page.vue | 6 +- src/assets/MaterialIcons-Regular.eot | Bin 0 -> 143258 bytes src/assets/MaterialIcons-Regular.ttf | Bin 0 -> 128180 bytes src/assets/MaterialIcons-Regular.woff | Bin 0 -> 57620 bytes src/assets/MaterialIcons-Regular.woff2 | Bin 0 -> 44300 bytes 11 files changed, 114 insertions(+), 109 deletions(-) rename src/admin/{components => pages}/collection-page.vue (91%) create mode 100644 src/assets/MaterialIcons-Regular.eot create mode 100644 src/assets/MaterialIcons-Regular.ttf create mode 100644 src/assets/MaterialIcons-Regular.woff create mode 100644 src/assets/MaterialIcons-Regular.woff2 diff --git a/package-lock.json b/package-lock.json index e3fdcf927..5c5bc3a8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -154,6 +154,7 @@ "version": "7.2.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.5.tgz", "integrity": "sha512-XqHfo8Ht0VU+T5P+eWEVoXza456KJ4l62BPewu3vpNf3LP9s2+zYXkXBznzYby4XeECXgG3N4i+hGvOhXErZmA==", + "dev": true, "requires": { "browserslist": "2.11.3", "caniuse-lite": "1.0.30000792", @@ -167,6 +168,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, "requires": { "color-convert": "1.9.1" } @@ -175,6 +177,7 @@ "version": "2.11.3", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz", "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", + "dev": true, "requires": { "caniuse-lite": "1.0.30000792", "electron-to-chromium": "1.3.31" @@ -184,6 +187,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, "requires": { "ansi-styles": "3.2.0", "escape-string-regexp": "1.0.5", @@ -194,6 +198,7 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, "requires": { "has-flag": "2.0.0" } @@ -203,17 +208,20 @@ "electron-to-chromium": { "version": "1.3.31", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz", - "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==" + "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==", + "dev": true }, "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true }, "postcss": { "version": "6.0.16", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz", "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==", + "dev": true, "requires": { "chalk": "2.3.0", "source-map": "0.6.1", @@ -223,12 +231,14 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true }, "supports-color": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", + "dev": true, "requires": { "has-flag": "2.0.0" } @@ -1225,7 +1235,8 @@ "caniuse-lite": { "version": "1.0.30000792", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz", - "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=" + "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=", + "dev": true }, "center-align": { "version": "0.1.3", @@ -1351,6 +1362,7 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, "requires": { "color-name": "1.1.3" } @@ -1358,7 +1370,8 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true }, "color-string": { "version": "0.3.0", @@ -1954,7 +1967,8 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "esprima": { "version": "2.7.3", @@ -4004,7 +4018,8 @@ "normalize-range": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "dev": true }, "normalize-url": { "version": "1.9.1", @@ -4021,7 +4036,8 @@ "num2fraction": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "dev": true }, "number-is-nan": { "version": "1.0.1", @@ -4953,7 +4969,8 @@ "postcss-value-parser": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=" + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "dev": true }, "postcss-zindex": { "version": "2.2.0", @@ -6056,6 +6073,11 @@ "vue-template-es2015-compiler": "1.6.0" } }, + "vue-material-design-icons": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-1.0.0.tgz", + "integrity": "sha512-Do4M+l6l9+Wf1MQCWcAeNvSSYpynxddtqMRnhCRLFys58OU3z34AI7aYrhEo1SpvHc1KHcgQq1x4K7LCZfYSYw==" + }, "vue-router": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", diff --git a/package.json b/package.json index ce67d55c0..60062e409 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "bootstrap": "^3.3.7", "element-ui": "^2.0.11", "vue": "^2.0.1", + "vue-material-design-icons": "^1.0.0", "vuex": "^3.0.1" }, "devDependencies": { diff --git a/src/admin/admin.vue b/src/admin/admin.vue index 85a17db5f..d46b996dd 100644 --- a/src/admin/admin.vue +++ b/src/admin/admin.vue @@ -3,12 +3,9 @@ Home - Header + Coleções - - Coleções - @@ -19,7 +16,7 @@ diff --git a/src/admin/components/collections-list.vue b/src/admin/components/collections-list.vue index 48a676169..e2b740015 100644 --- a/src/admin/components/collections-list.vue +++ b/src/admin/components/collections-list.vue @@ -1,42 +1,57 @@