diff --git a/frontend/.idea/inspectionProfiles/Project_Default.xml b/frontend/.idea/inspectionProfiles/Project_Default.xml
index ac87573..03d9549 100644
--- a/frontend/.idea/inspectionProfiles/Project_Default.xml
+++ b/frontend/.idea/inspectionProfiles/Project_Default.xml
@@ -2,21 +2,5 @@
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index ab12a6d..c10095f 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -1,13 +1,12 @@
import { createRouter, createWebHistory } from 'vue-router';
import AboutView from '../views/AboutView.vue';
import HomeView from '../views/HomeView.vue';
-import LoginView from '../views/LoginView.vue';
-import RegisterView from '../views/RegisterView';
import RegV from "@/views/RegV.vue";
import StartPage from "@/views/StartPage.vue";
import GameSelection from "@/views/GameSelection.vue";
import GameDesc from "@/views/GameDesc.vue";
import GameDescAdmin from "@/views/GameDescAdmin.vue";
+import LogV from "@/views/LogV.vue";
const routes = [
{
@@ -23,16 +22,11 @@ const routes = [
{
path: '/login',
name: 'Login',
- component: LoginView,
+ component: LogV,
},
{
path: '/register',
name: 'Register',
- component: RegisterView,
- },
- {
- path: '/gamereg',
- name: 'RegV',
component: RegV,
},
{
diff --git a/frontend/src/store/modules/users.js b/frontend/src/store/modules/users.js
index 44c4ef7..b6e9da5 100644
--- a/frontend/src/store/modules/users.js
+++ b/frontend/src/store/modules/users.js
@@ -5,6 +5,8 @@ const state = {
user: null,
};
+const url = 'https://industry-game.ru';
+
const getters = {
isAuthenticated: state => !!state.user,
isAdmin: state => state?.user?.type === 'ADMIN',
@@ -14,11 +16,11 @@ const getters = {
const actions = {
async register({dispatch}, user) {
- let {data} = await axios.post('https://industry-game.ru/api/v1/players/register/', user);
+ let {data} = await axios.post(url + '/api/v1/players/register/', user);
await dispatch('saveMe', data);
},
async login({dispatch}, user) {
- let {data} = await axios.post('/api/v1/players/login/', user);
+ let {data} = await axios.post(url + '/api/v1/players/login/', user);
await dispatch('saveMe', data);
},
async saveMe({commit}, data) {
diff --git a/frontend/src/views/GameSelection.vue b/frontend/src/views/GameSelection.vue
index 7c0992d..27bb4f0 100644
--- a/frontend/src/views/GameSelection.vue
+++ b/frontend/src/views/GameSelection.vue
@@ -4,7 +4,7 @@
{'Name'}, скорее присоединяйся к игре
-
+
@@ -18,9 +18,18 @@
\ No newline at end of file
diff --git a/frontend/src/views/StartPage.vue b/frontend/src/views/StartPage.vue
index 1fd21bd..28d4c79 100644
--- a/frontend/src/views/StartPage.vue
+++ b/frontend/src/views/StartPage.vue
@@ -11,11 +11,10 @@
приведи свой дистрикт к победе
- Войти в игру
-
+ Войти
+
+
+ Зарегистрироваться