diff --git a/package-lock.json b/package-lock.json index 69f47fe..bea3840 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "vuestic-admin", + "name": "cycle-rider", "version": "3.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "vuestic-admin", + "name": "cycle-rider", "version": "3.1.0", "dependencies": { "@gtm-support/vue-gtm": "^2.0.0", @@ -26,6 +26,7 @@ "vue-chartjs": "^5.3.0", "vue-i18n": "^9.6.2", "vue-router": "^4.2.5", + "vue-yandex-maps": "^2.1.4", "vuestic-ui": "^1.9.0" }, "devDependencies": { @@ -5569,7 +5570,7 @@ "version": "15.7.10", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz", "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==", - "dev": true + "devOptional": true }, "node_modules/@types/qs": { "version": "6.9.10", @@ -5587,7 +5588,7 @@ "version": "18.2.37", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz", "integrity": "sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==", - "dev": true, + "devOptional": true, "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -5598,7 +5599,7 @@ "version": "0.16.6", "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz", "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==", - "dev": true + "devOptional": true }, "node_modules/@types/semver": { "version": "7.5.8", @@ -6371,6 +6372,27 @@ } } }, + "node_modules/@yandex/ymaps3-types": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/@yandex/ymaps3-types/-/ymaps3-types-0.0.28.tgz", + "integrity": "sha512-xPXIDeN5zXWJB29o8yXgaOCLbQpHqqQrn6PaqPhqk4/0SM/pWWBuR9dI6wrM9ZBV7xnIrFIAbdF6hk3tqqs9Pg==", + "peerDependencies": { + "@types/react": "16-18", + "@types/react-dom": "16-18", + "@vue/runtime-core": "3" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + }, + "@vue/runtime-core": { + "optional": true + } + } + }, "node_modules/@yarnpkg/esbuild-plugin-pnp": { "version": "3.0.0-rc.15", "resolved": "https://registry.npmjs.org/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz", @@ -16823,6 +16845,30 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/vue-yandex-maps": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/vue-yandex-maps/-/vue-yandex-maps-2.1.4.tgz", + "integrity": "sha512-W/vJPbBRkSXpGxeDgHBYQmyViq4ct4T4Vih7RM2uhXMJySSHrVMl1yKUDE0qpg2Or4ZD9BiwYOm3HG/JtvcHxg==", + "dependencies": { + "@yandex/ymaps3-types": ">=0.0.27" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@vue/composition-api": ">=1", + "nuxt": "^2.16 || ^3", + "vue": "^2.7 || ^3.3" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + }, + "nuxt": { + "optional": true + } + } + }, "node_modules/vue/node_modules/@vue/shared": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.9.tgz", diff --git a/src/main.ts b/src/main.ts index ca64042..df090ab 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,8 +10,8 @@ import App from "./App.vue"; import axios from 'axios'; import { AxiosResponse } from "axios"; -const HOST = "https://cycle-rider.ru"; -// const HOST = "http://localhost:8000"; +// const HOST = "https://cycle-rider.ru"; +const HOST = "http://localhost:8000"; axios.defaults.baseURL = HOST; diff --git a/src/pages/workouts/WorkoutList.vue b/src/pages/workouts/WorkoutList.vue index 10a6441..710d166 100644 --- a/src/pages/workouts/WorkoutList.vue +++ b/src/pages/workouts/WorkoutList.vue @@ -20,7 +20,7 @@
  • Продолжительность: {{ secondsToDuration(item.duraion_sec) }}
  • Мощность: {{ Math.round(item.power) }}
  • - +
    @@ -64,7 +64,9 @@ const speedConvert = (speed: number) => { return Math.round(speed*3.6) } - +type Attachment = { + url: string; +} type WorkoutItem = { id: string; name: string; @@ -79,6 +81,7 @@ type WorkoutItem = { power: number; duraion_sec: number; distantion: number; + attachment: Attachment; }; const axiosAuth= inject('axiosAuth') as AxiosInstance; @@ -103,15 +106,12 @@ initWorkouts();