{Object.entries(sortByDay(marksByDay)).map(([day, lessonGrades]) => (
-
+
{Object.entries(lessonGrades).map(([lessonName, grades]) => (
{grades.map((grade, gradeIndex) => (
-
-
+ // @ts-ignore
+
+
+
+
))}
@@ -56,7 +67,7 @@ const MarksByDay: FC
= ({ performanceData }) => {
- );
-};
+ )
+}
-export default MarksByDay;
+export default MarksByDay
diff --git a/src/components/UI/NotFound.tsx b/src/components/UI/NotFound.tsx
index e9b44a09..b0916c2b 100644
--- a/src/components/UI/NotFound.tsx
+++ b/src/components/UI/NotFound.tsx
@@ -1,9 +1,7 @@
-import { CSSProperties } from 'react';
-import {
- AppRoot, Button, Div,
-} from '@vkontakte/vkui';
-import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
-import { useInsets } from '@vkontakte/vk-bridge-react';
+import { AppRoot, Button, Div } from '@vkontakte/vkui'
+import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router'
+import { useInsets } from '@vkontakte/vk-bridge-react'
+import { CSSProperties } from 'preact/compat'
const notFoundStyle: CSSProperties = {
display: 'flex',
@@ -13,7 +11,7 @@ const notFoundStyle: CSSProperties = {
alignItems: 'center',
justifyContent: 'center',
textAlign: 'center',
-};
+}
const text: CSSProperties = {
padding: '0px 8px',
@@ -23,11 +21,11 @@ const text: CSSProperties = {
background: 'rgba(63, 138, 224, 0.08)',
borderRadius: 8,
marginBottom: 40,
-};
+}
const NotFound = () => {
- const routeNavigator = useRouteNavigator();
- const vkBridgeInsets = useInsets() || undefined;
+ const routeNavigator = useRouteNavigator()
+ const vkBridgeInsets = useInsets() || undefined
return (
@@ -35,16 +33,16 @@ const NotFound = () => {
404
- );
-};
+ )
+}
-export default NotFound;
+export default NotFound
diff --git a/src/components/UI/PanelHeaderWithBack.tsx b/src/components/UI/PanelHeaderWithBack.tsx
index f14ac18f..93b39db0 100644
--- a/src/components/UI/PanelHeaderWithBack.tsx
+++ b/src/components/UI/PanelHeaderWithBack.tsx
@@ -1,26 +1,19 @@
-import { FC, useEffect } from 'react';
-import { PanelHeader, PanelHeaderBack } from '@vkontakte/vkui';
-import { useActiveVkuiLocation, useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
-import { getCookie } from '../../methods';
-import { MAIN_SETTINGS } from '../../routes';
+import { FunctionalComponent } from 'preact'
+import { PanelHeader, PanelHeaderBack } from '@vkontakte/vkui'
+import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router'
-const PanelHeaderWithBack: FC<{ title: string }> = ({ title }) => {
- const routeNavigator = useRouteNavigator();
- const storageCookie = localStorage.getItem('cookie');
- const { view } = useActiveVkuiLocation();
-
- useEffect(() => {
- getCookie().then((cookieValue) => {
- console.log(cookieValue);
- if ((!storageCookie || !cookieValue) && view !== MAIN_SETTINGS) {
- routeNavigator.replace('/');
- }
- });
- }, [view, localStorage, window.location]);
+const PanelHeaderWithBack: FunctionalComponent<{ title: string }> = ({
+ title,
+}) => {
+ const routeNavigator = useRouteNavigator()
return (
-
routeNavigator.back()} />}>{title}
- );
-};
+
routeNavigator.back()} />}
+ >
+ {title}
+
+ )
+}
-export default PanelHeaderWithBack;
+export default PanelHeaderWithBack
diff --git a/src/components/UI/SubjectsList.tsx b/src/components/UI/SubjectsList.tsx
index 11579c18..d56f9f63 100644
--- a/src/components/UI/SubjectsList.tsx
+++ b/src/components/UI/SubjectsList.tsx
@@ -1,55 +1,67 @@
-import { FC } from 'react';
import {
- Card, CardGrid, Div, Group, Header, InfoRow, Subhead, Title,
-} from '@vkontakte/vkui';
-import { ExaminationType, Examinations } from 'diary-shared';
+ Card,
+ CardGrid,
+ Div,
+ Group,
+ Header,
+ InfoRow,
+ Subhead,
+ Title,
+} from '@vkontakte/vkui'
+import { ExaminationType, Examinations } from 'diary-shared'
+import { FunctionalComponent } from 'preact'
export interface Subject {
- id: string;
- name: string;
- examinationType: ExaminationType;
- marks: Record
>;
+ id: string
+ name: string
+ examinationType: ExaminationType
+ marks: Record>
}
interface SubjectListProps {
- semesters: Record;
- studentName: string | null;
- year: number | null;
+ semesters: Record
+ studentName: string | null
+ year: number | null
}
-const SubjectList: FC = ({ semesters, studentName, year }) => (
+const SubjectList: FunctionalComponent = ({
+ semesters,
+ studentName,
+ year,
+}) => (
{Object.keys(semesters).map((semesterKey) => (
+ header={
+
- )}
+ }
>
{semesters[semesterKey].map((subject) => (
-
-
+
+
-
{subject.name}
-
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
+ {subject.name}
+
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
{Examinations[subject.examinationType]}
-
+
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
- {subject.marks[subject.id] && Object.keys(subject.marks[subject.id]).length > 0 ? (
- Object.keys(subject.marks[subject.id]).map((studentId) => (
-
- {subject.marks[subject.id][studentId]}
-
- ))
- ) : (
- 'Оценок нет'
- )}
+ {subject.marks[subject.id] &&
+ Object.keys(subject.marks[subject.id]).length > 0
+ ? Object.keys(subject.marks[subject.id]).map(
+ (studentId) => (
+
+ {subject.marks[subject.id][studentId]}
+
+ )
+ )
+ : 'Оценок нет'}
@@ -59,6 +71,6 @@ const SubjectList: FC = ({ semesters, studentName, year }) =>
))}
- {[2, 3, 4, 5].map((mark) => (
- markCounts[mark] > 0 && (
- }
- >
- x
- {' '}
- {markCounts[mark]}
-
- )
- ))}
-
+
+ {[2, 3, 4, 5].map(
+ (mark) =>
+ markCounts[mark] > 0 && (
+ }>
+ x {markCounts[mark]}
+
+ )
+ )}
+
)}
-);
+)
-export default Summary;
+export default Summary
diff --git a/src/components/UI/Suspense.tsx b/src/components/UI/Suspense.tsx
index 583914e8..7742df41 100644
--- a/src/components/UI/Suspense.tsx
+++ b/src/components/UI/Suspense.tsx
@@ -1,34 +1,37 @@
-import { FC, ReactNode, Suspense as ReactSuspense } from 'react';
-import { PanelSpinner, ScreenSpinner, Spinner } from '@vkontakte/vkui';
+import { PanelSpinner, ScreenSpinner, Spinner } from '@vkontakte/vkui'
+import { FC, ReactNode, Suspense as ReactSuspense } from 'preact/compat'
interface ISpinner {
- size?: 'small' | 'regular' | 'medium' | 'large',
- mode?: 'panel' | 'screen' | 'default',
+ size?: 'small' | 'regular' | 'medium' | 'large'
+ mode?: 'panel' | 'screen' | 'default'
}
interface ISuspense extends ISpinner {
- children: ReactNode,
- id: string,
+ children: ReactNode
+ id: string
}
const SpinnerWrapper: FC = ({ size, mode }) => {
switch (mode) {
case 'panel':
- return ;
+ return
case 'screen':
- return ;
+ return
case 'default':
default:
- return ;
+ return
}
-};
+}
const Suspense: FC = ({
- children, size = 'regular', id, mode = 'panel',
+ children,
+ size = 'regular',
+ id,
+ mode = 'panel',
}) => (
}>
{children}
-);
+)
-export default Suspense;
+export default Suspense
diff --git a/src/components/UI/Tabbar.tsx b/src/components/UI/Tabbar.tsx
index de042aec..1e498734 100644
--- a/src/components/UI/Tabbar.tsx
+++ b/src/components/UI/Tabbar.tsx
@@ -1,80 +1,95 @@
-import { FC } from 'react';
-import { TabbarItem, Tabbar as VKUITabbar, useAdaptivityConditionalRender } from '@vkontakte/vkui';
import {
+ TabbarItem,
+ Tabbar as VKUITabbar,
+ useAdaptivityConditionalRender,
+} from '@vkontakte/vkui'
+import {
+ Icon28BookSpreadOutline,
Icon28EducationOutline,
Icon28GraphOutline,
Icon28HelpOutline,
Icon28HomeOutline,
Icon28SettingsOutline,
- Icon28BookSpreadOutline,
-} from '@vkontakte/icons';
+} from '@vkontakte/icons'
+import { FC } from 'preact/compat'
import {
- VIEW_ATTESTATION, VIEW_CONTACTS, VIEW_MARKS, VIEW_NOTIFICATIONS, VIEW_SCHEDULE, VIEW_SETTINGS,
-} from '../../routes';
-import { Pages } from '../../types';
+ VIEW_ATTESTATION,
+ VIEW_CONTACTS,
+ VIEW_MARKS,
+ VIEW_NOTIFICATIONS,
+ VIEW_SCHEDULE,
+ VIEW_SETTINGS,
+} from '../../routes'
+import { Pages } from '../../types'
interface ITabbar {
- onStoryChange: (current: Pages) => void;
- activeView: Pages;
+ onStoryChange: (current: Pages) => void
+ activeView: Pages
}
const Tabbar: FC = ({ onStoryChange, activeView }) => {
- const { viewWidth } = useAdaptivityConditionalRender();
+ const { viewWidth } = useAdaptivityConditionalRender()
return (
viewWidth.tabletMinus && (
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_SCHEDULE)}
selected={activeView === VIEW_SCHEDULE}
data-story={VIEW_SCHEDULE}
- text='Главная'
+ text="Главная"
>
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_MARKS)}
selected={activeView === VIEW_MARKS}
data-story={VIEW_MARKS}
- text='Успеваемость'
+ text="Успеваемость"
>
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_ATTESTATION)}
selected={activeView === VIEW_ATTESTATION}
data-story={VIEW_ATTESTATION}
- text='Аттестация'
+ text="Аттестация"
>
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_NOTIFICATIONS)}
selected={activeView === VIEW_NOTIFICATIONS}
data-story={VIEW_NOTIFICATIONS}
- text='Объявления'
+ text="Объявления"
>
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_CONTACTS)}
selected={activeView === VIEW_CONTACTS}
data-story={VIEW_CONTACTS}
- text='Помощь'
+ text="Помощь"
>
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
onStoryChange(VIEW_SETTINGS)}
selected={activeView === VIEW_SETTINGS}
data-story={VIEW_SETTINGS}
- text='Настройки'
+ text="Настройки"
>
)
- );
-};
+ )
+}
-export default Tabbar;
+export default Tabbar
diff --git a/src/components/UserInfo.tsx b/src/components/UserInfo.tsx
index 0f34c460..b838689a 100644
--- a/src/components/UserInfo.tsx
+++ b/src/components/UserInfo.tsx
@@ -1,17 +1,25 @@
-import { CSSProperties, useEffect, useState } from 'react';
+import { CSSProperties, useEffect, useState } from 'react'
import {
- Avatar, Button, Div, Gradient, Group, Header, ScreenSpinner, SimpleCell, Spinner, Text, Title,
-} from '@vkontakte/vkui';
-import { Icon28SchoolOutline, Icon20RefreshOutline } from '@vkontakte/icons';
-
-import bridge from '@vkontakte/vk-bridge';
-import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
-import { Organization } from 'diary-shared';
-import { getVkStorageData } from '../methods';
-import { useModal } from '../modals/ModalContext';
-import { useRateLimitExceeded } from '../hooks';
-import { MODAL_COLLEGE_INFO } from '../modals/ModalRoot';
-import getCollegeInfo from '../methods/server/getCollegeInfo';
+ Avatar,
+ Button,
+ Div,
+ Gradient,
+ Group,
+ Header,
+ ScreenSpinner,
+ SimpleCell,
+ Spinner,
+ Text,
+ Title,
+} from '@vkontakte/vkui'
+import { Icon20RefreshOutline, Icon28SchoolOutline } from '@vkontakte/icons'
+
+import bridge from '@vkontakte/vk-bridge'
+import { useRouteNavigator } from '@vkontakte/vk-mini-apps-router'
+// import { Organization } from 'diary-shared';
+import { useRateLimitExceeded } from '../hooks'
+import { MODAL_COLLEGE_INFO } from '../modals/ModalRoot'
+import { getCollegeInfo } from '../methods'
const styles: CSSProperties = {
margin: 0,
@@ -21,7 +29,7 @@ const styles: CSSProperties = {
justifyContent: 'center',
textAlign: 'center',
padding: 32,
-};
+}
interface UserData {
city: string
@@ -32,76 +40,76 @@ interface UserData {
const getUserAva = async (): Promise => {
try {
- const data = await bridge.send('VKWebAppGetUserInfo');
+ const data = await bridge.send('VKWebAppGetUserInfo')
if (data.id) {
- localStorage.setItem('ava', data.photo_100);
- return data.photo_100;
+ localStorage.setItem('ava', data.photo_100)
+ return data.photo_100
}
- return null;
+ return null
} catch (error) {
- console.error(error);
- return null;
+ console.error(error)
+ return null
}
-};
+}
const UserInfo = () => {
- const routeNavigator = useRouteNavigator();
+ const routeNavigator = useRouteNavigator()
- const { openCollegeModal } = useModal();
+ // Const { openCollegeModal } = useModal();
- const [isLoading, setIsLoading] = useState(false);
- const [isCollegeLoading, setIsCollegeLoading] = useState(false);
- const [userAva, setUserAva] = useState();
+ const [isLoading, setIsLoading] = useState(false)
+ const [isCollegeLoading, setIsCollegeLoading] = useState(false)
+ const [userAva, setUserAva] = useState()
const [userData, setUserData] = useState({
name: '',
org: '',
city: '',
group: '',
- });
+ })
const getCollegeInfoFromServer = async () => {
- setIsCollegeLoading(true);
+ setIsCollegeLoading(true)
try {
- const data = await getCollegeInfo();
+ const data = await getCollegeInfo()
if (data === 429) {
- useRateLimitExceeded();
- return;
+ useRateLimitExceeded()
+ return
}
- await routeNavigator.showModal(MODAL_COLLEGE_INFO);
- openCollegeModal(data as Organization);
- setIsCollegeLoading(false);
+ await routeNavigator.showModal(MODAL_COLLEGE_INFO)
+ // OpenCollegeModal(data as Organization);
+ setIsCollegeLoading(false)
} catch (e) {
- console.error(e);
+ console.error(e)
}
- };
+ }
const getUserInfo = async (handle?: boolean) => {
- setIsLoading(true);
+ setIsLoading(true)
- const localData = localStorage.getItem('userData');
- const avaFromStorage = localStorage.getItem('ava');
+ const localData = localStorage.getItem('userData')
+ const avaFromStorage = localStorage.getItem('ava')
if (localData && !handle) {
- const parsedData = JSON.parse(localData) as UserData;
+ const parsedData = JSON.parse(localData) as UserData
if (parsedData.name && parsedData.group) {
- setUserData(parsedData);
+ setUserData(parsedData)
if (avaFromStorage) {
- setUserAva(avaFromStorage);
+ setUserAva(avaFromStorage)
}
- setIsLoading(false);
- return;
+ setIsLoading(false)
+ return
}
}
- const newUserData = await getVkStorageData(['data']);
- const parsedUserData = JSON.parse(newUserData.keys[0].value) as UserData;
+ const newUserData = localStorage.getItem('data')
+ const parsedUserData = JSON.parse(newUserData) as UserData
- const ava = await getUserAva();
+ const ava = await getUserAva()
if (ava) {
- setUserAva(ava);
+ setUserAva(ava)
}
setUserData({
@@ -109,71 +117,75 @@ const UserInfo = () => {
org: parsedUserData.org || '',
city: parsedUserData.city || '',
group: parsedUserData.group || '',
- });
+ })
- localStorage.setItem('userData', JSON.stringify(newUserData));
+ localStorage.setItem('userData', JSON.stringify(newUserData))
- setIsLoading(false);
- };
+ setIsLoading(false)
+ }
useEffect(() => {
- getUserInfo();
- }, []);
+ getUserInfo()
+ }, [])
if (isLoading) {
return (
- );
+ )
}
const header = (
}
- aria-label='Обновить'
- mode='tertiary'
+ aria-label="Обновить"
+ mode="tertiary"
onClick={() => getUserInfo(true)}
/>
- )}
- mode='tertiary'
+ }
+ mode="tertiary"
>
Личная информация
- );
+ )
return (
-
-
+
+
-
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
+ <Title style={{ marginBottom: 8, marginTop: 20 }} level="2" weight="2">
{userData.name}
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
- Студент (
- {userData.group}
- )
+ Студент ({userData.group})
- Учебное заведение}>
+ Учебное заведение}
+ >
{isCollegeLoading && }
- } subtitle={userData.city} onClick={getCollegeInfoFromServer}>
+ }
+ subtitle={userData.city}
+ onClick={getCollegeInfoFromServer}
+ >
{userData.org}
- );
-};
+ )
+}
-export default UserInfo;
+export default UserInfo
diff --git a/src/components/data.ts b/src/components/data.ts
index 036b97f7..e1143acf 100644
--- a/src/components/data.ts
+++ b/src/components/data.ts
@@ -1,33 +1,33 @@
-import { IHelpAccordion } from './HelpAccordion';
+import { IHelpAccordion } from './HelpAccordion'
export const helpData: IHelpAccordion[] = [
{
id: 1,
title: 'Часто приходится удалять сервис',
detail:
- 'Как правило, эта проблема появляется на телефонах. Одно из возможных решений — не заходить по прямой ссылке в '
- + 'сервис, а через страницу Сервисы -> Для вас -> Дневник СПО.',
+ 'Как правило, эта проблема появляется на телефонах. Одно из возможных решений — не заходить по прямой ссылке в ' +
+ 'сервис, а через страницу Сервисы -> Для вас -> Дневник СПО.',
},
{
id: 2,
title: 'В сервисе стоит оценка, которой нет в журнале Сетевого города',
detail:
- 'Иногда в журнале может появиться отметка, которой нет в оригинальном дневнике (Сетевой город). Обычно это \'Д\''
- + ' (Долг), но если вы уверены, что долга у вас нет, то напишите нам.',
+ "Иногда в журнале может появиться отметка, которой нет в оригинальном дневнике (Сетевой город). Обычно это 'Д'" +
+ ' (Долг), но если вы уверены, что долга у вас нет, то напишите нам.',
},
{
id: 3,
title: 'На странице Успеваемость нет данных обо мне',
detail:
- 'Если на странице Успеваемость нет данных о вас, то перезайдите в сервис (Настройки - Выйти), но если они '
- + 'неправильные, то сообщите нам. Все данные, кроме аватарки, мы берём из Сетевого города.',
+ 'Если на странице Успеваемость нет данных о вас, то перезайдите в сервис (Настройки - Выйти), но если они ' +
+ 'неправильные, то сообщите нам. Все данные, кроме аватарки, мы берём из Сетевого города.',
},
{
id: 4,
title: 'Везде ошибка загрузки данных',
detail:
- 'Если вы при заходе на любую страницу получаете ошибку загрузки данных с сервера, то тут может быть несколько '
- + 'проблем: 1. Сервер сетевого города или наш упал(и) — обычно мы сообщаем об этом в группе. 2. Ваша cookie '
- + 'устарела и вам надо получить новую — перезайдите в аккаунт или обновите её в настройках.',
+ 'Если вы при заходе на любую страницу получаете ошибку загрузки данных с сервера, то тут может быть несколько ' +
+ 'проблем: 1. Сервер сетевого города или наш упал(и) — обычно мы сообщаем об этом в группе. 2. Ваша cookie ' +
+ 'устарела и вам надо получить новую — перезайдите в аккаунт или обновите её в настройках.',
},
-];
+]
diff --git a/src/hooks/index.tsx b/src/hooks/index.tsx
index deb23265..3bc4911d 100644
--- a/src/hooks/index.tsx
+++ b/src/hooks/index.tsx
@@ -1,4 +1,4 @@
-export { default as useRateLimitExceeded } from './useRateLimitExceeded';
-export { default as useSnackbar } from './useSnackbar';
-export { default as useScrollPosition } from './useScrollPosition';
-export { default as useDebouncedChangeWeek } from './useDebouncedChangeWeek';
+export { default as useRateLimitExceeded } from './useRateLimitExceeded'
+export { default as useSnackbar } from './useSnackbar'
+export { default as useScrollPosition } from './useScrollPosition'
+export { default as useDebouncedChangeWeek } from './useDebouncedChangeWeek'
diff --git a/src/hooks/useDebouncedChangeWeek.tsx b/src/hooks/useDebouncedChangeWeek.tsx
index bbab0dec..8f5d702e 100644
--- a/src/hooks/useDebouncedChangeWeek.tsx
+++ b/src/hooks/useDebouncedChangeWeek.tsx
@@ -1,59 +1,63 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useState } from 'preact/hooks'
interface SendToServerIfValid {
- (start: Date, end: Date): void;
+ (start: Date, end: Date): void
}
+
const useDebouncedChangeWeek = (
startDate: Date,
endDate: Date,
setIsCurrent: (value: boolean) => void,
setStartDate: (startDate: Date) => void,
- setEndDate: (endDate: Date) => void,
+ setEndDate: (endDate: Date) => void
) => {
- const [clickCount, setClickCount] = useState(0);
- const [timeoutId, setTimeoutId] = useState(null);
+ const [clickCount, setClickCount] = useState(0)
+ const [timeoutId, setTimeoutId] = useState(null)
const debouncedChangeWeek = useCallback(
(direction: 'prev' | 'next', sendToServerIfValid: SendToServerIfValid) => {
- localStorage.setItem('isCurrent', JSON.stringify(false));
- setIsCurrent(false);
- const newStartDate = new Date(startDate);
- const newEndDate = new Date(endDate);
+ localStorage.setItem('isCurrent', JSON.stringify(false))
+ setIsCurrent(false)
+ const newStartDate = new Date(startDate)
+ const newEndDate = new Date(endDate)
if (clickCount > 0) {
- const weekDifference = clickCount * 7;
- newStartDate.setDate(newStartDate.getDate() + weekDifference);
- newEndDate.setDate(newEndDate.getDate() + weekDifference);
- setClickCount(0);
+ const weekDifference = clickCount * 7
+ newStartDate.setDate(newStartDate.getDate() + weekDifference)
+ newEndDate.setDate(newEndDate.getDate() + weekDifference)
+ setClickCount(0)
} else if (direction === 'prev') {
- newStartDate.setDate(newStartDate.getDate() - 7);
- newEndDate.setDate(newEndDate.getDate() - 7);
+ newStartDate.setDate(newStartDate.getDate() - 7)
+ newEndDate.setDate(newEndDate.getDate() - 7)
} else if (direction === 'next') {
- newStartDate.setDate(newStartDate.getDate() + 7);
- newEndDate.setDate(newEndDate.getDate() + 7);
+ newStartDate.setDate(newStartDate.getDate() + 7)
+ newEndDate.setDate(newEndDate.getDate() + 7)
}
- sendToServerIfValid(newStartDate, newEndDate);
- setStartDate(newStartDate);
- setEndDate(newEndDate);
+ sendToServerIfValid(newStartDate, newEndDate)
+ setStartDate(newStartDate)
+ setEndDate(newEndDate)
},
- [clickCount, startDate, endDate, setIsCurrent, setStartDate, setEndDate],
- );
-
- const handleButtonClick = (direction: 'prev' | 'next', sendToServerIfValid: SendToServerIfValid) => {
- setClickCount((prevCount) => prevCount + 1);
+ [clickCount, startDate, endDate, setIsCurrent, setStartDate, setEndDate]
+ )
+
+ const handleButtonClick = (
+ direction: 'prev' | 'next',
+ sendToServerIfValid: SendToServerIfValid
+ ) => {
+ setClickCount((prevCount) => prevCount + 1)
if (timeoutId) {
- clearTimeout(timeoutId);
+ clearTimeout(timeoutId)
}
const newTimeoutId = setTimeout(() => {
- debouncedChangeWeek(direction, sendToServerIfValid);
- setClickCount(0);
- }, 500);
+ debouncedChangeWeek(direction, sendToServerIfValid)
+ setClickCount(0)
+ }, 500)
- setTimeoutId(newTimeoutId);
- };
+ setTimeoutId(newTimeoutId)
+ }
- return { handleButtonClick };
-};
+ return { handleButtonClick }
+}
-export default useDebouncedChangeWeek;
+export default useDebouncedChangeWeek
diff --git a/src/hooks/useRateLimitExceeded.tsx b/src/hooks/useRateLimitExceeded.tsx
index 734dee34..9c132ef3 100644
--- a/src/hooks/useRateLimitExceeded.tsx
+++ b/src/hooks/useRateLimitExceeded.tsx
@@ -1,24 +1,27 @@
-import { ReactNode, useState } from 'react';
-import { Snackbar } from '@vkontakte/vkui';
-import { Icon28ErrorCircleOutline } from '@vkontakte/icons';
+import { Snackbar } from '@vkontakte/vkui'
+import { Icon28ErrorCircleOutline } from '@vkontakte/icons'
+import { useState } from 'preact/hooks'
+import { ReactNode } from 'preact/compat'
const useRateLimitExceeded = (): [ReactNode | null, () => void] => {
- const [rateSnackbar, setRateSnackbar] = useState(null);
+ const [rateSnackbar, setRateSnackbar] = useState(null)
const handleRateLimitExceeded = () => {
setRateSnackbar(
setRateSnackbar(null)}
- before={}
- subtitle='Вы временно заблокированы. Если вы считаете, что это ошибка, то сообщите нам'
+ before={
+
+ }
+ subtitle="Вы временно заблокированы. Если вы считаете, что это ошибка, то сообщите нам"
>
Слишком частые запросы
- ,
- );
- };
+
+ )
+ }
- return [rateSnackbar, handleRateLimitExceeded];
-};
+ return [rateSnackbar, handleRateLimitExceeded]
+}
-export default useRateLimitExceeded;
+export default useRateLimitExceeded
diff --git a/src/hooks/useScrollPosition.tsx b/src/hooks/useScrollPosition.tsx
index 53b42e7c..0a555e69 100644
--- a/src/hooks/useScrollPosition.tsx
+++ b/src/hooks/useScrollPosition.tsx
@@ -1,21 +1,21 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'preact/hooks'
const useScrollPosition = () => {
- const [scrollPosition, setScrollPosition] = useState(0);
+ const [scrollPosition, setScrollPosition] = useState(0)
const handleScroll = () => {
- const currentPosition = window.scrollY;
- setScrollPosition(currentPosition);
- };
+ const currentPosition = window.scrollY
+ setScrollPosition(currentPosition)
+ }
useEffect(() => {
- window.addEventListener('scroll', handleScroll);
+ window.addEventListener('scroll', handleScroll)
return () => {
- window.removeEventListener('scroll', handleScroll);
- };
- }, []);
+ window.removeEventListener('scroll', handleScroll)
+ }
+ }, [])
- return scrollPosition;
-};
+ return scrollPosition
+}
-export default useScrollPosition;
+export default useScrollPosition
diff --git a/src/hooks/useSnackbar.tsx b/src/hooks/useSnackbar.tsx
index 9ab8c928..cbb70ee0 100644
--- a/src/hooks/useSnackbar.tsx
+++ b/src/hooks/useSnackbar.tsx
@@ -1,33 +1,41 @@
-import React, { ReactNode, useCallback, useState } from 'react';
-import { Snackbar, SnackbarProps } from '@vkontakte/vkui';
-import { Icon28InfoCircleOutline } from '@vkontakte/icons';
+import { Snackbar, SnackbarProps } from '@vkontakte/vkui'
+import { Icon28InfoCircleOutline } from '@vkontakte/icons'
+import { CSSProperties, ReactNode } from 'preact/compat'
+import { useCallback, useState } from 'preact/hooks'
export interface SnackbarData {
- layout?: SnackbarProps['layout'];
- icon?: ReactNode;
- action?: string;
- onActionClick?: () => void;
- onClose?: () => void;
- duration?: number;
- style?: React.CSSProperties;
- title: string;
- subtitle?: string;
+ layout?: SnackbarProps['layout']
+ icon?: ReactNode
+ action?: string
+ onActionClick?: () => void
+ onClose?: () => void
+ duration?: number
+ style?: CSSProperties
+ title: string
+ subtitle?: string
}
-const useSnackbar = (): [ReactNode | null, (snackbarData: SnackbarData | null) => void] => {
- const [snackbar, setSnackbar] = useState(null);
+const useSnackbar = (): [
+ ReactNode | null,
+ (snackbarData: SnackbarData | null) => void,
+] => {
+ const [snackbar, setSnackbar] = useState(null)
const showSnackbar = useCallback((snackbarData: SnackbarData | null) => {
if (!snackbarData) {
- setSnackbar(null);
- return null;
+ setSnackbar(null)
+ return null
}
setSnackbar(
setSnackbar(null)}
- before={snackbarData.icon || }
+ before={
+ snackbarData.icon || (
+
+ )
+ }
action={snackbarData.action}
onActionClick={snackbarData.onActionClick}
duration={snackbarData.duration}
@@ -35,13 +43,13 @@ const useSnackbar = (): [ReactNode | null, (snackbarData: SnackbarData | null) =
subtitle={snackbarData.subtitle}
>
{snackbarData.title}
- ,
- );
+
+ )
- return null;
- }, []);
+ return null
+ }, [])
- return [snackbar, showSnackbar];
-};
+ return [snackbar, showSnackbar]
+}
-export default useSnackbar;
+export default useSnackbar
diff --git a/src/index.css b/src/index.css
index 82753354..59388051 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,16 +1,16 @@
._HorizontalCell__content_1q642_21 {
- word-break: unset !important;
+ word-break: unset !important;
}
-._SimpleCell__subtitle_rmh19_48, ._SimpleCell__extraSubtitle_rmh19_49 {
- width: 100%;
+._SimpleCell__subtitle_rmh19_48, ._SimpleCell__extraSubtitle_rmh19_49, .lesson ._Typography_182ve_1 {
+ width: 100%;
}
@media (max-width: 767.9px) {
- ._Tappable--sizeX-none_49f5u_121 {
- border-radius: 8px !important;
- }
+ ._Tappable--sizeX-none_49f5u_121 {
+ border-radius: 8px !important;
+ }
+}
+._HorizontalCell_1q642_1:first-child::before, ._HorizontalCell_1q642_1:last-child::after {
+ content: none !important;
}
- ._HorizontalCell_1q642_1:first-child::before, ._HorizontalCell_1q642_1:last-child::after {
- content: none !important;
- }
diff --git a/src/main.tsx b/src/main.tsx
index abb41303..9dc0e315 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,16 +1,12 @@
-import { lazy } from 'react';
-import { createRoot } from 'react-dom/client';
-import '@vkontakte/vkui/dist/cssm/styles/themes.css';
-import './index.css';
-import Suspense from './components/UI/Suspense';
+import { render } from 'preact'
+import './index.css'
+import '@vkontakte/vkui/dist/vkui.css'
+import Suspense from './components/UI/Suspense.tsx'
+import AppWrapper from './AppWrapper.tsx'
-const AppWrapper = lazy(() => import('./AppWrapper'));
-
-const domNode = document.getElementById('root')!;
-const root = createRoot(domNode);
-
-root.render(
-
+render(
+
,
-);
+ document.getElementById('app')!
+)
diff --git a/src/methods/bridge/appStorageSet.ts b/src/methods/bridge/appStorageSet.ts
deleted file mode 100644
index 11a33780..00000000
--- a/src/methods/bridge/appStorageSet.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import bridge from '@vkontakte/vk-bridge';
-
-export const appStorageSet = async (key: string, value: string): Promise => {
- try {
- const data = await bridge.send('VKWebAppStorageSet', {
- key,
- value,
- });
-
- if (data.result) {
- return data.result;
- }
-
- return false;
- } catch (error) {
- console.error(error);
- return error as string;
- }
-};
diff --git a/src/methods/bridge/getCookie.ts b/src/methods/bridge/getCookie.ts
deleted file mode 100644
index 3d7113da..00000000
--- a/src/methods/bridge/getCookie.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import bridge from '@vkontakte/vk-bridge';
-
-export const getCookie = async () => {
- try {
- const data = await bridge.send('VKWebAppStorageGet', {
- keys: ['cookie'],
- });
- if (data.keys) {
- console.log(data.keys);
- return data.keys[0].value;
- }
- return null;
- } catch (error) {
- console.error(error);
- return null;
- }
-};
diff --git a/src/methods/bridge/getUserId.ts b/src/methods/bridge/getUserId.ts
deleted file mode 100644
index e02faea0..00000000
--- a/src/methods/bridge/getUserId.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import bridge from '@vkontakte/vk-bridge';
-
-export const getUserId = async () => {
- try {
- const data = await bridge.send('VKWebAppStorageGet', {
- keys: ['id'],
- });
-
- if (data.keys) {
- return data.keys[0].value;
- }
- return 'no id';
- } catch (error) {
- console.error(error);
- return false;
- }
-};
diff --git a/src/methods/bridge/getVkStorageData.ts b/src/methods/bridge/getVkStorageData.ts
deleted file mode 100644
index 5e3e0dac..00000000
--- a/src/methods/bridge/getVkStorageData.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import bridge from '@vkontakte/vk-bridge';
-
-interface VKWebAppStorageGetResponse {
- keys: {
- key: string;
- value: string;
- }[]
-}
-
-export const getVkStorageData = async (keys: string[]): Promise => {
- try {
- return await bridge.send('VKWebAppStorageGet', {
- keys,
- });
- } catch (error) {
- console.error(error);
- return { keys: [] };
- }
-};
diff --git a/src/methods/bridge/getVkStorageKeys.ts b/src/methods/bridge/getVkStorageKeys.ts
deleted file mode 100644
index 419becf1..00000000
--- a/src/methods/bridge/getVkStorageKeys.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import bridge from '@vkontakte/vk-bridge';
-
-export const getVkStorageKeys = async () => {
- try {
- const data = await bridge.send('VKWebAppStorageGetKeys', {
- count: 20,
- offset: 0,
- });
-
- return data.keys || [];
- } catch (error) {
- console.error(error);
- return [];
- }
-};
diff --git a/src/methods/index.ts b/src/methods/index.ts
index cdc26ce5..c273ba73 100644
--- a/src/methods/index.ts
+++ b/src/methods/index.ts
@@ -1,12 +1,15 @@
-import { getVkStorageData } from './bridge/getVkStorageData';
-import { getVkStorageKeys } from './bridge/getVkStorageKeys';
-import { appStorageSet } from './bridge/appStorageSet';
-import { getCookie } from './bridge/getCookie';
-import { getUserId } from './bridge/getUserId';
-
-import { getPerformance } from './server/getPerformance';
-import { getLessons } from './server/getLessons';
+import { getPerformance } from './server/getPerformance'
+import { getLessons } from './server/getLessons'
+import { getAds } from './server/getAds.ts'
+import { getAttestation } from './server/getAttestation.ts'
+import { getCollegeInfo } from './server/getCollegeInfo.ts'
+import makeRequest from './server/makeRequest'
export {
- getCookie, getUserId, getLessons, appStorageSet, getPerformance, getVkStorageData, getVkStorageKeys,
-};
+ getLessons,
+ getPerformance,
+ getAds,
+ makeRequest,
+ getAttestation,
+ getCollegeInfo,
+}
diff --git a/src/methods/server/getAds.ts b/src/methods/server/getAds.ts
index c9d2ebb0..b4e01a37 100644
--- a/src/methods/server/getAds.ts
+++ b/src/methods/server/getAds.ts
@@ -1,6 +1,5 @@
-import { NotificationsResponse } from 'diary-shared';
-import makeRequest from './makeRequest';
+import { NotificationsResponse } from 'diary-shared'
+import makeRequest from './makeRequest'
-const getAds = async (): Promise => makeRequest('/ads');
-
-export default getAds;
+export const getAds = async (): Promise =>
+ makeRequest('/ads')
diff --git a/src/methods/server/getAttestation.ts b/src/methods/server/getAttestation.ts
index 13536085..8000210d 100644
--- a/src/methods/server/getAttestation.ts
+++ b/src/methods/server/getAttestation.ts
@@ -1,17 +1,15 @@
-import { AttestationResponse } from 'diary-shared';
-import { getCookie } from '../bridge/getCookie';
-import { getUserId } from '../bridge/getUserId';
-import makeRequest from './makeRequest';
+import { AttestationResponse } from 'diary-shared'
+import makeRequest from './makeRequest'
-const getAttestation = async (): Promise => {
- const cookie = await getCookie() ?? localStorage.getItem('cookie');
- const id = await getUserId();
+export const getAttestation = async (): Promise<
+ AttestationResponse | 418 | 429
+> => {
+ const cookie = localStorage.getItem('cookie')
+ const id = localStorage.getItem('id')
if (!cookie) {
- return 418;
+ return 418
}
- return makeRequest(`/attestation/${id}`);
-};
-
-export default getAttestation;
+ return makeRequest(`/attestation/${id}`)
+}
diff --git a/src/methods/server/getCollegeInfo.ts b/src/methods/server/getCollegeInfo.ts
index 3adf248d..8f37afe5 100644
--- a/src/methods/server/getCollegeInfo.ts
+++ b/src/methods/server/getCollegeInfo.ts
@@ -1,15 +1,5 @@
-import { Organization } from 'diary-shared';
-import { getCookie } from '../bridge/getCookie';
-import makeRequest from './makeRequest';
+import { Organization } from 'diary-shared'
+import makeRequest from './makeRequest'
-const getCollegeInfo = async (): Promise => {
- const cookie = await getCookie() ?? localStorage.getItem('cookie');
-
- if (!cookie) {
- return 418;
- }
-
- return makeRequest('/organization');
-};
-
-export default getCollegeInfo;
+export const getCollegeInfo = async (): Promise =>
+ makeRequest('/organization')
diff --git a/src/methods/server/getLessons.ts b/src/methods/server/getLessons.ts
index 92360355..4f3fa588 100644
--- a/src/methods/server/getLessons.ts
+++ b/src/methods/server/getLessons.ts
@@ -1,32 +1,30 @@
-import { Day } from 'diary-shared';
-import formatDateForRequest from '../../utils/formatDateForRequest';
-import { getUserId } from '../bridge/getUserId';
-import { getCookie } from '../bridge/getCookie';
-import makeRequest from './makeRequest';
+import { Day } from 'diary-shared'
+import formatDateForRequest from '../../utils/formatDateForRequest'
+import makeRequest from './makeRequest'
-export const getLessons = async (startDate?: Date, endDate?: Date): Promise => {
- const cookie = await getCookie() ?? localStorage.getItem('cookie');
- const id = await getUserId() || localStorage.getItem('id');
+export const getLessons = async (
+ startDate?: Date,
+ endDate?: Date
+): Promise => {
+ const id = localStorage.getItem('id')
if (!id) {
- return 418;
- }
-
- if (!cookie) {
- return 418;
+ return 418
}
if (!startDate) {
- startDate = new Date();
+ startDate = new Date()
}
if (!endDate) {
- endDate = new Date();
- endDate.setDate(endDate.getDate() + 7);
+ endDate = new Date()
+ endDate.setDate(endDate.getDate() + 7)
}
- const formattedStartDate = formatDateForRequest(startDate);
- const formattedEndDate = formatDateForRequest(endDate);
+ const formattedStartDate = formatDateForRequest(startDate)
+ const formattedEndDate = formatDateForRequest(endDate)
- return makeRequest(`/lessons/${id}/${formattedStartDate}/${formattedEndDate}`);
-};
+ return makeRequest(
+ `/lessons/${id}/${formattedStartDate}/${formattedEndDate}`
+ )
+}
diff --git a/src/methods/server/getPerformance.ts b/src/methods/server/getPerformance.ts
index d9a70cfa..4d040cc0 100644
--- a/src/methods/server/getPerformance.ts
+++ b/src/methods/server/getPerformance.ts
@@ -1,16 +1,15 @@
-import { PerformanceCurrent } from 'diary-shared';
-import { getCookie } from '../bridge/getCookie';
-import { getUserId } from '../bridge/getUserId';
-import makeRequest from './makeRequest';
+import { PerformanceCurrent } from 'diary-shared'
+import makeRequest from './makeRequest'
-export const getPerformance = async (): Promise => {
- const cookie = await getCookie() ?? localStorage.getItem('cookie');
- const id = await getUserId() || localStorage.getItem('id');
- console.log(id);
- console.log(cookie);
- if (!cookie) {
- return 418;
+export const getPerformance = async (): Promise<
+ PerformanceCurrent | 418 | 429
+> => {
+ const id = localStorage.getItem('id')
+ console.log(id)
+
+ if (!id) {
+ return 418
}
- return makeRequest(`/performance.current/${id}`);
-};
+ return makeRequest(`/performance.current/${id}`)
+}
diff --git a/src/methods/server/makeRequest.ts b/src/methods/server/makeRequest.ts
index f1db2639..535c1efc 100644
--- a/src/methods/server/makeRequest.ts
+++ b/src/methods/server/makeRequest.ts
@@ -1,15 +1,17 @@
-import { getCookie } from '../bridge/getCookie';
-
// TODO: move to config
-const BASE_URL = import.meta.env.VITE_SERVER_URL as string ?? '';
-const SECOND_SERVER_URL = import.meta.env.VITE_SERVER_URL_SECOND as string ?? '';
+//@ts-ignore типы React не совсем совместимы с Preact
+const BASE_URL = (import.meta.env.VITE_SERVER_URL as string) ?? ''
+//@ts-ignore типы React не совсем совместимы с Preact
+const SECOND_SERVER_URL =
+ (import.meta.env.VITE_SERVER_URL_SECOND as string) ?? ''
-const makeRequest = async (route: string): Promise< T | 418 | 429> => {
- const cookie = localStorage.getItem('cookie') ?? sessionStorage.getItem('cookie') ?? await getCookie();
- const url = `${BASE_URL}${route}`;
+const makeRequest = async (route: string): Promise => {
+ const cookie =
+ localStorage.getItem('cookie') ?? sessionStorage.getItem('cookie')
+ const url = `${BASE_URL}${route}`
if (!cookie) {
- return 418;
+ return 418
}
try {
@@ -19,14 +21,14 @@ const makeRequest = async (route: string): Promise< T | 418 | 429> => {
'Content-Type': 'application/json;charset=UTF-8',
secret: cookie,
},
- });
+ })
if (response.status === 429) {
- console.log(response.status);
- return response.status;
+ console.log(response.status)
+ return response.status
}
- console.log(response.ok);
+ console.log(response.ok)
if (!response.ok) {
const secondServerResponse = await fetch(SECOND_SERVER_URL + route, {
method: 'GET',
@@ -34,21 +36,21 @@ const makeRequest = async (route: string): Promise< T | 418 | 429> => {
'Content-Type': 'application/json;charset=UTF-8',
secret: cookie,
},
- });
+ })
if (secondServerResponse.status === 429) {
- console.log(secondServerResponse.status);
- return secondServerResponse.status;
+ console.log(secondServerResponse.status)
+ return secondServerResponse.status
}
if (!secondServerResponse.ok) {
- throw new Error(`Failed to fetch data from ${url} and SECOND_SERVER`);
+ throw new Error(`Failed to fetch data from ${url} and SECOND_SERVER`)
}
- return await secondServerResponse.json() as T;
+ return (await secondServerResponse.json()) as T
}
- return await response.json() as T;
+ return (await response.json()) as T
} catch (err) {
const secondServerResponse = await fetch(SECOND_SERVER_URL + route, {
method: 'GET',
@@ -56,20 +58,20 @@ const makeRequest = async (route: string): Promise< T | 418 | 429> => {
'Content-Type': 'application/json;charset=UTF-8',
secret: cookie,
},
- });
+ })
if (secondServerResponse.status === 429) {
- console.log(secondServerResponse.status);
- return secondServerResponse.status;
+ console.log(secondServerResponse.status)
+ return secondServerResponse.status
}
if (!secondServerResponse.ok) {
- throw new Error(`Failed to fetch data from ${url} and SECOND_SERVER`);
+ throw new Error(`Failed to fetch data from ${url} and SECOND_SERVER`)
}
- console.log(err);
- return await secondServerResponse.json() as T;
+ console.log(err)
+ return (await secondServerResponse.json()) as T
}
-};
+}
-export default makeRequest;
+export default makeRequest
diff --git a/src/modals/CollegeModal.tsx b/src/modals/CollegeModal.tsx
index 24dd1219..a9541dae 100644
--- a/src/modals/CollegeModal.tsx
+++ b/src/modals/CollegeModal.tsx
@@ -1,45 +1,47 @@
-import {
- Group, Header, InfoRow, Link, ModalPage, ModalPageHeader, SimpleCell,
-} from '@vkontakte/vkui';
-import { useModal } from './ModalContext';
-
-const CollegeModal = ({ id }: { id: string }) => {
- const { collegeModalData } = useModal();
-
- return (
-
- Подробнее о колледже
- Основная информация}>
-
- {collegeModalData?.name}
-
-
- {collegeModalData?.actualAddress}
-
-
- {collegeModalData?.directorName}
-
-
- Дополнительная информация}>
-
- {collegeModalData?.email}
-
-
- {collegeModalData?.fax}
-
-
- {collegeModalData?.phone}
-
-
-
-
- {collegeModalData?.site}
-
-
-
-
-
- );
-};
-
-export default CollegeModal;
+/*
+ * Import {
+ * Group, Header, InfoRow, Link, ModalPage, ModalPageHeader, SimpleCell,
+ * } from '@vkontakte/vkui';
+ * import { useModal } from './ModalContext';
+ *
+ * const CollegeModal = ({ id }: { id: string }) => {
+ * const { collegeModalData } = useModal();
+ *
+ * return (
+ *
+ * Подробнее о колледже
+ * Основная информация}>
+ *
+ * {collegeModalData?.name}
+ *
+ *
+ * {collegeModalData?.actualAddress}
+ *
+ *
+ * {collegeModalData?.directorName}
+ *
+ *
+ * Дополнительная информация}>
+ *
+ * {collegeModalData?.email}
+ *
+ *
+ * {collegeModalData?.fax}
+ *
+ *
+ * {collegeModalData?.phone}
+ *
+ *
+ *
+ *
+ * {collegeModalData?.site}
+ *
+ *
+ *
+ *
+ *
+ * );
+ * };
+ *
+ * export default CollegeModal;
+ */
diff --git a/src/modals/LessonModal.tsx b/src/modals/LessonModal.tsx
index 3324b5fb..eb94f2cf 100644
--- a/src/modals/LessonModal.tsx
+++ b/src/modals/LessonModal.tsx
@@ -1,44 +1,66 @@
-import { FC, useEffect, useState } from 'react';
import {
- Group, Header, InfoRow, ModalPage, ModalPageHeader, Separator, SimpleCell, Spacing, Text,
-} from '@vkontakte/vkui';
+ Group,
+ Header,
+ InfoRow,
+ ModalPage,
+ ModalPageHeader,
+ Separator,
+ SimpleCell,
+ Spacing,
+ Text,
+} from '@vkontakte/vkui'
import {
- AbsenceTypes, AbsenceTypesKeys, AbsenceTypesDescription, AbsenceTypesDescriptionKeys, Lesson, LessonType, LessonWorkType, TLesson,
-} from 'diary-shared';
-import setDefaultMark from '../utils/setDefaultMark';
-import textToLink from '../utils/textToLink';
-import { cleanData } from './data';
-import Mark from '../components/UI/Mark';
-import { useModal } from './ModalContext';
-import { Grade } from '../types';
-import ExplanationTooltip from '../components/UI/ExplanationTooltip';
+ AbsenceTypes,
+ AbsenceTypesDescription,
+ AbsenceTypesDescriptionKeys,
+ AbsenceTypesKeys,
+ Lesson,
+ LessonType,
+ LessonWorkType,
+ TLesson,
+} from 'diary-shared'
+import { FC } from 'preact/compat'
+import { useEffect, useState } from 'preact/hooks'
+import { useSelector } from 'react-redux'
+import setDefaultMark from '../utils/setDefaultMark'
+import textToLink from '../utils/textToLink'
+import { cleanData } from './data'
+import Mark from '../components/UI/Mark'
+import { Grade } from '../types'
+import ExplanationTooltip from '../components/UI/ExplanationTooltip'
+import { selectLessonModalData } from '../store/lessonSlice.ts'
interface ILessonModal {
- id: string;
+ id: string
}
const LessonModal: FC = ({ id }) => {
- const { lessonModalData } = useModal();
+ const lessonModalData = useSelector(selectLessonModalData)
- const [lessonData, setLessonData] = useState(cleanData);
+ const [lessonData, setLessonData] = useState(cleanData)
useEffect(() => {
if (lessonModalData) {
const {
- name, endTime, startTime, timetable, gradebook, tasks: tasksArray,
- } = lessonModalData;
+ name,
+ endTime,
+ startTime,
+ timetable,
+ gradebook,
+ tasks: tasksArray,
+ } = lessonModalData
- let lessonName = name || '';
+ let lessonName = name || ''
if (lessonName.includes('/')) {
- const parts = lessonName.split('/');
+ const parts = lessonName.split('/')
if (parts.length >= 2) {
- lessonName = parts[0];
- const additionalInfo = parts.slice(1).join('/');
+ lessonName = parts[0]
+ const additionalInfo = parts.slice(1).join('/')
if (additionalInfo.trim()) {
- lessonName += ` (${additionalInfo})`;
+ lessonName += ` (${additionalInfo})`
}
}
}
@@ -67,120 +89,137 @@ const LessonModal: FC = ({ id }) => {
},
startTime: startTime || 'Что-то не так с датой',
endTime: endTime || 'Что-то не так с датой',
- });
+ })
}
- }, [lessonModalData]);
+ }, [lessonModalData])
return (
Подробнее о паре
-
-
-
- )}
+
+
+
+ }
>
-
- {lessonData.name}
-
+ {lessonData.name}
-
+
{LessonWorkType[lessonData.gradebook?.lessonType as TLesson]}
-
- {lessonData.gradebook?.themes ? lessonData.gradebook?.themes.map((theme) => (
- textToLink(theme)
- )) : 'Не указана'}
+
+ {lessonData.gradebook?.themes
+ ? lessonData.gradebook?.themes.map((theme) => textToLink(theme))
+ : 'Не указана'}
-
+
{lessonData.timetable.teacher?.firstName
? `${lessonData?.timetable?.teacher?.lastName} ${lessonData.timetable.teacher?.firstName} ${lessonData.timetable.teacher?.middleName}`
: 'Не указан'}
- Место и время}>
+ Место и время}>
- )}
+ }
>
- {lessonData.timetable.classroom.name === '0'
- ? (
-
- )
- : lessonData.timetable.classroom.name}
+ {lessonData.timetable.classroom.name === '0' ? (
+
+ ) : (
+ lessonData.timetable.classroom.name
+ )}
- )}
+ }
>
- {lessonData.startTime.toLocaleString()}
- {' '}
- -
- {' '}
+ {lessonData.startTime.toLocaleString()} -{' '}
{lessonData.endTime.toLocaleString()}
- {((lessonData.gradebook?.tasks?.length && lessonData.gradebook.tasks.length > 0) || lessonData.gradebook?.absenceType)
- ? (
-
- 0) ||
+ lessonData.gradebook?.absenceType ? (
+
+
+
+ }
+ >
+ {lessonData.gradebook.tasks?.map((tasks, index) => (
+ <>
+ }
+ >
+ {LessonType[tasks.type]}
+
+ {/*//@ts-ignore типы React не совсем совместимы с Preact*/}
+ {tasks?.topic}
+
+
+
+
+
+
+ ))}
+ {lessonData.gradebook?.absenceType && (
+
-
+ }
+ >
+ {
+ AbsenceTypesDescription[
+ AbsenceTypes[
+ lessonData.gradebook?.absenceType
+ ] as AbsenceTypesDescriptionKeys
+ ]
+ }
+
)}
- >
- {lessonData.gradebook.tasks?.map((tasks, index) => (
- <>
- }>
-
- {LessonType[tasks.type]}
-
-
- {tasks?.topic}
-
-
-
-
-
-
- ))}
- {lessonData.gradebook?.absenceType && (
- }>
- {AbsenceTypesDescription[AbsenceTypes[lessonData.gradebook?.absenceType] as AbsenceTypesDescriptionKeys]}
-
- )}
-
- ) : null}
+
+ ) : null}
- );
-};
+ )
+}
-export default LessonModal;
+export default LessonModal
diff --git a/src/modals/ModalContext.tsx b/src/modals/ModalContext.tsx
deleted file mode 100644
index 36358c9c..00000000
--- a/src/modals/ModalContext.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, {
- ReactNode, createContext, useContext, useState, useMemo,
-} from 'react';
-import { Lesson, Organization } from 'diary-shared';
-
-const ModalContext = createContext<{
- lessonModalData: Lesson | null;
- collegeModalData: Organization | null;
- openLessonModal:(data: Lesson) => void;
- openCollegeModal: (data: Organization) => void;
-} | undefined>(undefined);
-
-export const ModalProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
- const [lessonModalData, setLessonModalData] = useState(null);
- const [collegeModalData, setCollegeModalData] = useState(null);
-
- const openLessonModal = (data: Lesson) => {
- setLessonModalData(data);
- };
-
- const openCollegeModal = (data: Organization) => {
- setCollegeModalData(data);
- };
-
- const contextValue = useMemo(() => ({
- lessonModalData,
- collegeModalData,
- openLessonModal,
- openCollegeModal,
- }), [lessonModalData, collegeModalData]);
-
- return (
-
- {children}
-
- );
-};
-
-export const useModal = () => {
- const context = useContext(ModalContext);
- if (context === undefined) {
- throw new Error('useModal must be used within a ModalProvider');
- }
- return context;
-};
diff --git a/src/modals/ModalRoot.tsx b/src/modals/ModalRoot.tsx
index 7453851c..3a7f87d6 100644
--- a/src/modals/ModalRoot.tsx
+++ b/src/modals/ModalRoot.tsx
@@ -1,23 +1,27 @@
+import { ModalRoot as VKUIModalRoot } from '@vkontakte/vkui'
import {
- ModalRoot as VKUIModalRoot,
-} from '@vkontakte/vkui';
-import { useActiveVkuiLocation, useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
-import LessonModal from './LessonModal';
-import CollegeModal from './CollegeModal';
+ useActiveVkuiLocation,
+ useRouteNavigator,
+} from '@vkontakte/vk-mini-apps-router'
+import LessonModal from './LessonModal'
+// Import CollegeModal from './CollegeModal';
-export const MODAL_PAGE_LESSON = 'lesson';
-export const MODAL_COLLEGE_INFO = 'college';
+export const MODAL_PAGE_LESSON = 'lesson'
+export const MODAL_COLLEGE_INFO = 'college'
const ModalRoot = () => {
- const routeNavigator = useRouteNavigator();
- const { modal: activeModal } = useActiveVkuiLocation();
+ const routeNavigator = useRouteNavigator()
+ const { modal: activeModal } = useActiveVkuiLocation()
return (
- routeNavigator.hideModal()}>
+ routeNavigator.hideModal()}
+ >
-
+ {/* */}
- );
-};
+ )
+}
-export default ModalRoot;
+export default ModalRoot
diff --git a/src/modals/data.ts b/src/modals/data.ts
index 45d91d2f..1c2bd343 100644
--- a/src/modals/data.ts
+++ b/src/modals/data.ts
@@ -1,4 +1,4 @@
-import { Lesson } from 'diary-shared';
+import { Lesson } from 'diary-shared'
export const cleanData: Lesson = {
name: '',
@@ -23,4 +23,4 @@ export const cleanData: Lesson = {
},
startTime: '',
endTime: '',
-};
+}
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 9608eb0e..7a8fd671 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -1,21 +1,24 @@
-import { RouteWithoutRoot, createHashRouter } from '@vkontakte/vk-mini-apps-router';
+import {
+ RouteWithoutRoot,
+ createHashRouter,
+} from '@vkontakte/vk-mini-apps-router'
-export const PAGE_MAIN = '/';
-export const PAGE_SCHEDULE = '/schedule';
-export const PAGE_CONTACTS = '/contacts';
-export const PAGE_MARKS = '/marks';
-export const PAGE_SETTINGS = '/settings';
-export const PAGE_ATTESTATION = '/attestation';
-export const PAGE_NOTIFICATIONS = '/notifications';
+export const PAGE_MAIN = '/'
+export const PAGE_SCHEDULE = '/schedule'
+export const PAGE_CONTACTS = '/contacts'
+export const PAGE_MARKS = '/marks'
+export const PAGE_SETTINGS = '/settings'
+export const PAGE_ATTESTATION = '/attestation'
+export const PAGE_NOTIFICATIONS = '/notifications'
-export const VIEW_SCHEDULE = 'schedule';
-export const VIEW_CONTACTS = 'contacts';
-export const VIEW_MARKS = 'marks';
-export const VIEW_SETTINGS = 'settings';
+export const VIEW_SCHEDULE = 'schedule'
+export const VIEW_CONTACTS = 'contacts'
+export const VIEW_MARKS = 'marks'
+export const VIEW_SETTINGS = 'settings'
-export const MAIN_SETTINGS = 'login';
-export const VIEW_ATTESTATION = 'attestation';
-export const VIEW_NOTIFICATIONS = 'notifications';
+export const MAIN_SETTINGS = 'login'
+export const VIEW_ATTESTATION = 'attestation'
+export const VIEW_NOTIFICATIONS = 'notifications'
const routes: RouteWithoutRoot[] = [
{
@@ -53,6 +56,6 @@ const routes: RouteWithoutRoot[] = [
panel: VIEW_NOTIFICATIONS,
view: VIEW_NOTIFICATIONS,
},
-];
+]
-export const router = createHashRouter(routes);
+export const router = createHashRouter(routes)
diff --git a/src/store/index.ts b/src/store/index.ts
new file mode 100644
index 00000000..849ba455
--- /dev/null
+++ b/src/store/index.ts
@@ -0,0 +1,10 @@
+import { configureStore } from '@reduxjs/toolkit'
+import lessonReducer from './lessonSlice'
+
+const store = configureStore({
+ reducer: {
+ lesson: lessonReducer,
+ },
+})
+
+export default store
diff --git a/src/store/lessonSlice.ts b/src/store/lessonSlice.ts
new file mode 100644
index 00000000..55057f0c
--- /dev/null
+++ b/src/store/lessonSlice.ts
@@ -0,0 +1,25 @@
+import { PayloadAction, createSlice } from '@reduxjs/toolkit'
+import { Lesson } from 'diary-shared'
+
+interface LessonState {
+ lessonModalData: Lesson | null
+}
+
+const initialState: LessonState = {
+ lessonModalData: null,
+}
+
+const lessonSlice = createSlice({
+ name: 'lesson',
+ initialState,
+ reducers: {
+ setLessonModalData: (state, action: PayloadAction) => {
+ state.lessonModalData = action.payload
+ },
+ },
+})
+
+export const { setLessonModalData } = lessonSlice.actions
+export const selectLessonModalData = (state: { lesson: LessonState }) =>
+ state.lesson.lessonModalData
+export default lessonSlice.reducer
diff --git a/src/transformers/transformVKBridgeAdaptivity.ts b/src/transformers/transformVKBridgeAdaptivity.ts
index 78a4b83d..8fa63f97 100644
--- a/src/transformers/transformVKBridgeAdaptivity.ts
+++ b/src/transformers/transformVKBridgeAdaptivity.ts
@@ -1,11 +1,11 @@
import {
type AdaptivityProps,
- getViewWidthByViewportWidth,
- getViewHeightByViewportHeight,
- ViewWidth,
SizeType,
-} from '@vkontakte/vkui';
-import type { UseAdaptivity } from '@vkontakte/vk-bridge-react';
+ ViewWidth,
+ getViewHeightByViewportHeight,
+ getViewWidthByViewportWidth,
+} from '@vkontakte/vkui'
+import type { UseAdaptivity } from '@vkontakte/vk-bridge-react'
/**
* Требуется конвертировать данные из VK Bridge в те, что принимает AdaptivityProvider из VKUI.
@@ -20,15 +20,16 @@ export const transformVKBridgeAdaptivity = ({
return {
viewWidth: getViewWidthByViewportWidth(viewportWidth),
viewHeight: getViewHeightByViewportHeight(viewportHeight),
- };
+ }
case 'force_mobile':
case 'force_mobile_compact':
return {
viewWidth: ViewWidth.MOBILE,
sizeX: SizeType.COMPACT,
- sizeY: type === 'force_mobile_compact' ? SizeType.COMPACT : SizeType.REGULAR,
- };
+ sizeY:
+ type === 'force_mobile_compact' ? SizeType.COMPACT : SizeType.REGULAR,
+ }
default:
- return {};
+ return {}
}
-};
+}
diff --git a/src/types/hashes.d.ts b/src/types/hashes.d.ts
index a4475daf..38a4dcd0 100644
--- a/src/types/hashes.d.ts
+++ b/src/types/hashes.d.ts
@@ -3,61 +3,61 @@ declare module 'jshashes' {
/**
* Hexadecimal hash encoding from string.
*/
- hex(input: string): string;
+ hex(input: string): string
/**
* Base64 hash encoding from string.
*/
- b64(input: string): string;
+ b64(input: string): string
/**
* Custom hash algorithm values encoding.
*/
- any(input: string, encoding: string): string;
+ any(input: string, encoding: string): string
/**
* Hexadecimal hash with HMAC salt key.
*/
- hex_hmac(key: string, input: string): string;
+ hex_hmac(key: string, input: string): string
/**
* Custom hash values encoding with HMAC salt key support.
*/
- b64_hmac(key: string, input: string): string;
+ b64_hmac(key: string, input: string): string
/**
* Custom hash values encoding with HMAC salt key support.
*/
- any_hmac(key: string, input: string, encoding: string): string;
+ any_hmac(key: string, input: string, encoding: string): string
/**
* Simple self-test to see if working.
*/
- vm_test(): this;
+ vm_test(): this
/**
* Enable/disable uppercase hexadecimal returned string.
*/
- setUpperCase(isEnabled: boolean): this;
+ setUpperCase(isEnabled: boolean): this
/**
* Defines a custom base64 pad string. Default is '=' according with the RFC standard.
*/
- setPad(pad: string): this;
+ setPad(pad: string): this
/**
* Enable/disable UTF-8 character encoding.
*/
- setUTF8(isEnabled: boolean): this;
+ setUTF8(isEnabled: boolean): this
}
namespace Hashes {
- export class MD5 extends HashesClass { }
- export class SHA1 extends HashesClass { }
- export class SHA256 extends HashesClass { }
- export class SHA512 extends HashesClass { }
- export class RMD160 extends HashesClass { }
+ export class MD5 extends HashesClass {}
+ export class SHA1 extends HashesClass {}
+ export class SHA256 extends HashesClass {}
+ export class SHA512 extends HashesClass {}
+ export class RMD160 extends HashesClass {}
}
- export = Hashes;
+ export = Hashes
}
diff --git a/src/types/index.ts b/src/types/index.ts
index c1290a08..534fe64b 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,14 +1,20 @@
-export type Pages = 'schedule' | 'contacts' | 'marks' | 'settings' | 'attestation' | 'notifications';
+export type Pages =
+ | 'schedule'
+ | 'contacts'
+ | 'marks'
+ | 'settings'
+ | 'attestation'
+ | 'notifications'
export interface Storage {
- key: string;
+ key: string
value: string
}
/**
* FIXME: enum стал страшный и в целом enum многие по понятным причинам хейтят
* Поэтому когда-нибудь надо пофиксить
-*/
+ */
export enum Grade {
Five = 5,
Four = 4,
@@ -24,7 +30,7 @@ export enum Grade {
'О' = 'О',
}
-export type GradeKeys = keyof typeof Grade;
+export type GradeKeys = keyof typeof Grade
-export type TextMark = GradeKeys;
-export type TMark = typeof Grade[GradeKeys];
+export type TextMark = GradeKeys
+export type TMark = (typeof Grade)[GradeKeys]
diff --git a/src/utils/calculateAverageMark.ts b/src/utils/calculateAverageMark.ts
index 48cf7b0e..57e22563 100644
--- a/src/utils/calculateAverageMark.ts
+++ b/src/utils/calculateAverageMark.ts
@@ -1,13 +1,14 @@
-import { TextMark } from 'diary-shared';
-import { Grade } from '../types';
+import { TextMark } from 'diary-shared'
+import { Grade } from '../types'
const calculateAverageMark = (marks: TextMark[] | undefined): number | null => {
if (!marks || marks.length === 0) {
- return null;
+ return null
}
- const sum = marks.reduce((total, mark) => total + (Grade[mark] as number), 0);
- return Number((sum / marks.length).toFixed(2));
-};
+ // @ts-ignore
+ const sum = marks.reduce((total, mark) => total + (Grade[mark] as number), 0)
+ return Number((sum / marks.length).toFixed(2))
+}
-export default calculateAverageMark;
+export default calculateAverageMark
diff --git a/src/utils/extractMarksByDay.ts b/src/utils/extractMarksByDay.ts
index b5743cfc..1e40e8b9 100644
--- a/src/utils/extractMarksByDay.ts
+++ b/src/utils/extractMarksByDay.ts
@@ -1,29 +1,39 @@
-import { PerformanceCurrent } from 'diary-shared';
-import { Grade, GradeKeys } from '../types';
-import { IMarksByDay } from '../components/UI/MarksByDay';
+import { PerformanceCurrent } from 'diary-shared'
+import { Grade, GradeKeys } from '../types'
+import { IMarksByDay } from '../components/UI/MarksByDay'
-export const extractMarksByDay = (performanceData: PerformanceCurrent | null): IMarksByDay => {
- const marksByDay: IMarksByDay = {};
+export const extractMarksByDay = (
+ performanceData: PerformanceCurrent | null
+): IMarksByDay => {
+ const marksByDay: IMarksByDay = {}
performanceData?.daysWithMarksForSubject?.forEach((subject) => {
subject?.daysWithMarks?.forEach((markData) => {
- const day = new Date(markData.day).toLocaleDateString();
- const grades = markData.markValues.map((gradeText) => Grade[gradeText as GradeKeys]);
- const lessonName = subject.subjectName;
+ const day = new Date(markData.day).toLocaleDateString()
+ const grades = markData.markValues.map(
+ (gradeText) => Grade[gradeText as GradeKeys]
+ )
+ const lessonName = subject.subjectName
- if (grades.length > 0 && grades.every((grade) => !Number.isNaN(parseFloat(grade as string)))) {
+ if (
+ grades.length > 0 &&
+ grades.every((grade) => !Number.isNaN(parseFloat(grade as string)))
+ ) {
if (!marksByDay[day]) {
- marksByDay[day] = {};
+ marksByDay[day] = {}
}
if (!marksByDay[day][lessonName]) {
- marksByDay[day][lessonName] = [];
+ marksByDay[day][lessonName] = []
}
- marksByDay[day][lessonName] = [...marksByDay[day][lessonName], ...grades];
+ marksByDay[day][lessonName] = [
+ ...marksByDay[day][lessonName],
+ ...grades,
+ ]
}
- });
- });
+ })
+ })
- return marksByDay;
-};
+ return marksByDay
+}
diff --git a/src/utils/formatDate.ts b/src/utils/formatDate.ts
index 80bbe13d..b501baf9 100644
--- a/src/utils/formatDate.ts
+++ b/src/utils/formatDate.ts
@@ -1,4 +1,4 @@
export const formatDate = (dateString: string) => {
- const parts = dateString.split('.');
- return new Date(Number(parts[2]), Number(parts[1]) - 1, Number(parts[0]));
-};
+ const parts = dateString.split('.')
+ return new Date(Number(parts[2]), Number(parts[1]) - 1, Number(parts[0]))
+}
diff --git a/src/utils/formatDateForRequest.ts b/src/utils/formatDateForRequest.ts
index fb643cee..bc2bd865 100644
--- a/src/utils/formatDateForRequest.ts
+++ b/src/utils/formatDateForRequest.ts
@@ -1,8 +1,8 @@
const formatDateForRequest = (date: Date): string => {
- const year: number = date.getFullYear();
- const month: string = (date.getMonth() + 1).toString().padStart(2, '0');
- const day: string = date.getDate().toString().padStart(2, '0');
- return `${year}-${month}-${day}`;
-};
+ const year: number = date.getFullYear()
+ const month: string = (date.getMonth() + 1).toString().padStart(2, '0')
+ const day: string = date.getDate().toString().padStart(2, '0')
+ return `${year}-${month}-${day}`
+}
-export default formatDateForRequest;
+export default formatDateForRequest
diff --git a/src/utils/formatLessonDate.ts b/src/utils/formatLessonDate.ts
index 907ab1d2..0acf7c51 100644
--- a/src/utils/formatLessonDate.ts
+++ b/src/utils/formatLessonDate.ts
@@ -1,11 +1,11 @@
export const formatLessonDate = (dateString: Date | string) => {
- const options = { year: 'numeric', month: 'long', day: 'numeric' };
+ const options = { year: 'numeric', month: 'long', day: 'numeric' }
// @ts-ignore
- return new Date(dateString).toLocaleDateString(undefined, options);
-};
+ return new Date(dateString).toLocaleDateString(undefined, options)
+}
export function getDayOfWeek(date: Date) {
- const daysOfWeek = ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'];
- return daysOfWeek[date.getDay()];
+ const daysOfWeek = ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб']
+ return daysOfWeek[date.getDay()]
}
diff --git a/src/utils/formatStatisticsData.ts b/src/utils/formatStatisticsData.ts
index 5d48b410..6ccf6f7d 100644
--- a/src/utils/formatStatisticsData.ts
+++ b/src/utils/formatStatisticsData.ts
@@ -1,46 +1,48 @@
-import { PerformanceCurrent } from 'diary-shared';
-import { Grade, TextMark } from '../types';
+import { PerformanceCurrent } from 'diary-shared'
+import { Grade, TextMark } from '../types'
export const formatStatisticsData = (marks: PerformanceCurrent) => {
try {
const allMarks: TextMark[] = marks.daysWithMarksForSubject.reduce(
(marksArray: TextMark[], subject) => {
if (subject.daysWithMarks) {
- // @ts-ignore
- subject.daysWithMarks.forEach((day) => marksArray.push(...day.markValues));
+ subject.daysWithMarks.forEach((day) =>
+ // @ts-ignore
+ marksArray.push(...day.markValues)
+ )
}
- return marksArray;
+ return marksArray
},
- [],
- );
+ []
+ )
- const totalNumberOfMarks: number = allMarks.length;
+ const totalNumberOfMarks: number = allMarks.length
const totalSumOfMarks: number = allMarks.reduce(
(sum, mark) => sum + (Grade[mark] as number),
- 0,
- );
- const averageMark: number = totalSumOfMarks / totalNumberOfMarks;
+ 0
+ )
+ const averageMark: number = totalSumOfMarks / totalNumberOfMarks
const markCounts: Record = {
2: 0,
3: 0,
4: 0,
5: 0,
- };
+ }
allMarks.forEach((textMark: TextMark) => {
- const numericMark: number = Grade[textMark] as number;
+ const numericMark: number = Grade[textMark] as number
if (numericMark >= 2 && numericMark <= 5) {
- markCounts[numericMark] += 1;
+ markCounts[numericMark] += 1
}
- });
+ })
return {
totalNumberOfMarks: totalNumberOfMarks.toString(),
averageMark: Number(averageMark.toFixed(3)),
markCounts,
- };
+ }
} catch (e) {
- console.error(e);
- return null;
+ console.error(e)
+ return null
}
-};
+}
diff --git a/src/utils/handleResponse.ts b/src/utils/handleResponse.ts
index 89782087..e2c3c6ba 100644
--- a/src/utils/handleResponse.ts
+++ b/src/utils/handleResponse.ts
@@ -1,31 +1,33 @@
-import React from 'react';
-import { Icon28ErrorCircleOutline } from '@vkontakte/icons';
-import { SnackbarData } from '../hooks/useSnackbar';
+import { Icon28ErrorCircleOutline } from '@vkontakte/icons'
+import { createElement } from 'preact'
+import { SnackbarData } from '../hooks/useSnackbar'
export function handleResponse(
response: T,
errorCallback: () => void,
limitExceededCallback: () => void,
loadingCallback: (isLoading: boolean) => void,
- showSnackbar?: (snackbarData: SnackbarData) => void,
+ showSnackbar?: (snackbarData: SnackbarData) => void
): void {
if (response === 418) {
- const errorIcon = React.createElement(Icon28ErrorCircleOutline, { fill: 'var(--vkui--color_icon_negative)' });
+ const errorIcon = createElement(Icon28ErrorCircleOutline, {
+ fill: 'var(--vkui--color_icon_negative)',
+ })
if (showSnackbar) {
showSnackbar({
icon: errorIcon,
title: 'Ошибка при попытке сделать запрос',
subtitle: 'Попробуйте обновить страницу или обновите куки в настройках',
- });
+ })
}
- loadingCallback(false);
- errorCallback();
- return;
+ loadingCallback(false)
+ errorCallback()
+ return
}
if (response === 429) {
- limitExceededCallback();
- errorCallback();
- loadingCallback(false);
+ limitExceededCallback()
+ errorCallback()
+ loadingCallback(false)
}
}
diff --git a/src/utils/isToday.ts b/src/utils/isToday.ts
index a1c337cb..d94ef9a6 100644
--- a/src/utils/isToday.ts
+++ b/src/utils/isToday.ts
@@ -1,8 +1,8 @@
export const isToday = (date: Date) => {
- const today = new Date();
+ const today = new Date()
return (
- date.getDate() === today.getDate()
- && date.getMonth() === today.getMonth()
- && date.getFullYear() === today.getFullYear()
- );
-};
+ date.getDate() === today.getDate() &&
+ date.getMonth() === today.getMonth() &&
+ date.getFullYear() === today.getFullYear()
+ )
+}
diff --git a/src/utils/logOut.ts b/src/utils/logOut.ts
index 972b4184..b321a458 100644
--- a/src/utils/logOut.ts
+++ b/src/utils/logOut.ts
@@ -1,21 +1,6 @@
-import { appStorageSet, getVkStorageKeys } from '../methods';
-
-const clearVkStorage = async () => {
- try {
- const keys = await getVkStorageKeys();
-
- await Promise.all(keys.map(async (key) => {
- await appStorageSet(key, '');
- }));
- } catch (error) {
- console.error(error);
- }
-};
-
const logOut = async () => {
- await clearVkStorage();
- localStorage.clear();
- window.location.reload();
-};
+ localStorage.clear()
+ window.location.reload()
+}
-export default logOut;
+export default logOut
diff --git a/src/utils/setDefaultMark.ts b/src/utils/setDefaultMark.ts
index e4b6c8aa..531bccd2 100644
--- a/src/utils/setDefaultMark.ts
+++ b/src/utils/setDefaultMark.ts
@@ -1,17 +1,20 @@
-import { Task } from 'diary-shared';
-import { TextMark } from '../types';
-// TODO: можно с помощью неё фиксить ошибки с неправильными оценами
-// FIXME: Переписать
+import { Task } from 'diary-shared'
+import { TextMark } from '../types'
+
+/*
+ * TODO: можно с помощью неё фиксить ошибки с неправильными оценами
+ * FIXME: Переписать
+ */
const setDefaultMark = (task: Task): TextMark => {
if (task.isRequired && !task.mark) {
- return 'Д';
+ return 'Д'
}
if (task.type === 'Home' && !task.mark) {
- return 'ДЗ';
+ return 'ДЗ'
}
- return task.mark as TextMark;
-};
+ return task.mark as TextMark
+}
-export default setDefaultMark;
+export default setDefaultMark
diff --git a/src/utils/sortByDay.ts b/src/utils/sortByDay.ts
index 75d182ea..64f462b1 100644
--- a/src/utils/sortByDay.ts
+++ b/src/utils/sortByDay.ts
@@ -1,12 +1,14 @@
-import { IMarksByDay } from '../components/UI/MarksByDay';
-import { formatDate } from './formatDate';
+import { IMarksByDay } from '../components/UI/MarksByDay'
+import { formatDate } from './formatDate'
export const sortByDay = (marksByDay: IMarksByDay): IMarksByDay => {
- const sortedDays = Object.keys(marksByDay).sort((a, b) => formatDate(b).getTime() - formatDate(a).getTime());
- const marksByDaySort: IMarksByDay = {};
+ const sortedDays = Object.keys(marksByDay).sort(
+ (a, b) => formatDate(b).getTime() - formatDate(a).getTime()
+ )
+ const marksByDaySort: IMarksByDay = {}
sortedDays.forEach((day) => {
- marksByDaySort[day] = marksByDay[day];
- });
+ marksByDaySort[day] = marksByDay[day]
+ })
- return marksByDaySort;
-};
+ return marksByDaySort
+}
diff --git a/src/utils/textToLink.tsx b/src/utils/textToLink.tsx
index cda07c17..0159a104 100644
--- a/src/utils/textToLink.tsx
+++ b/src/utils/textToLink.tsx
@@ -1,16 +1,20 @@
-import { Link } from '@vkontakte/vkui';
+import { Link } from '@vkontakte/vkui'
const textToLink = (name: string) => {
- const urlRegex = /(https?:\/\/\S+)/g;
+ const urlRegex = /(https?:\/\/\S+)/g
- const parts = name.split(urlRegex);
+ const parts = name.split(urlRegex)
return parts.map((part, index) => {
if (part.match(urlRegex)) {
- return {part};
+ return (
+
+ {part}
+
+ )
}
- return part;
- });
-};
+ return part
+ })
+}
-export default textToLink;
+export default textToLink
diff --git a/src/utils/truncateString.ts b/src/utils/truncateString.ts
index 88a830ca..ebdf5a38 100644
--- a/src/utils/truncateString.ts
+++ b/src/utils/truncateString.ts
@@ -1,6 +1,6 @@
export const truncateString = (str: string, maxLength: number) => {
if (str.length > maxLength) {
- return `${str.substring(0, maxLength)}...`;
+ return `${str.substring(0, maxLength)}...`
}
- return str;
-};
+ return str
+}
diff --git a/src/views/Attestation.tsx b/src/views/Attestation.tsx
index f14af216..f5642e91 100644
--- a/src/views/Attestation.tsx
+++ b/src/views/Attestation.tsx
@@ -1,124 +1,135 @@
import {
- FC, lazy, useEffect, useState,
-} from 'react';
+ Button,
+ ButtonGroup,
+ Div,
+ Link,
+ Panel,
+ Placeholder,
+ ScreenSpinner,
+ View,
+} from '@vkontakte/vkui'
import {
- Button, ButtonGroup, Div, Link, Panel, Placeholder, ScreenSpinner, View,
-} from '@vkontakte/vkui';
-import { useActiveVkuiLocation, useRouteNavigator } from '@vkontakte/vk-mini-apps-router';
-import { AttestationResponse } from 'diary-shared';
-import getAttestation from '../methods/server/getAttestation';
-import PanelHeaderWithBack from '../components/UI/PanelHeaderWithBack';
-import { useRateLimitExceeded } from '../hooks';
-import { handleResponse } from '../utils/handleResponse';
+ useActiveVkuiLocation,
+ useRouteNavigator,
+} from '@vkontakte/vk-mini-apps-router'
+import { AttestationResponse } from 'diary-shared'
+import { FC, lazy } from 'preact/compat'
+import { useEffect, useState } from 'preact/hooks'
+import PanelHeaderWithBack from '../components/UI/PanelHeaderWithBack'
+import { useRateLimitExceeded } from '../hooks'
+import { handleResponse } from '../utils/handleResponse'
+import { getAttestation } from '../methods'
-const SubjectList = lazy(() => import('../components/UI/SubjectsList'));
+const SubjectList = lazy(() => import('../components/UI/SubjectsList'))
interface IAttestation {
- id: string;
+ id: string
}
const Attestation: FC = ({ id }) => {
- const { panel: activePanel, panelsHistory } = useActiveVkuiLocation();
- const routeNavigator = useRouteNavigator();
+ const { panel: activePanel, panelsHistory } = useActiveVkuiLocation()
+ const routeNavigator = useRouteNavigator()
- const [isError, setIsError] = useState(false);
- const [isDataLoading, setIsLoading] = useState(false);
- const [attestationData, setAttestationData] = useState(null);
+ const [isError, setIsError] = useState(false)
+ const [isDataLoading, setIsLoading] = useState(false)
+ const [attestationData, setAttestationData] =
+ useState(null)
const getUserAttestation = async () => {
- setIsLoading(true);
- setIsError(false);
+ setIsLoading(true)
+ setIsError(false)
try {
- const data = await getAttestation();
+ const data = await getAttestation()
handleResponse(
data,
() => {
- setIsError(true);
- setIsLoading(false);
+ setIsError(true)
+ setIsLoading(false)
},
() => {
- useRateLimitExceeded();
- setIsError(true);
- setIsLoading(false);
+ useRateLimitExceeded()
+ setIsError(true)
+ setIsLoading(false)
},
(isLoading) => {
- setIsLoading(isLoading);
- },
- );
+ setIsLoading(isLoading)
+ }
+ )
- setAttestationData(data as AttestationResponse);
+ setAttestationData(data as AttestationResponse)
} catch (error) {
- setIsError(true);
- console.error('Плоха-плоха:', error);
+ setIsError(true)
+ console.error('Плоха-плоха:', error)
} finally {
- setIsLoading(false);
+ setIsLoading(false)
}
- };
+ }
useEffect(() => {
- getUserAttestation();
- }, []);
+ getUserAttestation()
+ }, [])
- const semesters: Record = {};
- let year: number | null = null;
- let studentName: string | null = null;
+ const semesters: Record = {}
+ let studentName: string | null = null
+ let year: number | null = null
if (attestationData && attestationData.students) {
- year = attestationData.year;
+ year = attestationData.year
studentName = `
- ${attestationData.students[0].lastName}
- ${attestationData.students[0].firstName.slice(0, 1)}.
- ${attestationData.students[0].middleName.slice(0, 1)}.`;
+ ${attestationData.students[0].lastName}
+ ${attestationData.students[0].firstName.slice(0, 1)}.
+ ${attestationData.students[0].middleName.slice(0, 1)}.`
}
if (attestationData && attestationData.subjects) {
attestationData.subjects.forEach((subject) => {
- const semesterKey = `Семестр ${attestationData.termNumber}`;
+ const semesterKey = `Семестр ${attestationData.termNumber}`
if (!semesters[semesterKey]) {
- semesters[semesterKey] = [];
+ semesters[semesterKey] = []
}
- semesters[semesterKey].push(subject);
- });
+ semesters[semesterKey].push(subject)
+ })
}
return (
routeNavigator.back()}
>
-
+
- {attestationData
- && (
+ {attestationData && (
- )}
+ )}
{isDataLoading &&
}
- {isError
- && (
-
-
-
- Сообщить о проблеме
-
-
- )}
- />
- )}
+ {isError && (
+
+
+
+ Сообщить о проблеме
+
+
+ }
+ />
+ )}
-
FAQ}>
-
+ FAQ}>
+
{helpData.map(({ detail, title, id: dataId }) => (
-
+
))}
- Контакты}>
+ Контакты}>
} src={scffsAva} />}
- subtitle='Разработчик | Любые вопросы'
+ before={
+ }
+ src={scffsAva}
+ />
+ }
+ subtitle="Разработчик | Любые вопросы"
style={{ borderRadius: '5px !important' }}
>
-
+
Семён Окулов
} src={winxAva} />}
- subtitle='Наша группа | Любые вопросы'
+ before={
+ }
+ src={winxAva}
+ />
+ }
+ subtitle="Наша группа | Любые вопросы"
style={{ borderRadius: '5px !important' }}
>
-
+
Дневник СПО
-
- {notifications && notifications?.length > 0 && (
- notifications?.map(({
- title, id: _id, date, isForEmployees, isForParents, isForStudents, deleteInDays, text,
- }) => (
-
- {isForEmployees && Для работников}
- {isForParents && Для родителей}
- {isForStudents && Для студентов}
-
-
{title}
- {text}
-
-
-
- ))
- )}
+ {notifications &&
+ notifications?.length > 0 &&
+ notifications?.map(
+ ({
+ title,
+ id: _id,
+ date,
+ isForEmployees,
+ isForParents,
+ isForStudents,
+ deleteInDays,
+ text,
+ }) => (
+
+ {isForEmployees && (
+ Для работников
+ )}
+ {isForParents && (
+
+ Для родителей
+
+ )}
+ {isForStudents && (
+
+ Для студентов
+
+ )}
+