This commit is contained in:
@@ -43,10 +43,6 @@
|
||||
</v-flex>
|
||||
</v-layout>
|
||||
</v-footer>
|
||||
<!-- <v-footer color="indigo" app height="auto">
|
||||
<span class="white--text">{{ version }}</span>
|
||||
<span class="white--text">{{ copyright }}</span>
|
||||
</v-footer>-->
|
||||
</v-app>
|
||||
</template>
|
||||
|
||||
@@ -61,8 +57,6 @@ export default {
|
||||
},
|
||||
mounted() {
|
||||
if (!this.$store.state.authenticated) {
|
||||
// eslint-disable-next-line
|
||||
console.log("App.vue::page url is:" + this.$route.query.page);
|
||||
this.$router.replace({ name: "login" });
|
||||
}
|
||||
},
|
||||
@@ -76,10 +70,7 @@ export default {
|
||||
},
|
||||
computed: {
|
||||
isAuthenticated() {
|
||||
return (
|
||||
this.$store.state.authenticated === true
|
||||
//this.$route.name !== "login" &&
|
||||
);
|
||||
return this.$store.state.authenticated === true;
|
||||
},
|
||||
navItems() {
|
||||
return this.$store.state.navItems;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* xeslint-disable */
|
||||
/* Xeslint-disable */
|
||||
import logger from "../utils/logit";
|
||||
import store from "../store";
|
||||
|
||||
@@ -56,20 +56,20 @@ export default {
|
||||
//construct the api url and store it
|
||||
//development location?
|
||||
if (
|
||||
window.location.host == "localhost" &&
|
||||
window.location.hostname == "localhost" &&
|
||||
window.location.port == "8080"
|
||||
) {
|
||||
logger.log("apiutil::APIUrl -> APIURL empty setting to dev. mode");
|
||||
store.commit("setAPIURL", "http://localhost:7575/api/v8.0/");
|
||||
} else {
|
||||
//production location <protocol>//<hostname>:<port>/
|
||||
store.commit(
|
||||
"setAPIURL",
|
||||
window.location.protocol +
|
||||
"//" +
|
||||
window.location.hostname +
|
||||
":" +
|
||||
window.location.port +
|
||||
"/api/v8.0/"
|
||||
window.location.protocol + "//" + window.location.host + "/api/v8.0/"
|
||||
);
|
||||
logger.log(
|
||||
"apiutil::APIUrl -> APIURL empty using: ",
|
||||
store.state.apiUrl
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ export default new Vuex.Store({
|
||||
plugins: [createPersistedState()],
|
||||
state: {
|
||||
authenticated: false,
|
||||
apiUrl: "", //http://localhost:7575/api/v8.0/
|
||||
apiUrl: "",
|
||||
apiToken: "-",
|
||||
userId: 0,
|
||||
roles: 0,
|
||||
|
||||
@@ -52,8 +52,8 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
login() {
|
||||
// eslint-disable-next-line
|
||||
debugger;
|
||||
// xeslint-disable-next-line
|
||||
// debugger;
|
||||
//console.log("Login.vue::page url is:" + this.$route.query.page);
|
||||
if (this.input.username != "" && this.input.password != "") {
|
||||
auth
|
||||
|
||||
@@ -37,6 +37,8 @@ NEXT UP / CURRENTLY WORKING ON:
|
||||
- otherwise it just uses the current page url fixed up with the api path instead
|
||||
|
||||
- About page with license info, server version / client version
|
||||
- Also should show or have link to go to the local error log "Support information" view
|
||||
- Add an error log view that a user can go to without logging in that shows the local error log
|
||||
- Dummy form with all RAVEN required input controls on it for testing
|
||||
- As if a widget but not actual widget api calls yet so can expand this form later and save time
|
||||
- Document a release procedure while doing the next step:
|
||||
|
||||
Reference in New Issue
Block a user