From 5f12a882669b81559f5de341655d01e249656617 Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Tue, 5 Nov 2019 01:44:06 +0300 Subject: [PATCH 1/6] add new modules and dependencies, fix codestyle --- example/.eslintrc.js | 7 +- example/babel.config.js | 2 +- example/package.json | 5 +- example/postcss.config.js | 3 +- example/src/main.ts | 13 ++- example/src/shims-vue.d.ts | 4 +- example/yarn.lock | 189 +++++++++++++++++++++++++++++++++++-- 7 files changed, 203 insertions(+), 20 deletions(-) diff --git a/example/.eslintrc.js b/example/.eslintrc.js index 301ff1de..ae346714 100644 --- a/example/.eslintrc.js +++ b/example/.eslintrc.js @@ -3,10 +3,11 @@ module.exports = { env: { node: true }, - 'extends': [ + extends: [ 'plugin:vue/essential', 'eslint:recommended', - '@vue/typescript' + '@vue/typescript', + 'codex' ], rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', @@ -15,4 +16,4 @@ module.exports = { parserOptions: { parser: '@typescript-eslint/parser' } -} +}; diff --git a/example/babel.config.js b/example/babel.config.js index e9558405..3f453d44 100644 --- a/example/babel.config.js +++ b/example/babel.config.js @@ -2,4 +2,4 @@ module.exports = { presets: [ '@vue/cli-plugin-babel/preset' ] -} +}; diff --git a/example/package.json b/example/package.json index 6ed9b93e..31101abc 100644 --- a/example/package.json +++ b/example/package.json @@ -9,9 +9,11 @@ }, "dependencies": { "core-js": "^3.3.2", + "postcss-nested": "^4.1.2", "vue": "^2.6.10", "vue-class-component": "^7.0.2", - "vue-property-decorator": "^8.3.0" + "vue-property-decorator": "^8.3.0", + "vue-unique-id": "^2.0.0" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.0.0", @@ -20,6 +22,7 @@ "@vue/cli-service": "^4.0.0", "@vue/eslint-config-typescript": "^4.0.0", "eslint": "^5.16.0", + "eslint-config-codex": "github:codex-team/eslint-config", "eslint-plugin-vue": "^5.0.0", "typescript": "~3.5.3", "vue-template-compiler": "^2.6.10" diff --git a/example/postcss.config.js b/example/postcss.config.js index 961986e2..42d4ccba 100644 --- a/example/postcss.config.js +++ b/example/postcss.config.js @@ -1,5 +1,6 @@ module.exports = { plugins: { + 'postcss-nested': {}, autoprefixer: {} } -} +}; diff --git a/example/src/main.ts b/example/src/main.ts index 63eb05f7..11f77cd2 100644 --- a/example/src/main.ts +++ b/example/src/main.ts @@ -1,8 +1,11 @@ -import Vue from 'vue' -import App from './App.vue' +import Vue from 'vue'; +import App from './App.vue'; +import uniqueId from 'vue-unique-id'; -Vue.config.productionTip = false +Vue.config.productionTip = false; + +Vue.use(uniqueId); new Vue({ - render: h => h(App), -}).$mount('#app') + render: h => h(App) +}).$mount('#app'); diff --git a/example/src/shims-vue.d.ts b/example/src/shims-vue.d.ts index d9f24faa..8f6f4102 100644 --- a/example/src/shims-vue.d.ts +++ b/example/src/shims-vue.d.ts @@ -1,4 +1,4 @@ declare module '*.vue' { - import Vue from 'vue' - export default Vue + import Vue from 'vue'; + export default Vue; } diff --git a/example/yarn.lock b/example/yarn.lock index 5fec427a..dee300c1 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -1434,6 +1434,14 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" + array-union@^1.0.1, array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -2296,6 +2304,11 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= +contains-path@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" + integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -2651,7 +2664,7 @@ de-indent@^1.0.2: resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2852,6 +2865,14 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" +doctrine@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" + integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= + dependencies: + esutils "^2.0.2" + isarray "^1.0.0" + doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -3033,7 +3054,7 @@ errno@^0.1.3, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.3.1: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -3047,7 +3068,7 @@ error-stack-parser@^2.0.0: dependencies: stackframe "^1.1.0" -es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1: +es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0: version "1.16.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d" integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg== @@ -3082,6 +3103,29 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +"eslint-config-codex@github:codex-team/eslint-config": + version "1.1.1" + resolved "https://codeload.github.com/codex-team/eslint-config/tar.gz/ed71c6b1c5248a62c10b3185bea6f6bcdaac3f88" + dependencies: + eslint-config-standard latest + eslint-plugin-import latest + eslint-plugin-node latest + eslint-plugin-promise latest + eslint-plugin-standard latest + +eslint-config-standard@latest: + version "14.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz#b23da2b76fe5a2eba668374f246454e7058f15d4" + integrity sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA== + +eslint-import-resolver-node@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" + integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== + dependencies: + debug "^2.6.9" + resolve "^1.5.0" + eslint-loader@^2.1.2: version "2.2.1" resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz#28b9c12da54057af0845e2a6112701a2f6bf8337" @@ -3093,6 +3137,61 @@ eslint-loader@^2.1.2: object-hash "^1.1.4" rimraf "^2.6.1" +eslint-module-utils@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c" + integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw== + dependencies: + debug "^2.6.8" + pkg-dir "^2.0.0" + +eslint-plugin-es@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976" + integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ== + dependencies: + eslint-utils "^1.4.2" + regexpp "^3.0.0" + +eslint-plugin-import@latest: + version "2.18.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" + integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== + dependencies: + array-includes "^3.0.3" + contains-path "^0.1.0" + debug "^2.6.9" + doctrine "1.5.0" + eslint-import-resolver-node "^0.3.2" + eslint-module-utils "^2.4.0" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.0" + read-pkg-up "^2.0.0" + resolve "^1.11.0" + +eslint-plugin-node@latest: + version "10.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6" + integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ== + dependencies: + eslint-plugin-es "^2.0.0" + eslint-utils "^1.4.2" + ignore "^5.1.1" + minimatch "^3.0.4" + resolve "^1.10.1" + semver "^6.1.0" + +eslint-plugin-promise@latest: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== + +eslint-plugin-standard@latest: + version "4.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" + integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== + eslint-plugin-vue@^5.0.0: version "5.2.3" resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz#3ee7597d823b5478804b2feba9863b1b74273961" @@ -3108,7 +3207,7 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1: +eslint-utils@^1.3.1, eslint-utils@^1.4.2: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== @@ -3534,7 +3633,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.1.0: +find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -4161,6 +4260,11 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.1.1: + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -4790,6 +4894,16 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +load-json-file@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + strip-bom "^3.0.0" + loader-fs-cache@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz#54cedf6b727e1779fd8f01205f05f6e88706f086" @@ -5408,7 +5522,7 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.5.0: +normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -5834,6 +5948,13 @@ parse-asn1@^5.0.0: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -5924,6 +6045,13 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-type@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= + dependencies: + pify "^2.0.0" + path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -5986,6 +6114,13 @@ pkg-dir@^1.0.0: dependencies: find-up "^1.0.0" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -6191,6 +6326,14 @@ postcss-modules-values@^3.0.0: icss-utils "^4.0.0" postcss "^7.0.6" +postcss-nested@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.1.2.tgz#8e0570f736bfb4be5136e31901bf2380b819a561" + integrity sha512-9bQFr2TezohU3KRSu9f6sfecXmf/x6RXDedl8CHF6fyuyVW7UqgNMRdWMHZQWuFY6Xqs2NYk+Fj4Z4vSOf7PQg== + dependencies: + postcss "^7.0.14" + postcss-selector-parser "^5.0.0" + postcss-normalize-charset@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" @@ -6567,6 +6710,23 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +read-pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= + dependencies: + find-up "^2.0.0" + read-pkg "^2.0.0" + +read-pkg@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= + dependencies: + load-json-file "^2.0.0" + normalize-package-data "^2.3.2" + path-type "^2.0.0" + read-pkg@^5.1.1: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -6652,6 +6812,11 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" + integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== + regexpu-core@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" @@ -6796,7 +6961,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: version "1.12.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== @@ -7447,6 +7612,11 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -8094,6 +8264,11 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== +vue-unique-id@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/vue-unique-id/-/vue-unique-id-2.0.0.tgz#0d6466df9ac9995bfb29d77b7abe98bde9857a05" + integrity sha512-+s2yMxDrFzWB62k1tw32ZZA34iHKyE3P3pPbNlkrNPGwfx7VDHGQbCWA5hoPs0UpxpDHYFyM/mkJR6CAc54KOQ== + vue@^2.6.10: version "2.6.10" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637" From 06bff0bab1eeadecd0802e53c6e4b3cacf2e59d5 Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Tue, 5 Nov 2019 01:44:31 +0300 Subject: [PATCH 2/6] create player component --- example/src/App.vue | 10 +++- example/src/components/Player.vue | 89 +++++++++++++++++++++++++++++++ example/src/styles/player.css | 9 ++++ example/src/views/Home.vue | 35 ++++++++++++ 4 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 example/src/components/Player.vue create mode 100644 example/src/styles/player.css create mode 100644 example/src/views/Home.vue diff --git a/example/src/App.vue b/example/src/App.vue index b86aeee9..2623b3ba 100644 --- a/example/src/App.vue +++ b/example/src/App.vue @@ -1,15 +1,23 @@ diff --git a/example/src/components/Player.vue b/example/src/components/Player.vue new file mode 100644 index 00000000..f3884aef --- /dev/null +++ b/example/src/components/Player.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/example/src/styles/player.css b/example/src/styles/player.css new file mode 100644 index 00000000..fc1c2fc7 --- /dev/null +++ b/example/src/styles/player.css @@ -0,0 +1,9 @@ +.player-table { + background: #E7F8FF; + font-family: Arial; + + thead { + color: #667C7C; + font-size: 16px; + } +} diff --git a/example/src/views/Home.vue b/example/src/views/Home.vue new file mode 100644 index 00000000..49339c58 --- /dev/null +++ b/example/src/views/Home.vue @@ -0,0 +1,35 @@ + + + + + From 9edefc07d60958be9478ab905fe37e117c11d916 Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Wed, 6 Nov 2019 12:46:00 +0300 Subject: [PATCH 3/6] add color variables --- example/src/styles/variables.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 example/src/styles/variables.css diff --git a/example/src/styles/variables.css b/example/src/styles/variables.css new file mode 100644 index 00000000..947b6069 --- /dev/null +++ b/example/src/styles/variables.css @@ -0,0 +1,15 @@ +:root { + /** Fonts */ + --color-text-main: #102a24; + --color-text-second: #667C7C; + + /** Backgrounds */ + --color-bg-main: #E7F8FF; + --color-bg-element: #ecfff6; + --color-bg-range-thumb: #23cba3; + --color-bg-range-track: rgba(16, 42, 36, 0.6); + --color-bg-label: rgba(16, 42, 36, 0.6); + + /** Borders */ + --color-border-element: #cbe9d7; +} From b44d9b8d16176c9f1a827b03a5c327dcc64a2821 Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Wed, 6 Nov 2019 12:46:16 +0300 Subject: [PATCH 4/6] add styles for player --- example/src/components/Player.vue | 7 ++- example/src/styles/player.css | 97 ++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/example/src/components/Player.vue b/example/src/components/Player.vue index f3884aef..e239b784 100644 --- a/example/src/components/Player.vue +++ b/example/src/components/Player.vue @@ -2,7 +2,8 @@ @@ -16,12 +17,12 @@ - - diff --git a/example/src/styles/player.css b/example/src/styles/player.css index fc1c2fc7..f51d7c55 100644 --- a/example/src/styles/player.css +++ b/example/src/styles/player.css @@ -1,9 +1,100 @@ +@import "variables.css"; + .player-table { - background: #E7F8FF; - font-family: Arial; + background: var(--color-bg-main); + font-family: "Roboto"; thead { - color: #667C7C; + color: var(--color-text-second); font-size: 16px; + text-align: left; + } +} + +.player { + &__button { + display: flex; + align-items: center; + border: 1px solid var(--color-border-element); + border-radius: 3px; + color: var(--color-text-main); + background: var(--color-bg-element); + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.05); + padding: 8px 15px; + font-family: "Roboto"; + font-weight: 500; + font-size: 14px; + height: 32px; + box-sizing: border-box; + + &-icon { + display: inline-block; + float: left; + background-image: url(../images/icons/triangle.svg); + height: 10px; + width: 6px; + margin-right: 10px; + } + } + + &__input { + box-sizing: border-box; + height: 32px; + border: 1px solid var(--color-border-element); + border-radius: 3px; + background: var(--color-bg-element); + color: var(--color-text-main); + font-family: "Roboto"; + font-weight: 500; + font-size: 14px; + padding: 8px 10px; + } + + &__range { + -webkit-appearance: none; + width: 100%; + background: transparent; + + /** Thumb */ + &::-webkit-slider-thumb { + -webkit-appearance: none; + height: 17px; + width: 17px; + border-radius: 50%; + background: var(--color-bg-range-thumb); + cursor: pointer; + margin-top: -6px; + } + + &::-moz-range-thumb { + height: 17px; + width: 17px; + border-radius: 50%; + background: var(--color-bg-range-thumb); + cursor: pointer; + } + + /** Track */ + &::-webkit-slider-runnable-track { + width: 100%; + height: 5px; + cursor: pointer; + background: var(--color-bg-range-track); + border-radius: 3px; + } + + &::-moz-range-track { + width: 100%; + height: 5px; + cursor: pointer; + background: var(--color-bg-range-track); + border-radius: 3px; + } + } + + &__label { + font-family: "Roboto"; + font-size: 14px; + color: var(--color-bg-label); } } From be5294fa1530821dd85c3bcc83d05aca4c7bcce4 Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Mon, 11 Nov 2019 21:02:58 +0300 Subject: [PATCH 5/6] add styles for table and player, upload triangle.svg --- example/src/App.vue | 9 ++- example/src/components/Player.vue | 96 +++++++++++++++++++++++++- example/src/images/icons/triangle.svg | 3 + example/src/styles/base.css | 28 ++++++++ example/src/styles/player.css | 99 --------------------------- example/src/styles/variables.css | 1 + example/src/views/Home.vue | 17 ++++- 7 files changed, 149 insertions(+), 104 deletions(-) create mode 100644 example/src/images/icons/triangle.svg create mode 100644 example/src/styles/base.css diff --git a/example/src/App.vue b/example/src/App.vue index 2623b3ba..02e3c784 100644 --- a/example/src/App.vue +++ b/example/src/App.vue @@ -1,6 +1,5 @@ @@ -21,5 +20,13 @@ import Home from './views/Home.vue'; export default class App extends Vue {} + + diff --git a/example/src/components/Player.vue b/example/src/components/Player.vue index e239b784..50260f07 100644 --- a/example/src/components/Player.vue +++ b/example/src/components/Player.vue @@ -78,13 +78,103 @@ import { Component, Vue } from 'vue-property-decorator'; @Component({ - components: {} + components: { + } }) /** * Player component */ -export default class Player extends Vue {} +export default class Player extends Vue { +} - + diff --git a/example/src/images/icons/triangle.svg b/example/src/images/icons/triangle.svg new file mode 100644 index 00000000..f86accc4 --- /dev/null +++ b/example/src/images/icons/triangle.svg @@ -0,0 +1,3 @@ + + + diff --git a/example/src/styles/base.css b/example/src/styles/base.css new file mode 100644 index 00000000..6a2fb91c --- /dev/null +++ b/example/src/styles/base.css @@ -0,0 +1,28 @@ +@import "variables.css"; + +@import url('https://fonts.googleapis.com/css?family=Roboto&display=swap'); + +/** + * Base site styles + */ +html,body { + height: 100%; +} + +body { + display: flex; + align-items: stretch; + box-sizing: border-box; + min-height: 100%; + overflow: hidden; + color: var(--color-text-main); + background: var(--color-bg-main); + font-size: 15px; + font-family: Roboto, system-ui, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +*, *:before, *:after { + box-sizing: inherit; +} diff --git a/example/src/styles/player.css b/example/src/styles/player.css index f51d7c55..8b137891 100644 --- a/example/src/styles/player.css +++ b/example/src/styles/player.css @@ -1,100 +1 @@ -@import "variables.css"; -.player-table { - background: var(--color-bg-main); - font-family: "Roboto"; - - thead { - color: var(--color-text-second); - font-size: 16px; - text-align: left; - } -} - -.player { - &__button { - display: flex; - align-items: center; - border: 1px solid var(--color-border-element); - border-radius: 3px; - color: var(--color-text-main); - background: var(--color-bg-element); - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.05); - padding: 8px 15px; - font-family: "Roboto"; - font-weight: 500; - font-size: 14px; - height: 32px; - box-sizing: border-box; - - &-icon { - display: inline-block; - float: left; - background-image: url(../images/icons/triangle.svg); - height: 10px; - width: 6px; - margin-right: 10px; - } - } - - &__input { - box-sizing: border-box; - height: 32px; - border: 1px solid var(--color-border-element); - border-radius: 3px; - background: var(--color-bg-element); - color: var(--color-text-main); - font-family: "Roboto"; - font-weight: 500; - font-size: 14px; - padding: 8px 10px; - } - - &__range { - -webkit-appearance: none; - width: 100%; - background: transparent; - - /** Thumb */ - &::-webkit-slider-thumb { - -webkit-appearance: none; - height: 17px; - width: 17px; - border-radius: 50%; - background: var(--color-bg-range-thumb); - cursor: pointer; - margin-top: -6px; - } - - &::-moz-range-thumb { - height: 17px; - width: 17px; - border-radius: 50%; - background: var(--color-bg-range-thumb); - cursor: pointer; - } - - /** Track */ - &::-webkit-slider-runnable-track { - width: 100%; - height: 5px; - cursor: pointer; - background: var(--color-bg-range-track); - border-radius: 3px; - } - - &::-moz-range-track { - width: 100%; - height: 5px; - cursor: pointer; - background: var(--color-bg-range-track); - border-radius: 3px; - } - } - - &__label { - font-family: "Roboto"; - font-size: 14px; - color: var(--color-bg-label); - } -} diff --git a/example/src/styles/variables.css b/example/src/styles/variables.css index 947b6069..a438dfdb 100644 --- a/example/src/styles/variables.css +++ b/example/src/styles/variables.css @@ -12,4 +12,5 @@ /** Borders */ --color-border-element: #cbe9d7; + --color-border-table: #cbe9d7; } diff --git a/example/src/views/Home.vue b/example/src/views/Home.vue index 49339c58..3cb2f27d 100644 --- a/example/src/views/Home.vue +++ b/example/src/views/Home.vue @@ -31,5 +31,20 @@ import Player from '../components/Player.vue'; export default class Home extends Vue {} - From c7501ab7b170a175bb303b94c273cf4a56d2372d Mon Sep 17 00:00:00 2001 From: ilyamore88 Date: Thu, 14 Nov 2019 14:39:18 +0300 Subject: [PATCH 6/6] delete empty file, link font in html head, fix ::before and ::after --- example/public/index.html | 1 + example/src/styles/base.css | 4 +--- example/src/styles/player.css | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 example/src/styles/player.css diff --git a/example/public/index.html b/example/public/index.html index e4907f60..d7e8592d 100644 --- a/example/public/index.html +++ b/example/public/index.html @@ -5,6 +5,7 @@ CodeX.Music Demo +