File tree Expand file tree Collapse file tree 7 files changed +38
-29
lines changed Expand file tree Collapse file tree 7 files changed +38
-29
lines changed Original file line number Diff line number Diff line change @@ -17,4 +17,5 @@ export default {
17
17
</script >
18
18
19
19
<style {{#extended }}lang="scss"{{else}}lang="css"{{/extended}}>
20
+ {{#extended }}@import " style/app.scss" ;{{/extended }}
20
21
</style >
Original file line number Diff line number Diff line change 14
14
15
15
$fa-font-path : " ../static/fonts" ;
16
16
@import " font-awesome/scss/font-awesome" ;
17
+
18
+ #app {
19
+ width : 100vw ;
20
+ height : 100vh ;
21
+ background-color : darken ($light , 40% );
22
+ }
Original file line number Diff line number Diff line change 13
13
class =" form-control"
14
14
id =" email"
15
15
aria-describedby =" emailHelp"
16
- placeholder =" Digite seu e-mail "
16
+ placeholder =" Insert your email "
17
17
v-model =" email"
18
18
required >
19
19
</div >
20
20
<div class =" form-group" >
21
- <label for =" senha" >Senha </label >
21
+ <label for =" senha" >Password </label >
22
22
<input type =" password"
23
23
class =" form-control"
24
24
id =" senha"
25
- placeholder =" Digite sua senha "
25
+ placeholder =" Insert your password "
26
26
v-model =" password"
27
27
required >
28
28
</div >
33
33
<a class =" link"
34
34
@click.prevent =" $refs.forgotPassword.show()"
35
35
href =" #" >
36
- Esqueceu sua senha ?
36
+ Forgot your password ?
37
37
</a >
38
38
<button type =" submit"
39
39
class =" btn btn-success" >
40
40
<i v-if =" loading" class =" fa fa-spinner" ></i >
41
41
<i v-else class =" fa fa-check" ></i >
42
- ENTRAR
42
+ SIGN IN
43
43
</button >
44
44
</div >
45
45
</form >
46
46
47
47
<!-- Forgot Password -->
48
48
<b-modal
49
49
ref =" forgotPassword"
50
- title =" Recuperar a senha "
50
+ title =" Recover the password "
51
51
size =" sm"
52
52
@ok =" onModalOk"
53
53
@shown =" onModalShown" >
63
63
type =" email"
64
64
class =" form-control"
65
65
ref =" recoverEmail"
66
- placeholder =" Digite o seu e-mail "
66
+ placeholder =" Insert your email "
67
67
v-model =" recoverEmail"
68
68
@keydown.enter =" sendRecoverEmail"
69
69
required />
73
73
<b-modal
74
74
ref =" recoverSuccess"
75
75
ok-only >
76
- Um email foi enviado para você, por favor verifique a caixa de entrada
76
+ An email has been sent, please verify your mailbox
77
77
</b-modal >
78
78
</div >
79
79
</div >
@@ -141,7 +141,7 @@ export default {
141
141
this .recoverError = err;
142
142
});
143
143
} else {
144
- this .recoverError = {message: ' Verifique o e-mail digitado e tente novamente ' };
144
+ this .recoverError = {message: ' Please, check the inserted email and try again ' };
145
145
}
146
146
}
147
147
}
Original file line number Diff line number Diff line change 7
7
<div class =" card-block p-4" >
8
8
<form @submit =" onSubmit" >
9
9
<div v-if =" access_token === null" class =" form-group" >
10
- <label for =" senha" >Senha antiga </label>
10
+ <label for =" senha" >Old password </label>
11
11
<input type =" password"
12
12
class =" form-control"
13
13
id =" senha"
14
- placeholder =" Digite sua senha antiga "
14
+ placeholder =" Insert the old password "
15
15
v-model =" password"
16
16
required >
17
17
</div>
18
18
<div class =" form-group" >
19
- <label for =" senha-nova1" >Nova senha </label>
19
+ <label for =" senha-nova1" >New password </label>
20
20
<input type =" password"
21
21
class =" form-control"
22
22
id =" senha-nova1"
23
- placeholder =" Digite sua nova senha "
23
+ placeholder =" Insert the new password "
24
24
v-model =" passwordNew1"
25
25
required >
26
26
</div>
27
27
<div class =" form-group" >
28
- <label for =" senha-nova2" >Confirmação </label>
28
+ <label for =" senha-nova2" >Confirmation </label>
29
29
<input type =" password"
30
30
class =" form-control"
31
31
id =" senha-nova2"
32
- placeholder =" Confirme sua nova senha "
32
+ placeholder =" Confirm the new password "
33
33
v-model =" passwordNew2"
34
34
required >
35
35
</div>
41
41
class =" btn btn-danger"
42
42
@click =" onCancel" >
43
43
<i class =" fa fa-ban" ></i>
44
- CANCELAR
44
+ CANCEL
45
45
</button>
46
46
<button type =" submit"
47
47
class =" btn btn-success" >
48
48
<i v-if =" loading" class =" fa fa-spinner" ></i>
49
49
<i v-else class="fa fa-check"></i>
50
- SALVAR
50
+ SAVE
51
51
</button>
52
52
</div>
53
53
</form>
@@ -87,7 +87,7 @@ export default {
87
87
88
88
if (this .passwordNew1 !== this .passwordNew2 ) {
89
89
this .loading = false
90
- this .error = new Error (' As senhas não conferem, por favor tente novamente ' )
90
+ this .error = new Error (' The password does not match, please try again ' )
91
91
return ;
92
92
}
93
93
Original file line number Diff line number Diff line change 9
9
10
10
<b-collapse is-nav id =" nav_collapse" >
11
11
<b-navbar-nav class =" ml-auto" >
12
- <b-nav-item :to =" {name: 'profile'}" >ALTERAR SENHA </b-nav-item>
12
+ <b-nav-item :to =" {name: 'profile'}" >CHANGE PASSWORD </b-nav-item>
13
13
<b-nav-item @click =" onLogoutClick" >LOG OUT</b-nav-item>
14
14
</b-navbar-nav>
15
15
</b-collapse>
Original file line number Diff line number Diff line change 11
11
"email" : {
12
12
"name" : " email" ,
13
13
"connector" : " mail" ,
14
- "transports" : [{
15
- "type" : " smtp" ,
16
- "host" : " mywebhost.com" ,
17
- "secure" : true ,
18
- "port" : 465 ,
19
- "auth" : {
20
-
21
- "pass" : " h4ckme"
14
+ "transports" : [
15
+ {
16
+ "type" : " smtp" ,
17
+ "host" : " smtp.mailtrap.io" ,
18
+ "secure" : false ,
19
+ "port" : 2525 ,
20
+ "auth" : {
21
+ "user" : " bc6242e46c4abb" ,
22
+ "pass" : " 6dcc9b55c677be"
23
+ }
22
24
}
23
- } ]
25
+ ]
24
26
}
25
27
{{/extended }}
26
28
}
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ describe('boot process', () => {
53
53
54
54
it ( 'Email model should send email' , ( done ) => {
55
55
server . models . Email . send ( {
56
- from : 'noreply@mydomain.com ' ,
56
+ from : 'noreply@fakeserver.mailtrap.io ' ,
57
57
58
58
subject : 'Testing email' ,
59
59
text : 'Testing email text' ,
You can’t perform that action at this time.
0 commit comments