Mercurial > gemma
changeset 507:eaa8365bb261 metamorph-for-all
Merged default into metamorph-for-all branch.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 24 Aug 2018 15:56:56 +0200 |
| parents | 21a4c7ef871b (current diff) 11d527b3321b (diff) |
| children | e41b48825f5f |
| files | |
| diffstat | 3 files changed, 34 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/translations.json Fri Aug 24 15:38:15 2018 +0200 +++ b/client/src/translations.json Fri Aug 24 15:56:56 2018 +0200 @@ -1,13 +1,13 @@ { "en_GB": { - "Enter email": "Enter email", + "Enter username": "Enter username", "Enter passphrase": "Enter passphrase", "Login failed": "Login failed", "Login": "Login", "Forgot password": "Forgot password" }, "de_AT": { - "Enter email": "Email", + "Enter username": "Benutzername", "Enter passphrase": "Passphrase", "Login failed": "Login fehlgeschlagen", "Login": "Login",
--- a/client/src/views/Login.vue Fri Aug 24 15:38:15 2018 +0200 +++ b/client/src/views/Login.vue Fri Aug 24 15:56:56 2018 +0200 @@ -11,8 +11,8 @@ <div id="alert" v-if="loginFailed" class="loginerrormessage alert alert-danger" role="alert"> <span class="loginerror"><translate>Login failed</translate></span> </div> - <div class="input-group mb-3 emailgroup"> - <input type="text" v-model="user" id="inputEmail" class="form-control" :placeholder="emailLabel" required autofocus> + <div class="input-group mb-3 usernamegroup"> + <input type="text" v-model="user" id="inputUsername" class="form-control" :placeholder="usernameLabel" required autofocus> </div> <div class="input-group mb-3 passwordgroup"> <input :type="isPasswordVisible" v-model="password" id="inputPassword" class="form-control" :placeholder='passwordLabel' required> @@ -28,8 +28,8 @@ <div class="d-flex flex-row justify-content-center"> <form class="loginform form-signin"> <div v-if="showPasswordReset" class="small">TODO text and action for password reset - <div class="input-group mb-3 emailgroup"> - <input type="text" v-model="emailToReset" class="form-control" :placeholder="emailLabel" required> + <div class="input-group mb-3 usernamegroup"> + <input type="text" v-model="usernameToReset" class="form-control" :placeholder="usernameLabel" required> </div> <button class="btn btn-secondary btn-block" type="button" @click="togglePasswordReset"><translate>Send</translate></button> @@ -51,7 +51,7 @@ $logincollapsed: 470px; $loginextended: 550px; -.emailgroup { +.usernamegroup { box-shadow: $basic-shadow-light !important; } .forgottenlink { @@ -127,15 +127,15 @@ loginFailed: false, readablePassword: false, showPasswordReset: false, - emailToReset: "" + usernameToReset: "" }; }, computed: { passwordLabel() { return this.$gettext("Enter passphrase"); }, - emailLabel() { - return this.$gettext("Enter email"); + usernameLabel() { + return this.$gettext("Enter username"); }, isPasswordVisible() { return this.readablePassword ? "text" : "password";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docker/Dockerfile.spa Fri Aug 24 15:56:56 2018 +0200 @@ -0,0 +1,24 @@ +FROM ubuntu:bionic +LABEL authors="tom@intevation.de" + +RUN sed -i 's/$/ universe/' /etc/apt/sources.list + +RUN apt-get update &&\ + apt-get -y install --no-install-recommends curl nodejs + +# Install yarn +RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\ + echo 'deb https://dl.yarnpkg.com/debian/ stable main' >> \ + /etc/apt/sources.list &&\ + apt-get update &&\ + apt-get -y install yarn + +COPY ./client /opt/gemma_spa + +WORKDIR /opt/gemma_spa + +RUN yarn install + +EXPOSE 8080 + +CMD ["yarn", "serve"]