diff --git a/eslint.config.js b/eslint.config.js index c107818..fd690d3 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,13 +1,13 @@ import antfu from '@antfu/eslint-config' export default await antfu({ - vue: true, - typescript: true, - overrides: { - vue: { - 'vue/block-order': ['error', { - order: ['template', 'script', 'style'], - }], - }, + vue: true, + typescript: true, + overrides: { + vue: { + 'vue/block-order': ['error', { + order: ['template', 'script', 'style'], + }], }, -}) \ No newline at end of file + }, +}) diff --git a/package-lock.json b/package-lock.json index b8c4223..1171d59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,10 +8,10 @@ "name": "test-task-medods", "version": "0.0.0", "dependencies": { - "@vuelidate/core": "^2.0.3", - "@vuelidate/validators": "^2.0.4", + "@yandex/ymaps3-types": "^0.0.21", "vue": "^3.4.19", - "vue-router": "^4.3.0" + "vue-router": "^4.3.0", + "vue-yandex-maps": "^2.0.1" }, "devDependencies": { "@antfu/eslint-config": "^2.6.4", @@ -1508,86 +1508,23 @@ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz", "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==" }, - "node_modules/@vuelidate/core": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.3.tgz", - "integrity": "sha512-AN6l7KF7+mEfyWG0doT96z+47ljwPpZfi9/JrNMkOGLFv27XVZvKzRLXlmDPQjPl/wOB1GNnHuc54jlCLRNqGA==", - "dependencies": { - "vue-demi": "^0.13.11" - }, + "node_modules/@yandex/ymaps3-types": { + "version": "0.0.21", + "resolved": "https://registry.npmjs.org/@yandex/ymaps3-types/-/ymaps3-types-0.0.21.tgz", + "integrity": "sha512-mMKDhzHdV+4ZkzrN2oKzRXEHfCtS3/PLjzWUG2Tp5qsBWszViruk4gng+c/ORthztooYRgqB2+U5syNHDPc0Kw==", "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^2.0.0 || >=3.0.0" + "@types/react": "16-18", + "@types/react-dom": "16-18", + "@vue/runtime-core": "3" }, "peerDependenciesMeta": { - "@vue/composition-api": { + "@types/react": { "optional": true - } - } - }, - "node_modules/@vuelidate/core/node_modules/vue-demi": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "hasInstallScript": true, - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { + }, + "@types/react-dom": { "optional": true - } - } - }, - "node_modules/@vuelidate/validators": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.4.tgz", - "integrity": "sha512-odTxtUZ2JpwwiQ10t0QWYJkkYrfd0SyFYhdHH44QQ1jDatlZgTh/KRzrWVmn/ib9Gq7H4hFD4e8ahoo5YlUlDw==", - "dependencies": { - "vue-demi": "^0.13.11" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^2.0.0 || >=3.0.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - } - } - }, - "node_modules/@vuelidate/validators/node_modules/vue-demi": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", - "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", - "hasInstallScript": true, - "bin": { - "vue-demi-fix": "bin/vue-demi-fix.js", - "vue-demi-switch": "bin/vue-demi-switch.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - }, - "peerDependencies": { - "@vue/composition-api": "^1.0.0-rc.1", - "vue": "^3.0.0-0 || ^2.6.0" - }, - "peerDependenciesMeta": { - "@vue/composition-api": { + }, + "@vue/runtime-core": { "optional": true } } @@ -4950,6 +4887,30 @@ "vue": "^3.2.0" } }, + "node_modules/vue-yandex-maps": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/vue-yandex-maps/-/vue-yandex-maps-2.0.1.tgz", + "integrity": "sha512-tLP+3YZKazLNWsoYF2tMZCM4RCAUMspz5FOk2VnlPWaDFHi71PtHo8dfhTlf5Guy9YP2i11YjZGJfBfSUsEU4g==", + "dependencies": { + "@yandex/ymaps3-types": ">=0.0.21" + }, + "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/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 27e7d30..bf00af6 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,20 @@ { "name": "test-task-medods", - "private": true, - "version": "0.0.0", "type": "module", + "version": "0.0.0", + "private": true, "scripts": { "dev": "vite", "build": "vite build", - "preview": "vite preview" + "preview": "vite preview", + "lint": "eslint .", + "lint:fix": "eslint . --fix" }, "dependencies": { - "@vuelidate/core": "^2.0.3", - "@vuelidate/validators": "^2.0.4", + "@yandex/ymaps3-types": "^0.0.21", "vue": "^3.4.19", - "vue-router": "^4.3.0" + "vue-router": "^4.3.0", + "vue-yandex-maps": "^2.0.1" }, "devDependencies": { "@antfu/eslint-config": "^2.6.4", diff --git a/public/shop.png b/public/shop.png new file mode 100644 index 0000000..e48291e Binary files /dev/null and b/public/shop.png differ diff --git a/src/assets/index.css b/src/assets/index.css index efbad67..d97ae42 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -51,7 +51,6 @@ body { body { background: black; font-family: "Montserrat", sans-serif; - overflow: hidden; color: white; } @@ -77,7 +76,7 @@ button:hover { } .container { - max-width: 800px; + max-width: 1400px; width: 100%; margin-inline: auto; } diff --git a/src/assets/index.css.map b/src/assets/index.css.map index 627dc55..c9fe401 100644 --- a/src/assets/index.css.map +++ b/src/assets/index.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["fonts.scss","style.scss","normalize.scss"],"names":[],"mappings":"AAAQ;AAER;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AC3CF;AAAA;EAEE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EAEA;;;ACtCF;AAEA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAUA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;EAGE;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA,QACQ;EACN;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA,SACS;EACP;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;EAEE;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE","file":"index.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["fonts.scss","style.scss","normalize.scss"],"names":[],"mappings":"AAAQ;AAER;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AC3CF;AAAA;EAEE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EAEA;;;ACrCF;AAEA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAUA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;EAGE;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAME;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA,QACQ;EACN;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA,SACS;EACP;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;AAAA;EAEE;EACA;;;AAGF;AAAA;AAAA;AAIA;AAAA;EAEE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAAA;AAKA;EACE;EACA;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAGA;AAAA;AAAA;AAIA;EACE;;;AAGF;AAAA;AAAA;AAIA;EACE","file":"index.css"} \ No newline at end of file diff --git a/src/assets/style.scss b/src/assets/style.scss index edde597..588ce81 100644 --- a/src/assets/style.scss +++ b/src/assets/style.scss @@ -6,7 +6,6 @@ body { body { background: black; font-family: 'Montserrat', sans-serif; - overflow: hidden; color: white; } @@ -33,8 +32,8 @@ button { } .container{ - max-width: 800px; + max-width: 1400px; width: 100%; margin-inline: auto; -} \ No newline at end of file +} diff --git a/src/components/app-button.vue b/src/components/app-button.vue deleted file mode 100644 index ca7c74e..0000000 --- a/src/components/app-button.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/app-checkbox.vue b/src/components/app-checkbox.vue deleted file mode 100644 index 436e211..0000000 --- a/src/components/app-checkbox.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/app-input.vue b/src/components/app-input.vue deleted file mode 100644 index b301035..0000000 --- a/src/components/app-input.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/app-select.vue b/src/components/app-select.vue deleted file mode 100644 index 3974431..0000000 --- a/src/components/app-select.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/custom-map.vue b/src/components/custom-map.vue new file mode 100644 index 0000000..360a652 --- /dev/null +++ b/src/components/custom-map.vue @@ -0,0 +1,107 @@ + + + diff --git a/src/components/map.vue b/src/components/map.vue new file mode 100644 index 0000000..e7c55b3 --- /dev/null +++ b/src/components/map.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/main.js b/src/main.js index b90824e..0e432e7 100644 --- a/src/main.js +++ b/src/main.js @@ -1,11 +1,18 @@ import { createApp } from 'vue' import App from './App.vue' -import router from "./router/index.js" +import router from './router/index.js' import './assets/index.scss' +// eslint-disable-next-line import/order +import { createYmaps } from 'vue-yandex-maps' + const app = createApp(App) app - .use(router) - .mount('#app') + .use(router) + .use(createYmaps({ + apikey: '13f4c06b-cb7e-4eeb-81f1-af52f12587b2', + importModules: ['@yandex/ymaps3-controls@0.0.1'], + })) + .mount('#app') diff --git a/src/pages/createUser.vue b/src/pages/createUser.vue deleted file mode 100644 index 842cad9..0000000 --- a/src/pages/createUser.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/map.vue b/src/pages/map.vue new file mode 100644 index 0000000..090d484 --- /dev/null +++ b/src/pages/map.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index eef35b8..68263c1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,16 +1,16 @@ import { createRouter, createWebHistory } from 'vue-router' -import Test from "../pages/createUser.vue"; +import Map from '../pages/map.vue' const routes = [ - { - path: '/', - component: Test, - }, + { + path: '/', + component: Map, + }, ] const router = createRouter({ - routes, - history: createWebHistory(), + routes, + history: createWebHistory(), }) -export default router \ No newline at end of file +export default router