This commit is contained in:
2019-03-06 20:51:14 +00:00
parent 84bc3fc835
commit 8d30093935
2 changed files with 34 additions and 87 deletions

View File

@@ -27,39 +27,13 @@
</v-btn> </v-btn>
</v-toolbar> </v-toolbar>
<v-content> <v-content>
<v-container fluid fill-height > <v-container fluid fill-height>
<v-layout justify-center > <v-layout justify-center>
<router-view ></router-view> <router-view></router-view>
</v-layout> </v-layout>
</v-container> </v-container>
</v-content> </v-content>
<!-- <v-footer > <v-footer v-if="!isAuthenticated">
<v-layout>
<v-flex primary
py-2
text-xs-center
white--text
xs12>
<div>
<a href="https://ayanova.com" target="_blank"><span class="white--text caption">AyaNova ({{version}}) {{copyright}}</span></a>
</div>
</v-flex>
</v-layout>
</v-footer> -->
<!-- <v-footer app color="primary" dark height="auto">
<v-layout row wrap="" align-center>
<v-flex xs12>
<div class="ml-3">
<a href="https://ayanova.com" target="_blank">AyaNova</a>
({{version}}) {{copyright}}
</div>
</v-flex>
</v-layout>
</v-footer>
-->
<v-footer v-if="!isAuthenticated">
<v-layout> <v-layout>
<v-flex primary py-2 text-xs-center white--text xs12> <v-flex primary py-2 text-xs-center white--text xs12>
<div> <div>
@@ -83,9 +57,6 @@ export default {
drawer: null drawer: null
}; };
}, },
// beforeCreate() {
// },
mounted() { mounted() {
if (!this.$store.state.authenticated) { if (!this.$store.state.authenticated) {
this.$router.replace({ name: "login" }); this.$router.replace({ name: "login" });

View File

@@ -1,99 +1,96 @@
<template> <template>
<!-- <div class="about">
<h1>About AyaNova</h1>-->
<v-layout row> <v-layout row>
<v-flex><!-- xs12 sm6 offset-sm3 --> <v-flex>
<v-card> <v-card>
<v-toolbar> <v-toolbar>
<v-avatar size="64px" tile> <v-avatar size="64px" tile>
<img :src="require('../assets/bw-logo.svg')" alt="AyaNova"> <img :src="require('../assets/bw-logo.svg')" alt="AyaNova">
</v-avatar> </v-avatar>
<v-toolbar-title>{{ lt("HelpAboutAyaNova")}}</v-toolbar-title> <v-toolbar-title>{{ this.$gzlocale.get("HelpAboutAyaNova")}}</v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn large icon to="/log"> <v-btn large icon to="/log">
<v-icon>fa-glasses</v-icon> <v-icon>fa-glasses</v-icon>
</v-btn> </v-btn>
</v-toolbar> </v-toolbar>
<v-list two-line subheader> <v-list two-line subheader>
<v-subheader>{{ lt("ClientApp")}}</v-subheader> <v-subheader>{{ this.$gzlocale.get("ClientApp")}}</v-subheader>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("Version")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("Version")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ clientInfo.version }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ clientInfo.version }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
</v-list> </v-list>
<v-divider></v-divider> <v-divider></v-divider>
<v-list two-line subheader> <v-list two-line subheader>
<v-subheader>{{ lt("Server")}}</v-subheader> <v-subheader>{{ this.$gzlocale.get("Server")}}</v-subheader>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("ServerAddress")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("ServerAddress")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverUrl() }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ this.$store.state.apiUrl }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("Version")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("Version")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.serverVersion }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.serverVersion }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("SchemaVersion")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("SchemaVersion")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.dbSchemaVersion }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.dbSchemaVersion }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("ServerTime")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("ServerTime")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.serverLocalTime }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.serverLocalTime }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("TimeZone")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("TimeZone")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.serverTimeZone }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.serverTimeZone }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
</v-list> </v-list>
<v-divider></v-divider> <v-divider></v-divider>
<v-list two-line subheader> <v-list two-line subheader>
<v-subheader>{{ lt("HelpLicense")}}</v-subheader> <v-subheader>{{ this.$gzlocale.get("HelpLicense")}}</v-subheader>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("RegisteredUser")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("RegisteredUser")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.license.license.licensedTo }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.license.license.licensedTo }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("DatabaseID")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("DatabaseID")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.license.license.dbId }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.license.license.dbId }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("LicenseSerial")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("LicenseSerial")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.license.license.keySerial }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.license.license.keySerial }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("LicenseExpiration")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("LicenseExpiration")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.license.license.licenseExpiration }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.license.license.licenseExpiration }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("SupportedUntil")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("SupportedUntil")}}</v-list-tile-title>
<v-list-tile-sub-title>{{ serverInfo.license.license.maintenanceExpiration }}</v-list-tile-sub-title> <v-list-tile-sub-title>{{ serverInfo.license.license.maintenanceExpiration }}</v-list-tile-sub-title>
</v-list-tile-content> </v-list-tile-content>
</v-list-tile> </v-list-tile>
<v-list-tile avatar> <v-list-tile avatar>
<v-list-tile-content> <v-list-tile-content>
<v-list-tile-title>{{ lt("LicensedOptions")}}</v-list-tile-title> <v-list-tile-title>{{ this.$gzlocale.get("LicensedOptions")}}</v-list-tile-title>
<v-list-tile-sub-title <v-list-tile-sub-title
v-for="item in serverInfo.license.license.features" v-for="item in serverInfo.license.license.features"
:key="item.Feature" :key="item.Feature"
@@ -104,24 +101,14 @@
</v-card> </v-card>
</v-flex> </v-flex>
</v-layout> </v-layout>
<!-- </div> -->
</template> </template>
<script> <script>
/* xeslint-disable */ /* Xeslint-disable */
import api from "../api/apiutil";
import aboutInfo from "../api/aboutinfo"; import aboutInfo from "../api/aboutinfo";
import lt from "../api/locale";
import store from "../store";
export default { export default {
data() { beforeCreate() {
return { this.$gzlocale.fetch([
serverInfo: { license: { license: {} } },
clientInfo: {}
};
},
beforeRouteEnter(to, from, next) {
lt.fetch([
"HelpAboutAyaNova", "HelpAboutAyaNova",
"ClientApp", "ClientApp",
"Server", "Server",
@@ -137,35 +124,24 @@ export default {
"LicenseExpiration", "LicenseExpiration",
"SupportedUntil", "SupportedUntil",
"LicensedOptions" "LicensedOptions"
]).then(() => { ]);
next();
});
}, },
mounted() { created() {
this.clientInfo.version = aboutInfo.version; this.clientInfo.version = aboutInfo.version;
api this.$gzapi
.get("ServerInfo") .get("ServerInfo")
.then(response => { .then(response => {
this.serverInfo = response.data; this.serverInfo = response.data;
}) })
.catch(function(error) { .catch(function(error) {
/* xeslint-disable-next-line */ throw error;
//console.log(error);
//TODO: turn this into a general error handling method for every form
//probablyo an error component with error message slot to fill in
alert(error);
}); });
}, },
methods: { data() {
lt: function(key) { return {
return lt.get(key); serverInfo: { license: { license: {} } },
}, clientInfo: {}
serverUrl() { };
return store.state.apiUrl;
}
} }
}; };
</script> </script>
<style>
</style>