Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#2662 Integration of New Login #2675

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

#2662 Integration of New Login #2675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f852b57
#2662 Update links to new routes and replace create advanced account …
gibbsfromncis May 10, 2019
69eb749
#2662 Update default container to Cloud instead of Local
gibbsfromncis May 10, 2019
5fab3e3
#2662 Update link from dropdown
gibbsfromncis May 10, 2019
4fad7dc
#2662 Update link to create account page
gibbsfromncis May 10, 2019
6a7d7a9
#2662 Update link to create account page
gibbsfromncis May 10, 2019
fcee7d0
#2662 Remove unused routes and methods
gibbsfromncis May 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,6 @@ class App extends React.Component {
exact
component={AccountDepositWithdraw}
/>
<Route
path="/create-account"
component={LoginSelector}
/>
<Route path="/login" component={Login} />
<Route
path="/registration"
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "--",
"open_orders": "Offene Aufträge",
"optional": {
"formatter": "Optional, {restore_link} oder erstellen Sie ein Konto mit {restore_form}.",
"formatter": "Optional, {restore_link} oder {restore_link_brain}.",
"restore_form": "Formular",
"restore_link": "stellen Sie Ihr Konto wiederher"
"restore_link": "stellen Sie Ihr Konto wiederher",
"restore_link_brain": "stellen Sie Ihr Konto mit dem Brain-Key wieder her"
},
"options": {
"memo_key": "Notitz-Schlüssel",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@
"no_price": "--",
"open_orders": "Open Orders",
"optional": {
"formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
"formatter": "Optionally, {restore_link} or {restore_link_brain}.",
"restore_form": "advanced form",
"restore_link": "restore your account"
"restore_link": "restore your account from backup",
"restore_link_brain": "restore your account using brain-key"
},
"options": {
"memo_key": "Memo Key",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "--",
"open_orders": "Ordenes abiertas",
"optional": {
"formatter": "Opcionalmente, {restore_link} o crea una cuenta usando el {restore_form}.",
"formatter": "Opcionalmente, {restore_link} o {restore_link_brain}.",
"restore_form": "forma avanzada",
"restore_link": "restaurar su cuenta"
"restore_link": "restaurar su cuenta",
"restore_link_brain": "restaura tu cuenta usando la tecla cerebral"
},
"options": {
"memo_key": "Llave Memo",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "--",
"open_orders": "Open Orders",
"optional": {
"formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
"formatter": "Optionally, {restore_link} or {restore_link_brain}.",
"restore_form": "advanced form",
"restore_link": "restore your account"
"restore_link": "restore your account from backup",
"restore_link_brain": "restore your account using brain-key"
},
"options": {
"memo_key": "Memo Key",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "Valore sconosciuto",
"open_orders": "Ordini aperti",
"optional": {
"formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
"formatter": "Optionally, {restore_link} or {restore_link_brain}.",
"restore_form": "advanced form",
"restore_link": "restore your account"
"restore_link": "restore your account from backup",
"restore_link_brain": "restore your account using brain-key"
},
"options": {
"memo_key": "Chiave Memo",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "不明な値",
"open_orders": "注文中",
"optional": {
"formatter": "ここから{restore_link}、または{restore_form}を使ってアカウントを作成することができます。",
"formatter": "オプションで、{restore_link} または {restore_link_brain}",
"restore_form": "高度設定フォーム",
"restore_link": "アカウントのリストア"
"restore_link": "アカウントのリストア",
"restore_link_brain": "ブレインキーを使ってアカウントを復元する"
},
"options": {
"memo_key": "メモキー",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "--",
"open_orders": "Open Orders",
"optional": {
"formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
"formatter": "Optionally, {restore_link} or {restore_link_brain}.",
"restore_form": "advanced form",
"restore_link": "restore your account"
"restore_link": "restore your account from backup",
"restore_link_brain": "restore your account using brain-key"
},
"options": {
"memo_key": "메모 키",
Expand Down
3 changes: 2 additions & 1 deletion app/assets/locales/locale-ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@
"optional": {
"formatter": "При необходимости {restore_link} или создайте аккаунт с помощью {restore_form}.",
"restore_form": "расширенная форма",
"restore_link": "восстановить аккаунт"
"restore_link": "восстановить аккаунт из резервной копии",
"restore_link_brain": "восстановить аккаунт, используя ключ"
},
"options": {
"memo_key": "Мемо-ключ",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "Fiyat mevcut değil",
"open_orders": "Açık Emirler",
"optional": {
"formatter": "Optionally, {restore_link} or create an account using the {restore_form}.",
"formatter": "Optionally, {restore_link} or {restore_link_brain}.",
"restore_form": "advanced form",
"restore_link": "restore your account"
"restore_link": "restore your account from backup",
"restore_link_brain": "restore your account using brain-key"
},
"options": {
"memo_key": "Memo Anahtarı",
Expand Down
5 changes: 3 additions & 2 deletions app/assets/locales/locale-zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@
"no_price": "--",
"open_orders": "我的挂单",
"optional": {
"formatter": "可选: {restore_link} 或使用 {restore_form} 注册一个账户.",
"formatter": "（可选）{restore_link} 要么 {restore_link_brain}",
"restore_form": "钱包模式",
"restore_link": "恢复你的账户"
"restore_link": "从备份中恢复您的帐户",
"restore_link_brain": "使用大脑密钥恢复您的帐户"
},
"options": {
"memo_key": "备注公钥",
Expand Down
2 changes: 1 addition & 1 deletion app/components/Dashboard/DashboardList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class DashboardList extends React.Component {
}

_createAccount() {
this.props.history.push("/create-account/wallet");
this.props.history.push("/registration");
}

_onFilter(e) {
Expand Down
8 changes: 4 additions & 4 deletions app/components/Layout/HeaderDropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ export default class DropDownMenu extends React.Component {
className={cnames({
active:
active.indexOf(
`/create-account/${
!passwordLogin ? "wallet" : "password"
`/registration/${
!passwordLogin ? "local" : "cloud"
}`
) !== -1
})}
onClick={this.props.onNavigate.bind(
this,
`/create-account/${
!passwordLogin ? "wallet" : "password"
`/registration/${
!passwordLogin ? "local" : "cloud"
}`
)}
>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Login/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default class Login extends React.Component {
constructor() {
super();
this.state = {
activeWalletModel: true
activeWalletModel: false
};
}

Expand Down
41 changes: 11 additions & 30 deletions app/components/LoginSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ class LoginSelector extends React.Component {
this.unmounted = true;
}

onSelect(route) {
this.props.history.push("/create-account/" + route);
}

handleLanguageSelect(locale) {
IntlActions.switchLocale(locale);
this.setState({
Expand Down Expand Up @@ -163,7 +159,7 @@ class LoginSelector extends React.Component {
<div className="grid-block account-login-options">
<Link
id="account_login_button"
to="/create-account/password"
to="/registration"
className="button primary"
data-intro={translator.translate(
"walkthrough.create_cloud_wallet"
Expand All @@ -172,20 +168,16 @@ class LoginSelector extends React.Component {
<Translate content="header.create_account" />
</Link>

<span
<Link
id="account_login_button"
to="/login"
className="button hollow primary"
onClick={() => {
SettingsActions.changeSetting.defer({
setting: "passwordLogin",
value: true
});
WalletUnlockActions.unlock().catch(
() => {}
);
}}
data-intro={translator.translate(
"walkthrough.create_cloud_wallet"
)}
>
<Translate content="header.unlock_short" />
</span>
</Link>
</div>

<div className="additional-account-options">
Expand All @@ -205,29 +197,18 @@ class LoginSelector extends React.Component {
},
{
type: "link",
value: "/create-account/wallet",
value: "/create-wallet-brainkey",
translation:
"account.optional.restore_form",
"account.optional.restore_link_brain",
dataIntro: translator.translate(
"walkthrough.create_local_wallet"
),
arg: "restore_form"
arg: "restore_link_brain"
}
]}
/>
</h5>
</div>

<Route
path="/create-account/wallet"
exact
component={CreateAccount}
/>
<Route
path="/create-account/password"
exact
component={CreateAccountPassword}
/>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/components/Wallet/WalletUnlockModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ class WalletUnlockModal extends React.Component {
this.props.history.push(path);
};

handleCreateWallet = () => this.closeRedirect("/create-account/wallet");
handleCreateWallet = () => this.closeRedirect("/registration/local");

handleRestoreOther = () => this.closeRedirect("/settings/restore");

Expand Down