From 422a67af9279970b27eaa099d9c5c6bd83ee4721 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 14 Dec 2018 13:15:19 +0100 Subject: [PATCH] Add ui-assets with svg from apps (#22) --- .stylelintrc.json | 3 - README.md | 1 + jest.config.js | 3 +- lerna.json | 2 +- package.json | 2 +- packages/ui-assets/LICENSE | 201 ++++++++++++++++++ packages/ui-assets/README.md | 3 + packages/ui-assets/package.json | 14 ++ .../ui-assets/src/parity-substrate-white.svg | 1 + packages/ui-assets/src/parity-substrate.svg | 1 + packages/ui-assets/src/polkadot-white.svg | 104 +++++++++ packages/ui-assets/src/polkadot.svg | 104 +++++++++ packages/ui-assets/src/types.d.ts | 8 + packages/ui-identicon/package.json | 4 +- packages/ui-keyring/package.json | 2 +- packages/ui-settings/package.json | 2 +- postcss.config.js | 1 - tsconfig.json | 1 + yarn.lock | 18 +- 19 files changed, 454 insertions(+), 21 deletions(-) delete mode 100644 .stylelintrc.json create mode 100644 packages/ui-assets/LICENSE create mode 100644 packages/ui-assets/README.md create mode 100644 packages/ui-assets/package.json create mode 100644 packages/ui-assets/src/parity-substrate-white.svg create mode 100644 packages/ui-assets/src/parity-substrate.svg create mode 100644 packages/ui-assets/src/polkadot-white.svg create mode 100644 packages/ui-assets/src/polkadot.svg create mode 100644 packages/ui-assets/src/types.d.ts delete mode 100644 postcss.config.js diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index 8477594a..00000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@polkadot/dev-react/config/stylelint" -} diff --git a/README.md b/README.md index 3309cb88..9a0e4d9c 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ Basic browser components for creating apps using the polkadot{.js} libraries The following libraries are currently available +- [ui-assets](packages/ui-assets/) Static assets, images and others, shared accross projects - [ui-identicon](packages/ui-identicon/) Identity icon generator with address as input - [ui-keyring](packages/ui-keyring/) A browser-specific wrapper around the base [@polkadot/util-keyring](https://github.com/polkadot-js/util/) library - [ui-settings](packages/ui-settings/) A browser local stiorage wrapper for app settings & configuration diff --git a/jest.config.js b/jest.config.js index 2d27960f..06ef2d40 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,8 +2,7 @@ const config = require('@polkadot/dev-react/config/jest'); module.exports = Object.assign({}, config, { moduleNameMapper: { - '@polkadot/app-(accounts|addresses|democracy|explorer|extrinsics|rpc|settings|staking|storage|toolbox|transfer|vanitygen)(.*)$': '/packages/app-$1/src/$2', - '@polkadot/ui-(app|identicon|keyring|react-rx|settings|signer)(.*)$': '/packages/ui-$1/src/$2', + '@polkadot/ui-(assets|identicon|keyring|settings)(.*)$': '/packages/ui-$1/src/$2', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object', '\\.(css|less)$': 'empty/object' } diff --git a/lerna.json b/lerna.json index cbc9e332..46a90aa7 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.22.18" + "version": "0.23.0" } diff --git a/package.json b/package.json index fa91941e..5bd5a37d 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@babel/core": "^7.2.0", - "@polkadot/dev-react": "^0.22.11", + "@polkadot/dev-react": "^0.22.12", "@polkadot/ts": "^0.1.43", "empty": "^0.10.1" } diff --git a/packages/ui-assets/LICENSE b/packages/ui-assets/LICENSE new file mode 100644 index 00000000..0d381b2e --- /dev/null +++ b/packages/ui-assets/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/ui-assets/README.md b/packages/ui-assets/README.md new file mode 100644 index 00000000..96194164 --- /dev/null +++ b/packages/ui-assets/README.md @@ -0,0 +1,3 @@ +# @polkadot/ui-assets + +Static assets including images shared across projects diff --git a/packages/ui-assets/package.json b/packages/ui-assets/package.json new file mode 100644 index 00000000..e727799f --- /dev/null +++ b/packages/ui-assets/package.json @@ -0,0 +1,14 @@ +{ + "name": "@polkadot/ui-assets", + "version": "0.23.0", + "description": "Static assets shared accross projects", + "main": "index.js", + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime": "^7.2.0" + } +} diff --git a/packages/ui-assets/src/parity-substrate-white.svg b/packages/ui-assets/src/parity-substrate-white.svg new file mode 100644 index 00000000..0eb6ad15 --- /dev/null +++ b/packages/ui-assets/src/parity-substrate-white.svg @@ -0,0 +1 @@ +parity-substrate-3 diff --git a/packages/ui-assets/src/parity-substrate.svg b/packages/ui-assets/src/parity-substrate.svg new file mode 100644 index 00000000..b894a599 --- /dev/null +++ b/packages/ui-assets/src/parity-substrate.svg @@ -0,0 +1 @@ +parity-substrate-3 \ No newline at end of file diff --git a/packages/ui-assets/src/polkadot-white.svg b/packages/ui-assets/src/polkadot-white.svg new file mode 100644 index 00000000..4023c9da --- /dev/null +++ b/packages/ui-assets/src/polkadot-white.svg @@ -0,0 +1,104 @@ + diff --git a/packages/ui-assets/src/polkadot.svg b/packages/ui-assets/src/polkadot.svg new file mode 100644 index 00000000..5cb9729b --- /dev/null +++ b/packages/ui-assets/src/polkadot.svg @@ -0,0 +1,104 @@ + diff --git a/packages/ui-assets/src/types.d.ts b/packages/ui-assets/src/types.d.ts new file mode 100644 index 00000000..f3342f47 --- /dev/null +++ b/packages/ui-assets/src/types.d.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2018 @polkadot/ui-assets authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +declare module '*.svg' { + const content: any; + export default content; +} diff --git a/packages/ui-identicon/package.json b/packages/ui-identicon/package.json index 6fd2e505..cdb915b7 100644 --- a/packages/ui-identicon/package.json +++ b/packages/ui-identicon/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-identicon", - "version": "0.22.18", + "version": "0.23.0", "description": "Renders an SVG picture representing an address", "main": "index.js", "author": "Jaco Greeff ", @@ -11,7 +11,7 @@ "dependencies": { "@babel/runtime": "^7.2.0", "@polkadot/keyring": "^0.33.13", - "@polkadot/ui-settings": "^0.22.18", + "@polkadot/ui-settings": "^0.23.0", "@polkadot/util-crypto": "^0.33.13", "@types/color": "^3.0.0", "@types/react-copy-to-clipboard": "^4.2.6", diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index fc75c8c7..914ac706 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-keyring", - "version": "0.22.18", + "version": "0.23.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", diff --git a/packages/ui-settings/package.json b/packages/ui-settings/package.json index 28deaa0f..059fd1ee 100644 --- a/packages/ui-settings/package.json +++ b/packages/ui-settings/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-settings", - "version": "0.22.18", + "version": "0.23.0", "description": "Manages app settings", "main": "index.js", "author": "Jaco Greeff ", diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index 440a7535..00000000 --- a/postcss.config.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@polkadot/dev-react/config/postcss'); diff --git a/tsconfig.json b/tsconfig.json index 75b8042c..9857f69b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", "paths": { + "@polkadot/ui-assets/*": [ "packages/ui-assets/src/*" ], "@polkadot/ui-identicon/*": [ "packages/ui-identicon/src/*" ], "@polkadot/ui-keyring/*": [ "packages/ui-keyring/src/*" ], "@polkadot/ui-settings/*": [ "packages/ui-settings/src/*" ] diff --git a/yarn.lock b/yarn.lock index 92a1b9ca..b6fa6301 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1344,15 +1344,15 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@polkadot/dev-react@^0.22.11": - version "0.22.11" - resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.22.11.tgz#fff2416805eb9abcacc34beaa305c984dc26e7f0" - integrity sha512-opjCg2+HzZZjjwGWR9E3wdA2OjcxIsz72qi4KzDTGmWkHuF8rcggS22qaCAAwDmh62/ZMMlawLzLBV+pjePXcA== +"@polkadot/dev-react@^0.22.12": + version "0.22.12" + resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.22.12.tgz#2b885f8524f3bbe02dce53d6073ab9d5c33dc2e7" + integrity sha512-hOnNbbWqdiMA33/IQvd53oTfvSP651HC/nhV6qko0WbXwayHnNtfhcpVxZ6SAMOgpcHOhL2QU9BOf2Wl/m1tCA== dependencies: "@babel/core" "^7.2.0" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/preset-react" "^7.0.0" - "@polkadot/dev" "^0.22.11" + "@polkadot/dev" "^0.22.12" "@types/react" "^16.7.13" "@types/react-dom" "^16.0.11" "@types/styled-components" "^4.1.2" @@ -1383,10 +1383,10 @@ webpack-serve "^2.0.3" worker-loader "^2.0.0" -"@polkadot/dev@^0.22.11": - version "0.22.11" - resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.22.11.tgz#fcacaba21cb7f72490ad67e228171ce6cf5903f7" - integrity sha512-xYyAknjwqNZqDpxNgbH137R5m3jACQjnJi7/rz3uR8GFW107rFb7sGTtvtX3TYaS7CP69Eiy+mCRCE+3bdKHsw== +"@polkadot/dev@^0.22.12": + version "0.22.12" + resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.22.12.tgz#f0eaf211efb3d6b70869dab63a022858a110de85" + integrity sha512-dF4LJHrDOLbn7AqBm2ZL8o9YqUsm0+00OED8XCI0n2jy7jvMd37PwPn3gib0Ip7xwSZiikJbHvNkvmyGUUZjpw== dependencies: "@babel/cli" "^7.2.0" "@babel/core" "^7.2.0"