@@ -52,18 +52,26 @@
@@ -91,7 +99,7 @@ export default defineComponent({
async signOut() {
await this.$http.get('/logout/')
localStorage.removeItem('user')
- store.state.user = undefined
+ store.commit('removeUser')
this.$router.push('/login')
},
},
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index 57c209b..8d03711 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -1,5 +1,4 @@
-
Панель управления
@@ -15,30 +14,29 @@
Если вы нашли какую-то ошибку на сайте или у вас есть предложение по функционалу, напишите пожалуйста нам на
почту
diff --git a/src/components/NotFound.vue b/src/components/NotFound.vue
new file mode 100644
index 0000000..f0cd0b1
--- /dev/null
+++ b/src/components/NotFound.vue
@@ -0,0 +1,44 @@
+
+
+
+
+ 404
+
+
+ Ой... Похоже, такой страницы не существует.
+
+
+
+
+
+
+
diff --git a/src/components/ServerItem.vue b/src/components/ServerItem.vue
index 49bf9fe..13d9ef9 100644
--- a/src/components/ServerItem.vue
+++ b/src/components/ServerItem.vue
@@ -128,7 +128,7 @@ export default defineComponent({
if (this.server.status === ServerStatus.RUNNING) {
return `${settings.SERVER_HOST_URL}:${this.server.port}`
} else {
- return 'Сервер не запущенн'
+ return 'Сервер не запущен'
}
}
},
diff --git a/src/components/ServerModal.vue b/src/components/ServerModal.vue
index 641d018..158e7e2 100644
--- a/src/components/ServerModal.vue
+++ b/src/components/ServerModal.vue
@@ -111,6 +111,8 @@ import { defineComponent } from "vue"
import { useVuelidate } from "@vuelidate/core"
import { required } from "@vuelidate/validators"
+import store from '../store'
+
export default defineComponent({
setup() {
return { v$: useVuelidate() }
@@ -183,7 +185,7 @@ export default defineComponent({
const { data } = await this.$http.post("/servers/", this.form)
await this.$http.post(`/servers/${data.id}/build/`)
this.pending = false
- this.$emit("create-server", data)
+ store.state.servers.push(data)
this.$emit("update:show", false)
},
},
diff --git a/src/main.ts b/src/main.ts
index c7f4e60..1e8ea1a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -15,10 +15,13 @@ const app = createApp({
const user = localStorage.getItem('user')
if (user) {
try {
- store.state.user = JSON.parse(user)
+ store.commit({
+ type: 'setUser',
+ user: JSON.parse(user)
+ })
} catch (err) {
localStorage.removeItem('user')
- store.state.user = undefined
+ store.commit('removeUser')
}
}
},
@@ -40,7 +43,7 @@ axios.interceptors.response.use(
(error) => {
if (error.response?.status === 403) {
localStorage.removeItem('user')
- store.state.user = undefined
+ store.commit('removeUser')
return Promise.reject(error)
}
return Promise.reject(error)
@@ -48,6 +51,7 @@ axios.interceptors.response.use(
)
app.config.globalProperties.$http = axios
app.use(router)
+app.use(store)
app.mount('#app')
declare module "@vue/runtime-core" {
diff --git a/src/router.ts b/src/router.ts
index ef64a37..2fdb424 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -2,6 +2,7 @@ import { Component } from 'vue'
import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
import Dashboard from './components/Dashboard.vue'
+import NotFound from './components/NotFound.vue'
import SignUp from './components/SignUp.vue'
import SignIn from './components/SignIn.vue'
import store from './store'
@@ -31,6 +32,14 @@ const routes: RouteRecordRaw[] = [
authRoute: true,
},
},
+ {
+ path: '/404',
+ component: NotFound,
+ },
+ {
+ path: '/:pathMatch(.*)*',
+ redirect: '/404',
+ },
]
export const router = createRouter({
diff --git a/src/store.ts b/src/store.ts
index ea8e962..0150835 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -1,16 +1,32 @@
-import { reactive } from 'vue'
+import { createStore } from 'vuex'
+import { Server } from './interfaces'
-export interface User {
+interface User {
id: number,
username: string,
}
interface State {
user?: User,
+ servers: Server[],
}
-export default {
- state: reactive({
- user: undefined,
- }) as State,
-}
+export default createStore({
+ state(): State {
+ return {
+ user: undefined,
+ servers: [],
+ }
+ },
+ mutations: {
+ setUser(state: State, payload) {
+ state.user = payload.user
+ },
+ removeUser(state: State) {
+ state.user = undefined
+ },
+ setServers(state: State, payload) {
+ state.servers = payload.servers
+ }
+ }
+})