From 73cf319573b8bf02f9db73b9b17b1a9d4455ba2c Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Tue, 29 Sep 2020 20:56:46 +0200 Subject: [PATCH 1/5] Start the tile and basic text part of the app This doesn't have much in it, just building the header of the app outlined in the mockup Bug: T263564 --- package-lock.json | 372 +++++++++++++++++++------------- package.json | 4 +- src/App.vue | 15 +- src/components/HelloWorld.vue | 126 ----------- src/components/QueryBuilder.vue | 58 +++++ 5 files changed, 285 insertions(+), 290 deletions(-) delete mode 100644 src/components/HelloWorld.vue create mode 100644 src/components/QueryBuilder.vue diff --git a/package-lock.json b/package-lock.json index 05b8491c..ed6e733d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1644,8 +1644,8 @@ }, "@types/parse-json": { "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/@types/parse-json/download/@types/parse-json-4.0.0.tgz", - "integrity": "sha1-L4u0QUNNFjs1+4/9zNcTiSf/uMA=", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true, "optional": true }, @@ -2112,103 +2112,6 @@ "tslint": "^5.20.1", "webpack": "^4.0.0", "yorkie": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "optional": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", - "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", - "dev": true, - "optional": true, - "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" - } - }, - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, "@vue/cli-plugin-unit-jest": { @@ -2352,17 +2255,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1597606287037&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz", @@ -2446,18 +2338,6 @@ "graceful-fs": "^4.1.6" } }, - "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, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz", @@ -2554,18 +2434,6 @@ "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=", "dev": true }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", - "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz", @@ -2867,6 +2735,22 @@ "integrity": "sha512-x7H7dAf/x3Q+OzckzrQqQs6TrSx03v07qkvB/EDzmvOnreYy6q/fJKHQoFei7kXzQmKuwzuuD8OdKXbfLs8sew==", "dev": true }, + "@wmde/wikit-tokens": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@wmde/wikit-tokens/-/wikit-tokens-1.0.1.tgz", + "integrity": "sha512-rL4QF3pPZwSwk7GpuyM85v0tMiAxkz6B8LgUmtHxu89X1t24CK0GvGXDybtah5YPpQ8mEuIWvNRH+HTnWvGWDA==" + }, + "@wmde/wikit-vue-components": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@wmde/wikit-vue-components/-/wikit-vue-components-1.0.1.tgz", + "integrity": "sha512-Z3+JL0RYxl068ai1nIkMcEF5nq7LRM5HAzDLI4DD1KHYQqCm/YhWkwZWRM7eWkXeyOh4iB1+glKQSwHkzsDtAQ==", + "requires": { + "@wmde/wikit-tokens": "^1.0.1", + "core-js": "^3.6.5", + "ress": "^3.0.0", + "vue": "^2.6.11" + } + }, "@xtuc/ieee754": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz", @@ -3210,8 +3094,8 @@ }, "at-least-node": { "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz", - "integrity": "sha1-YCzUtG6EStTv/JKoARo8RuAjjcI=", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", "dev": true, "optional": true }, @@ -5000,8 +4884,8 @@ }, "cosmiconfig": { "version": "6.0.0", - "resolved": "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1596310641928&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz", - "integrity": "sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI=", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", "dev": true, "optional": true, "requires": { @@ -5014,8 +4898,8 @@ "dependencies": { "path-type": { "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz", - "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, "optional": true } @@ -7051,6 +6935,103 @@ "worker-rpc": "^0.1.0" } }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", + "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, + "optional": true, + "requires": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + } + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true, + "optional": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz", @@ -7095,8 +7076,8 @@ }, "fs-extra": { "version": "9.0.1", - "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-9.0.1.tgz", - "integrity": "sha1-kQ2gBiQ3ukw5/t2GPxZ1zP78ufw=", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "optional": true, "requires": { @@ -7117,8 +7098,8 @@ }, "fs-monkey": { "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.1.tgz", - "integrity": "sha1-SoLzaUQ2XmGfRFTZ//EGVTBnt4E=", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.1.tgz", + "integrity": "sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==", "dev": true, "optional": true }, @@ -9238,8 +9219,8 @@ }, "jsonfile": { "version": "6.0.1", - "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.0.1.tgz", - "integrity": "sha1-mJZsuiFDeMjIS4LghZB7QL9hQXk=", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", "dev": true, "optional": true, "requires": { @@ -9604,8 +9585,8 @@ }, "memfs": { "version": "3.2.0", - "resolved": "https://registry.npm.taobao.org/memfs/download/memfs-3.2.0.tgz", - "integrity": "sha1-+UOOYitazR2qikrhYMSW/dEyWyY=", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.2.0.tgz", + "integrity": "sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==", "dev": true, "optional": true, "requires": { @@ -12132,6 +12113,11 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "ress": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ress/-/ress-3.0.0.tgz", + "integrity": "sha512-MTPto7t44AawqmSbEmvMKoSMWPnxjaTuHf94s7RjWxuSGFN0o8/b+6yOwkaC50+Vihjsu6ODUEQR397gTMn57w==" + }, "restore-cursor": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz", @@ -13924,8 +13910,8 @@ }, "universalify": { "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-1.0.0.tgz", - "integrity": "sha1-thodoXPoQ1sv48Z9Kbmt+FlL0W0=", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", "dev": true, "optional": true }, @@ -14286,6 +14272,88 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.8", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", + "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "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, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz", @@ -15055,8 +15123,8 @@ }, "yaml": { "version": "1.10.0", - "resolved": "https://registry.npm.taobao.org/yaml/download/yaml-1.10.0.tgz?cache=0&sync_timestamp=1598200635030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyaml%2Fdownload%2Fyaml-1.10.0.tgz", - "integrity": "sha1-O1k63ZRIdgd9TWg/7gEIG9n/8x4=", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==", "dev": true, "optional": true }, diff --git a/package.json b/package.json index b4043644..beb1eb4b 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "dependencies": { "core-js": "^3.6.5", "vue": "^2.6.11", - "vuex": "^3.4.0" + "vuex": "^3.4.0", + "@wmde/wikit-vue-components": "1.0.1", + "@wmde/wikit-tokens": "1.0.1" }, "devDependencies": { "@types/jest": "^24.0.19", diff --git a/src/App.vue b/src/App.vue index 8fa0d26d..0bae777e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,28 +1,21 @@ diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 19b3223b..00000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - diff --git a/src/components/QueryBuilder.vue b/src/components/QueryBuilder.vue new file mode 100644 index 00000000..662db0a5 --- /dev/null +++ b/src/components/QueryBuilder.vue @@ -0,0 +1,58 @@ + + + + + From 930be8aeb67dcf8e9ff992dbebfdefe9d2ca58d8 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Tue, 29 Sep 2020 21:11:36 +0200 Subject: [PATCH 2/5] Fix tests Empty string for now. --- tests/unit/example.spec.ts | 12 ------------ tests/unit/querybuilder.spec.ts | 9 +++++++++ 2 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 tests/unit/example.spec.ts create mode 100644 tests/unit/querybuilder.spec.ts diff --git a/tests/unit/example.spec.ts b/tests/unit/example.spec.ts deleted file mode 100644 index 8c0d47db..00000000 --- a/tests/unit/example.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { shallowMount } from '@vue/test-utils'; -import HelloWorld from '@/components/HelloWorld.vue'; - -describe( 'HelloWorld.vue', () => { - it( 'renders props.msg when passed', () => { - const msg = 'new message'; - const wrapper = shallowMount( HelloWorld, { - propsData: { msg } - } ); - expect( wrapper.text() ).toMatch( msg ); - } ); -} ); diff --git a/tests/unit/querybuilder.spec.ts b/tests/unit/querybuilder.spec.ts new file mode 100644 index 00000000..567cd887 --- /dev/null +++ b/tests/unit/querybuilder.spec.ts @@ -0,0 +1,9 @@ +import { shallowMount } from '@vue/test-utils'; +import QueryBuilder from '@/components/QueryBuilder.vue'; + +describe( 'QueryBuilder.vue', () => { + it( 'renders props.msg when passed', () => { + const wrapper = shallowMount( QueryBuilder, {} ); + expect( wrapper.text() ).toMatch( '' ); + } ); +} ); From b20316928c938bec7245ed5ca69e2a1e6a823603 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Wed, 30 Sep 2020 18:47:07 +0200 Subject: [PATCH 3/5] Rename tests to CamelCase --- tests/unit/{querybuilder.spec.ts => QueryBuilder.spec.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/unit/{querybuilder.spec.ts => QueryBuilder.spec.ts} (100%) diff --git a/tests/unit/querybuilder.spec.ts b/tests/unit/QueryBuilder.spec.ts similarity index 100% rename from tests/unit/querybuilder.spec.ts rename to tests/unit/QueryBuilder.spec.ts From 7744b7d1ad4976b35f080732b86f114b149f7b14 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Thu, 1 Oct 2020 10:15:36 +0200 Subject: [PATCH 4/5] Change h4 to h2 --- src/components/QueryBuilder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/QueryBuilder.vue b/src/components/QueryBuilder.vue index 662db0a5..37c80664 100644 --- a/src/components/QueryBuilder.vue +++ b/src/components/QueryBuilder.vue @@ -5,7 +5,7 @@ Short explanatory text that also manages expectations. Short explanatory text that also manages expectations.

-

Find all items...

+

Find all items...

From aadef3c3253e2a03b6942150924e0c11e1913d19 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Thu, 1 Oct 2020 15:54:21 +0200 Subject: [PATCH 5/5] Reapply Jakob's suggestions They went missing after the change. --- src/components/QueryBuilder.vue | 5 ----- tests/unit/QueryBuilder.spec.ts | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/components/QueryBuilder.vue b/src/components/QueryBuilder.vue index 37c80664..7cc963f0 100644 --- a/src/components/QueryBuilder.vue +++ b/src/components/QueryBuilder.vue @@ -21,9 +21,6 @@ export default Vue.extend( { @import '~@wmde/wikit-tokens/dist/variables'; .querybuilder { - position: relative; - width: 1024px; - height: 349px; padding: 40px; // $dimension-spacing-xlarge } @@ -32,8 +29,6 @@ export default Vue.extend( { font-weight: $font-weight-style-h1; font-size: $font-size-style-h1; line-height: $font-line-height-style-heading; - display: flex; - align-items: center; color: $font-color-base; } diff --git a/tests/unit/QueryBuilder.spec.ts b/tests/unit/QueryBuilder.spec.ts index 567cd887..3daf5bc7 100644 --- a/tests/unit/QueryBuilder.spec.ts +++ b/tests/unit/QueryBuilder.spec.ts @@ -2,8 +2,8 @@ import { shallowMount } from '@vue/test-utils'; import QueryBuilder from '@/components/QueryBuilder.vue'; describe( 'QueryBuilder.vue', () => { - it( 'renders props.msg when passed', () => { + it( 'has a heading', () => { const wrapper = shallowMount( QueryBuilder, {} ); - expect( wrapper.text() ).toMatch( '' ); + expect( wrapper.find( 'h1' ).text() ).toBe( 'Simple Query Builder' ); } ); } );