dry_wash_inc/dry-wash-pl
dry_wash_inc/dry-wash-pl
4
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: make layout, form, order pages and wizards (#6) #13

Merged
237x237 merged 2 commits from feature/arm-layout into main 2024-11-03 11:44:24 +03:00
Conversation 0 Commits 2 Files Changed 26 +42 -38
4 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f6c3ebaf4 - Show all commits

5
package-lock.json generated
View File

@ -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"

1
package.json
View File

@ -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",

58
src/mocks /index.ts
View File

@ -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',
primakov commented 2024-11-03 11:18:26 +03:00
Outdated
Review
Copy Link

Добавить Id

Добавить Id
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",
},
];
{
id: 'order1',
carNumber: 'A123BC',
primakov commented 2024-11-03 11:19:34 +03:00
Outdated
Review
Copy Link

Переделать на строку на английском

Переделать на строку на английском
washTime: '10:30',
primakov commented 2024-11-03 11:18:15 +03:00
Outdated
Review
Copy Link

Храним без + и пробелов

Храним без + и пробелов
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',
},
];

16
src/routes.tsx
View File

@ -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 (
<Routes>
<Route path="/dry-wash-pl" element={<Landing />}></Route>
<Route path="/dry-wash-pl/order" element={<Order />}></Route>
<Route path="/dry-wash-pl/arm" element={<Arm />}></Route>
<Route path='/dry-wash' element={<Landing />}></Route>
<Route path='/dry-wash/order' element={<Order />}></Route>
<Route path='/dry-wash/arm' element={<Arm />}></Route>
</Routes>
);
};