diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
new file mode 100644
index 000000000..d970792bb
--- /dev/null
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
diff --git a/webapp/components/PasswordReset/Request.spec.js b/webapp/components/PasswordReset/Request.spec.js
index 1804be6a6..63e51cf76 100644
--- a/webapp/components/PasswordReset/Request.spec.js
+++ b/webapp/components/PasswordReset/Request.spec.js
@@ -6,11 +6,11 @@ const localVue = createLocalVue()
localVue.use(Styleguide)
config.stubs['sweetalert-icon'] = ''
+config.stubs['client-only'] = ''
+config.stubs['nuxt-link'] = ''
describe('Request', () => {
- let wrapper
- let Wrapper
- let mocks
+ let wrapper, Wrapper, mocks, stubs
beforeEach(() => {
mocks = {
@@ -23,6 +23,12 @@ describe('Request', () => {
loading: false,
mutate: jest.fn().mockResolvedValue({ data: { reqestPasswordReset: true } }),
},
+ $i18n: {
+ locale: () => 'en',
+ },
+ }
+ stubs = {
+ LocaleSwitch: "
",
}
})
@@ -33,6 +39,7 @@ describe('Request', () => {
return mount(Request, {
mocks,
localVue,
+ stubs,
})
}
diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index 8ca2da89b..aa7e67fcf 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -1,58 +1,77 @@
-
-
-
-
-
- {{ $t('password-reset.form.description') }}
-
+
+
+
+
+
+
+
-
+
+
+ {{ $t('login.copy') }}
+
+
- {{ $t('password-reset.form.submit') }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ $t('password-reset.form.description') }}
+
+
+ {{ $t('password-reset.form.submit') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('site.login') }}
+
+
+
+
+
+
diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js
index 75e1ade83..6551211c0 100644
--- a/webapp/components/Registration/CreateUserAccount.spec.js
+++ b/webapp/components/Registration/CreateUserAccount.spec.js
@@ -7,12 +7,10 @@ const localVue = createLocalVue()
localVue.use(Styleguide)
config.stubs['sweetalert-icon'] = ''
+config.stubs['client-only'] = ''
describe('CreateUserAccount', () => {
- let wrapper
- let Wrapper
- let mocks
- let propsData
+ let wrapper, Wrapper, mocks, propsData, stubs
beforeEach(() => {
mocks = {
@@ -27,6 +25,9 @@ describe('CreateUserAccount', () => {
},
}
propsData = {}
+ stubs = {
+ LocaleSwitch: "",
+ }
})
describe('mount', () => {
@@ -35,6 +36,7 @@ describe('CreateUserAccount', () => {
mocks,
propsData,
localVue,
+ stubs,
})
}
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 9e4d899e7..ebcfb9691 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -16,7 +16,10 @@
@submit="submit"
>
-
+
+
+
+
+
+
diff --git a/webapp/layouts/basic.vue b/webapp/layouts/basic.vue
new file mode 100644
index 000000000..6766390d2
--- /dev/null
+++ b/webapp/layouts/basic.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
index 81d25a5ca..080323528 100644
--- a/webapp/layouts/blank.vue
+++ b/webapp/layouts/blank.vue
@@ -11,7 +11,6 @@
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ca8cc71e4..381e493f8 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -41,7 +41,8 @@
"responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ",
"bank": "Bankverbindung",
"germany": "Deutschland",
- "code-of-conduct": "Verhaltenscodex"
+ "code-of-conduct": "Verhaltenscodex",
+ "login": "Zurück zum Anmeldung"
},
"sorting": {
"newest": "Neuste",
@@ -61,7 +62,6 @@
"success": "Du bist eingeloggt!"
},
"password-reset": {
- "title": "Passwort zurücksetzen",
"form": {
"description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
"submit": "Email anfordern",
@@ -619,4 +619,4 @@
"have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎",
"closing": "Herzlichst
Euer Human Connection Team"
}
-}
+}
\ No newline at end of file
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 1898f8c4d..66ab4a47b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -41,14 +41,15 @@
"responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)",
"bank": "bank account",
"germany": "Germany",
- "code-of-conduct": "Code of Conduct"
+ "code-of-conduct": "Code of Conduct",
+ "login": "Back to login"
},
"sorting": {
"newest": "Newest",
"oldest": "Oldest"
},
"login": {
- "copy": "If you already have a human-connection account, login here.",
+ "copy": "If you already have a human-connection account, please login.",
"login": "Login",
"logout": "Logout",
"email": "Your Email",
@@ -65,7 +66,7 @@
"form": {
"description": "A password reset email will be sent to the given email address.",
"submit": "Request email",
- "submitted": "A mail with further instruction has been sent to {email}"
+ "submitted": "An email with further instructions has been sent to {email}"
}
},
"registration": {
@@ -619,4 +620,4 @@
"have-fun": "Now have fun with the alpha version of Human Connection! For the first universal peace. ♥︎",
"closing": "Thank you very much
your Human Connection Team"
}
-}
+}
\ No newline at end of file
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 785844ebf..d08d569c2 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -1,28 +1,37 @@
{
"site": {
- "made": "Com ❤ feito",
+ "made": "Feito com ❤",
"imprint": "Impressão",
- "termsAc": "termos e condições",
- "data-privacy": "protecção de dados",
+ "termsAc": "Termos e Condições",
+ "data-privacy": "Proteção de Dados",
"changelog": "Mudanças e Histórico",
"contact": "Contato",
- "tribunal": "tribunal",
"tribunal": "tribunal de registo",
"register": "número de registo",
"director": "Diretor Administrativo",
"taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)",
"responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
"bank": "conta bancária",
- "germany": "Alemanha"
+ "germany": "Alemanha",
+ "code-of-conduct": "Codigo de Conduto",
+ "login": "Voltar para o Login"
},
"login": {
- "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
+ "copy": "Se você já tem uma conta no Human Connection, por favor faça o login.",
"login": "Entrar",
"logout": "Sair",
"email": "Seu email",
"password": "Sua senha",
"moreInfo": "O que é o Human Connection?",
- "hello": "Olá"
+ "hello": "Olá",
+ "forgotPassword": "Esqueceu a sua senha?"
+ },
+ "password-reset": {
+ "form": {
+ "description": "Um e-mail de redefinição de senha será enviado para o endereço de e-mail fornecido.",
+ "submit": "Solicitar email",
+ "submitted": "Um e-mail com mais instruções foi enviado para {email}"
+ }
},
"profile": {
"name": "Meu perfil",
@@ -203,4 +212,4 @@
"shoutButton": {
"shouted": "Aclamou"
}
-}
+}
\ No newline at end of file
diff --git a/webapp/pages/changelog.vue b/webapp/pages/changelog.vue
index ddaec5962..ed3cf58e4 100644
--- a/webapp/pages/changelog.vue
+++ b/webapp/pages/changelog.vue
@@ -76,7 +76,7 @@