From 3f6c3ebaf44ff762eb1d25526ebfd924b9b46a5c Mon Sep 17 00:00:00 2001 From: ilnaz <237x237@gmail.com> Date: Sun, 3 Nov 2024 11:38:43 +0300 Subject: [PATCH] fix: delete pl in router (#6) --- package-lock.json | 5 ++-- package.json | 1 + src/mocks /index.ts | 58 ++++++++++++++++++++++++--------------------- src/routes.tsx | 16 ++++++------- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d1971e..a900cee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@chakra-ui/react": "^2.4.2", "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", + "@types/react": "^18.3.12", "express": "^4.21.1", "framer-motion": "^6.2.8", "react": "^18.3.1", @@ -3299,14 +3300,12 @@ "node_modules/@types/prop-types": { "version": "15.7.13", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", - "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", - "devOptional": true + "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==" }, "node_modules/@types/react": { "version": "18.3.12", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", - "devOptional": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" diff --git a/package.json b/package.json index 2c6e075..76d5403 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@chakra-ui/react": "^2.4.2", "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", + "@types/react": "^18.3.12", "express": "^4.21.1", "framer-motion": "^6.2.8", "react": "^18.3.1", diff --git a/src/mocks /index.ts b/src/mocks /index.ts index 7ba7b7d..a0a26f8 100644 --- a/src/mocks /index.ts +++ b/src/mocks /index.ts @@ -1,31 +1,35 @@ export const mastersData = [ - { - name: "Иван Иванов", - schedule: ["15:00 - 16:30", "17:00 - 18:00"], - phone: "+7 900 123 45 67", - }, - { - name: "Сергей Петров", - schedule: ["10:00 - 12:30", "14:00 - 15:30", "16:00 - 17:00"], - phone: "+7 900 234 56 78", - }, + { + id: 'masters1', + name: 'Иван Иванов', + schedule: ['15:00 - 16:30', '17:00 - 18:00'], + phone: '+7 900 123 45 67', + }, + { + id: 'masters2', + name: 'Сергей Петров', + schedule: ['10:00 - 12:30', '14:00 - 15:30', '16:00 - 17:00'], + phone: '+7 900 234 56 78', + }, ]; export const ordersData = [ - { - carNumber: "A123BC", - washTime: "10:30", - orderDate: "2024-10-31", - status: "В процессе", - phone: "+7 900 123 45 67", - location: "Казань, ул. Баумана, 1", - }, - { - carNumber: "B456CD", - washTime: "11:00", - orderDate: "2024-10-31", - status: "Завершено", - phone: "+7 900 234 56 78", - location: "Казань, ул. Кремлёвская, 3", - }, -]; \ No newline at end of file + { + id: 'order1', + carNumber: 'A123BC', + washTime: '10:30', + orderDate: '2024-10-31', + status: 'progress', + phone: '79001234567', + location: 'Казань, ул. Баумана, 1', + }, + { + id: 'order2', + carNumber: 'B456CD', + washTime: '11:00', + orderDate: '2024-10-31', + status: 'complete', + phone: '79002345678', + location: 'Казань, ул. Кремлёвская, 3', + }, +]; diff --git a/src/routes.tsx b/src/routes.tsx index b272319..6728eb6 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,15 +1,15 @@ -import React from "react"; -import { Routes, Route } from "react-router-dom"; -import Arm from "./pages/arm"; -import Order from "./pages/order-view"; -import Landing from "./pages/landing"; +import React from 'react'; +import { Routes, Route } from 'react-router-dom'; +import Arm from './pages/arm'; +import Order from './pages/order-view'; +import Landing from './pages/landing'; const Routers = () => { return ( - }> - }> - }> + }> + }> + }> ); };