From 03089f3f011cd405e27c35a6583ba22405aada21 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Date: Thu, 18 Apr 2019 12:27:12 +0100 Subject: [PATCH] Rename the "Addresses" app into "Address book" (#1034) * change addresses to address book * rename address into contact --- README.md | 2 +- .../LICENSE | 0 packages/app-address-book/README.md | 1 + .../package.json | 2 +- .../src/Creator.tsx | 4 ++-- .../src/Editor.tsx | 4 ++-- .../src/Forgetting.tsx | 0 .../src/index.css | 2 +- .../src/index.tsx | 20 +++++++++---------- .../src/translate.ts | 4 ++-- .../src/types.ts | 2 +- packages/app-addresses/README.md | 1 - .../routing/{addresses.ts => addressbook.ts} | 8 ++++---- packages/apps/src/routing/index.ts | 6 +++--- tsconfig.json | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-) rename packages/{app-addresses => app-address-book}/LICENSE (100%) create mode 100644 packages/app-address-book/README.md rename packages/{app-addresses => app-address-book}/package.json (90%) rename packages/{app-addresses => app-address-book}/src/Creator.tsx (97%) rename packages/{app-addresses => app-address-book}/src/Editor.tsx (98%) rename packages/{app-addresses => app-address-book}/src/Forgetting.tsx (100%) rename packages/{app-addresses => app-address-book}/src/index.css (71%) rename packages/{app-addresses => app-address-book}/src/index.tsx (86%) rename packages/{app-addresses => app-address-book}/src/translate.ts (58%) rename packages/{app-addresses => app-address-book}/src/types.ts (75%) delete mode 100644 packages/app-addresses/README.md rename packages/apps/src/routing/{addresses.ts => addressbook.ts} (71%) diff --git a/README.md b/README.md index fcecbdc730..e63e040501 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The repo is split into a number of packages, each representing an application. T - [apps](packages/apps/) This is the main entry point. It handles the selection sidebar and routing to the specific application being displayed. - [app-accounts](packages/app-accounts/) A basic account management app. -- [app-addresses](packages/app-addresses/) A basic address management app. +- [app-address-book](packages/app-address-book/) A basic address management app. - [app-democracy](packages/app-democracy/) A basic voting app, allowing votes on activate proposals and referendums. - [app-explorer](packages/app-explorer/) A simple block explorer. It only shows the most recent blocks, updating as they become available. - [app-extrinsics](packages/app-extrinsics/) Submission of extrinsics to a node. diff --git a/packages/app-addresses/LICENSE b/packages/app-address-book/LICENSE similarity index 100% rename from packages/app-addresses/LICENSE rename to packages/app-address-book/LICENSE diff --git a/packages/app-address-book/README.md b/packages/app-address-book/README.md new file mode 100644 index 0000000000..096a780148 --- /dev/null +++ b/packages/app-address-book/README.md @@ -0,0 +1 @@ +# @polkadot/app-address-book diff --git a/packages/app-addresses/package.json b/packages/app-address-book/package.json similarity index 90% rename from packages/app-addresses/package.json rename to packages/app-address-book/package.json index fc173ae218..3ab6e979ce 100644 --- a/packages/app-addresses/package.json +++ b/packages/app-address-book/package.json @@ -1,5 +1,5 @@ { - "name": "@polkadot/app-addresses", + "name": "@polkadot/app-address-book", "version": "0.32.0-beta.5", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", diff --git a/packages/app-addresses/src/Creator.tsx b/packages/app-address-book/src/Creator.tsx similarity index 97% rename from packages/app-addresses/src/Creator.tsx rename to packages/app-address-book/src/Creator.tsx index 7ba70511f2..0aaabefdd9 100644 --- a/packages/app-addresses/src/Creator.tsx +++ b/packages/app-address-book/src/Creator.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2019 @polkadot/app-addresses authors & contributors +// Copyright 2017-2019 @polkadot/app-address-book authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. @@ -38,7 +38,7 @@ class Creator extends React.PureComponent { const { address } = this.state; return ( -
+
{ render () { const { isForgetOpen, current } = this.state; return ( -
+
}; -class AddressesApp extends React.PureComponent { +class AddressBookApp extends React.PureComponent { state: State; constructor (props: Props) { @@ -35,19 +35,19 @@ class AddressesApp extends React.PureComponent { const { allAddresses = {}, t } = props; const baseState = Object.keys(allAddresses).length !== 0 - ? AddressesApp.showEditState() - : AddressesApp.hideEditState(); + ? AddressBookApp.showEditState() + : AddressBookApp.hideEditState(); this.state = { ...baseState, items: [ { name: 'edit', - text: t('Edit address') + text: t('Edit contact') }, { name: 'create', - text: t('Add address') + text: t('Add contact') } ] }; @@ -71,11 +71,11 @@ class AddressesApp extends React.PureComponent { if (hidden.length === 0) { return hasAddresses ? null - : AddressesApp.hideEditState(); + : AddressBookApp.hideEditState(); } return hasAddresses - ? AddressesApp.showEditState() + ? AddressBookApp.showEditState() : null; } @@ -85,7 +85,7 @@ class AddressesApp extends React.PureComponent { const renderCreator = this.renderComponent(Creator); return ( -
+
{ } export default withMulti( - AddressesApp, + AddressBookApp, translate, withObservable(addressObservable.subject, { propName: 'allAddresses' }) ); diff --git a/packages/app-addresses/src/translate.ts b/packages/app-address-book/src/translate.ts similarity index 58% rename from packages/app-addresses/src/translate.ts rename to packages/app-address-book/src/translate.ts index 8936a82948..9b7144ce7a 100644 --- a/packages/app-addresses/src/translate.ts +++ b/packages/app-address-book/src/translate.ts @@ -1,7 +1,7 @@ -// Copyright 2017-2019 @polkadot/app-addresses authors & contributors +// Copyright 2017-2019 @polkadot/app-address-book 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(['addresses', 'ui']); +export default withTranslation(['address-book', 'ui']); diff --git a/packages/app-addresses/src/types.ts b/packages/app-address-book/src/types.ts similarity index 75% rename from packages/app-addresses/src/types.ts rename to packages/app-address-book/src/types.ts index 1f308c1fa5..47ea1d28ca 100644 --- a/packages/app-addresses/src/types.ts +++ b/packages/app-address-book/src/types.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2019 @polkadot/app-addresses authors & contributors +// Copyright 2017-2019 @polkadot/app-address-book authors & contributors // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. diff --git a/packages/app-addresses/README.md b/packages/app-addresses/README.md deleted file mode 100644 index bbfb07e411..0000000000 --- a/packages/app-addresses/README.md +++ /dev/null @@ -1 +0,0 @@ -# @polkadot/app-addresses diff --git a/packages/apps/src/routing/addresses.ts b/packages/apps/src/routing/addressbook.ts similarity index 71% rename from packages/apps/src/routing/addresses.ts rename to packages/apps/src/routing/addressbook.ts index 2b71f1fe6e..efbe44d23d 100644 --- a/packages/apps/src/routing/addresses.ts +++ b/packages/apps/src/routing/addressbook.ts @@ -4,18 +4,18 @@ import { Routes } from '../types'; -import Addresses from '@polkadot/app-addresses'; +import AddressBook from '@polkadot/app-address-book'; export default ([ { - Component: Addresses, + Component: AddressBook, display: { needsApi: [] }, i18n: { - defaultValue: 'Addresses' + defaultValue: 'Address book' }, icon: 'address book', - name: 'addresses' + name: 'addressbook' } ] as Routes); diff --git a/packages/apps/src/routing/index.ts b/packages/apps/src/routing/index.ts index 17ab480879..e67e21aa66 100644 --- a/packages/apps/src/routing/index.ts +++ b/packages/apps/src/routing/index.ts @@ -8,7 +8,7 @@ import appSettings from '@polkadot/ui-settings'; import template from './123code'; import accounts from './accounts'; -import addresses from './addresses'; +import addressbook from './addressbook'; import contracts from './contracts'; import democracy from './democracy'; import explorer from './explorer'; @@ -27,7 +27,7 @@ const routes: Routes = appSettings.uiMode === 'light' democracy, null, accounts, - addresses, + addressbook, null, settings, template @@ -39,7 +39,7 @@ const routes: Routes = appSettings.uiMode === 'light' democracy, null, accounts, - addresses, + addressbook, null, contracts, storage, diff --git a/tsconfig.json b/tsconfig.json index eee6500763..003ed205ed 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,8 +7,8 @@ "@polkadot/app-123code/*": [ "packages/app-123code/src/*" ], "@polkadot/app-accounts": [ "packages/app-accounts/src" ], "@polkadot/app-accounts/*": [ "packages/app-accounts/src/*" ], - "@polkadot/app-addresses": [ "packages/app-addresses/src" ], - "@polkadot/app-addresses/*": [ "packages/app-addresses/src/*" ], + "@polkadot/app-address-book": [ "packages/app-address-book/src" ], + "@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-democracy": [ "packages/app-democracy/src" ],