diff --git a/package.json b/package.json index f973f1b..e7e566f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "author": "Xtimms", "version": "0.1.0", "private": true, - "homepage": "https://ridebus.by", + "homepage": "https://pwa.ridebus.by", "scripts": { "dev": "vite", "build": "vite build", diff --git a/src/entities/Logo/img/LogoWithText.svg b/src/entities/Logo/img/LogoWithText.svg index 3f41856..fb03a6d 100644 --- a/src/entities/Logo/img/LogoWithText.svg +++ b/src/entities/Logo/img/LogoWithText.svg @@ -82,65 +82,64 @@ - - - - - - - + + + + + + + - + - - + - + diff --git a/src/features/Complains/model/useComplains.tsx b/src/features/Complains/model/useComplains.tsx index bad48eb..ba99cad 100644 --- a/src/features/Complains/model/useComplains.tsx +++ b/src/features/Complains/model/useComplains.tsx @@ -23,77 +23,8 @@ interface IReturns { export const useComplains = (): IReturns => { const [complains, setComplains] = useState([]) - const fetchComplains = (): void => { - fetch(`https://popooga.ru/graphql`, { - headers: { - accept: `*/*`, - 'accept-language': `ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7`, - 'content-type': `application/json`, - 'sec-fetch-dest': `empty`, - 'sec-fetch-mode': `cors`, - 'sec-fetch-site': `same-origin`, - }, - referrer: `https://popooga.ru/graphql`, - referrerPolicy: `strict-origin-when-cross-origin`, - body: `{"operationName":"C","variables":{},"query":"query C {\\n findComplains {\\n id\\n stop\\n direction\\n date\\n type\\n on\\n }\\n}\\n"}`, - method: `POST`, - mode: `cors`, - credentials: `omit`, - }) - .then(res => res.json()) - .then(res => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - if (res?.data?.findComplains) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access - setComplains(res.data.findComplains) - } - - return null - }) - .catch(() => {}) - } - - useEffect(() => { - fetchComplains() - const interval = setInterval(() => { - fetchComplains() - }, 5000) - - return () => { - clearInterval(interval) - } - }, []) - const addComplain = (data: IComplains): void => { AndrewLytics(`addComplainMethod`) - const body = { - operationName: null, - variables: { - data, - }, - query: `mutation Complain($data: ComplainsInputDTO!) {createComplain(data: $data) {id} - }`, - } - - fetch(`https://popooga.ru/graphql`, { - headers: { - accept: `*/*`, - 'accept-language': `ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7`, - 'content-type': `application/json`, - 'sec-ch-ua': `" Not A;Brand";v="99", "Chromium";v="101", "Google Chrome";v="101"`, - 'sec-ch-ua-mobile': `?0`, - 'sec-ch-ua-platform': `"macOS"`, - 'sec-fetch-dest': `empty`, - 'sec-fetch-mode': `cors`, - 'sec-fetch-site': `same-origin`, - }, - referrer: `https://popooga.ru/graphql`, - referrerPolicy: `strict-origin-when-cross-origin`, - body: JSON.stringify(body), - method: `POST`, - mode: `cors`, - credentials: `omit`, - }).catch(() => {}) } return { complains, addComplain } diff --git a/src/shared/api/schedule.ts b/src/shared/api/schedule.ts index e233117..8cfe500 100644 --- a/src/shared/api/schedule.ts +++ b/src/shared/api/schedule.ts @@ -12,6 +12,6 @@ export type FetchScheduleResponse = IContentfulResponse export const fetchSchedule = (): Promise => { return baseRequest( - `https://cdn.contentful.com/spaces/ze9lyxygmq5z/environments/master/entries/43nolroEBc5PNSMub6VR8G?access_token=${config.CONTENTFUL_TOKEN}`, + `https://cdn.contentful.com/spaces/ze9lyxygmq5z/environments/master/entries/1eo7haWl3AEcgwoR3YMcwn?access_token=${config.CONTENTFUL_TOKEN}`, ) } diff --git a/src/shared/common/schedule.ts b/src/shared/common/schedule.ts index 99489e7..09df9d7 100644 --- a/src/shared/common/schedule.ts +++ b/src/shared/common/schedule.ts @@ -385,7 +385,7 @@ export const SCHEDULE: ISchedule = { `18:43`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `6:50`, `7:20`, `7:50`, @@ -786,7 +786,7 @@ export const SCHEDULE: ISchedule = { `18:43`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `6:50`, `7:20`, `7:50`, @@ -1187,7 +1187,7 @@ export const SCHEDULE: ISchedule = { `18:43`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `6:50`, `7:20`, `7:50`, @@ -1588,7 +1588,7 @@ export const SCHEDULE: ISchedule = { `18:43`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `6:50`, `7:20`, `7:50`, @@ -1989,7 +1989,7 @@ export const SCHEDULE: ISchedule = { `18:43`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `6:50`, `7:20`, `7:50`, @@ -2370,7 +2370,7 @@ export const SCHEDULE: ISchedule = { `19:28`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `5:58`, `7:42`, `8:32`, @@ -2750,7 +2750,7 @@ export const SCHEDULE: ISchedule = { `19:28`, `20:43`, ], - 'Железнодородная больница': [ + 'Железнодорожная больница': [ `5:58`, `7:42`, `8:32`, @@ -2887,7 +2887,7 @@ export const SCHEDULE: ISchedule = { `8:10`, `8:35`, `9:10`, - `9:10`, + `9:40`, `10:25`, `11:25`, `12:55`, @@ -2905,7 +2905,7 @@ export const SCHEDULE: ISchedule = { `8:11`, `8:36`, `9:11`, - `9:11`, + `9:41`, `10:26`, `11:26`, `12:56`, @@ -2923,7 +2923,7 @@ export const SCHEDULE: ISchedule = { `8:13`, `8:38`, `9:13`, - `9:13`, + `9:43`, `10:28`, `11:28`, `12:58`, @@ -2941,7 +2941,7 @@ export const SCHEDULE: ISchedule = { `8:15`, `8:40`, `9:15`, - `9:15`, + `9:45`, `10:30`, `11:30`, `13:00`, @@ -2959,7 +2959,7 @@ export const SCHEDULE: ISchedule = { `8:17`, `8:42`, `9:17`, - `9:17`, + `9:47`, `10:32`, `11:32`, `13:02`, @@ -2977,7 +2977,7 @@ export const SCHEDULE: ISchedule = { `8:20`, `8:45`, `9:20`, - `9:20`, + `9:50`, `10:35`, `11:35`, `13:05`, @@ -2995,7 +2995,7 @@ export const SCHEDULE: ISchedule = { `8:21`, `8:46`, `9:21`, - `9:21`, + `9:51`, `10:36`, `11:36`, `13:06`, @@ -3013,7 +3013,7 @@ export const SCHEDULE: ISchedule = { `8:23`, `8:48`, `9:23`, - `9:23`, + `9:53`, `10:38`, `11:38`, `13:08`, @@ -3031,7 +3031,7 @@ export const SCHEDULE: ISchedule = { `8:25`, `8:50`, `9:25`, - `9:25`, + `9:55`, `10:40`, `11:40`, `13:10`, @@ -3049,7 +3049,7 @@ export const SCHEDULE: ISchedule = { `8:27`, `8:52`, `9:27`, - `9:27`, + `9:57`, `10:42`, `11:42`, `13:12`, @@ -3067,7 +3067,7 @@ export const SCHEDULE: ISchedule = { `8:29`, `8:54`, `9:29`, - `9:29`, + `9:59`, `10:44`, `11:44`, `13:14`, @@ -3085,7 +3085,7 @@ export const SCHEDULE: ISchedule = { `8:31`, `8:56`, `9:31`, - `9:31`, + `10:31`, `10:46`, `11:46`, `13:16`, @@ -3103,7 +3103,7 @@ export const SCHEDULE: ISchedule = { `8:33`, `8:58`, `9:33`, - `9:33`, + `10:33`, `10:48`, `11:48`, `13:18`, @@ -3121,7 +3121,7 @@ export const SCHEDULE: ISchedule = { `8:35`, `9:00`, `9:35`, - `9:35`, + `10:35`, `10:50`, `11:50`, `13:20`, @@ -3249,7 +3249,7 @@ export const SCHEDULE: ISchedule = { `8:10`, `8:35`, `9:10`, - `9:10`, + `9:40`, `10:25`, `11:25`, `12:55`, @@ -3267,7 +3267,7 @@ export const SCHEDULE: ISchedule = { `8:11`, `8:36`, `9:11`, - `9:11`, + `9:41`, `10:26`, `11:26`, `12:56`, @@ -3285,7 +3285,7 @@ export const SCHEDULE: ISchedule = { `8:13`, `8:38`, `9:13`, - `9:13`, + `9:43`, `10:28`, `11:28`, `12:58`, @@ -3303,7 +3303,7 @@ export const SCHEDULE: ISchedule = { `8:15`, `8:40`, `9:15`, - `9:15`, + `9:45`, `10:30`, `11:30`, `13:00`, @@ -3321,7 +3321,7 @@ export const SCHEDULE: ISchedule = { `8:17`, `8:42`, `9:17`, - `9:17`, + `9:47`, `10:32`, `11:32`, `13:02`, @@ -3339,7 +3339,7 @@ export const SCHEDULE: ISchedule = { `8:20`, `8:45`, `9:20`, - `9:20`, + `9:50`, `10:35`, `11:35`, `13:05`, @@ -3357,7 +3357,7 @@ export const SCHEDULE: ISchedule = { `8:21`, `8:46`, `9:21`, - `9:21`, + `9:51`, `10:36`, `11:36`, `13:06`, @@ -3375,7 +3375,7 @@ export const SCHEDULE: ISchedule = { `8:23`, `8:48`, `9:23`, - `9:23`, + `9:53`, `10:38`, `11:38`, `13:08`, @@ -3393,7 +3393,7 @@ export const SCHEDULE: ISchedule = { `8:25`, `8:50`, `9:25`, - `9:25`, + `9:55`, `10:40`, `11:40`, `13:10`, @@ -3411,7 +3411,7 @@ export const SCHEDULE: ISchedule = { `8:27`, `8:52`, `9:27`, - `9:27`, + `9:57`, `10:42`, `11:42`, `13:12`, @@ -3429,7 +3429,7 @@ export const SCHEDULE: ISchedule = { `8:29`, `8:54`, `9:29`, - `9:29`, + `9:59`, `10:44`, `11:44`, `13:14`, @@ -3447,7 +3447,7 @@ export const SCHEDULE: ISchedule = { `8:31`, `8:56`, `9:31`, - `9:31`, + `10:31`, `10:46`, `11:46`, `13:16`, @@ -3465,7 +3465,7 @@ export const SCHEDULE: ISchedule = { `8:33`, `8:58`, `9:33`, - `9:33`, + `10:33`, `10:48`, `11:48`, `13:18`, @@ -3483,7 +3483,7 @@ export const SCHEDULE: ISchedule = { `8:35`, `9:00`, `9:35`, - `9:35`, + `10:35`, `10:50`, `11:50`, `13:20`, @@ -3611,7 +3611,7 @@ export const SCHEDULE: ISchedule = { `8:10`, `8:35`, `9:10`, - `9:10`, + `9:40`, `10:25`, `11:25`, `12:55`, @@ -3629,7 +3629,7 @@ export const SCHEDULE: ISchedule = { `8:11`, `8:36`, `9:11`, - `9:11`, + `9:41`, `10:26`, `11:26`, `12:56`, @@ -3647,7 +3647,7 @@ export const SCHEDULE: ISchedule = { `8:13`, `8:38`, `9:13`, - `9:13`, + `9:43`, `10:28`, `11:28`, `12:58`, @@ -3665,7 +3665,7 @@ export const SCHEDULE: ISchedule = { `8:15`, `8:40`, `9:15`, - `9:15`, + `9:45`, `10:30`, `11:30`, `13:00`, @@ -3683,7 +3683,7 @@ export const SCHEDULE: ISchedule = { `8:17`, `8:42`, `9:17`, - `9:17`, + `9:47`, `10:32`, `11:32`, `13:02`, @@ -3701,7 +3701,7 @@ export const SCHEDULE: ISchedule = { `8:20`, `8:45`, `9:20`, - `9:20`, + `9:50`, `10:35`, `11:35`, `13:05`, @@ -3719,7 +3719,7 @@ export const SCHEDULE: ISchedule = { `8:21`, `8:46`, `9:21`, - `9:21`, + `9:51`, `10:36`, `11:36`, `13:06`, @@ -3737,7 +3737,7 @@ export const SCHEDULE: ISchedule = { `8:23`, `8:48`, `9:23`, - `9:23`, + `9:53`, `10:38`, `11:38`, `13:08`, @@ -3755,7 +3755,7 @@ export const SCHEDULE: ISchedule = { `8:25`, `8:50`, `9:25`, - `9:25`, + `9:55`, `10:40`, `11:40`, `13:10`, @@ -3773,7 +3773,7 @@ export const SCHEDULE: ISchedule = { `8:27`, `8:52`, `9:27`, - `9:27`, + `9:57`, `10:42`, `11:42`, `13:12`, @@ -3791,7 +3791,7 @@ export const SCHEDULE: ISchedule = { `8:29`, `8:54`, `9:29`, - `9:29`, + `9:59`, `10:44`, `11:44`, `13:14`, @@ -3809,7 +3809,7 @@ export const SCHEDULE: ISchedule = { `8:31`, `8:56`, `9:31`, - `9:31`, + `10:31`, `10:46`, `11:46`, `13:16`, @@ -3827,7 +3827,7 @@ export const SCHEDULE: ISchedule = { `8:33`, `8:58`, `9:33`, - `9:33`, + `10:33`, `10:48`, `11:48`, `13:18`, @@ -3845,7 +3845,7 @@ export const SCHEDULE: ISchedule = { `8:35`, `9:00`, `9:35`, - `9:35`, + `10:35`, `10:50`, `11:50`, `13:20`, @@ -3973,7 +3973,7 @@ export const SCHEDULE: ISchedule = { `8:10`, `8:35`, `9:10`, - `9:10`, + `9:40`, `10:25`, `11:25`, `12:55`, @@ -3991,7 +3991,7 @@ export const SCHEDULE: ISchedule = { `8:11`, `8:36`, `9:11`, - `9:11`, + `9:41`, `10:26`, `11:26`, `12:56`, @@ -4009,7 +4009,7 @@ export const SCHEDULE: ISchedule = { `8:13`, `8:38`, `9:13`, - `9:13`, + `9:43`, `10:28`, `11:28`, `12:58`, @@ -4027,7 +4027,7 @@ export const SCHEDULE: ISchedule = { `8:15`, `8:40`, `9:15`, - `9:15`, + `9:45`, `10:30`, `11:30`, `13:00`, @@ -4045,7 +4045,7 @@ export const SCHEDULE: ISchedule = { `8:17`, `8:42`, `9:17`, - `9:17`, + `9:47`, `10:32`, `11:32`, `13:02`, @@ -4063,7 +4063,7 @@ export const SCHEDULE: ISchedule = { `8:20`, `8:45`, `9:20`, - `9:20`, + `9:50`, `10:35`, `11:35`, `13:05`, @@ -4081,7 +4081,7 @@ export const SCHEDULE: ISchedule = { `8:21`, `8:46`, `9:21`, - `9:21`, + `9:51`, `10:36`, `11:36`, `13:06`, @@ -4099,7 +4099,7 @@ export const SCHEDULE: ISchedule = { `8:23`, `8:48`, `9:23`, - `9:23`, + `9:53`, `10:38`, `11:38`, `13:08`, @@ -4117,7 +4117,7 @@ export const SCHEDULE: ISchedule = { `8:25`, `8:50`, `9:25`, - `9:25`, + `9:55`, `10:40`, `11:40`, `13:10`, @@ -4135,7 +4135,7 @@ export const SCHEDULE: ISchedule = { `8:27`, `8:52`, `9:27`, - `9:27`, + `9:57`, `10:42`, `11:42`, `13:12`, @@ -4153,7 +4153,7 @@ export const SCHEDULE: ISchedule = { `8:29`, `8:54`, `9:29`, - `9:29`, + `9:59`, `10:44`, `11:44`, `13:14`, @@ -4171,7 +4171,7 @@ export const SCHEDULE: ISchedule = { `8:31`, `8:56`, `9:31`, - `9:31`, + `10:31`, `10:46`, `11:46`, `13:16`, @@ -4189,7 +4189,7 @@ export const SCHEDULE: ISchedule = { `8:33`, `8:58`, `9:33`, - `9:33`, + `10:33`, `10:48`, `11:48`, `13:18`, @@ -4207,7 +4207,7 @@ export const SCHEDULE: ISchedule = { `8:35`, `9:00`, `9:35`, - `9:35`, + `10:35`, `10:50`, `11:50`, `13:20`, @@ -4335,7 +4335,7 @@ export const SCHEDULE: ISchedule = { `8:10`, `8:35`, `9:10`, - `9:10`, + `9:40`, `10:25`, `11:25`, `12:55`, @@ -4353,7 +4353,7 @@ export const SCHEDULE: ISchedule = { `8:11`, `8:36`, `9:11`, - `9:11`, + `9:41`, `10:26`, `11:26`, `12:56`, @@ -4371,7 +4371,7 @@ export const SCHEDULE: ISchedule = { `8:13`, `8:38`, `9:13`, - `9:13`, + `9:43`, `10:28`, `11:28`, `12:58`, @@ -4389,7 +4389,7 @@ export const SCHEDULE: ISchedule = { `8:15`, `8:40`, `9:15`, - `9:15`, + `9:45`, `10:30`, `11:30`, `13:00`, @@ -4407,7 +4407,7 @@ export const SCHEDULE: ISchedule = { `8:17`, `8:42`, `9:17`, - `9:17`, + `9:47`, `10:32`, `11:32`, `13:02`, @@ -4425,7 +4425,7 @@ export const SCHEDULE: ISchedule = { `8:20`, `8:45`, `9:20`, - `9:20`, + `9:50`, `10:35`, `11:35`, `13:05`, @@ -4443,7 +4443,7 @@ export const SCHEDULE: ISchedule = { `8:21`, `8:46`, `9:21`, - `9:21`, + `9:51`, `10:36`, `11:36`, `13:06`, @@ -4461,7 +4461,7 @@ export const SCHEDULE: ISchedule = { `8:23`, `8:48`, `9:23`, - `9:23`, + `9:53`, `10:38`, `11:38`, `13:08`, @@ -4479,7 +4479,7 @@ export const SCHEDULE: ISchedule = { `8:25`, `8:50`, `9:25`, - `9:25`, + `9:55`, `10:40`, `11:40`, `13:10`, @@ -4497,7 +4497,7 @@ export const SCHEDULE: ISchedule = { `8:27`, `8:52`, `9:27`, - `9:27`, + `9:57`, `10:42`, `11:42`, `13:12`, @@ -4515,7 +4515,7 @@ export const SCHEDULE: ISchedule = { `8:29`, `8:54`, `9:29`, - `9:29`, + `9:59`, `10:44`, `11:44`, `13:14`, @@ -4533,7 +4533,7 @@ export const SCHEDULE: ISchedule = { `8:31`, `8:56`, `9:31`, - `9:31`, + `10:31`, `10:46`, `11:46`, `13:16`, @@ -4551,7 +4551,7 @@ export const SCHEDULE: ISchedule = { `8:33`, `8:58`, `9:33`, - `9:33`, + `10:33`, `10:48`, `11:48`, `13:18`, @@ -4569,7 +4569,7 @@ export const SCHEDULE: ISchedule = { `8:35`, `9:00`, `9:35`, - `9:35`, + `10:35`, `10:50`, `11:50`, `13:20`, @@ -4584,725 +4584,645 @@ export const SCHEDULE: ISchedule = { '5': { 'Железнодорожная больница': [ `5:50`, - `6:50`, - `7:20`, - `8:00`, - `8:25`, - `9:00`, - `9:30`, - `10:15`, - `11:15`, - `12:45`, - `14:15`, - `15:15`, - `16:15`, - `17:00`, - `17:35`, - `18:55`, + `7:10`, + `8:10`, + `10:00`, + `10:52`, + `11:51`, + `12:48`, + `13:45`, + `14:12`, + `15:40`, + `16:37`, + `17:42`, + `18:04`, + `19:37`, ], Калиновского: [ `5:52`, - `6:52`, - `7:22`, - `8:02`, - `8:27`, - `9:02`, - `9:32`, - `10:17`, - `11:17`, - `12:47`, - `14:17`, - `15:17`, - `16:17`, - `17:02`, - `17:37`, - `18:57`, + `7:12`, + `8:12`, + `10:02`, + `10:54`, + `11:53`, + `12:50`, + `13:47`, + `14:14`, + `15:42`, + `16:39`, + `17:44`, + `18:06`, + `19:39`, ], 'Центр детей и молодёжи': [ `5:54`, - `6:54`, - `7:24`, - `8:04`, - `8:29`, - `9:04`, - `9:34`, - `10:19`, - `11:19`, - `12:49`, - `14:19`, - `15:19`, - `16:19`, - `17:04`, - `17:39`, - `18:59`, + `7:14`, + `8:14`, + `10:04`, + `10:56`, + `11:55`, + `12:52`, + `13:49`, + `14:16`, + `15:44`, + `16:41`, + `17:46`, + `18:08`, + `19:41`, ], 'Проезд Гагарина': [ `5:56`, - `6:56`, - `7:26`, - `8:06`, - `8:31`, - `9:06`, - `9:36`, - `10:21`, - `11:21`, - `12:51`, - `14:21`, - `15:21`, - `16:21`, - `17:06`, - `17:41`, - `19:01`, + `7:16`, + `8:16`, + `10:06`, + `10:58`, + `11:57`, + `12:54`, + `13:51`, + `14:18`, + `15:46`, + `16:43`, + `17:48`, + `18:10`, + `19:43`, ], РСУ: [ `5:57`, - `6:57`, - `7:27`, - `8:07`, - `8:32`, - `9:07`, - `9:37`, - `10:22`, - `11:22`, - `12:52`, - `14:22`, - `15:22`, - `16:22`, - `17:07`, - `17:42`, - `19:02`, - ], - Гагарина: [ - `5:58`, - `6:58`, - `7:28`, - `8:08`, - `8:33`, - `9:08`, - `9:38`, - `10:23`, - `11:23`, - `12:53`, - `14:23`, - `15:23`, - `16:23`, - `17:08`, - `17:43`, - `19:03`, + `7:17`, + `8:17`, + `10:07`, + `10:59`, + `11:58`, + `12:55`, + `13:52`, + `14:19`, + `15:47`, + `16:44`, + `17:49`, + `18:11`, + `19:44`, + ], + Гагарина: [ + `5:58`, + `7:18`, + `8:18`, + `10:08`, + `11:00`, + `11:59`, + `12:56`, + `13:53`, + `14:20`, + `15:48`, + `16:45`, + `17:50`, + `18:12`, + `19:45`, ], Типография: [ `6:00`, - `7:00`, - `8:30`, - `8:10`, - `8:35`, - `9:10`, - `9:10`, - `10:25`, - `11:25`, - `12:55`, - `14:25`, - `15:25`, - `16:25`, - `17:10`, - `17:45`, - `19:05`, + `7:20`, + `8:20`, + `10:10`, + `11:02`, + `12:01`, + `12:58`, + `13:55`, + `14:22`, + `15:50`, + `16:47`, + `17:52`, + `18:14`, + `19:47`, ], Белсоюзпечать: [ `6:01`, - `7:01`, - `8:31`, - `8:11`, - `8:36`, - `9:11`, - `9:11`, - `10:26`, - `11:26`, - `12:56`, - `14:26`, - `15:26`, - `16:26`, - `17:11`, - `17:46`, - `19:06`, + `7:21`, + `8:21`, + `10:11`, + `11:03`, + `12:02`, + `12:59`, + `13:56`, + `14:23`, + `15:51`, + `16:48`, + `17:53`, + `18:15`, + `19:48`, ], Автовокзал: [ `6:03`, - `7:03`, - `8:33`, - `8:13`, - `8:38`, - `9:13`, - `9:13`, - `10:28`, - `11:28`, - `12:58`, - `14:28`, - `15:28`, - `16:28`, - `17:13`, - `17:48`, - `19:08`, + `7:23`, + `8:23`, + `10:13`, + `11:05`, + `12:04`, + `13:01`, + `13:58`, + `14:25`, + `15:53`, + `16:50`, + `17:55`, + `18:17`, + `19:50`, ], 'Дом торгволи': [ `6:05`, - `7:05`, - `8:35`, - `8:15`, - `8:40`, - `9:15`, - `9:15`, - `10:30`, - `11:30`, - `13:00`, - `14:30`, - `15:30`, - `16:30`, - `17:15`, - `17:50`, - `19:10`, + `7:25`, + `8:25`, + `10:15`, + `11:07`, + `12:06`, + `13:03`, + `14:00`, + `14:27`, + `15:55`, + `16:52`, + `17:57`, + `18:19`, + `19:52`, ], Поликлиника: [ `6:07`, - `7:07`, - `8:37`, - `8:17`, - `8:42`, - `9:17`, - `9:17`, - `10:32`, - `11:32`, - `13:02`, - `14:32`, - `15:32`, - `16:32`, - `17:17`, - `17:52`, - `19:12`, + `7:27`, + `8:27`, + `10:17`, + `11:09`, + `12:08`, + `13:05`, + `14:02`, + `14:29`, + `15:57`, + `16:54`, + `17:59`, + `18:21`, + `19:54`, ], 'Педагогический колледж': [ `6:10`, - `7:10`, - `8:40`, - `8:20`, - `8:45`, - `9:20`, - `9:20`, - `10:35`, - `11:35`, - `13:05`, - `14:35`, - `15:35`, - `16:35`, - `17:20`, - `17:55`, - `19:15`, + `7:30`, + `8:30`, + `10:20`, + `11:12`, + `12:11`, + `13:08`, + `14:05`, + `14:32`, + `16:00`, + `16:57`, + `18:02`, + `18:24`, + `19:57`, ], 'Экономический колледж': [ `6:11`, - `7:11`, - `8:41`, - `8:21`, - `8:46`, - `9:21`, - `9:21`, - `10:36`, - `11:36`, - `13:06`, - `14:36`, - `15:36`, - `16:36`, - `17:21`, - `17:56`, - `19:16`, + `7:31`, + `8:31`, + `10:21`, + `11:13`, + `12:12`, + `13:09`, + `14:06`, + `14:33`, + `16:01`, + `16:58`, + `18:03`, + `18:25`, + `19:58`, ], Олимпиец: [ `6:13`, - `7:13`, - `8:43`, - `8:23`, - `8:48`, - `9:23`, - `9:23`, - `10:38`, - `11:38`, - `13:08`, - `14:38`, - `15:38`, - `16:38`, - `17:23`, - `17:58`, - `19:18`, + `7:33`, + `8:33`, + `10:23`, + `11:15`, + `12:14`, + `13:11`, + `14:08`, + `14:35`, + `16:03`, + `17:00`, + `18:05`, + `18:27`, + `20:00`, ], Спортклуб: [ `6:15`, - `7:15`, - `8:45`, - `8:25`, - `8:50`, - `9:25`, - `9:25`, - `10:40`, - `11:40`, - `13:10`, - `14:40`, - `15:40`, - `16:40`, - `17:25`, - `18:00`, - `19:20`, + `7:35`, + `8:35`, + `10:25`, + `11:17`, + `12:16`, + `13:13`, + `14:10`, + `14:37`, + `16:05`, + `17:02`, + `18:07`, + `18:29`, + `20:02`, ], Энергосбыт: [ `6:17`, - `7:17`, - `8:47`, - `8:27`, - `8:52`, - `9:27`, - `9:27`, - `10:42`, - `11:42`, - `13:12`, - `14:42`, - `15:42`, - `16:42`, - `17:27`, - `18:02`, - `19:22`, + `7:37`, + `8:37`, + `10:27`, + `11:19`, + `12:18`, + `13:15`, + `14:12`, + `14:39`, + `16:07`, + `17:04`, + `18:09`, + `18:31`, + `20:04`, ], Заполотье: [ `6:19`, - `7:19`, - `8:49`, - `8:29`, - `8:54`, - `9:29`, - `9:29`, - `10:44`, - `11:44`, - `13:14`, - `14:44`, - `15:44`, - `16:44`, - `17:29`, - `18:04`, - `19:24`, + `7:39`, + `8:39`, + `10:29`, + `11:21`, + `12:20`, + `13:17`, + `14:14`, + `14:41`, + `16:09`, + `17:06`, + `18:11`, + `18:33`, + `20:06`, ], Экимань: [ `6:21`, - `7:21`, - `8:51`, - `8:31`, - `8:56`, - `9:31`, - `9:31`, - `10:46`, - `11:46`, - `13:16`, - `14:46`, - `15:46`, - `16:46`, - `17:31`, - `18:06`, - `19:26`, - ], - Курган: [ - `6:23`, - `7:23`, - `8:53`, - `8:33`, - `8:58`, - `9:33`, - `9:33`, - `10:48`, - `11:48`, - `13:18`, - `14:48`, - `15:48`, - `16:48`, - `17:33`, - `18:08`, - `19:28`, + `7:41`, + `8:41`, + `10:31`, + `11:23`, + `12:22`, + `13:19`, + `14:16`, + `14:43`, + `16:11`, + `17:08`, + `18:13`, + `18:35`, + `20:08`, + ], + Курган: [ + `6:23`, + `7:43`, + `8:43`, + `10:33`, + `11:25`, + `12:24`, + `13:21`, + `14:18`, + `14:45`, + `16:13`, + `17:10`, + `18:15`, + `18:37`, + `20:10`, ], Больница: [ `6:25`, - `7:25`, - `8:55`, - `8:35`, - `9:00`, - `9:35`, - `9:35`, - `10:50`, - `11:50`, - `13:20`, - `14:50`, - `15:50`, - `16:50`, - `17:35`, - `18:10`, - `19:30`, + `7:45`, + `8:45`, + `10:35`, + `11:27`, + `12:26`, + `13:23`, + `14:20`, + `14:47`, + `16:15`, + `17:12`, + `18:17`, + `18:39`, + `20:12`, ], }, '6': { 'Железнодорожная больница': [ `5:50`, - `6:50`, - `7:20`, - `8:00`, - `8:25`, - `9:00`, - `9:30`, - `10:15`, - `11:15`, - `12:45`, - `14:15`, - `15:15`, - `16:15`, - `17:00`, - `17:35`, - `18:55`, + `7:10`, + `8:10`, + `10:00`, + `10:52`, + `11:51`, + `12:48`, + `13:45`, + `14:12`, + `15:40`, + `16:37`, + `17:42`, + `18:04`, + `19:37`, ], Калиновского: [ `5:52`, - `6:52`, - `7:22`, - `8:02`, - `8:27`, - `9:02`, - `9:32`, - `10:17`, - `11:17`, - `12:47`, - `14:17`, - `15:17`, - `16:17`, - `17:02`, - `17:37`, - `18:57`, + `7:12`, + `8:12`, + `10:02`, + `10:54`, + `11:53`, + `12:50`, + `13:47`, + `14:14`, + `15:42`, + `16:39`, + `17:44`, + `18:06`, + `19:39`, ], 'Центр детей и молодёжи': [ `5:54`, - `6:54`, - `7:24`, - `8:04`, - `8:29`, - `9:04`, - `9:34`, - `10:19`, - `11:19`, - `12:49`, - `14:19`, - `15:19`, - `16:19`, - `17:04`, - `17:39`, - `18:59`, + `7:14`, + `8:14`, + `10:04`, + `10:56`, + `11:55`, + `12:52`, + `13:49`, + `14:16`, + `15:44`, + `16:41`, + `17:46`, + `18:08`, + `19:41`, ], 'Проезд Гагарина': [ `5:56`, - `6:56`, - `7:26`, - `8:06`, - `8:31`, - `9:06`, - `9:36`, - `10:21`, - `11:21`, - `12:51`, - `14:21`, - `15:21`, - `16:21`, - `17:06`, - `17:41`, - `19:01`, + `7:16`, + `8:16`, + `10:06`, + `10:58`, + `11:57`, + `12:54`, + `13:51`, + `14:18`, + `15:46`, + `16:43`, + `17:48`, + `18:10`, + `19:43`, ], РСУ: [ `5:57`, - `6:57`, - `7:27`, - `8:07`, - `8:32`, - `9:07`, - `9:37`, - `10:22`, - `11:22`, - `12:52`, - `14:22`, - `15:22`, - `16:22`, - `17:07`, - `17:42`, - `19:02`, + `7:17`, + `8:17`, + `10:07`, + `10:59`, + `11:58`, + `12:55`, + `13:52`, + `14:19`, + `15:47`, + `16:44`, + `17:49`, + `18:11`, + `19:44`, ], Гагарина: [ `5:58`, - `6:58`, - `7:28`, - `8:08`, - `8:33`, - `9:08`, - `9:38`, - `10:23`, - `11:23`, - `12:53`, - `14:23`, - `15:23`, - `16:23`, - `17:08`, - `17:43`, - `19:03`, + `7:18`, + `8:18`, + `10:08`, + `11:00`, + `11:59`, + `12:56`, + `13:53`, + `14:20`, + `15:48`, + `16:45`, + `17:50`, + `18:12`, + `19:45`, ], Типография: [ `6:00`, - `7:00`, - `8:30`, - `8:10`, - `8:35`, - `9:10`, - `9:40`, - `10:25`, - `11:25`, - `12:55`, - `14:25`, - `15:25`, - `16:25`, - `17:10`, - `17:45`, - `19:05`, + `7:20`, + `8:20`, + `10:10`, + `11:02`, + `12:01`, + `12:58`, + `13:55`, + `14:22`, + `15:50`, + `16:47`, + `17:52`, + `18:14`, + `19:47`, ], Белсоюзпечать: [ `6:01`, - `7:01`, - `8:31`, - `8:11`, - `8:36`, - `9:11`, - `9:41`, - `10:26`, - `11:26`, - `12:56`, - `14:26`, - `15:26`, - `16:26`, - `17:11`, - `17:46`, - `19:06`, + `7:21`, + `8:21`, + `10:11`, + `11:03`, + `12:02`, + `12:59`, + `13:56`, + `14:23`, + `15:51`, + `16:48`, + `17:53`, + `18:15`, + `19:48`, ], Автовокзал: [ `6:03`, - `7:03`, - `8:33`, - `8:13`, - `8:38`, - `9:13`, - `9:43`, - `10:28`, - `11:28`, - `12:58`, - `14:28`, - `15:28`, - `16:28`, - `17:13`, - `17:48`, - `19:08`, + `7:23`, + `8:23`, + `10:13`, + `11:05`, + `12:04`, + `13:01`, + `13:58`, + `14:25`, + `15:53`, + `16:50`, + `17:55`, + `18:17`, + `19:50`, ], 'Дом торгволи': [ `6:05`, - `7:05`, - `8:35`, - `8:15`, - `8:40`, - `9:15`, - `9:45`, - `10:30`, - `11:30`, - `13:00`, - `14:30`, - `15:30`, - `16:30`, - `17:15`, - `17:50`, - `19:10`, + `7:25`, + `8:25`, + `10:15`, + `11:07`, + `12:06`, + `13:03`, + `14:00`, + `14:27`, + `15:55`, + `16:52`, + `17:57`, + `18:19`, + `19:52`, ], Поликлиника: [ `6:07`, - `7:07`, - `8:37`, - `8:17`, - `8:42`, - `9:17`, - `9:47`, - `10:32`, - `11:32`, - `13:02`, - `14:32`, - `15:32`, - `16:32`, - `17:17`, - `17:52`, - `19:12`, + `7:27`, + `8:27`, + `10:17`, + `11:09`, + `12:08`, + `13:05`, + `14:02`, + `14:29`, + `15:57`, + `16:54`, + `17:59`, + `18:21`, + `19:54`, ], 'Педагогический колледж': [ `6:10`, - `7:10`, - `8:40`, - `8:20`, - `8:45`, - `9:20`, - `9:50`, - `10:35`, - `11:35`, - `13:05`, - `14:35`, - `15:35`, - `16:35`, - `17:20`, - `17:55`, - `19:15`, + `7:30`, + `8:30`, + `10:20`, + `11:12`, + `12:11`, + `13:08`, + `14:05`, + `14:32`, + `16:00`, + `16:57`, + `18:02`, + `18:24`, + `19:57`, ], 'Экономический колледж': [ `6:11`, - `7:11`, - `8:41`, - `8:21`, - `8:46`, - `9:21`, - `9:51`, - `10:36`, - `11:36`, - `13:06`, - `14:36`, - `15:36`, - `16:36`, - `17:21`, - `17:56`, - `19:16`, + `7:31`, + `8:31`, + `10:21`, + `11:13`, + `12:12`, + `13:09`, + `14:06`, + `14:33`, + `16:01`, + `16:58`, + `18:03`, + `18:25`, + `19:58`, ], Олимпиец: [ `6:13`, - `7:13`, - `8:43`, - `8:23`, - `8:48`, - `9:23`, - `9:53`, - `10:38`, - `11:38`, - `13:08`, - `14:38`, - `15:38`, - `16:38`, - `17:23`, - `17:58`, - `19:18`, + `7:33`, + `8:33`, + `10:23`, + `11:15`, + `12:14`, + `13:11`, + `14:08`, + `14:35`, + `16:03`, + `17:00`, + `18:05`, + `18:27`, + `20:00`, ], Спортклуб: [ `6:15`, - `7:15`, - `8:45`, - `8:25`, - `8:50`, - `9:25`, - `9:55`, - `10:40`, - `11:40`, - `13:10`, - `14:40`, - `15:40`, - `16:40`, - `17:25`, - `18:00`, - `19:20`, + `7:35`, + `8:35`, + `10:25`, + `11:17`, + `12:16`, + `13:13`, + `14:10`, + `14:37`, + `16:05`, + `17:02`, + `18:07`, + `18:29`, + `20:02`, ], Энергосбыт: [ `6:17`, - `7:17`, - `8:47`, - `8:27`, - `8:52`, - `9:27`, - `9:57`, - `10:42`, - `11:42`, - `13:12`, - `14:42`, - `15:42`, - `16:42`, - `17:27`, - `18:02`, - `19:22`, + `7:37`, + `8:37`, + `10:27`, + `11:19`, + `12:18`, + `13:15`, + `14:12`, + `14:39`, + `16:07`, + `17:04`, + `18:09`, + `18:31`, + `20:04`, ], Заполотье: [ `6:19`, - `7:19`, - `8:49`, - `8:29`, - `8:54`, - `9:29`, - `9:59`, - `10:44`, - `11:44`, - `13:14`, - `14:44`, - `15:44`, - `16:44`, - `17:29`, - `18:04`, - `19:24`, + `7:39`, + `8:39`, + `10:29`, + `11:21`, + `12:20`, + `13:17`, + `14:14`, + `14:41`, + `16:09`, + `17:06`, + `18:11`, + `18:33`, + `20:06`, ], Экимань: [ `6:21`, - `7:21`, - `8:51`, - `8:31`, - `8:56`, - `9:31`, - `10:01`, - `10:46`, - `11:46`, - `13:16`, - `14:46`, - `15:46`, - `16:46`, - `17:31`, - `18:06`, - `19:26`, + `7:41`, + `8:41`, + `10:31`, + `11:23`, + `12:22`, + `13:19`, + `14:16`, + `14:43`, + `16:11`, + `17:08`, + `18:13`, + `18:35`, + `20:08`, ], Курган: [ `6:23`, - `7:23`, - `8:53`, - `8:33`, - `8:58`, - `9:33`, - `10:03`, - `10:48`, - `11:48`, - `13:18`, - `14:48`, - `15:48`, - `16:48`, - `17:33`, - `18:08`, - `19:28`, + `7:43`, + `8:43`, + `10:33`, + `11:25`, + `12:24`, + `13:21`, + `14:18`, + `14:45`, + `16:13`, + `17:10`, + `18:15`, + `18:37`, + `20:10`, ], Больница: [ `6:25`, - `7:25`, - `8:55`, - `8:35`, - `9:00`, - `9:35`, - `10:05`, - `10:50`, - `11:50`, - `13:20`, - `14:50`, - `15:50`, - `16:50`, - `17:35`, - `18:10`, - `19:30`, + `7:45`, + `8:45`, + `10:35`, + `11:27`, + `12:26`, + `13:23`, + `14:20`, + `14:47`, + `16:15`, + `17:12`, + `18:17`, + `18:39`, + `20:12`, ], }, }, diff --git a/src/shared/configs/base.ts b/src/shared/configs/base.ts index d7a68b0..a45037d 100644 --- a/src/shared/configs/base.ts +++ b/src/shared/configs/base.ts @@ -1,5 +1,5 @@ export const config = { - CONTENTFUL_TOKEN: `vzn0kpyr3xFJvVD5opyxAX-7hbe51Phular7apQnzgI`, + CONTENTFUL_TOKEN: `SssWuor0jdefGrv7pmWD0YOnIxrFeNlFgJjadvYvkhg`, GOOGLE_UID: `UA-1234-1`, YANDEX_ID: 97394841, } diff --git a/src/widget/Map/ui/MapContent.tsx b/src/widget/Map/ui/MapContent.tsx index e176cca..aff6115 100644 --- a/src/widget/Map/ui/MapContent.tsx +++ b/src/widget/Map/ui/MapContent.tsx @@ -39,14 +39,14 @@ export const MapContent: React.FC<{ map: TMap }> = ({ map }) => { const busStop = useSelector(busStopNewSelector) const userLocation = useSelector(userLocationSelector) const currentDayKey = useSelector(currentDaySelector) - const shedule = useSelector(scheduleSelector) + const schedule = useSelector(scheduleSelector) const [stopsCollection, setStopsCollections] = useState([]) const updater = useEverySecondUpdater() const [mapLoaded, setMapLoaded] = useState(false) const getCurrentTime = useCallback( (stop: IStops | IStops): ITime => { - const closestTime = findClosesTime(shedule[stop.direction][currentDayKey][stop.label]) + const closestTime = findClosesTime(schedule[stop.direction][currentDayKey][stop.label]) if (!closestTime) return { @@ -56,7 +56,7 @@ export const MapContent: React.FC<{ map: TMap }> = ({ map }) => { return calculateHowMuchIsLeft(closestTime) }, - [currentDayKey, shedule], + [currentDayKey, schedule], ) const flyToStop = useCallback( @@ -296,4 +296,4 @@ export const MapContent: React.FC<{ map: TMap }> = ({ map }) => { }, [dispath, map]) return -} +} \ No newline at end of file