freeleaps_product/freeleaps_frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://freeleaps.com:3443/products/freeleaps into main

Browse Source 
* 'main' of https://freeleaps.com:3443/products/freeleaps:
  Fix some minor translation issue

# Conflicts:
#	frontend/src/pages/guest/SigninWithEmailAndCode.vue
This commit is contained in:
min.jiang 2024-08-17 01:16:58 +08:00
commit 6d200bad88
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lang/en.js
View File

@ -66,7 +66,7 @@ export default {
'invalid code': 'invalid code', 'invalid code': 'invalid code',
Password: 'Password', Password: 'Password',
'Forget password': 'Forget password', 'Forget password': 'Forget password',
'Invalid password': 'Invalid password', 'Invalid password': 'Password doesn\'t match',
'Read More': 'Read More', 'Read More': 'Read More',
'Total earning': 'Total earning', 'Total earning': 'Total earning',
Payable: 'Payable', Payable: 'Payable',

23
frontend/src/pages/guest/SigninWithEmailAndCode.vue
View File

@ -3,20 +3,14 @@
<form @submit.prevent="signinWithCode"> <form @submit.prevent="signinWithCode">
<div class="form-input-back" @click="frontPage"> <div class="form-input-back" @click="frontPage">
<svg-icon icon="back" class-name="input-back-icon" /> <svg-icon icon="back" class-name="input-back-icon" />
<p>{{email}}</p> <p>{{ email }}</p>
</div> </div>
<div class="input-container"> <div class="input-container">
<div class="form-group"> <div class="form-group">
<div class="input-group-container"> <div class="input-group-container">
<div class="form-floating"> <div class="form-floating">
<input <input class="input-email" id="inputCode" type="text" :placeholder="'Code sent to your email'"
class="input-email" v-model="code" @focus="inputFocus" />
id="inputCode"
type="text"
:placeholder="'Code sent to your email'"
v-model="code"
@focus="inputFocus"
/>
<label for="inputCode">{{ $t('Authenticaion Code Sent To Your Email') }}</label> <label for="inputCode">{{ $t('Authenticaion Code Sent To Your Email') }}</label>
</div> </div>
<button type="submit" class="btn-start">{{ $t('SIGN IN') }}</button> <button type="submit" class="btn-start">{{ $t('SIGN IN') }}</button>
@ -24,9 +18,10 @@
</div> </div>
<p class="error-msg" v-if="message != null">{{ message }}</p> <p class="error-msg" v-if="message != null">{{ message }}</p>
<p class="error-msg msg-center" v-if="!message"> <p class="error-msg msg-center" v-if="!message">
<span>{{$t('Didn\'t get the email? Check junk folder or')}}</span> <span>{{ $t('Didn\'t get the email? Check junk folder or') }}</span>
<button class="btn btn-link resend-btn" :disabled="countdown !== 0" type="button" @click="trySigninWithEmail">send again</button> <button class="btn btn-link resend-btn" :disabled="countdown !== 0" type="button"
<span v-if="countdown !== 0" class="countdown">({{countdown}})</span> @click="trySigninWithEmail">{{ $t('send again') }}</button>
<span v-if="countdown !== 0" class="countdown">({{ countdown }})</span>
</p> </p>
</div> </div>
</form> </form>
@ -57,7 +52,7 @@ export default {
} }
}, },
created() {}, created() { },
mounted() { mounted() {
if (this.mnx_IsKeepUserSignedIn() && this.mnx_isUserAuthenticated()) { if (this.mnx_IsKeepUserSignedIn() && this.mnx_isUserAuthenticated()) {
this.mnx_navAfterSignedin() this.mnx_navAfterSignedin()
@ -145,11 +140,13 @@ export default {
font-weight: 500; font-weight: 500;
padding: 0; padding: 0;
font-size: 18px; font-size: 18px;
&:disabled { &:disabled {
color: $primary; color: $primary;
opacity: .78; opacity: .78;
} }
} }
.countdown { .countdown {
color: $primary; color: $primary;
} }