diff --git a/packages/app-123code/README.md b/packages/app-123code/README.md index 77b3068a87..fe01a1661a 100644 --- a/packages/app-123code/README.md +++ b/packages/app-123code/README.md @@ -15,8 +15,8 @@ And we have the basic app source setup, time to get the tooling correct. At this point the app should be buildable, but not quite reachable. The final step is to add it to the actual sidebar in `apps`. -4. In `apps/src/routing/` duplicate the `123code.ts` file to `example.ts` and edit it with the appropriate information, including the hash link, name and icon (any icon name from semantic-ui-react/font-awesome 4 should be appropriate). +4. In `apps-routing/src` duplicate the `123code.ts` file to `example.ts` and edit it with the appropriate information, including the hash link, name and icon (any icon name from semantic-ui-react/font-awesome 4 should be appropriate). 5. In the above description file, the `isHidden` field needs to be toggled to make it appear - the base template is hidden by default. -6. Finally add the `template` to the `apps/src/routing/index.ts` file at the appropriate place for both full and light mode (either optional) +6. Finally add the `template` to the `apps-routing/src/index.ts` file at the appropriate place for both full and light mode (either optional) Yes. After all that we have things hooked up. Run `yarn start` and your new app (non-coded) should show up. Now start having fun and building something great. diff --git a/packages/app-dashboard/LICENSE b/packages/app-dashboard/LICENSE new file mode 100644 index 0000000000..0d381b2e97 --- /dev/null +++ b/packages/app-dashboard/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/app-dashboard/README.md b/packages/app-dashboard/README.md new file mode 100644 index 0000000000..77b3068a87 --- /dev/null +++ b/packages/app-dashboard/README.md @@ -0,0 +1,22 @@ +# @polkadot/app-123code + +A simple template to get started with adding an "app" to this UI. It contains the bare minimum for a nicely hackable app (if you just want to code _somewhere_) and the steps needed to create, add and register an new app that appears in the UI. + +## adding an app + +If you want to add a new app to the UI, this is the place to start. + +1. Duplicate this `app-123code` folder and give it an appropriate name, in this case we will select `app-example` to keep things clear. +2. Edit the `apps-example/package.json` app description, i.e. the name, author and relevant overview. + +And we have the basic app source setup, time to get the tooling correct. + +3. Add the new app to the TypeScript config in root, `tsconfig.json`, i.e. an entry such as `"@polkadot/app-example/*": [ "packages/app-example/src/*" ],` + +At this point the app should be buildable, but not quite reachable. The final step is to add it to the actual sidebar in `apps`. + +4. In `apps/src/routing/` duplicate the `123code.ts` file to `example.ts` and edit it with the appropriate information, including the hash link, name and icon (any icon name from semantic-ui-react/font-awesome 4 should be appropriate). +5. In the above description file, the `isHidden` field needs to be toggled to make it appear - the base template is hidden by default. +6. Finally add the `template` to the `apps/src/routing/index.ts` file at the appropriate place for both full and light mode (either optional) + +Yes. After all that we have things hooked up. Run `yarn start` and your new app (non-coded) should show up. Now start having fun and building something great. diff --git a/packages/app-dashboard/package.json b/packages/app-dashboard/package.json new file mode 100644 index 0000000000..d40a648862 --- /dev/null +++ b/packages/app-dashboard/package.json @@ -0,0 +1,17 @@ +{ + "name": "@polkadot/app-dashboard", + "version": "0.33.0-beta.5", + "description": "Dashboard for all apps, allowing for an overview and quick navigation", + "main": "index.js", + "scripts": {}, + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime": "^7.4.4", + "@polkadot/apps-routing": "^0.33.0-beta.5", + "@polkadot/ui-app": "^0.33.0-beta.5" + } +} diff --git a/packages/app-dashboard/src/Entry.tsx b/packages/app-dashboard/src/Entry.tsx new file mode 100644 index 0000000000..f0c01044a9 --- /dev/null +++ b/packages/app-dashboard/src/Entry.tsx @@ -0,0 +1,45 @@ +// Copyright 2017-2019 @polkadot/app-dashboard authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Route } from '@polkadot/apps-routing/types'; +import { I18nProps } from '@polkadot/ui-app/types'; + +import React from 'react'; +import { Link } from 'react-router-dom'; +import styled from 'styled-components'; +import { Icon } from '@polkadot/ui-app'; + +import translate from './translate'; + +type Props = I18nProps & { + route: Route +}; + +const Wrapper = styled.div` + .name { + margin-top: 0.75rem; + } +`; + +class Entry extends React.PureComponent { + render () { + const { route: { i18n, icon, name }, t } = this.props; + + return ( + + + +
+ {t(`entry.${name}`, i18n)} +
+ +
+ ); + } +} + +export default translate(Entry); diff --git a/packages/app-dashboard/src/Spacer.tsx b/packages/app-dashboard/src/Spacer.tsx new file mode 100644 index 0000000000..a5bee94fbe --- /dev/null +++ b/packages/app-dashboard/src/Spacer.tsx @@ -0,0 +1,15 @@ +// Copyright 2017-2019 @polkadot/app-dashboard authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import React from 'react'; + +type Props = {}; + +export default class Spacer extends React.PureComponent { + render () { + return ( +
+ ); + } +} diff --git a/packages/app-dashboard/src/index.tsx b/packages/app-dashboard/src/index.tsx new file mode 100644 index 0000000000..97df502010 --- /dev/null +++ b/packages/app-dashboard/src/index.tsx @@ -0,0 +1,76 @@ +// Copyright 2017-2019 @polkadot/app-dashboard authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Route } from '@polkadot/apps-routing/types'; +import { AppProps } from '@polkadot/ui-app/types'; + +import React from 'react'; +import styled from 'styled-components'; +import routing from '@polkadot/apps-routing'; + +import Entry from './Entry'; +import Spacer from './Spacer'; + +type Props = AppProps; +type State = { + routes: Array +}; + +const Wrapper = styled.main` + .routes { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + + > div { + flex: 1; + padding: 1.5rem; + text-align: center; + } + } +`; + +export default class App extends React.PureComponent { + // FIXME Atm we are not applying all the logic around should this be hidden or not, i.e. + // is the api available, are there accounts, etc. (That logic should also be extracted so + // it can be used in a proper way here) + state: State = { + routes: routing.routes.filter((route) => + route && !route.display.isHidden && route.name !== 'dashboard' + ) as Array + }; + + render () { + const { routes } = this.state; + + return ( + +
+ {routes.map(this.renderEntry)} + {routes.map(this.renderSpacer)} +
+
+ ); + } + + private renderEntry (route: Route) { + return ( + + ); + } + + // NOTE: This _looks_ weird and it looks weird, because it is weird. Basically we want all + // the entries of an equal width. So here we add a non-content spacers at the end that just + // ensures flex has enough items to render something usable to the user. Since we don't + // quite know how many items per row, we just render a bunch, n === routes.length + private renderSpacer (route: Route, index: number) { + return ( + + ); + } +} diff --git a/packages/app-dashboard/src/translate.ts b/packages/app-dashboard/src/translate.ts new file mode 100644 index 0000000000..5e4187c2cf --- /dev/null +++ b/packages/app-dashboard/src/translate.ts @@ -0,0 +1,7 @@ +// Copyright 2017-2019 @polkadot/app-dashboard authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { withTranslation } from 'react-i18next'; + +export default withTranslation(['dashboard', 'ui']); diff --git a/packages/apps-routing/LICENSE b/packages/apps-routing/LICENSE new file mode 100644 index 0000000000..0d381b2e97 --- /dev/null +++ b/packages/apps-routing/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/apps-routing/README.md b/packages/apps-routing/README.md new file mode 100644 index 0000000000..c200610646 --- /dev/null +++ b/packages/apps-routing/README.md @@ -0,0 +1,3 @@ +# @polkadot/apps-routing + +The routing config for the application diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json new file mode 100644 index 0000000000..77a48678d4 --- /dev/null +++ b/packages/apps-routing/package.json @@ -0,0 +1,15 @@ +{ + "name": "@polkadot/apps-routing", + "version": "0.33.0-beta.5", + "main": "index.js", + "repository": "https://github.com/polkadot-js/apps.git", + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "contributors": [], + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime": "^7.4.4" + } +} diff --git a/packages/apps/src/routing/123code.ts b/packages/apps-routing/src/123code.ts similarity index 81% rename from packages/apps/src/routing/123code.ts rename to packages/apps-routing/src/123code.ts index b8fe2854f3..23e5c6037d 100644 --- a/packages/apps/src/routing/123code.ts +++ b/packages/apps-routing/src/123code.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Template from '@polkadot/app-123code'; diff --git a/packages/apps/src/routing/accounts.ts b/packages/apps-routing/src/accounts.ts similarity index 78% rename from packages/apps/src/routing/accounts.ts rename to packages/apps-routing/src/accounts.ts index f169714e6c..300e4c972e 100644 --- a/packages/apps/src/routing/accounts.ts +++ b/packages/apps-routing/src/accounts.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Accounts from '@polkadot/app-accounts'; diff --git a/packages/apps/src/routing/addressbook.ts b/packages/apps-routing/src/addressbook.ts similarity index 79% rename from packages/apps/src/routing/addressbook.ts rename to packages/apps-routing/src/addressbook.ts index efbe44d23d..480c2ad0b9 100644 --- a/packages/apps/src/routing/addressbook.ts +++ b/packages/apps-routing/src/addressbook.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import AddressBook from '@polkadot/app-address-book'; diff --git a/packages/apps/src/routing/contracts.ts b/packages/apps-routing/src/contracts.ts similarity index 81% rename from packages/apps/src/routing/contracts.ts rename to packages/apps-routing/src/contracts.ts index 1ff84f8d13..ccd2ed100c 100644 --- a/packages/apps/src/routing/contracts.ts +++ b/packages/apps-routing/src/contracts.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Contracts from '@polkadot/app-contracts'; diff --git a/packages/apps-routing/src/dashboard.ts b/packages/apps-routing/src/dashboard.ts new file mode 100644 index 0000000000..4bd2c84b30 --- /dev/null +++ b/packages/apps-routing/src/dashboard.ts @@ -0,0 +1,21 @@ +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Routes } from './types'; + +import Dashboard from '@polkadot/app-dashboard'; + +export default ([ + { + Component: Dashboard, + display: { + isHidden: true + }, + i18n: { + defaultValue: 'Dashboard' + }, + icon: 'th', + name: 'dashboard' + } +] as Routes); diff --git a/packages/apps/src/routing/democracy.ts b/packages/apps-routing/src/democracy.ts similarity index 80% rename from packages/apps/src/routing/democracy.ts rename to packages/apps-routing/src/democracy.ts index a4fbfe09e1..f8904d783e 100644 --- a/packages/apps/src/routing/democracy.ts +++ b/packages/apps-routing/src/democracy.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Democracy from '@polkadot/app-democracy'; diff --git a/packages/apps/src/routing/explorer.ts b/packages/apps-routing/src/explorer.ts similarity index 78% rename from packages/apps/src/routing/explorer.ts rename to packages/apps-routing/src/explorer.ts index 2cf8da0daa..7264369c7b 100644 --- a/packages/apps/src/routing/explorer.ts +++ b/packages/apps-routing/src/explorer.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Explorer from '@polkadot/app-explorer'; diff --git a/packages/apps/src/routing/extrinsics.ts b/packages/apps-routing/src/extrinsics.ts similarity index 79% rename from packages/apps/src/routing/extrinsics.ts rename to packages/apps-routing/src/extrinsics.ts index 27c200f395..99533b48f2 100644 --- a/packages/apps/src/routing/extrinsics.ts +++ b/packages/apps-routing/src/extrinsics.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Extrinsics from '@polkadot/app-extrinsics'; diff --git a/packages/apps/src/routing/index.ts b/packages/apps-routing/src/index.ts similarity index 87% rename from packages/apps/src/routing/index.ts rename to packages/apps-routing/src/index.ts index bfdbf22dd7..0b224f1312 100644 --- a/packages/apps/src/routing/index.ts +++ b/packages/apps-routing/src/index.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routing, Routes } from '../types'; +import { Routing, Routes } from './types'; import appSettings from '@polkadot/ui-settings'; @@ -10,6 +10,7 @@ import template from './123code'; import accounts from './accounts'; import addressbook from './addressbook'; import contracts from './contracts'; +import dashboard from './dashboard'; import democracy from './democracy'; import explorer from './explorer'; import extrinsics from './extrinsics'; @@ -23,6 +24,7 @@ import transfer from './transfer'; const routes: Routes = appSettings.uiMode === 'light' ? ([] as Routes).concat( + dashboard, transfer, staking, democracy, @@ -34,6 +36,7 @@ const routes: Routes = appSettings.uiMode === 'light' template ) : ([] as Routes).concat( + dashboard, explorer, transfer, staking, diff --git a/packages/apps/src/routing/js.ts b/packages/apps-routing/src/js.ts similarity index 77% rename from packages/apps/src/routing/js.ts rename to packages/apps-routing/src/js.ts index 415399941b..41cc2076d5 100644 --- a/packages/apps/src/routing/js.ts +++ b/packages/apps-routing/src/js.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Js from '@polkadot/app-js'; diff --git a/packages/apps/src/routing/settings.ts b/packages/apps-routing/src/settings.ts similarity index 77% rename from packages/apps/src/routing/settings.ts rename to packages/apps-routing/src/settings.ts index 7859cf69d3..f040aeee3d 100644 --- a/packages/apps/src/routing/settings.ts +++ b/packages/apps-routing/src/settings.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Settings from '@polkadot/app-settings'; diff --git a/packages/apps/src/routing/staking.ts b/packages/apps-routing/src/staking.ts similarity index 83% rename from packages/apps/src/routing/staking.ts rename to packages/apps-routing/src/staking.ts index 627793c958..977ac67bda 100644 --- a/packages/apps/src/routing/staking.ts +++ b/packages/apps-routing/src/staking.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Staking from '@polkadot/app-staking'; diff --git a/packages/apps/src/routing/storage.ts b/packages/apps-routing/src/storage.ts similarity index 78% rename from packages/apps/src/routing/storage.ts rename to packages/apps-routing/src/storage.ts index c511107401..18a5e29a4b 100644 --- a/packages/apps/src/routing/storage.ts +++ b/packages/apps-routing/src/storage.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Storage from '@polkadot/app-storage'; diff --git a/packages/apps/src/routing/sudo.ts b/packages/apps-routing/src/sudo.ts similarity index 80% rename from packages/apps/src/routing/sudo.ts rename to packages/apps-routing/src/sudo.ts index d9f5737e45..a1f4c9eec1 100644 --- a/packages/apps/src/routing/sudo.ts +++ b/packages/apps-routing/src/sudo.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Sudo from '@polkadot/app-sudo'; diff --git a/packages/apps/src/routing/toolbox.ts b/packages/apps-routing/src/toolbox.ts similarity index 78% rename from packages/apps/src/routing/toolbox.ts rename to packages/apps-routing/src/toolbox.ts index aa8fbbfe2d..6a17877311 100644 --- a/packages/apps/src/routing/toolbox.ts +++ b/packages/apps-routing/src/toolbox.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Toolbox from '@polkadot/app-toolbox'; diff --git a/packages/apps/src/routing/transfer.ts b/packages/apps-routing/src/transfer.ts similarity index 80% rename from packages/apps/src/routing/transfer.ts rename to packages/apps-routing/src/transfer.ts index 488d965cca..6f734e6b00 100644 --- a/packages/apps/src/routing/transfer.ts +++ b/packages/apps-routing/src/transfer.ts @@ -1,8 +1,8 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Routes } from '../types'; +import { Routes } from './types'; import Transfer from '@polkadot/app-transfer'; diff --git a/packages/apps/src/types.ts b/packages/apps-routing/src/types.ts similarity index 86% rename from packages/apps/src/types.ts rename to packages/apps-routing/src/types.ts index 66c48b62e5..5d30926469 100644 --- a/packages/apps/src/types.ts +++ b/packages/apps-routing/src/types.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2019 @polkadot/apps authors & contributors +// Copyright 2017-2019 @polkadot/apps-routing authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. @@ -15,7 +15,9 @@ export type Route = { needsApi?: Array>, needsSudo?: boolean }, - i18n: { defaultValue: string }, + i18n: { + defaultValue: string + }, icon: SemanticICONS, name: string }; diff --git a/packages/apps/package.json b/packages/apps/package.json index 06083f2c26..235b04d27b 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -15,8 +15,6 @@ "@babel/runtime": "^7.4.4", "@polkadot/ui-app": "^0.33.0-beta.15", "@polkadot/ui-assets": "^0.38.0-beta.5", - "@polkadot/ui-signer": "^0.33.0-beta.15", - "@types/react-tooltip": "^3.9.1", - "react-tooltip": "^3.9.2" + "@polkadot/ui-signer": "^0.33.0-beta.15" } } diff --git a/packages/apps/src/Apps.tsx b/packages/apps/src/Apps.tsx index c602a3ef0d..2dd9b26e77 100644 --- a/packages/apps/src/Apps.tsx +++ b/packages/apps/src/Apps.tsx @@ -6,6 +6,7 @@ import { BareProps } from '@polkadot/ui-app/types'; import { SideBarTransition, SIDEBAR_TRANSITION_DURATION, SIDEBAR_MENU_THRESHOLD } from './constants'; import React from 'react'; +import { hot } from 'react-hot-loader/root'; import store from 'store'; import styled, { ThemeProvider } from 'styled-components'; import { media } from '@polkadot/ui-app'; @@ -13,8 +14,6 @@ import { classes } from '@polkadot/ui-app/util'; import Signer from '@polkadot/ui-signer'; import settings from '@polkadot/ui-settings'; -import { hot } from 'react-hot-loader/root'; - import Connecting from './Connecting'; import Content from './Content'; import SideBar from './SideBar'; @@ -75,9 +74,7 @@ class Apps extends React.Component { const { isCollapsed, isMenu, menuOpen } = this.state; return ( - + void, diff --git a/packages/apps/src/SideBar/index.tsx b/packages/apps/src/SideBar/index.tsx index c1e1ae9b06..763bc2c6d6 100644 --- a/packages/apps/src/SideBar/index.tsx +++ b/packages/apps/src/SideBar/index.tsx @@ -10,11 +10,11 @@ import './SideBar.css'; import React from 'react'; import styled from 'styled-components'; import { Responsive } from 'semantic-ui-react'; +import routing from '@polkadot/apps-routing'; import { Button, Icon, Menu, media } from '@polkadot/ui-app'; import { classes } from '@polkadot/ui-app/util'; import { logoBackground, logoPadding } from '@polkadot/ui-app/styles/theme'; -import routing from '../routing'; import translate from '../translate'; import Item from './Item'; import NodeInfo from './NodeInfo'; diff --git a/packages/ui-app/package.json b/packages/ui-app/package.json index 85ee90c95f..ffbdd55e21 100644 --- a/packages/ui-app/package.json +++ b/packages/ui-app/package.json @@ -22,6 +22,7 @@ "@types/react-copy-to-clipboard": "^4.2.6", "@types/react-dropzone": "^4.2.2", "@types/react-router-dom": "^4.3.2", + "@types/react-tooltip": "^3.9.1", "@types/styled-components": "4.1.8", "@types/styled-theming": "2.2.0", "chart.js": "^2.7.2", @@ -38,6 +39,7 @@ "react-markdown": "^4.0.8", "react-router": "^5.0.0", "react-router-dom": "^5.0.0", + "react-tooltip": "^3.9.2", "semantic-ui-css": "^2.3.1", "semantic-ui-react": "^0.86.0", "store": "^2.0.12", diff --git a/tsconfig.json b/tsconfig.json index 166b222fc6..1784a8679b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,6 +11,8 @@ "@polkadot/app-address-book/*": [ "packages/app-address-book/src/*" ], "@polkadot/app-contracts": [ "packages/app-contracts/src" ], "@polkadot/app-contracts/*": [ "packages/app-contracts/src/*" ], + "@polkadot/app-dashboard": [ "packages/app-dashboard/src" ], + "@polkadot/app-dashboard/*": [ "packages/app-dashboard/src/*" ], "@polkadot/app-democracy": [ "packages/app-democracy/src" ], "@polkadot/app-democracy/*": [ "packages/app-democracy/src/*" ], "@polkadot/app-extrinsics": [ "packages/app-extrinsics/src" ], @@ -31,8 +33,8 @@ "@polkadot/app-toolbox/*": [ "packages/app-toolbox/src/*" ], "@polkadot/app-transfer": [ "packages/app-transfer/src" ], "@polkadot/app-transfer/*": [ "packages/app-transfer/src/*" ], - "@polkadot/apps": [ "packages/apps/src" ], - "@polkadot/apps/*": [ "packages/apps/src/*" ], + "@polkadot/apps-routing": [ "packages/apps-routing/src" ], + "@polkadot/apps-routing/*": [ "packages/apps-routing/src/*" ], "@polkadot/ui-api": [ "packages/ui-api/src" ], "@polkadot/ui-api/*": [ "packages/ui-api/src/*" ], "@polkadot/ui-app": [ "packages/ui-app/src" ],