From f54a00f173fba15aeade4c4ecf4081c4cc73e38b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 11 Mar 2021 12:38:19 +0100 Subject: [PATCH] Combine parachains/auctions/crowdloans (#4821) * Combine parachains/auctions/crowdloans * Remove skeleton * Skeleton * linting --- packages/apps-routing/src/auctions.ts | 22 -- packages/apps-routing/src/crowdloan.ts | 22 -- packages/apps-routing/src/index.ts | 4 - .../apps/public/locales/en/app-auctions.json | 3 - packages/page-auctions/.skip-build | 0 packages/page-auctions/.skip-npm | 0 packages/page-auctions/LICENSE | 201 ------------------ packages/page-auctions/README.md | 1 - packages/page-auctions/package.json | 15 -- packages/page-auctions/src/index.tsx | 24 --- packages/page-auctions/src/translate.ts | 10 - packages/page-crowdloan/.skip-build | 0 packages/page-crowdloan/.skip-npm | 0 packages/page-crowdloan/LICENSE | 201 ------------------ packages/page-crowdloan/README.md | 1 - packages/page-crowdloan/package.json | 15 -- packages/page-crowdloan/src/index.tsx | 41 ---- packages/page-crowdloan/src/translate.ts | 10 - .../page-parachains/src/Auctions/Summary.tsx | 32 +++ .../page-parachains/src/Auctions/index.tsx | 20 ++ .../src/Crowdloan}/Fund.tsx | 0 .../src/Crowdloan}/FundAdd.tsx | 2 +- .../src/Crowdloan}/FundContribute.tsx | 2 +- .../src/Crowdloan}/Funds.tsx | 2 +- .../src/Crowdloan}/Summary.tsx | 2 +- .../src/Crowdloan/index.tsx} | 4 +- .../src/Crowdloan}/useFundIndexes.ts | 0 .../page-parachains/src/Overview/Actions.tsx | 4 +- .../{modals => Overview}/RegisterThread.tsx | 0 .../page-parachains/src/Proposals/Actions.tsx | 2 +- .../src/{modals => Proposals}/Propose.tsx | 0 packages/page-parachains/src/index.tsx | 16 ++ tsconfig.json | 4 - yarn.lock | 18 -- 34 files changed, 77 insertions(+), 601 deletions(-) delete mode 100644 packages/apps-routing/src/auctions.ts delete mode 100644 packages/apps-routing/src/crowdloan.ts delete mode 100644 packages/apps/public/locales/en/app-auctions.json delete mode 100644 packages/page-auctions/.skip-build delete mode 100644 packages/page-auctions/.skip-npm delete mode 100644 packages/page-auctions/LICENSE delete mode 100644 packages/page-auctions/README.md delete mode 100644 packages/page-auctions/package.json delete mode 100644 packages/page-auctions/src/index.tsx delete mode 100644 packages/page-auctions/src/translate.ts delete mode 100644 packages/page-crowdloan/.skip-build delete mode 100644 packages/page-crowdloan/.skip-npm delete mode 100644 packages/page-crowdloan/LICENSE delete mode 100644 packages/page-crowdloan/README.md delete mode 100644 packages/page-crowdloan/package.json delete mode 100644 packages/page-crowdloan/src/index.tsx delete mode 100644 packages/page-crowdloan/src/translate.ts create mode 100644 packages/page-parachains/src/Auctions/Summary.tsx create mode 100644 packages/page-parachains/src/Auctions/index.tsx rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/Fund.tsx (100%) rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/FundAdd.tsx (99%) rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/FundContribute.tsx (98%) rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/Funds.tsx (97%) rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/Summary.tsx (93%) rename packages/{page-crowdloan/src/Overview.tsx => page-parachains/src/Crowdloan/index.tsx} (88%) rename packages/{page-crowdloan/src => page-parachains/src/Crowdloan}/useFundIndexes.ts (100%) rename packages/page-parachains/src/{modals => Overview}/RegisterThread.tsx (100%) rename packages/page-parachains/src/{modals => Proposals}/Propose.tsx (100%) diff --git a/packages/apps-routing/src/auctions.ts b/packages/apps-routing/src/auctions.ts deleted file mode 100644 index 4f232b256b..0000000000 --- a/packages/apps-routing/src/auctions.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-routing authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { TFunction } from 'i18next'; -import type { Route } from './types'; - -import Component from '@polkadot/app-auctions'; - -export default function create (t: TFunction): Route { - return { - Component, - display: { - needsApi: [ - 'query.auctions.auctionCounter' - ] - }, - group: 'network', - icon: 'gavel', - name: 'auctions', - text: t('nav.auctions', 'Auctions', { ns: 'apps-routing' }) - }; -} diff --git a/packages/apps-routing/src/crowdloan.ts b/packages/apps-routing/src/crowdloan.ts deleted file mode 100644 index 4a89ff3181..0000000000 --- a/packages/apps-routing/src/crowdloan.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-routing authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { TFunction } from 'i18next'; -import type { Route } from './types'; - -import Component from '@polkadot/app-crowdloan'; - -export default function create (t: TFunction): Route { - return { - Component, - display: { - needsApi: [ - 'query.crowdloan.funds' - ] - }, - group: 'network', - icon: 'coins', - name: 'crowdloan', - text: t('nav.crowdloan', 'Crowdloan', { ns: 'apps-routing' }) - }; -} diff --git a/packages/apps-routing/src/index.ts b/packages/apps-routing/src/index.ts index 0fcced1ded..8b86531f37 100644 --- a/packages/apps-routing/src/index.ts +++ b/packages/apps-routing/src/index.ts @@ -6,13 +6,11 @@ import type { Routes } from './types'; import accounts from './accounts'; import addresses from './addresses'; -import auctions from './auctions'; import bounties from './bounties'; import calendar from './calendar'; import claims from './claims'; import contracts from './contracts'; import council from './council'; -import crowdloan from './crowdloan'; import democracy from './democracy'; import explorer from './explorer'; import extrinsics from './extrinsics'; @@ -45,8 +43,6 @@ export default function create (t: TFunction): Routes { bounties(t), techcomm(t), parachains(t), - auctions(t), - crowdloan(t), society(t), calendar(t), contracts(t), diff --git a/packages/apps/public/locales/en/app-auctions.json b/packages/apps/public/locales/en/app-auctions.json deleted file mode 100644 index 3734f2c0dd..0000000000 --- a/packages/apps/public/locales/en/app-auctions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "auctions....": "auctions...." -} \ No newline at end of file diff --git a/packages/page-auctions/.skip-build b/packages/page-auctions/.skip-build deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/page-auctions/.skip-npm b/packages/page-auctions/.skip-npm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/page-auctions/LICENSE b/packages/page-auctions/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/page-auctions/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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/page-auctions/README.md b/packages/page-auctions/README.md deleted file mode 100644 index 8aaa749733..0000000000 --- a/packages/page-auctions/README.md +++ /dev/null @@ -1 +0,0 @@ -# @polkadot/app-auctions diff --git a/packages/page-auctions/package.json b/packages/page-auctions/package.json deleted file mode 100644 index 5979c19480..0000000000 --- a/packages/page-auctions/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@polkadot/app-auctions", - "private": true, - "version": "0.83.2-25", - "description": "A module to allows for parachain auctions", - "main": "index.js", - "scripts": {}, - "author": "Jaco Greeff ", - "maintainers": [], - "license": "Apache-2.0", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@polkadot/react-components": "^0.83.2-25" - } -} diff --git a/packages/page-auctions/src/index.tsx b/packages/page-auctions/src/index.tsx deleted file mode 100644 index ea166cd641..0000000000 --- a/packages/page-auctions/src/index.tsx +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2017-2021 @polkadot/app-crowdloan authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import React from 'react'; -import styled from 'styled-components'; - -import { useTranslation } from './translate'; - -interface Props { - basePath: string; - className?: string; -} - -function AuctionsApp ({ className }: Props): React.ReactElement { - const { t } = useTranslation(); - - return ( -
- {t('auctions....')} -
- ); -} - -export default React.memo(styled(AuctionsApp)``); diff --git a/packages/page-auctions/src/translate.ts b/packages/page-auctions/src/translate.ts deleted file mode 100644 index 618c255e69..0000000000 --- a/packages/page-auctions/src/translate.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2021 @polkadot/app-crowdloan authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { UseTranslationResponse } from 'react-i18next'; - -import { useTranslation as useTranslationBase } from 'react-i18next'; - -export function useTranslation (): UseTranslationResponse<'app-auctions'> { - return useTranslationBase('app-auctions'); -} diff --git a/packages/page-crowdloan/.skip-build b/packages/page-crowdloan/.skip-build deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/page-crowdloan/.skip-npm b/packages/page-crowdloan/.skip-npm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/page-crowdloan/LICENSE b/packages/page-crowdloan/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/page-crowdloan/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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/page-crowdloan/README.md b/packages/page-crowdloan/README.md deleted file mode 100644 index 1510701e67..0000000000 --- a/packages/page-crowdloan/README.md +++ /dev/null @@ -1 +0,0 @@ -# @polkadot/app-crowdloan diff --git a/packages/page-crowdloan/package.json b/packages/page-crowdloan/package.json deleted file mode 100644 index 0b7fc363f7..0000000000 --- a/packages/page-crowdloan/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@polkadot/app-crowdloan", - "private": true, - "version": "0.83.2-25", - "description": "A module to allow participating in crowdloan", - "main": "index.js", - "scripts": {}, - "author": "Jaco Greeff ", - "maintainers": [], - "license": "Apache-2.0", - "dependencies": { - "@babel/runtime": "^7.13.10", - "@polkadot/react-components": "^0.83.2-25" - } -} diff --git a/packages/page-crowdloan/src/index.tsx b/packages/page-crowdloan/src/index.tsx deleted file mode 100644 index 4c5c88c522..0000000000 --- a/packages/page-crowdloan/src/index.tsx +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2017-2021 @polkadot/app-crowdloan authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import React, { useRef } from 'react'; -import styled from 'styled-components'; - -import { Tabs } from '@polkadot/react-components'; - -import Overview from './Overview'; -import { useTranslation } from './translate'; - -interface Props { - basePath: string; - className?: string; -} - -function CrowdloanApp ({ basePath, className }: Props): React.ReactElement { - const { t } = useTranslation(); - - const items = useRef([ - { - isRoot: true, - name: 'overview', - text: t('Overview') - } - ]); - - return ( -
-
- -
- -
- ); -} - -export default React.memo(styled(CrowdloanApp)``); diff --git a/packages/page-crowdloan/src/translate.ts b/packages/page-crowdloan/src/translate.ts deleted file mode 100644 index 2ad2f1762f..0000000000 --- a/packages/page-crowdloan/src/translate.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2021 @polkadot/app-crowdloan authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { UseTranslationResponse } from 'react-i18next'; - -import { useTranslation as useTranslationBase } from 'react-i18next'; - -export function useTranslation (): UseTranslationResponse<'app-crowdloan'> { - return useTranslationBase('app-crowdloan'); -} diff --git a/packages/page-parachains/src/Auctions/Summary.tsx b/packages/page-parachains/src/Auctions/Summary.tsx new file mode 100644 index 0000000000..45bfbeac51 --- /dev/null +++ b/packages/page-parachains/src/Auctions/Summary.tsx @@ -0,0 +1,32 @@ +// Copyright 2017-2021 @polkadot/app-auctions authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { AuctionIndex } from '@polkadot/types/interfaces'; + +import React from 'react'; + +import { CardSummary, SummaryBox } from '@polkadot/react-components'; +import { useApi, useCall } from '@polkadot/react-hooks'; +import { formatNumber } from '@polkadot/util'; + +import { useTranslation } from '../translate'; + +interface Props { + className?: string; +} + +function Summary ({ className }: Props): React.ReactElement { + const { api } = useApi(); + const numAuctions = useCall(api.query.auctions.auctionCounter); + const { t } = useTranslation(); + + return ( + + ('auctions')}> + {formatNumber(numAuctions)} + + + ); +} + +export default React.memo(Summary); diff --git a/packages/page-parachains/src/Auctions/index.tsx b/packages/page-parachains/src/Auctions/index.tsx new file mode 100644 index 0000000000..9937f8cd25 --- /dev/null +++ b/packages/page-parachains/src/Auctions/index.tsx @@ -0,0 +1,20 @@ +// Copyright 2017-2021 @polkadot/app-crowdloan authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import React from 'react'; + +import Summary from './Summary'; + +interface Props { + className?: string; +} + +function Auctions ({ className }: Props): React.ReactElement { + return ( +
+ +
+ ); +} + +export default React.memo(Auctions); diff --git a/packages/page-crowdloan/src/Fund.tsx b/packages/page-parachains/src/Crowdloan/Fund.tsx similarity index 100% rename from packages/page-crowdloan/src/Fund.tsx rename to packages/page-parachains/src/Crowdloan/Fund.tsx diff --git a/packages/page-crowdloan/src/FundAdd.tsx b/packages/page-parachains/src/Crowdloan/FundAdd.tsx similarity index 99% rename from packages/page-crowdloan/src/FundAdd.tsx rename to packages/page-parachains/src/Crowdloan/FundAdd.tsx index aff3ea3b97..1f40f91ff9 100644 --- a/packages/page-crowdloan/src/FundAdd.tsx +++ b/packages/page-parachains/src/Crowdloan/FundAdd.tsx @@ -9,7 +9,7 @@ import { Button, InputAddress, InputBalance, InputNumber, Modal, TxButton } from import { useAccounts, useApi, useToggle } from '@polkadot/react-hooks'; import { BN_ZERO } from '@polkadot/util'; -import { useTranslation } from './translate'; +import { useTranslation } from '../translate'; interface Props { bestNumber?: BN; diff --git a/packages/page-crowdloan/src/FundContribute.tsx b/packages/page-parachains/src/Crowdloan/FundContribute.tsx similarity index 98% rename from packages/page-crowdloan/src/FundContribute.tsx rename to packages/page-parachains/src/Crowdloan/FundContribute.tsx index 300a2b12c4..935c2a5580 100644 --- a/packages/page-crowdloan/src/FundContribute.tsx +++ b/packages/page-parachains/src/Crowdloan/FundContribute.tsx @@ -10,7 +10,7 @@ import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/r import { useAccounts, useApi, useToggle } from '@polkadot/react-hooks'; import { BN_ZERO } from '@polkadot/util'; -import { useTranslation } from './translate'; +import { useTranslation } from '../translate'; interface Props { cap: Balance; diff --git a/packages/page-crowdloan/src/Funds.tsx b/packages/page-parachains/src/Crowdloan/Funds.tsx similarity index 97% rename from packages/page-crowdloan/src/Funds.tsx rename to packages/page-parachains/src/Crowdloan/Funds.tsx index 56612b7403..d8e4f9b70a 100644 --- a/packages/page-crowdloan/src/Funds.tsx +++ b/packages/page-parachains/src/Crowdloan/Funds.tsx @@ -10,8 +10,8 @@ import React, { useEffect, useRef, useState } from 'react'; import { Table } from '@polkadot/react-components'; import { useApi, useCallMulti } from '@polkadot/react-hooks'; +import { useTranslation } from '../translate'; import Fund from './Fund'; -import { useTranslation } from './translate'; interface Props { bestNumber?: BN; diff --git a/packages/page-crowdloan/src/Summary.tsx b/packages/page-parachains/src/Crowdloan/Summary.tsx similarity index 93% rename from packages/page-crowdloan/src/Summary.tsx rename to packages/page-parachains/src/Crowdloan/Summary.tsx index 3314af312d..8bacd0b577 100644 --- a/packages/page-crowdloan/src/Summary.tsx +++ b/packages/page-parachains/src/Crowdloan/Summary.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { CardSummary, SummaryBox } from '@polkadot/react-components'; import { formatNumber } from '@polkadot/util'; -import { useTranslation } from './translate'; +import { useTranslation } from '../translate'; interface Props { className?: string; diff --git a/packages/page-crowdloan/src/Overview.tsx b/packages/page-parachains/src/Crowdloan/index.tsx similarity index 88% rename from packages/page-crowdloan/src/Overview.tsx rename to packages/page-parachains/src/Crowdloan/index.tsx index 999b0f09d0..a6e4ecf7f5 100644 --- a/packages/page-crowdloan/src/Overview.tsx +++ b/packages/page-parachains/src/Crowdloan/index.tsx @@ -17,7 +17,7 @@ interface Props { className?: string; } -function Overview ({ className }: Props): React.ReactElement { +function Crowdloan ({ className }: Props): React.ReactElement { const { api } = useApi(); const bestNumber = useCall(api.derive.chain.bestNumber); const paraIds = useFundIndexes(); @@ -36,4 +36,4 @@ function Overview ({ className }: Props): React.ReactElement { ); } -export default React.memo(Overview); +export default React.memo(Crowdloan); diff --git a/packages/page-crowdloan/src/useFundIndexes.ts b/packages/page-parachains/src/Crowdloan/useFundIndexes.ts similarity index 100% rename from packages/page-crowdloan/src/useFundIndexes.ts rename to packages/page-parachains/src/Crowdloan/useFundIndexes.ts diff --git a/packages/page-parachains/src/Overview/Actions.tsx b/packages/page-parachains/src/Overview/Actions.tsx index 60b71c974c..2129ccc591 100644 --- a/packages/page-parachains/src/Overview/Actions.tsx +++ b/packages/page-parachains/src/Overview/Actions.tsx @@ -6,8 +6,8 @@ import React from 'react'; import { Button } from '@polkadot/react-components'; import { useApi, useToggle } from '@polkadot/react-hooks'; -import RegisterThread from '../modals/RegisterThread'; import { useTranslation } from '../translate'; +import RegisterThread from './RegisterThread'; interface Props { className?: string; @@ -20,7 +20,7 @@ function Actions ({ className }: Props): React.ReactElement { return ( - {api.tx.registrar.register && ( + {api.tx.registrar?.register && ( <>