diff --git a/Makefile b/Makefile index a9bf4e3..9be76e4 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ all: develop %/$(CANARY): $(eval image:=$(patsubst %/$(CANARY),%,$@)) - $(COMPOSE) build $(image) + $(COMPOSE) build --pull $(image) $(COMPOSE) run --rm $(image) yarn install --production=false DFILES:=$(wildcard */Dockerfile) diff --git a/frontend/.vue-cli-ui/db.json b/frontend/.vue-cli-ui/db.json index 0217ee7..b265679 100644 --- a/frontend/.vue-cli-ui/db.json +++ b/frontend/.vue-cli-ui/db.json @@ -6,7 +6,7 @@ "favorite": 0, "type": "vue", "name": "frontend", - "openDate": 1557153442414, + "openDate": 1557166583987, "widgets": [ { "id": "5sGiztidd", diff --git a/frontend/src/components/forms/Login.vue b/frontend/src/components/forms/Login.vue index 29cb343..0d2b8db 100644 --- a/frontend/src/components/forms/Login.vue +++ b/frontend/src/components/forms/Login.vue @@ -8,7 +8,6 @@ @@ -17,11 +16,9 @@ v-model="password" :append-icon="showPassword ? 'visibility' : 'visibility_off'" @click:append="showPassword = !showPassword" - :rules="passwordRules" :type="showPassword ? 'text' : 'password'" label="Password" required - counter > @@ -39,11 +36,8 @@ export default { data: () => ({ login: '', - loginRules: [v => !!v || 'User name is required'], - password: '', - showPassword: false, - passwordRules: [v => !!v || 'Password is required'] + showPassword: false }), methods: { diff --git a/frontend/src/components/forms/Register.vue b/frontend/src/components/forms/Register.vue index 5d7676c..3542602 100644 --- a/frontend/src/components/forms/Register.vue +++ b/frontend/src/components/forms/Register.vue @@ -31,7 +31,6 @@ :type="showPassword ? 'text' : 'password'" label="Confirm Password" required - counter > @@ -61,7 +60,7 @@ export default { computed: { passwordConfirmRules() { return [ - () => this.password === this.passwordConfirm || "Passwords don't match" + () => this.password === this.passwordConfirm || "Passwords must match" ] }, },