ElyBy-Mirror/accounts-frontend
1
0
Fork 0
mirror of https://github.com/elyby/accounts-frontend.git synced 2025-05-31 14:11:58 +05:30
Code Issues Packages Projects Releases Wiki Activity

Добавлено описание сайта при авторизации без oAuth

Browse Source 
Все дефисы для E-mail заменены на неразрывные
Увеличен боковой отступ для сообщений об ошибках в процессе авторизации
Добавлен автофокус на поле ввода логина для формы "забыл пароль"
This commit is contained in:
ErickSkrauch
2016-05-22 22:17:34 +03:00
parent 594893978b
commit 09ca1aa85a
15 changed files with 134 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/auth/activation/Activation.intl.json
View File

@@ -1,7 +1,7 @@
{
"accountActivationTitle": "Account activation",
"activationMailWasSent": "Please check {email} for the message with the last registration step",
"confirmEmail": "Confirm E-mail",
"didNotReceivedEmail": "Did not received E-mail?",
"enterTheCode": "Enter the code from E-mail here"
"confirmEmail": "Confirm E‑mail",
"didNotReceivedEmail": "Did not received E‑mail?",
"enterTheCode": "Enter the code from E‑mail here"
}

5
src/components/auth/appInfo/AppInfo.intl.json
View File

@@ -1,4 +1,7 @@
{
"appName": "Ely Accounts",
"goToAuth": "Go to auth"
"goToAuth": "Go to auth",
"appDescription": "You are on the Ely.by authorization service, that allows you to safely perform any operations on your account. This single entry point for websites and desktop software, including game launchers.",
"useItYourself": "Visit our {link}, to learn how to use this service in you projects.",
"documentation": "documentation"
}

23
src/components/auth/appInfo/AppInfo.jsx
View File

@@ -31,9 +31,26 @@ export default class AppInfo extends Component {
</h2>
</div>
<div className={styles.descriptionContainer}>
<p className={styles.description}>
{description}
</p>
{description ? (
<p className={styles.description}>
{description}
</p>
) : (
<div>
<p className={styles.description}>
<Message {...messages.appDescription} />
</p>
<p className={styles.description}>
<Message {...messages.useItYourself} values={{
link: (
<a href="http://docs.ely.by/oauth.html">
<Message {...messages.documentation} />
</a>
)
}} />
</p>
</div>
)}
</div>
<div className={styles.goToAuth}>
<Button onClick={onGoToAuth} label={messages.goToAuth} />

16
src/components/auth/appInfo/appInfo.scss
View File

@@ -36,10 +36,24 @@
}
.description {
$font-color: #ccc;
font-family: $font-family-base;
color: #cccccc;
color: $font-color;
font-size: 13px;
line-height: 1.7;
margin-top: 7px;
a {
color: lighten($font-color, 10%);
border-bottom: 1px dotted #666;
text-decoration: none;
transition: .25s;
&:hover {
border-bottom-color: #777;
color: $font-color;
}
}
}
.goToAuth {

4
src/components/auth/forgotPassword/ForgotPassword.intl.json
View File

@@ -1,7 +1,7 @@
{
"title": "Forgot password",
"sendMail": "Send mail",
"specifyEmail": "Specify the registration E-mail address or last used username for your account and we will send an email with instructions for further password recovery.",
"pleasePressButton": "Please press the button bellow to get an email with password recovery code.",
"specifyEmail": "Specify the registration E‑mail address or last used username for your account and we will send an E‑mail with instructions for further password recovery.",
"pleasePressButton": "Please press the button bellow to get an E‑mail with password recovery code.",
"alreadyHaveCode": "Already have a code"
}

3
src/components/auth/forgotPassword/ForgotPasswordBody.jsx
View File

@@ -68,5 +68,8 @@ export default class ForgotPasswordBody extends BaseAuthBody {
isLoginEdit: true
});
this.context.requestRedraw();
// TODO: requestRedraw должен возвращать promise, по которому нужно ставить фокус на поле
// иначе же, если фокус ставить сразу, то форма скачет
setTimeout(() => {this.form.focus('email');}, 300);
};
}

2
src/components/auth/login/Login.intl.json
View File

@@ -1,5 +1,5 @@
{
"loginTitle": "Sign in",
"emailOrUsername": "E-mail or username",
"emailOrUsername": "E‑mail or username",
"next": "Next"
}

4
src/components/auth/recoverPassword/RecoverPassword.intl.json
View File

@@ -1,8 +1,8 @@
{
"title": "Restore password",
"contactSupport": "Contact support",
"messageWasSent": "The recovery code was sent to your account email.",
"messageWasSentTo": "The recovery code was sent to your email {email}.",
"messageWasSent": "The recovery code was sent to your account E‑mail.",
"messageWasSentTo": "The recovery code was sent to your E‑mail {email}.",
"enterCodeBelow": "Please enter the code received into the field below:",
"enterNewPasswordBelow": "Enter and repeat new password below:",
"enterTheCode": "Enter confirmation code"

2
src/components/auth/register/Register.intl.json
View File

@@ -1,7 +1,7 @@
{
"registerTitle": "Sign Up",
"yourNickname": "Your nickname",
"yourEmail": "Your E-mail",
"yourEmail": "Your E‑mail",
"accountPassword": "Account password",
"repeatPassword": "Repeat password",
"signUpButton": "Register",

2
src/components/profile/Profile.jsx
View File

@@ -61,7 +61,7 @@ export default class Profile extends Component {
<ProfileField
link="/profile/change-email"
label={'E-mail'}
label={'E‑mail'}
value={user.email}
/>

22
src/components/profile/changeEmail/ChangeEmail.intl.json
View File

@@ -1,17 +1,17 @@
{
"changeEmailTitle": "Change E-mail",
"changeEmailDescription": "To change current account E-mail you must first verify that you own the current address and then confirm the new one.",
"currentAccountEmail": "Current account E-mail address:",
"pressButtonToStart": "Press the button below to send a message with the code for E-mail change initialization.",
"enterInitializationCode": "The E-mail with an initialization code for E-mail change procedure was sent to {email}. Please enter the code into the field below:",
"changeEmailTitle": "Change E‑mail",
"changeEmailDescription": "To change current account E‑mail you must first verify that you own the current address and then confirm the new one.",
"currentAccountEmail": "Current account E‑mail address:",
"pressButtonToStart": "Press the button below to send a message with the code for E‑mail change initialization.",
"enterInitializationCode": "The E‑mail with an initialization code for E‑mail change procedure was sent to {email}. Please enter the code into the field below:",
"enterNewEmail": "Then provide your new E-mail address, that you want to use with this account. You will be mailed with confirmation code.",
"finalizationCodeWasSentToEmail": "The E-mail change confirmation code was sent to {email}.",
"enterFinalizationCode": "In order to confirm your new E-mail, please enter the code received into the field below:",
"enterNewEmail": "Then provide your new E‑mail address, that you want to use with this account. You will be mailed with confirmation code.",
"finalizationCodeWasSentToEmail": "The E‑mail change confirmation code was sent to {email}.",
"enterFinalizationCode": "In order to confirm your new E‑mail, please enter the code received into the field below:",
"newEmailPlaceholder": "Enter new E-mail",
"newEmailPlaceholder": "Enter new E‑mail",
"codePlaceholder": "Paste the code here",
"sendEmailButton": "Send E-mail",
"changeEmailButton": "Change E-mail",
"sendEmailButton": "Send E‑mail",
"changeEmailButton": "Change E‑mail",
"alreadyReceivedCode": "Already received code"
}

8
src/components/ui/panel.scss
View File

@@ -16,7 +16,8 @@ $headerHeight: 60px;
font-family: $font-family-title;
text-align: center;
line-height: $headerHeight + 2px; // Шрифт Roboto Condensed имеет странную высоту линии, так что компенсируем это
// Шрифт Roboto Condensed имеет странную высоту линии, так что компенсируем это
line-height: $headerHeight + 2px;
font-size: 20px;
color: #fff;
}
@@ -70,9 +71,8 @@ $bodyTopBottomPadding: 15px;
.bodyHeader {
position: relative;
overflow: hidden;
padding: 10px;
margin: (-$bodyTopBottomPadding) (-$bodyLeftRightPadding);
margin-bottom: 15px;
padding: 10px 20px;
margin: (-$bodyTopBottomPadding) (-$bodyLeftRightPadding) 15px;
max-height: 200px;
transition: 0.4s ease;