Skip to content

Commit 0f31e93

Browse files
author
Walker Leite
committed
fix(template): fix css and translate strings to english
1 parent 0942b36 commit 0f31e93

File tree

7 files changed

+38
-29
lines changed

7 files changed

+38
-29
lines changed

template/client/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ export default {
1717
</script>
1818

1919
<style {{#extended}}lang="scss"{{else}}lang="css"{{/extended}}>
20+
{{#extended}}@import "style/app.scss";{{/extended}}
2021
</style>

template/client/style/app.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414

1515
$fa-font-path: "../static/fonts";
1616
@import "font-awesome/scss/font-awesome";
17+
18+
#app {
19+
width: 100vw;
20+
height: 100vh;
21+
background-color: darken($light, 40%);
22+
}

template/client/view/Login.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
class="form-control"
1414
id="email"
1515
aria-describedby="emailHelp"
16-
placeholder="Digite seu e-mail"
16+
placeholder="Insert your email"
1717
v-model="email"
1818
required>
1919
</div>
2020
<div class="form-group">
21-
<label for="senha">Senha</label>
21+
<label for="senha">Password</label>
2222
<input type="password"
2323
class="form-control"
2424
id="senha"
25-
placeholder="Digite sua senha"
25+
placeholder="Insert your password"
2626
v-model="password"
2727
required>
2828
</div>
@@ -33,21 +33,21 @@
3333
<a class="link"
3434
@click.prevent="$refs.forgotPassword.show()"
3535
href="#">
36-
Esqueceu sua senha?
36+
Forgot your password?
3737
</a>
3838
<button type="submit"
3939
class="btn btn-success">
4040
<i v-if="loading" class="fa fa-spinner"></i>
4141
<i v-else class="fa fa-check"></i>
42-
ENTRAR
42+
SIGN IN
4343
</button>
4444
</div>
4545
</form>
4646

4747
<!-- Forgot Password -->
4848
<b-modal
4949
ref="forgotPassword"
50-
title="Recuperar a senha"
50+
title="Recover the password"
5151
size="sm"
5252
@ok="onModalOk"
5353
@shown="onModalShown">
@@ -63,7 +63,7 @@
6363
type="email"
6464
class="form-control"
6565
ref="recoverEmail"
66-
placeholder="Digite o seu e-mail"
66+
placeholder="Insert your email"
6767
v-model="recoverEmail"
6868
@keydown.enter="sendRecoverEmail"
6969
required/>
@@ -73,7 +73,7 @@
7373
<b-modal
7474
ref="recoverSuccess"
7575
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
7777
</b-modal>
7878
</div>
7979
</div>
@@ -141,7 +141,7 @@ export default {
141141
this.recoverError = err;
142142
});
143143
} 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'};
145145
}
146146
}
147147
}

template/client/view/Profile.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
<div class="card-block p-4">
88
<form @submit="onSubmit">
99
<div v-if="access_token === null" class="form-group">
10-
<label for="senha">Senha antiga</label>
10+
<label for="senha">Old password</label>
1111
<input type="password"
1212
class="form-control"
1313
id="senha"
14-
placeholder="Digite sua senha antiga"
14+
placeholder="Insert the old password"
1515
v-model="password"
1616
required>
1717
</div>
1818
<div class="form-group">
19-
<label for="senha-nova1">Nova senha</label>
19+
<label for="senha-nova1">New password</label>
2020
<input type="password"
2121
class="form-control"
2222
id="senha-nova1"
23-
placeholder="Digite sua nova senha"
23+
placeholder="Insert the new password"
2424
v-model="passwordNew1"
2525
required>
2626
</div>
2727
<div class="form-group">
28-
<label for="senha-nova2">Confirmação</label>
28+
<label for="senha-nova2">Confirmation</label>
2929
<input type="password"
3030
class="form-control"
3131
id="senha-nova2"
32-
placeholder="Confirme sua nova senha"
32+
placeholder="Confirm the new password"
3333
v-model="passwordNew2"
3434
required>
3535
</div>
@@ -41,13 +41,13 @@
4141
class="btn btn-danger"
4242
@click="onCancel">
4343
<i class="fa fa-ban"></i>
44-
CANCELAR
44+
CANCEL
4545
</button>
4646
<button type="submit"
4747
class="btn btn-success">
4848
<i v-if="loading" class="fa fa-spinner"></i>
4949
<i v-else class="fa fa-check"></i>
50-
SALVAR
50+
SAVE
5151
</button>
5252
</div>
5353
</form>
@@ -87,7 +87,7 @@ export default {
8787
8888
if(this.passwordNew1 !== this.passwordNew2) {
8989
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')
9191
return;
9292
}
9393

template/client/view/containers/HeaderContainer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<b-collapse is-nav id="nav_collapse">
1111
<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>
1313
<b-nav-item @click="onLogoutClick">LOG OUT</b-nav-item>
1414
</b-navbar-nav>
1515
</b-collapse>

template/server/datasources.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@
1111
"email": {
1212
"name": "email",
1313
"connector": "mail",
14-
"transports": [{
15-
"type": "smtp",
16-
"host": "mywebhost.com",
17-
"secure": true,
18-
"port": 465,
19-
"auth": {
20-
"user": "[email protected]",
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+
}
2224
}
23-
}]
25+
]
2426
}
2527
{{/extended}}
2628
}

template/test/server/boot.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('boot process', () => {
5353

5454
it('Email model should send email', (done) => {
5555
server.models.Email.send({
56-
from: 'noreply@mydomain.com',
56+
from: 'noreply@fakeserver.mailtrap.io',
5757
5858
subject: 'Testing email',
5959
text: 'Testing email text',

0 commit comments

Comments
 (0)