This commit is contained in:
@@ -43,10 +43,6 @@
|
|||||||
</v-flex>
|
</v-flex>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
</v-footer>
|
</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>
|
</v-app>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -61,8 +57,6 @@ export default {
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
if (!this.$store.state.authenticated) {
|
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" });
|
this.$router.replace({ name: "login" });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -76,10 +70,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
isAuthenticated() {
|
isAuthenticated() {
|
||||||
return (
|
return this.$store.state.authenticated === true;
|
||||||
this.$store.state.authenticated === true
|
|
||||||
//this.$route.name !== "login" &&
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
navItems() {
|
navItems() {
|
||||||
return this.$store.state.navItems;
|
return this.$store.state.navItems;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
/* xeslint-disable */
|
/* Xeslint-disable */
|
||||||
import logger from "../utils/logit";
|
import logger from "../utils/logit";
|
||||||
import store from "../store";
|
import store from "../store";
|
||||||
|
|
||||||
@@ -56,20 +56,20 @@ export default {
|
|||||||
//construct the api url and store it
|
//construct the api url and store it
|
||||||
//development location?
|
//development location?
|
||||||
if (
|
if (
|
||||||
window.location.host == "localhost" &&
|
window.location.hostname == "localhost" &&
|
||||||
window.location.port == "8080"
|
window.location.port == "8080"
|
||||||
) {
|
) {
|
||||||
|
logger.log("apiutil::APIUrl -> APIURL empty setting to dev. mode");
|
||||||
store.commit("setAPIURL", "http://localhost:7575/api/v8.0/");
|
store.commit("setAPIURL", "http://localhost:7575/api/v8.0/");
|
||||||
} else {
|
} else {
|
||||||
//production location <protocol>//<hostname>:<port>/
|
//production location <protocol>//<hostname>:<port>/
|
||||||
store.commit(
|
store.commit(
|
||||||
"setAPIURL",
|
"setAPIURL",
|
||||||
window.location.protocol +
|
window.location.protocol + "//" + window.location.host + "/api/v8.0/"
|
||||||
"//" +
|
);
|
||||||
window.location.hostname +
|
logger.log(
|
||||||
":" +
|
"apiutil::APIUrl -> APIURL empty using: ",
|
||||||
window.location.port +
|
store.state.apiUrl
|
||||||
"/api/v8.0/"
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export default new Vuex.Store({
|
|||||||
plugins: [createPersistedState()],
|
plugins: [createPersistedState()],
|
||||||
state: {
|
state: {
|
||||||
authenticated: false,
|
authenticated: false,
|
||||||
apiUrl: "", //http://localhost:7575/api/v8.0/
|
apiUrl: "",
|
||||||
apiToken: "-",
|
apiToken: "-",
|
||||||
userId: 0,
|
userId: 0,
|
||||||
roles: 0,
|
roles: 0,
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
login() {
|
login() {
|
||||||
// eslint-disable-next-line
|
// xeslint-disable-next-line
|
||||||
debugger;
|
// debugger;
|
||||||
//console.log("Login.vue::page url is:" + this.$route.query.page);
|
//console.log("Login.vue::page url is:" + this.$route.query.page);
|
||||||
if (this.input.username != "" && this.input.password != "") {
|
if (this.input.username != "" && this.input.password != "") {
|
||||||
auth
|
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
|
- otherwise it just uses the current page url fixed up with the api path instead
|
||||||
|
|
||||||
- About page with license info, server version / client version
|
- 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
|
- 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
|
- 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:
|
- Document a release procedure while doing the next step:
|
||||||
|
|||||||
Reference in New Issue
Block a user