This commit is contained in:
2020-06-13 23:39:10 +00:00
parent c94ffe6c78
commit f012bfeece

View File

@@ -1,16 +1,5 @@
<template> <template>
<v-row align="center" justify="center" class="mx-auto mt-sm-12 mb-8"> <v-row align="center" justify="center" class="mx-auto mt-sm-12 mb-8">
<!-- <v-row>
<v-col cols="1" offset="5">
<v-select
v-model="selectedTranslation"
:items="selectLists.translations"
item-text="name"
item-value="value"
>
</v-select>
</v-col>
</v-row> -->
<v-col cols="12" offset-md="4"> <v-col cols="12" offset-md="4">
<form> <form>
<v-row> <v-row>
@@ -32,19 +21,7 @@
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
</v-col> </v-col>
<v-col cols="12"> <v-col cols="12" md="7" v-if="serverStatus == 1">
<v-col cols="12" md="1">
<v-select
v-model="selectedTranslation"
:items="selectLists.translations"
item-text="name"
item-value="value"
>
</v-select>
</v-col>
</v-col>
<v-col cols="12" md="7" v-if="trialMode">
<v-select <v-select
v-model="selectedTrialUserId" v-model="selectedTrialUserId"
:items="selectLists.trialUsers" :items="selectLists.trialUsers"
@@ -65,7 +42,6 @@
id="username" id="username"
v-model="input.username" v-model="input.username"
prepend-icon="fa-user" prepend-icon="fa-user"
:label="userLabel"
autofocus autofocus
autocomplete="off" autocomplete="off"
autocorrect="off" autocorrect="off"
@@ -83,7 +59,6 @@
v-model="input.password" v-model="input.password"
:append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'" :append-outer-icon="reveal ? 'fa-eye' : 'fa-eye-slash'"
prepend-icon="fa-key" prepend-icon="fa-key"
:label="passwordLabel"
:type="reveal ? 'text' : 'password'" :type="reveal ? 'text' : 'password'"
:error="errorBadCreds" :error="errorBadCreds"
v-on:keyup.enter="login" v-on:keyup.enter="login"
@@ -122,18 +97,9 @@ export default {
errorBadCreds: false, errorBadCreds: false,
reveal: false, reveal: false,
formState: { errorBoxMessage: null }, formState: { errorBoxMessage: null },
trialMode: false, serverStatus: 0,
userLabel: "User",
passwordLabel: "Password",
selectedTranslation: "en",
selectedTrialUserId: 1, selectedTrialUserId: 1,
selectLists: { selectLists: {
translations: [
{ name: "English", value: "en" },
{ name: "Español", value: "es" },
{ name: "Deutsch", value: "de" },
{ name: "Français", value: "fr" }
],
trialUsers: [ trialUsers: [
{ {
name: "AyaNova administrator - all", name: "AyaNova administrator - all",
@@ -260,21 +226,24 @@ export default {
.get("notify/hello") .get("notify/hello")
.then(res => { .then(res => {
if (res.data != null) { if (res.data != null) {
vm.trialMode = !res.data; /**public enum LicenseStatus
{
NONE = 0,
ActiveTrial = 1,
ExpiredTrial = 2,
ActivePurchased = 3,
ExpiredPurchased = 4,
Revoked = 5
} */
vm.serverStatus = res.data;
} }
}) })
.catch(function handleGetTrialModeError(error) { .catch(function handleGetTrialModeError(error) {
//squash it, this isn't critical //squash it, this isn't critical
}); });
}, },
watch: {
selectedTranslation(val) {
console.log(val);
},
value() {
this.date = this.value; //always in UTC
}
},
methods: { methods: {
trialUserSelected(item) { trialUserSelected(item) {
this.input.password = item.p; this.input.password = item.p;