diff --git a/begushiybashkir/bbvue/package-lock.json b/begushiybashkir/bbvue/package-lock.json index e341650..b2c05c4 100644 --- a/begushiybashkir/bbvue/package-lock.json +++ b/begushiybashkir/bbvue/package-lock.json @@ -1,13 +1,14 @@ { "name": "bbvue", - "version": "0.0.0", + "version": "0.0.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bbvue", - "version": "0.0.0", + "version": "0.0.13", "dependencies": { + "axios": "^1.12.2", "pinia": "^3.0.3", "vue": "^3.5.22", "vue-router": "^4.5.1" @@ -1939,6 +1940,23 @@ "dev": true, "license": "Python-2.0" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", + "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -2033,6 +2051,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -2101,6 +2132,18 @@ "dev": true, "license": "MIT" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2232,6 +2275,29 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/electron-to-chromium": { "version": "1.5.227", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.227.tgz", @@ -2261,6 +2327,51 @@ "url": "https://github.com/sponsors/antfu" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/esbuild": { "version": "0.25.10", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz", @@ -2702,6 +2813,42 @@ "dev": true, "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2717,6 +2864,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -2727,6 +2883,43 @@ "node": ">=6.9.0" } }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stream": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", @@ -2770,6 +2963,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2780,6 +2985,45 @@ "node": ">=8" } }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hookable": { "version": "5.5.3", "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", @@ -3105,6 +3349,36 @@ "@jridgewell/sourcemap-codec": "^1.5.5" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3488,6 +3762,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/begushiybashkir/bbvue/package.json b/begushiybashkir/bbvue/package.json index b14dd1e..3517973 100644 --- a/begushiybashkir/bbvue/package.json +++ b/begushiybashkir/bbvue/package.json @@ -14,6 +14,7 @@ "format": "prettier --write src/" }, "dependencies": { + "axios": "^1.12.2", "pinia": "^3.0.3", "vue": "^3.5.22", "vue-router": "^4.5.1" diff --git a/begushiybashkir/bbvue/src/main.js b/begushiybashkir/bbvue/src/main.js index 5dcad83..b997f6c 100644 --- a/begushiybashkir/bbvue/src/main.js +++ b/begushiybashkir/bbvue/src/main.js @@ -5,10 +5,47 @@ import { createPinia } from 'pinia' import App from './App.vue' import router from './router' +import axios from 'axios' + +// Глобальная конфигурация axios +axios.defaults.baseURL = 'https://begushiybashkir.ru/api/v1' +axios.defaults.withCredentials = true // Для работы с куками + +// Интерцептор для автоматического добавления токена +axios.interceptors.request.use((config) => { + const token = localStorage.getItem('auth_token') + if (token) { + config.headers.Authorization = `Bearer ${token}` + } + return config +}) + +// Интерцептор для обработки ошибок авторизации +axios.interceptors.response.use( + (response) => response, + (error) => { + if (error.response?.status === 401) { + // Токен истек или невалиден + const authStore = useAuthStore() + authStore.clearToken() + authStore.clearUser() + window.location.href = '/login' + } + return Promise.reject(error) + } +) + const app = createApp(App) app.use(createPinia()) app.use(router) +// Инициализация auth store после создания app +import { useAuthStore } from './stores/auth' +const authStore = useAuthStore() +authStore.initializeAuth() + + + app.mount('#app') diff --git a/begushiybashkir/bbvue/src/router/index.js b/begushiybashkir/bbvue/src/router/index.js index 728e8fc..46fe708 100644 --- a/begushiybashkir/bbvue/src/router/index.js +++ b/begushiybashkir/bbvue/src/router/index.js @@ -4,62 +4,68 @@ import Home from '../views/Home.vue' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ - { - path: '/', - name: 'Home', - component: Home - }, - { - path: '/about', - name: 'About', - component: () => import('../views/About.vue') - }, - { - path: '/achievements', - name: 'Achievements', - component: () => import('../views/Achievements.vue') - }, - { - path: '/gallery', - name: 'Gallery', - component: () => import('../views/Gallery.vue') - }, - { - path: '/training', - name: 'Training', - component: () => import('../views/Training.vue') - }, - { - path: '/news', - name: 'News', - component: () => import('../views/News.vue') - }, - { - path: '/members', - name: 'Members', - component: () => import('../views/Members.vue') - }, - { - path: '/reviews', - name: 'Reviews', - component: () => import('../views/Reviews.vue') - }, - { - path: '/login', - name: 'Login', - component: () => import('../views/Login.vue') - }, - { - path: '/profile', - name: 'Profile', - component: () => import('../views/Profile.vue') - }, - { - path: '/register', - name: 'Register', - component: () => import('../views/Register.vue') - } -] + { + path: '/', + name: 'Home', + component: Home + }, + { + path: '/about', + name: 'About', + component: () => import('../views/About.vue') + }, + { + path: '/achievements', + name: 'Achievements', + component: () => import('../views/Achievements.vue') + }, + { + path: '/gallery', + name: 'Gallery', + component: () => import('../views/Gallery.vue') + }, + { + path: '/training', + name: 'Training', + component: () => import('../views/Training.vue') + }, + { + path: '/news', + name: 'News', + component: () => import('../views/News.vue') + }, + { + path: '/members', + name: 'Members', + component: () => import('../views/Members.vue') + }, + { + path: '/reviews', + name: 'Reviews', + component: () => import('../views/Reviews.vue') + }, + { + path: '/login', + name: 'Login', + component: () => import('../views/Login.vue') + }, + { + path: '/profile', + name: 'Profile', + component: () => import('../views/Profile.vue') + }, + { + path: '/register', + name: 'Register', + component: () => import('../views/Register.vue') + }, + { + path: '/profile/edit', + name: 'ProfileEdit', + component: () => import('../views/ProfileEdit.vue'), + meta: { requiresAuth: true } + } + ] }) diff --git a/begushiybashkir/bbvue/src/stores/auth.js b/begushiybashkir/bbvue/src/stores/auth.js new file mode 100644 index 0000000..18d05fa --- /dev/null +++ b/begushiybashkir/bbvue/src/stores/auth.js @@ -0,0 +1,161 @@ +import { defineStore } from 'pinia' +import { ref, computed } from 'vue' +import axios from 'axios' + +const API_BASE_URL = 'https://begushiybashkir.ru/api/v1/auth' + +export const useAuthStore = defineStore('auth', () => { + const user = ref(null) + const token = ref(localStorage.getItem('auth_token') || '') + const loading = ref(false) + const error = ref('') + + // Computed свойства + const isAuthenticated = computed(() => !!token.value && !!user.value) + const userFullName = computed(() => { + if (!user.value) return '' + return `${user.value.firstName} ${user.value.lastName}` + }) + + // Установка токена + const setToken = (newToken) => { + token.value = newToken + localStorage.setItem('auth_token', newToken) + // Устанавливаем токен в заголовки axios по умолчанию + axios.defaults.headers.common['Authorization'] = `Bearer ${newToken}` + } + + // Очистка токена + const clearToken = () => { + token.value = '' + localStorage.removeItem('auth_token') + delete axios.defaults.headers.common['Authorization'] + } + + // Установка пользователя + const setUser = (userData) => { + user.value = userData + } + + // Очистка пользователя + const clearUser = () => { + user.value = null + } + + // Регистрация + const register = async (userData) => { + loading.value = true + error.value = '' + + try { + const response = await axios.post(`${API_BASE_URL}/register`, userData) + + // После успешной регистрации автоматически логинимся + const loginResponse = await axios.post(`${API_BASE_URL}/login`, { + email: userData.email, + password: userData.password + }) + + const { token: authToken, user: userInfo } = loginResponse.data + setToken(authToken) + setUser(userInfo) + + return { success: true, data: response.data } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка регистрации' + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Логин + const login = async (credentials) => { + loading.value = true + error.value = '' + + try { + const response = await axios.post(`${API_BASE_URL}/login`, credentials) + const { token: authToken, user: userInfo } = response.data + + setToken(authToken) + setUser(userInfo) + + return { success: true, data: response.data } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка входа' + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Выход + const logout = async () => { + loading.value = true + + try { + await axios.post(`${API_BASE_URL}/logout`, {}, { + headers: { + 'Authorization': `Bearer ${token.value}` + } + }) + } catch (err) { + console.error('Ошибка при выходе:', err) + } finally { + clearToken() + clearUser() + loading.value = false + } + } + + // Получение профиля + const fetchProfile = async () => { + loading.value = true + error.value = '' + + try { + const response = await axios.get(`${API_BASE_URL}/profile`) + setUser(response.data) + return { success: true, data: response.data } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка загрузки профиля' + clearToken() + clearUser() + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Инициализация при загрузке приложения + const initializeAuth = async () => { + if (token.value) { + // Восстанавливаем заголовок авторизации + axios.defaults.headers.common['Authorization'] = `Bearer ${token.value}` + // Загружаем данные пользователя + await fetchProfile() + } + } + + return { + // State + user, + token, + loading, + error, + + // Getters + isAuthenticated, + userFullName, + + // Actions + register, + login, + logout, + fetchProfile, + initializeAuth, + setToken, + clearToken + } +}) \ No newline at end of file diff --git a/begushiybashkir/bbvue/src/stores/user.js b/begushiybashkir/bbvue/src/stores/user.js new file mode 100644 index 0000000..b8bb4d3 --- /dev/null +++ b/begushiybashkir/bbvue/src/stores/user.js @@ -0,0 +1,136 @@ +import { defineStore } from 'pinia' +import { ref, computed } from 'vue' +// import axios from 'axios' + +// const API_BASE_URL = 'https://begushiybashkir.ru/api/v1' + +export const useUserStore = defineStore('user', () => { + const userStats = ref(null) + const userTraining = ref(null) + const userAchievements = ref([]) + const loading = ref(false) + const error = ref('') + + // Получение статистики пользователя + const fetchUserStats = async () => { + loading.value = true + error.value = '' + + try { + // TODO: Заменить на реальный endpoint когда будет доступен + // const response = await axios.get(`${API_BASE_URL}/user/stats`) + + // Временные данные для демонстрации + await new Promise(resolve => setTimeout(resolve, 1000)) + + userStats.value = { + totalDistance: 245, + bestResult: '10км - 48:15', + totalWorkouts: 36, + weeklyDistance: 25, + monthlyDistance: 98, + avgPace: '5:15', + caloriesBurned: 12450 + } + + return { success: true, data: userStats.value } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка загрузки статистики' + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Получение плана тренировок + const fetchUserTraining = async () => { + loading.value = true + error.value = '' + + try { + // TODO: Заменить на реальный endpoint + // const response = await axios.get(`${API_BASE_URL}/user/training`) + + await new Promise(resolve => setTimeout(resolve, 1000)) + + userTraining.value = { + currentWeek: 4, + totalWeeks: 12, + nextWorkout: '2024-03-20T18:00:00', + workouts: [ + { id: 1, date: '2024-03-18', type: 'interval', distance: '8km', completed: true }, + { id: 2, date: '2024-03-20', type: 'tempo', distance: '10km', completed: false }, + { id: 3, date: '2024-03-22', type: 'long', distance: '15km', completed: false } + ] + } + + return { success: true, data: userTraining.value } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка загрузки плана тренировок' + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Получение достижений + const fetchUserAchievements = async () => { + loading.value = true + error.value = '' + + try { + // TODO: Заменить на реальный endpoint + // const response = await axios.get(`${API_BASE_URL}/user/achievements`) + + await new Promise(resolve => setTimeout(resolve, 1000)) + + userAchievements.value = [ + { id: 1, name: 'Первый забег', description: 'Пробежать первую 5км', achieved: true, date: '2024-01-20' }, + { id: 2, name: 'Неделя тренировок', description: 'Тренироваться 7 дней подряд', achieved: true, date: '2024-02-15' }, + { id: 3, name: '100 км', description: 'Пробежать 100 км', achieved: true, date: '2024-03-01' }, + { id: 4, name: 'Полумарафон', description: 'Пробежать 21.1 км', achieved: false }, + { id: 5, name: 'Скорость', description: 'Пробежать 5км быстрее 25 минут', achieved: false } + ] + + return { success: true, data: userAchievements.value } + } catch (err) { + error.value = err.response?.data?.message || 'Ошибка загрузки достижений' + return { success: false, error: error.value } + } finally { + loading.value = false + } + } + + // Computed свойства + const completedAchievements = computed(() => + userAchievements.value.filter(achievement => achievement.achieved) + ) + + const pendingAchievements = computed(() => + userAchievements.value.filter(achievement => !achievement.achieved) + ) + + const achievementProgress = computed(() => { + if (!userAchievements.value.length) return 0 + return Math.round((completedAchievements.value.length / userAchievements.value.length) * 100) + }) + + return { + // State + userStats, + userTraining, + userAchievements, + loading, + error, + + // Getters + completedAchievements, + pendingAchievements, + achievementProgress, + + // Actions + fetchUserStats, + fetchUserTraining, + fetchUserAchievements + } +}) \ No newline at end of file diff --git a/begushiybashkir/bbvue/src/views/Login.vue b/begushiybashkir/bbvue/src/views/Login.vue index 42791f8..75f9541 100644 --- a/begushiybashkir/bbvue/src/views/Login.vue +++ b/begushiybashkir/bbvue/src/views/Login.vue @@ -1,64 +1,160 @@ \ No newline at end of file diff --git a/begushiybashkir/bbvue/src/views/Profile.vue b/begushiybashkir/bbvue/src/views/Profile.vue index f0b5dc6..4521e22 100644 --- a/begushiybashkir/bbvue/src/views/Profile.vue +++ b/begushiybashkir/bbvue/src/views/Profile.vue @@ -1,61 +1,105 @@ +[file name]: Profile.vue +[file content begin] \ No newline at end of file + +[file content end] \ No newline at end of file diff --git a/begushiybashkir/bbvue/src/views/ProfileEdit.vue b/begushiybashkir/bbvue/src/views/ProfileEdit.vue new file mode 100644 index 0000000..0b7b718 --- /dev/null +++ b/begushiybashkir/bbvue/src/views/ProfileEdit.vue @@ -0,0 +1,410 @@ + + + + + \ No newline at end of file diff --git a/begushiybashkir/bbvue/src/views/Register.vue b/begushiybashkir/bbvue/src/views/Register.vue index 156ea36..b6c1e35 100644 --- a/begushiybashkir/bbvue/src/views/Register.vue +++ b/begushiybashkir/bbvue/src/views/Register.vue @@ -15,6 +15,7 @@ class="form-input" placeholder="Введите ваше имя" required + :disabled="loading" > @@ -27,6 +28,7 @@ class="form-input" placeholder="Введите вашу фамилию" required + :disabled="loading" > @@ -40,6 +42,7 @@ class="form-input" placeholder="example@mail.ru" required + :disabled="loading" > @@ -51,6 +54,7 @@ type="tel" class="form-input" placeholder="+7 (999) 123-45-67" + :disabled="loading" > @@ -65,6 +69,7 @@ placeholder="Не менее 6 символов" required minlength="6" + :disabled="loading" > @@ -77,6 +82,7 @@ class="form-input" placeholder="Повторите пароль" required + :disabled="loading" > @@ -87,6 +93,7 @@ id="experience" v-model="formData.experience" class="form-input" + :disabled="loading" > @@ -102,6 +109,7 @@ id="goals" v-model="formData.goals" class="form-input" + :disabled="loading" > @@ -122,6 +130,7 @@ type="checkbox" class="checkbox" required + :disabled="loading" > Я соглашаюсь с @@ -136,6 +145,7 @@ v-model="formData.newsletter" type="checkbox" class="checkbox" + :disabled="loading" > Хочу получать новости о тренировках и мероприятиях @@ -176,9 +186,15 @@