diff --git a/ui/quasar.config.js b/ui/quasar.config.js index 8a11ef6..fc3579a 100644 --- a/ui/quasar.config.js +++ b/ui/quasar.config.js @@ -67,7 +67,7 @@ module.exports = configure(function (ctx) { return process.env.CUSTOM_API } else { if (ctx.dev) { - return 'http://localhost:41000/api' + return 'http://localhost:40300/api' } else { return '/api' } @@ -78,7 +78,7 @@ module.exports = configure(function (ctx) { return process.env.CUSTOM_WS } else { if (ctx.dev) { - return 'ws://127.0.0.1:41000/ws' + return 'ws://127.0.0.1:40300/ws' } else { return 'wss://bres.notitek.com.tr/ws' } diff --git a/ui/src/boot/axios.js b/ui/src/boot/axios.js index 9dbc942..3d82fcf 100644 --- a/ui/src/boot/axios.js +++ b/ui/src/boot/axios.js @@ -7,7 +7,7 @@ import axios from 'axios' // good idea to move this instance creation inside of the // "export default () => {}" function below (which runs individually // for each client) -const api = axios.create({ baseURL: 'https://api.example.com' }) +const api = axios.create({ baseURL: process.env.apiAddr }) export default boot(({ app }) => { // for use inside Vue files (Options API) through this.$axios and this.$api diff --git a/ui/src/layouts/panelLayout.vue b/ui/src/layouts/panelLayout.vue index eba898c..3a51ad2 100644 --- a/ui/src/layouts/panelLayout.vue +++ b/ui/src/layouts/panelLayout.vue @@ -7,22 +7,6 @@ - - - - - {{ v.flag }} {{ v.title }} - - - - -
- + diff --git a/ui/src/router/index.js b/ui/src/router/index.js index e28c96f..fa6f1af 100644 --- a/ui/src/router/index.js +++ b/ui/src/router/index.js @@ -55,7 +55,7 @@ Router.beforeEach( if ((isLoggedIn) && ((to.path === '/') || (to.path === 'login'))) { return { - path: '/panel', + path: '/', query: '', } } diff --git a/ui/src/router/routes.js b/ui/src/router/routes.js index 695c004..e73e593 100644 --- a/ui/src/router/routes.js +++ b/ui/src/router/routes.js @@ -7,7 +7,8 @@ const routes = [ requiresAuth: true }, children: [ - { path: '', component: () => import('pages/IndexPage.vue') }, + { path: '', component: () => import('pages/index.vue') }, + { path: '/panel', component: () => import('pages/index.vue') }, ] }, diff --git a/ui/src/stores/login.js b/ui/src/stores/login.js index 69f7954..3df23a0 100644 --- a/ui/src/stores/login.js +++ b/ui/src/stores/login.js @@ -10,9 +10,14 @@ const defaultState = { LoggedIn: false, Token: '', UsrKSUID: '', + UsrEmail: '', + UsrFullname: '', + Username: '', + ClientKSUID: '', - Email: '', - Fullname: '', + ClientCode: '', + LicenseCode: '', + PkgConf: {} } export const useLoginStore = defineStore('login', {