23 Commits

Author SHA1 Message Date
Primakov Alexandr Alexandrovich
923f7034dd 3.4.1
All checks were successful
platform/bro-js/journal.pl/pipeline/head This commit looks good
2024-10-30 14:44:17 +03:00
Primakov Alexandr Alexandrovich
fd422da06f fix update lesson 2024-10-30 14:44:12 +03:00
Primakov Alexandr Alexandrovich
0034704af6 3.4.0 2024-10-30 14:28:55 +03:00
Primakov Alexandr Alexandrovich
3dfd854a4c inline edit mode 2024-10-30 14:28:42 +03:00
Primakov Alexandr Alexandrovich
6b903b4d54 3.3.1 2024-10-22 17:52:44 +03:00
Primakov Alexandr Alexandrovich
c3de9692d8 fix unmount stuff 2024-10-22 16:56:19 +03:00
Primakov Alexandr Alexandrovich
b2898ef4b3 try open exam as spa 2024-10-22 16:39:32 +03:00
Primakov Alexandr Alexandrovich
26c8a477c3 3.3.0 2024-10-01 10:06:22 +03:00
Primakov Alexandr Alexandrovich
c9a64ccbef lessons list table размер названия лекции максимален 2024-10-01 10:05:56 +03:00
Primakov Alexandr Alexandrovich
250feff2f4 fix link to exam 2024-09-01 16:11:08 +03:00
Primakov Alexandr Alexandrovich
efc359ce7e fix exam url 2024-08-29 11:55:10 +03:00
Primakov Alexandr Alexandrovich
5911cdf8a8 link 2 exam 2024-08-29 09:55:05 +03:00
Primakov Alexandr Alexandrovich
a8195cd627 3.2.0 2024-08-29 08:10:10 +03:00
Primakov Alexandr Alexandrovich
52b60ed1f5 toggle exam 2024-08-29 08:10:03 +03:00
Primakov Alexandr Alexandrovich
bdf6c5e8a1 3.1.2
Some checks failed
platform/bro/pipeline/head This commit looks good
platform/bro/pipeline/tag This commit looks good
platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit
platform/bro-js/journal.pl/pipeline/head This commit looks good
2024-08-12 16:30:51 +03:00
Primakov Alexandr Alexandrovich
87c08e18bd fix: поправил автоподстановку даты в форму редактирования лекции [#29]
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-12 16:30:01 +03:00
Primakov Alexandr Alexandrovich
2d98b55bbc metrix on production mode + up cli version
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-12 15:50:30 +03:00
Primakov Alexandr Alexandrovich
ced1f85a7f fix: поправил мобильную вёрстку на экране списка курсов
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-12 10:59:09 +03:00
Primakov Alexandr Alexandrovich
e21b41f9ca 3.1.1
Some checks failed
platform/bro/pipeline/head This commit looks good
platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit
platform/bro/pipeline/tag This commit looks good
2024-08-12 00:05:37 +03:00
Primakov Alexandr Alexandrovich
cb3629bd43 global __webpack_public_path__ 2024-08-12 00:05:30 +03:00
Primakov Alexandr Alexandrovich
65216843ac 3.1.0
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-11 23:55:48 +03:00
Primakov Alexandr Alexandrovich
a76fce5506 ym
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-08-11 23:54:27 +03:00
Primakov Alexandr Alexandrovich
c842befc8f 3.0.0
All checks were successful
platform/bro/pipeline/head This commit looks good
platform/bro/pipeline/tag This commit looks good
2024-08-11 23:36:53 +03:00
32 changed files with 5888 additions and 3085 deletions

View File

@@ -9,6 +9,8 @@ module.exports = {
}, },
navigations: { navigations: {
'journal.main': '/journal.pl', 'journal.main': '/journal.pl',
'exam.main': '/exam',
'link.exam.details': '/details/:courseId/:examId'
}, },
features: { features: {
journal: { journal: {

4
index.d.ts vendored
View File

@@ -1,4 +1,6 @@
declare module '*.svg' { declare module '*.svg' {
const src: string; const src: string;
export default src; export default src;
} }
declare const __webpack_public_path__: string;

12
openapi-config.ts Normal file
View File

@@ -0,0 +1,12 @@
import type { ConfigFile } from '@rtk-query/codegen-openapi'
const config: ConfigFile = {
schemaFile: 'https://platform.bro-js.ru/jrnl-bh/documentation/json',
apiFile: './src/__data__/api/api.ts',
apiImport: 'api',
outputFile: './src/__data__/api/jrnl.ts',
exportName: 'jrnlApi',
hooks: true,
}
export default config

6872
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{ {
"name": "journal.pl", "name": "journal.pl",
"version": "2.4.5", "version": "3.4.1",
"description": "bro-js platform journal ui repo", "description": "bro-js platform journal ui repo",
"main": "./src/index.tsx", "main": "./src/index.tsx",
"scripts": { "scripts": {
@@ -19,13 +19,14 @@
"author": "", "author": "",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@rtk-query/codegen-openapi": "^1.2.0",
"@typescript-eslint/eslint-plugin": "^7.4.0", "@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0", "@typescript-eslint/parser": "^7.4.0",
"eslint": "^8.57.0", "eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.1" "eslint-plugin-react": "^7.34.1"
}, },
"dependencies": { "dependencies": {
"@brojs/cli": "^0.0.4-alpha.9", "@brojs/cli": "^0.0.4-beta.0",
"@chakra-ui/icons": "^2.1.1", "@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.2", "@chakra-ui/react": "^2.8.2",
"@emotion/react": "^11.11.4", "@emotion/react": "^11.11.4",
@@ -47,6 +48,7 @@
"react-redux": "^9.1.0", "react-redux": "^9.1.0",
"react-router-dom": "^6.22.1", "react-router-dom": "^6.22.1",
"redux": "^5.0.1", "redux": "^5.0.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"webpack-hot-middleware": "^2.26.1" "webpack-hot-middleware": "^2.26.1"
} }

View File

@@ -7,6 +7,7 @@ import {
BaseResponse, BaseResponse,
Course, Course,
Lesson, Lesson,
PopulatedCourse,
User, User,
UserData, UserData,
} from '../model' } from '../model'
@@ -32,7 +33,7 @@ export const api = createApi({
headers.set('Authorization', `Bearer ${keycloak.token}`) headers.set('Authorization', `Bearer ${keycloak.token}`)
}, },
}), }),
tagTypes: ['LessonList', 'CourseList'], tagTypes: ['LessonList', 'CourseList', 'Course'],
endpoints: (builder) => ({ endpoints: (builder) => ({
coursesList: builder.query<BaseResponse<Course[]>, void>({ coursesList: builder.query<BaseResponse<Course[]>, void>({
query: () => '/course/list', query: () => '/course/list',
@@ -78,7 +79,7 @@ export const api = createApi({
}), }),
invalidatesTags: ['LessonList'], invalidatesTags: ['LessonList'],
}), }),
updateLesson: builder.mutation<BaseResponse<Lesson>, Partial<Lesson> & Pick<Lesson, '_id'>>({ updateLesson: builder.mutation<BaseResponse<Lesson>, Partial<Lesson> & Pick<Lesson, 'id'>>({
query: (data) => ({ query: (data) => ({
method: 'PUT', method: 'PUT',
url: '/lesson', url: '/lesson',
@@ -116,5 +117,18 @@ export const api = createApi({
method: 'GET', method: 'GET',
}), }),
}), }),
getCourseById: builder.query<PopulatedCourse, string>({
query: (courseId) => `/course/${courseId}`,
transformResponse: (response: BaseResponse<PopulatedCourse>) => response.body,
providesTags: ['Course'],
}),
toggleExamWithJury: builder.mutation<void, string>({
query: (courseId) => ({
url: `/course/toggle-exam-with-jury/${courseId}`,
method: 'POST',
body: {},
}),
invalidatesTags: ['Course']
})
}), }),
}) })

View File

@@ -50,7 +50,7 @@ export type BaseResponse<Data> = {
}; };
export interface Lesson { export interface Lesson {
_id: string; id: string;
name: string; name: string;
students: User[]; students: User[];
date: string; date: string;
@@ -79,10 +79,46 @@ export interface User {
export interface Course { export interface Course {
_id: string; _id: string;
id: string;
name: string; name: string;
teachers: User[]; teachers: User[];
lessons: Lesson[]; lessons: string[];
creator: User; creator: User;
startDt: string; startDt: string;
examWithJury?: string;
created: string; created: string;
} }
export interface PopulatedCourse extends Omit<Course, 'examWithJury' | 'lessons'> {
examWithJury: ExamWithJury;
lessons: Lesson[];
}
interface ExamWithJury {
name: string;
description: string;
jury: any[];
date: string;
created: string;
criterias: Criteria[][];
id: string;
}
interface Criteria {
title: string;
type?: string;
min?: number;
max?: number;
wight?: number;
subcriterias?: Subcriteria[];
}
interface Subcriteria {
title: string;
type: string;
wight: number;
trueText?: string;
falseText?: string;
min?: number;
max?: number;
}

View File

@@ -1,87 +1,28 @@
import React from 'react'; import React from 'react';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import { Global, css } from '@emotion/react' import { Global } from '@emotion/react'
import { BrowserRouter } from 'react-router-dom'; import { BrowserRouter } from 'react-router-dom';
import ruLocale from 'dayjs/locale/ru'; import ruLocale from 'dayjs/locale/ru';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { ChakraProvider } from '@chakra-ui/react' import { ChakraProvider } from '@chakra-ui/react'
import { Dashboard } from './dashboard'; import { Dashboard } from './dashboard';
import { globalStyles } from './global.styles';
dayjs.locale('ru', ruLocale); dayjs.locale('ru', ruLocale);
const App = ({ store }) => { const App = ({ store }) => (
return( <ChakraProvider>
<ChakraProvider> <BrowserRouter>
<BrowserRouter> <Helmet>
<Helmet> <meta name="viewport" content="width=device-width, user-scalable=no" />
<meta name="viewport" content="width=device-width, user-scalable=no" /> <title>Журнал</title>
<title>Журнал</title> </Helmet>
</Helmet> <Global styles={globalStyles} />
<Global <Dashboard store={store} />
styles={css` </BrowserRouter>
html { </ChakraProvider>
height: 100%; )
max-width: 100%;
overflow: hidden;
}
body {
color: #000;
/* background: radial-gradient(circle at top right, rgb(154 227 33), rgb(33 160 56)); */
background: radial-gradient(
farthest-side at bottom left,
rgba(35, 235, 4, 0.709),
rgba(255, 255, 255, 0) 65%
),
radial-gradient(
farthest-corner at bottom center,
rgba(244, 244, 8, 0.6),
rgba(255, 255, 255, 0) 40%
),
radial-gradient(
farthest-side at bottom right,
rgba(0, 195, 255, 0.648),
rgb(239 244 246) 65%
/* rgba(255, 255, 255, 0) 65% */
);
height: 100%;
/* font-family: KiyosunaSans, Montserrat, RFKrabuler, sans-serif; */
font-weight: 600;
}
#app {
height: 100%;
overflow-y: auto;
}
@font-face {
font-family: 'KiyosunaSans';
src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-B.otf'}');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'KiyosunaSans';
src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-L.otf'}');
font-weight: lighter;
font-style: normal;
}
@font-face {
font-family: 'RFKrabuler';
src: url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.eot'}');
src:
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff2'}') format('woff2'),
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff'}') format('woff'),
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/TTF/RF-Krabuler-Regular.ttf'}') format('truetype');
font-weight: normal;
font-style: normal;
}
`}
/>
<Dashboard store={store} />
</BrowserRouter>
</ChakraProvider>
)
}
export default App; export default App;

View File

@@ -0,0 +1,20 @@
import React from 'react'
import {
Spinner,
Container,
Center,
} from '@chakra-ui/react'
export const PageLoader = () => (
<Container maxW="container.xl">
<Center h="300px">
<Spinner
thickness="4px"
speed="0.65s"
emptyColor="gray.200"
color="blue.500"
size="xl"
/>
</Center>
</Container>
)

View File

@@ -0,0 +1 @@
export { XlSpinner } from './xl-spinner';

View File

@@ -0,0 +1,20 @@
import React from 'react'
import {
Container,
Center,
Spinner,
} from '@chakra-ui/react'
export const XlSpinner = () => (
<Container maxW="container.xl">
<Center h="300px">
<Spinner
thickness="4px"
speed="0.65s"
emptyColor="gray.200"
color="blue.500"
size="xl"
/>
</Center>
</Container>
)

60
src/global.styles.ts Normal file
View File

@@ -0,0 +1,60 @@
import { css } from '@emotion/react'
export const globalStyles = css`
html {
height: 100%;
max-width: 100%;
min-width: 320px;
overflow: hidden;
}
body {
color: #000;
/* background: radial-gradient(circle at top right, rgb(154 227 33), rgb(33 160 56)); */
background: radial-gradient(
farthest-side at bottom left,
rgba(35, 235, 4, 0.709),
rgba(255, 255, 255, 0) 65%
),
radial-gradient(
farthest-corner at bottom center,
rgba(244, 244, 8, 0.6),
rgba(255, 255, 255, 0) 40%
),
radial-gradient(
farthest-side at bottom right,
rgba(0, 195, 255, 0.648),
rgb(239 244 246) 65%
/* rgba(255, 255, 255, 0) 65% */
);
height: 100%;
/* font-family: KiyosunaSans, Montserrat, RFKrabuler, sans-serif; */
font-weight: 600;
}
#app {
height: 100%;
overflow-y: auto;
}
@font-face {
font-family: 'KiyosunaSans';
src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-B.otf'}');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'KiyosunaSans';
src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-L.otf'}');
font-weight: lighter;
font-style: normal;
}
@font-face {
font-family: 'RFKrabuler';
src: url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.eot'}');
src:
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff2'}') format('woff2'),
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff'}') format('woff'),
url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/TTF/RF-Krabuler-Regular.ttf'}') format('truetype');
font-weight: normal;
font-style: normal;
}
`

View File

@@ -1,3 +1,4 @@
/* eslint-disable react/display-name */
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom/client'; import ReactDOM from 'react-dom/client';
@@ -5,6 +6,10 @@ import App from './app';
import { keycloak } from "./__data__/kc"; import { keycloak } from "./__data__/kc";
import { createStore } from "./__data__/store"; import { createStore } from "./__data__/store";
if(!module.hot) {
import('./ym');
}
export default (props) => <App {...props} />; export default (props) => <App {...props} />;
let rootElement: ReactDOM.Root let rootElement: ReactDOM.Root
@@ -20,7 +25,7 @@ export const mount = async (Сomponent, element = document.getElementById('app')
} }
const store = createStore({ user }); const store = createStore({ user });
const rootElement = ReactDOM.createRoot(element); rootElement = ReactDOM.createRoot(element);
rootElement.render(<Сomponent store={store} />); rootElement.render(<Сomponent store={store} />);
if(module.hot) { if(module.hot) {

View File

@@ -0,0 +1,93 @@
import React, { useCallback, useEffect, useState } from 'react'
import dayjs from 'dayjs'
import { Link as ConnectedLink } from 'react-router-dom'
import { getNavigationsValue } from '@brojs/cli'
import {
Box,
CardHeader,
CardBody,
CardFooter,
ButtonGroup,
Stack,
StackDivider,
Button,
Card,
Heading,
Tooltip,
Spinner,
} from '@chakra-ui/react'
import { api } from '../../__data__/api/api'
import { ArrowUpIcon, LinkIcon } from '@chakra-ui/icons'
import { Course } from '../../__data__/model'
import { CourseDetails } from './course-details'
export const CourseCard = ({
course,
}: {
course: Course
}) => {
const [getLessonList, populatedCourse] = api.useLazyGetCourseByIdQuery()
const [isOpened, setIsOpened] = useState(false)
useEffect(() => {
if (isOpened) {
getLessonList(course.id, true)
}
}, [isOpened])
const handleToggleOpene = useCallback(() => {
setIsOpened(opened => !opened)
}, [setIsOpened])
return (
<Card key={course._id} align="left">
<CardHeader>
<Heading as="h2" mt="0">
{course.name}
</Heading>
</CardHeader>
{isOpened && (
<CardBody mt="16px">
<Stack divider={<StackDivider />} spacing="8px">
<Box as="span" textAlign="left">
{`Дата начала курса - ${dayjs(course.startDt).format('DD MMMM YYYYг.')}`}
</Box>
<Box as="span" textAlign="left">
Количество занятий - {course.lessons.length}
</Box>
{populatedCourse.isFetching && <Spinner />}
{!populatedCourse.isFetching && populatedCourse.isSuccess && <CourseDetails populatedCourse={populatedCourse.data} />}
</Stack>
</CardBody>
)}
<CardFooter>
<ButtonGroup spacing={[0, 4]} mt="16px" flexDirection={['column', 'row']}>
<Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
<Button
leftIcon={<LinkIcon />}
as={ConnectedLink}
colorScheme="blue"
to={`${getNavigationsValue('journal.main')}/lessons-list/${course._id}`}
>
Открыть
</Button>
</Tooltip>
<Tooltip label="Детали" fontSize="12px" top="16px">
<Button
colorScheme="blue"
mt={["16px", 0]}
variant="outline"
leftIcon={<ArrowUpIcon transform={isOpened ? 'rotate(0)' : 'rotate(180deg)'} />}
loadingText="Загрузка"
isLoading={populatedCourse.isFetching}
onClick={handleToggleOpene}
>
{isOpened ? 'Закрыть' : 'Просмотреть детали'}
</Button>
</Tooltip>
</ButtonGroup>
</CardFooter>
</Card>
)
}

View File

@@ -0,0 +1,99 @@
import React from 'react'
import dayjs from 'dayjs'
import { Link as ConnectedLink } from 'react-router-dom'
import { getNavigationsValue, getHistory } from '@brojs/cli'
import {
Stack,
Heading,
Link,
Button,
Tooltip,
Box,
} from '@chakra-ui/react'
import { useAppSelector } from '../../__data__/store'
import { isTeacher } from '../../utils/user'
import { PopulatedCourse } from '../../__data__/model'
import { api } from '../../__data__/api/api'
import { LinkIcon } from '@chakra-ui/icons'
type CourseDetailsProps = {
populatedCourse: PopulatedCourse;
}
const history = getHistory()
export const CourseDetails = ({ populatedCourse }: CourseDetailsProps) => {
const user = useAppSelector((s) => s.user)
const exam = populatedCourse.examWithJury
const [toggleExamWithJury, examWithJuryRequest] = api.useToggleExamWithJuryMutation()
return (
<>
<Heading as="h3" mt={4} mb={3} size="lg">
Экзамен: {exam?.name} {exam && <Tooltip label="Начать экзамен" fontSize="12px" top="16px">
<Button
leftIcon={<LinkIcon />}
as={'a'}
colorScheme="blue"
href={getNavigationsValue('exam.main') + getNavigationsValue('link.exam.details').replace(':courseId', populatedCourse.id).replace(':examId', exam.id)}
onClick={event => {
event.preventDefault();
history.push(getNavigationsValue('exam.main') + getNavigationsValue('link.exam.details').replace(':courseId', populatedCourse.id).replace(':examId', exam.id))
}}
>
Открыть
</Button>
</Tooltip>}
</Heading>
{!Boolean(exam) && (
<>
<Heading as="h3" mt={4} mb={3} size="lg">
Не задан
</Heading>
<Box mt={10}>
<Tooltip label="Создать экзамен с жюри" fontSize="12px" top="16px">
<Button
colorScheme="blue"
mt={["16px", 0]}
variant="outline"
isLoading={examWithJuryRequest.isLoading}
onClick={() => toggleExamWithJury(populatedCourse.id)}
>
Создать
</Button>
</Tooltip>
</Box>
</>
)}
{Boolean(exam) && (
<>
<Heading as="h3" mt={4} mb={3} size="lg">
Количество членов жюри:
</Heading>
<Heading as="h3" mt={4} mb={3} size="lg">
{populatedCourse.examWithJury.jury.length}
</Heading></>
)}
<Heading as="h3" mt={4} mb={3} size="lg">
Список занятий:
</Heading>
<Stack>
{populatedCourse?.lessons?.map((lesson) => (
<Link
as={ConnectedLink}
key={lesson.id}
to={
isTeacher(user)
? `${getNavigationsValue('journal.main')}/lesson/${populatedCourse.id}/${lesson.id}`
: ''
}
>
{lesson.name}
</Link>
))}
</Stack>
</>
)
}

View File

@@ -1,56 +1,44 @@
import React, { useCallback, useEffect, useRef, useState } from 'react' import React, { useEffect, useRef, useState } from 'react'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { Link as ConnectedLink } from 'react-router-dom'
import { getNavigationsValue } from '@brojs/cli'
import { import {
Box, Box,
CardHeader, CardHeader,
CardBody, CardBody,
CardFooter,
ButtonGroup,
Stack,
StackDivider,
Button, Button,
Card, Card,
Heading, Heading,
Tooltip,
Spinner,
Container, Container,
VStack, VStack,
Link,
Input, Input,
CloseButton, CloseButton,
FormControl, FormControl,
FormLabel, FormLabel,
FormHelperText, FormHelperText,
Center,
FormErrorMessage, FormErrorMessage,
useToast, useToast,
} from '@chakra-ui/react' } from '@chakra-ui/react'
import { useForm, Controller } from 'react-hook-form' import { useForm, Controller } from 'react-hook-form'
import { ErrorSpan } from './style' import { ErrorSpan } from '../style'
import { useAppSelector } from '../__data__/store' import { useAppSelector } from '../../__data__/store'
import { api } from '../__data__/api/api' import { api } from '../../__data__/api/api'
import { isTeacher } from '../utils/user' import { isTeacher } from '../../utils/user'
import { AddIcon, ArrowDownIcon, ArrowUpIcon, LinkIcon } from '@chakra-ui/icons' import { AddIcon } from '@chakra-ui/icons'
import { Course } from '../__data__/model' import { PageLoader } from '../../components/page-loader/page-loader'
import { CourseCard } from './course-card'
interface NewCourseForm { interface NewCourseForm {
startDt: string startDt: string
name: string name: string
} }
const CoursesList = () => { export const CoursesList = () => {
const toast = useToast() const toast = useToast()
const user = useAppSelector((s) => s.user) const user = useAppSelector((s) => s.user)
const { data, isLoading } = api.useCoursesListQuery() const { data, isLoading } = api.useCoursesListQuery()
const [createUpdateCourse, crucQuery] = api.useCreateUpdateCourseMutation() const [createUpdateCourse, crucQuery] = api.useCreateUpdateCourseMutation()
const [showForm, setShowForm] = useState(false) const [showForm, setShowForm] = useState(false)
const [courseDetailsOpenedId, setCourseDetailsOpenedId] = useState<
string | null
>(null)
const toastRef = useRef(null) const toastRef = useRef(null)
const { const {
@@ -61,8 +49,8 @@ const CoursesList = () => {
getValues, getValues,
} = useForm<NewCourseForm>({ } = useForm<NewCourseForm>({
defaultValues: { defaultValues: {
startDt: '', startDt: dayjs().format('YYYY-MM-DD'),
name: '', name: 'Название',
}, },
}) })
@@ -93,17 +81,7 @@ const CoursesList = () => {
if (isLoading) { if (isLoading) {
return ( return (
<Container maxW="container.xl"> <PageLoader />
<Center h="300px">
<Spinner
thickness="4px"
speed="0.65s"
emptyColor="gray.200"
color="blue.500"
size="xl"
/>
</Center>
</Container>
) )
} }
@@ -212,109 +190,11 @@ const CoursesList = () => {
<VStack as="ul" align="stretch"> <VStack as="ul" align="stretch">
{data?.body?.map((c) => ( {data?.body?.map((c) => (
<CourseCard <CourseCard
isOpened={courseDetailsOpenedId === c._id} key={c.id}
key={c._id}
course={c} course={c}
openDetails={() =>
courseDetailsOpenedId === c._id
? setCourseDetailsOpenedId(null)
: setCourseDetailsOpenedId(c._id)
}
/> />
))} ))}
</VStack> </VStack>
</Container> </Container>
) )
} }
const CourseCard = ({
course,
isOpened,
openDetails,
}: {
course: Course
isOpened: boolean
openDetails: () => void
}) => {
const [getLessonList, lessonList] = api.useLazyLessonListQuery()
useEffect(() => {
if (isOpened) {
getLessonList(course._id, true)
}
}, [isOpened])
const user = useAppSelector((s) => s.user)
return (
<Card key={course._id} align="left">
<CardHeader>
<Heading as="h2" mt="0">
{course.name}
</Heading>
</CardHeader>
{isOpened && (
<CardBody mt="16px">
<Stack divider={<StackDivider />} spacing="8px">
<Box as="span" textAlign="left">
{`Дата начала курса - ${dayjs(course.startDt).format('DD MMMM YYYYг.')}`}
</Box>
<Box as="span" textAlign="left">
Количество занятий - {course.lessons.length}
</Box>
{lessonList.isFetching ? (
<Spinner />
) : (
<>
<Heading as="h3" mt={4} mb={3} size="lg">
Список занятий:
</Heading>
<Stack>
{lessonList.data?.body?.map((lesson) => (
<Link
as={ConnectedLink}
key={lesson._id}
to={
isTeacher(user)
? `${getNavigationsValue('journal.main')}/lesson/${course._id}/${lesson._id}`
: ''
}
>
{lesson.name}
</Link>
))}
</Stack>
</>
)}
</Stack>
</CardBody>
)}
<CardFooter>
<ButtonGroup spacing="4" mt="16px">
<Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
<Button
leftIcon={<LinkIcon />}
as={ConnectedLink}
colorScheme="blue"
to={`${getNavigationsValue('journal.main')}/lessons-list/${course._id}`}
>
Открыть
</Button>
</Tooltip>
<Tooltip label="Детали" fontSize="12px" top="16px">
<Button
colorScheme="blue"
variant="outline"
leftIcon={isOpened ? <ArrowUpIcon /> : <ArrowDownIcon />}
loadingText="Загрузка"
isLoading={lessonList.isFetching}
onClick={openDetails}
>
Просмотреть детали
</Button>
</Tooltip>
</ButtonGroup>
</CardFooter>
</Card>
)
}
export default CoursesList

View File

@@ -0,0 +1,3 @@
import { CoursesList } from './course-list'
export default CoursesList

View File

@@ -1,8 +1,6 @@
import { lazy } from 'react' import { lazy } from 'react'
export const CourseListPage = lazy(/* chank-name="course-details" */() => import('./course-list')); export const CourseListPage = lazy(() => import(/* webpackChunkName: "course-list" */ './course-list'));
export const LessonDetailsPage = lazy(() => import(/* webpackChunkName: "lesson-details" */ './lesson-details'));
export const LessonDetailsPage = lazy(/* chank-name="course-details" */() => import('./lesson-details')); export const LessonListPage = lazy(() => import(/* webpackChunkName: "lesson-list" */ './lesson-list'));
export const LessonListPage = lazy(/* chank-name="course-details" */() => import('./lesson-list')); export const UserPage = lazy(() => import(/* webpackChunkName: "user-page" */ './user-page'));
export const UserPage = lazy(/* chank-name="course-details" */() => import('./user-page'));

View File

@@ -0,0 +1,28 @@
import React from 'react'
import { ResponsiveBar } from '@nivo/bar'
export const Bar = ({ data }) => (
<ResponsiveBar
data={data}
keys={['count']}
indexBy="lessonIndex"
margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
padding={0.3}
valueScale={{ type: 'linear' }}
indexScale={{ type: 'band', round: true }}
colors={{ scheme: 'set3' }}
axisTop={null}
axisRight={null}
labelSkipWidth={12}
labelSkipHeight={12}
labelTextColor={{
from: 'color',
modifiers: [['brighter', 1.4]],
}}
role="application"
ariaLabel="График посещаемости лекций"
barAriaLabel={(e) =>
e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
}
/>
)

View File

@@ -0,0 +1,144 @@
import React, { useEffect, useRef, useState } from 'react'
import dayjs from 'dayjs'
import { Link } from 'react-router-dom'
import { getNavigationsValue, getFeatures } from '@brojs/cli'
import {
Button,
Tr,
Td,
Menu,
MenuButton,
MenuItem,
MenuList,
useToast,
} from '@chakra-ui/react'
import { EditIcon } from '@chakra-ui/icons'
import { qrCode } from '../../../assets'
import { LessonForm } from './lessons-form'
import { api } from '../../../__data__/api/api'
const features = getFeatures('journal')
const groupByDate = features?.['group.by.date']
type ItemProps = {
id: string
date: string
name: string
isTeacher: boolean
courseId: string
setlessonToDelete(): void
students: unknown[]
}
export const Item: React.FC<ItemProps> = ({
id,
date,
name,
isTeacher,
courseId,
setlessonToDelete,
students,
}) => {
const [edit, setEdit] = useState(false)
const toastRef = useRef(null)
const toast = useToast()
const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
const createdLessonRef = useRef(null)
const onSubmit = (lessonData) => {
toastRef.current = toast({
title: 'Отправляем',
status: 'loading',
duration: 9000,
})
createdLessonRef.current = lessonData
if (navigator.onLine) {
updateLesson(lessonData)
} else {
toast.update(toastRef.current, {
title: 'Отсутствует интернет',
status: 'error',
duration: 3000
})
}
}
useEffect(() => {
if (updateLessonRqst.isSuccess) {
const toastProps = {
title: 'Лекция Обновлена',
description: `Лекция ${createdLessonRef.current?.name} успешно обновлена`,
status: 'success' as const,
duration: 9000,
isClosable: true,
}
if (toastRef.current) toast.update(toastRef.current, toastProps)
else toast(toastProps)
setEdit(false)
}
}, [updateLessonRqst.isSuccess])
if (edit && isTeacher) {
return (
<Tr>
<Td colSpan={5}>
<LessonForm
isLoading={updateLessonRqst.isLoading}
error={(updateLessonRqst.error as any)?.error}
onSubmit={onSubmit}
onCancel={() => {
setEdit(false)
}}
lesson={{ _id: id, id, name, date }}
title={'Редактирование лекции'}
nameButton={'Сохранить'}
/>
</Td>
</Tr>
)
}
return (
<Tr>
{isTeacher && (
<Td>
<Link
to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${id}`}
style={{ display: 'flex' }}
>
<img width={24} src={qrCode} style={{ margin: '0 auto' }} />
</Link>
</Td>
)}
<Td textAlign="center">
{dayjs(date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
</Td>
<Td>{name}</Td>
{isTeacher && (
<Td>
{!edit && (
<Menu>
<MenuButton as={Button}>
<EditIcon />
</MenuButton>
<MenuList>
<MenuItem
onClick={() => {
setEdit(true)
}}
>
Edit
</MenuItem>
<MenuItem onClick={setlessonToDelete}>Delete</MenuItem>
</MenuList>
</Menu>
)}
{edit && <Button onClick={setlessonToDelete}>Сохранить</Button>}
</Td>
)}
<Td isNumeric>{students.length}</Td>
</Tr>
)
}

View File

@@ -0,0 +1,45 @@
import React from 'react'
import dayjs from 'dayjs'
import {
Tr,
Td,
} from '@chakra-ui/react'
import { Lesson } from '../../../__data__/model'
import { Item } from './item'
type LessonItemProps = {
date: string
lessons: Lesson[]
isTeacher: boolean
courseId: string
setlessonToDelete(lesson: Lesson): void
}
export const LessonItems: React.FC<LessonItemProps> = ({
date,
lessons,
isTeacher,
courseId,
setlessonToDelete,
}) => (
<>
{date && (
<Tr>
<Td colSpan={isTeacher ? 5 : 3}>
{dayjs(date).format('DD MMMM YYYY')}
</Td>
</Tr>
)}
{lessons.map((lesson) => (
<Item
key={lesson.id}
{...lesson}
setlessonToDelete={() => setlessonToDelete(lesson)}
courseId={courseId}
isTeacher={isTeacher}
/>
))}
</>
)

View File

@@ -0,0 +1,140 @@
import React from 'react'
import { useForm, Controller } from 'react-hook-form'
import {
Box,
Card,
CardBody,
CardHeader,
Heading,
Button,
CloseButton,
VStack,
FormControl,
FormLabel,
FormHelperText,
FormErrorMessage,
Input,
} from '@chakra-ui/react'
import { AddIcon } from '@chakra-ui/icons'
import { dateToCalendarFormat } from '../../../utils/time'
import { Lesson } from '../../../__data__/model'
import { ErrorSpan } from '../style'
interface NewLessonForm {
name: string
date: string
}
interface LessonFormProps {
lesson?: Partial<Lesson>
isLoading: boolean
onCancel: () => void
onSubmit: (lesson: Lesson) => void
error?: string
title: string
nameButton: string
}
export const LessonForm = ({
lesson,
isLoading,
onCancel,
onSubmit,
error,
title,
nameButton,
}: LessonFormProps) => {
const {
control,
handleSubmit,
reset,
formState: { errors },
} = useForm<NewLessonForm>({
defaultValues: (lesson && {
...lesson,
date: dateToCalendarFormat(lesson.date),
}) || {
name: '',
date: dateToCalendarFormat(),
},
})
return (
<Card align="left">
<CardHeader display="flex">
<Heading as="h2" mt="0">
{title}
</Heading>
<CloseButton
ml="auto"
onClick={() => {
reset()
onCancel()
}}
/>
</CardHeader>
<CardBody>
<form onSubmit={handleSubmit(onSubmit)}>
<VStack spacing="10" align="left">
<Controller
control={control}
name="date"
rules={{ required: 'Обязательное поле' }}
render={({ field }) => (
<FormControl>
<FormLabel>Дата</FormLabel>
<Input
{...field}
required={false}
placeholder="Укажите дату лекции"
size="md"
type="datetime-local"
/>
{errors.date ? (
<FormErrorMessage>{errors.date?.message}</FormErrorMessage>
) : (
<FormHelperText>Укажите дату и время лекции</FormHelperText>
)}
</FormControl>
)}
/>
<Controller
control={control}
name="name"
rules={{ required: 'Обязательное поле' }}
render={({ field }) => (
<FormControl isRequired isInvalid={Boolean(errors.name)}>
<FormLabel>Название новой лекции:</FormLabel>
<Input
{...field}
required={false}
placeholder="Название лекции"
size="md"
/>
{errors.name && (
<FormErrorMessage>{errors.name.message}</FormErrorMessage>
)}
</FormControl>
)}
/>
<Box mt="10">
<Button
size="lg"
type="submit"
leftIcon={<AddIcon />}
colorScheme="blue"
isLoading={isLoading}
>
{nameButton}
</Button>
</Box>
</VStack>
{error && <ErrorSpan>{error}</ErrorSpan>}
</form>
</CardBody>
</Card>
)
}

View File

@@ -0,0 +1,3 @@
import LessonsList from './lesson-list';
export default LessonsList;

View File

@@ -1,48 +1,23 @@
import React, { import React, { useEffect, useMemo, useRef, useState } from 'react'
useEffect,
useMemo,
useRef,
useState,
} from 'react'
import { ResponsiveBar } from '@nivo/bar'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { Link, useParams } from 'react-router-dom' import { Link, useParams } from 'react-router-dom'
import { getNavigationsValue, getFeatures } from '@brojs/cli' import { getNavigationsValue, getFeatures } from '@brojs/cli'
import { useForm, Controller } from 'react-hook-form'
import { import {
Breadcrumb, Breadcrumb,
BreadcrumbItem, BreadcrumbItem,
BreadcrumbLink, BreadcrumbLink,
Container, Container,
Box, Box,
Card,
CardBody,
CardHeader,
Heading,
Button, Button,
CloseButton,
useToast, useToast,
VStack,
FormControl,
FormLabel,
Toast, Toast,
FormHelperText,
FormErrorMessage,
Input,
TableContainer, TableContainer,
Table, Table,
Thead, Thead,
Tr, Tr,
Th, Th,
Tbody, Tbody,
Td,
Menu,
MenuButton,
MenuItem,
Text, Text,
MenuList,
Center,
Spinner,
AlertDialog, AlertDialog,
AlertDialogBody, AlertDialogBody,
AlertDialogContent, AlertDialogContent,
@@ -50,136 +25,24 @@ import {
AlertDialogHeader, AlertDialogHeader,
AlertDialogOverlay, AlertDialogOverlay,
} from '@chakra-ui/react' } from '@chakra-ui/react'
import { AddIcon, EditIcon } from '@chakra-ui/icons' import { AddIcon } from '@chakra-ui/icons'
import { useAppSelector } from '../__data__/store' import { useAppSelector } from '../../__data__/store'
import { api } from '../__data__/api/api' import { api } from '../../__data__/api/api'
import { isTeacher } from '../utils/user' import { isTeacher } from '../../utils/user'
import { qrCode } from '../assets' import { Lesson } from '../../__data__/model'
import { Lesson } from '../__data__/model' import { XlSpinner } from '../../components/xl-spinner'
import { ErrorSpan, BreadcrumbsWrapper } from './style' import { LessonForm } from './components/lessons-form'
import { Bar } from './components/bar'
import { LessonItems } from './components/lesson-items'
import { BreadcrumbsWrapper } from './style'
const features = getFeatures('journal') const features = getFeatures('journal')
const barFeature = features?.['lesson.bar'] const barFeature = features?.['lesson.bar']
const groupByDate = features?.['group.by.date'] const groupByDate = features?.['group.by.date']
interface NewLessonForm {
name: string
date: string
}
interface LessonFormProps {
lesson?: Partial<Lesson>
isLoading: boolean
onCancel: () => void
onSubmit: (lesson: Lesson) => void
error?: string
title: string
nameButton: string
}
const LessonForm = ({
lesson,
isLoading,
onCancel,
onSubmit,
error,
title,
nameButton,
}: LessonFormProps) => {
const {
control,
handleSubmit,
reset,
formState: { errors },
} = useForm<NewLessonForm>({
defaultValues: lesson || {
name: '',
date: '',
},
})
return (
<Card align="left">
<CardHeader display="flex">
<Heading as="h2" mt="0">
{title}
</Heading>
<CloseButton
ml="auto"
onClick={() => {
reset()
onCancel()
}}
/>
</CardHeader>
<CardBody>
<form onSubmit={handleSubmit(onSubmit)}>
<VStack spacing="10" align="left">
<Controller
control={control}
name="date"
rules={{ required: 'Обязательное поле' }}
render={({ field }) => (
<FormControl>
<FormLabel>Дата</FormLabel>
<Input
{...field}
required={false}
placeholder="Укажите дату лекции"
size="md"
type="datetime-local"
/>
{errors.date ? (
<FormErrorMessage>{errors.date?.message}</FormErrorMessage>
) : (
<FormHelperText>Укажите дату и время лекции</FormHelperText>
)}
</FormControl>
)}
/>
<Controller
control={control}
name="name"
rules={{ required: 'Обязательное поле' }}
render={({ field }) => (
<FormControl isRequired isInvalid={Boolean(errors.name)}>
<FormLabel>Название новой лекции:</FormLabel>
<Input
{...field}
required={false}
placeholder="Название лекции"
size="md"
/>
{errors.name && (
<FormErrorMessage>{errors.name.message}</FormErrorMessage>
)}
</FormControl>
)}
/>
<Box mt="10">
<Button
size="lg"
type="submit"
leftIcon={<AddIcon />}
colorScheme="blue"
isLoading={isLoading}
>
{nameButton}
</Button>
</Box>
</VStack>
{error && <ErrorSpan>{error}</ErrorSpan>}
</form>
</CardBody>
</Card>
)
}
const LessonList = () => { const LessonList = () => {
const { courseId } = useParams() const { courseId } = useParams()
const user = useAppSelector((s) => s.user) const user = useAppSelector((s) => s.user)
@@ -194,14 +57,16 @@ const LessonList = () => {
const toastRef = useRef(null) const toastRef = useRef(null)
const createdLessonRef = useRef(null) const createdLessonRef = useRef(null)
const [editLesson, setEditLesson] = useState<Lesson>(null) const [editLesson, setEditLesson] = useState<Lesson>(null)
const sorted = useMemo(() => [...(data?.body || [])]?.sort((a, b) => a.date > b.date ? 1 : -1), [data, data?.body]) const sorted = useMemo(
() => [...(data?.body || [])]?.sort((a, b) => (a.date > b.date ? 1 : -1)),
[data, data?.body],
)
const lessonCalc = useMemo(() => { const lessonCalc = useMemo(() => {
if (!isSuccess) { if (!isSuccess) {
return [] return []
} }
if (!groupByDate) { if (!groupByDate) {
return [{ date: '', data: sorted }] return [{ date: '', data: sorted }]
} }
@@ -223,7 +88,7 @@ const LessonList = () => {
} }
} }
return lessonsData.sort((a, b) => a.date < b.date? 1 : -1) return lessonsData.sort((a, b) => (a.date < b.date ? 1 : -1))
}, [groupByDate, isSuccess, sorted]) }, [groupByDate, isSuccess, sorted])
const onSubmit = (lessonData) => { const onSubmit = (lessonData) => {
@@ -281,8 +146,8 @@ const LessonList = () => {
if (crLQuery.isSuccess) { if (crLQuery.isSuccess) {
const toastProps = { const toastProps = {
title: 'Лекция создана', title: 'Лекция создана',
description: `Лекция ${createdLessonRef.current.name} успешно создана`, description: `Лекция ${createdLessonRef.current?.name} успешно создана`,
status: 'success' as 'success', status: 'success' as const,
duration: 9000, duration: 9000,
isClosable: true, isClosable: true,
} }
@@ -296,8 +161,8 @@ const LessonList = () => {
if (updateLessonRqst.isSuccess) { if (updateLessonRqst.isSuccess) {
const toastProps = { const toastProps = {
title: 'Лекция Обновлена', title: 'Лекция Обновлена',
description: `Лекция ${createdLessonRef.current.name} успешно обновлена`, description: `Лекция ${createdLessonRef.current?.name} успешно обновлена`,
status: 'success' as 'success', status: 'success' as const,
duration: 9000, duration: 9000,
isClosable: true, isClosable: true,
} }
@@ -308,19 +173,7 @@ const LessonList = () => {
}, [updateLessonRqst.isSuccess]) }, [updateLessonRqst.isSuccess])
if (isLoading) { if (isLoading) {
return ( return <XlSpinner />
<Container maxW="container.xl">
<Center h="300px">
<Spinner
thickness="4px"
speed="0.65s"
emptyColor="gray.200"
color="blue.500"
size="xl"
/>
</Center>
</Container>
)
} }
return ( return (
@@ -353,7 +206,7 @@ const LessonList = () => {
colorScheme="red" colorScheme="red"
loadingText="" loadingText=""
isLoading={deletingRqst.isLoading} isLoading={deletingRqst.isLoading}
onClick={() => deleteLesson(lessonToDelete._id)} onClick={() => deleteLesson(lessonToDelete.id)}
ml={3} ml={3}
> >
Delete Delete
@@ -380,7 +233,7 @@ const LessonList = () => {
<Box mt="15" mb="15"> <Box mt="15" mb="15">
{showForm ? ( {showForm ? (
<LessonForm <LessonForm
key={editLesson?._id} key={editLesson?.id}
isLoading={crLQuery.isLoading} isLoading={crLQuery.isLoading}
onSubmit={onSubmit} onSubmit={onSubmit}
onCancel={() => { onCancel={() => {
@@ -405,7 +258,7 @@ const LessonList = () => {
)} )}
</Box> </Box>
)} )}
{barFeature && sorted?.length && ( {barFeature && sorted?.length > 1 && (
<Box height="300"> <Box height="300">
<Bar <Bar
data={sorted.map((lesson, index) => ({ data={sorted.map((lesson, index) => ({
@@ -425,65 +278,23 @@ const LessonList = () => {
</Th> </Th>
)} )}
<Th textAlign="center" width={1}> <Th textAlign="center" width={1}>
Дата {groupByDate ? 'Время' : 'Дата'}
</Th> </Th>
<Th>Название</Th> <Th width="100%">Название</Th>
{isTeacher(user) && <Th>action</Th>} {isTeacher(user) && <Th>action</Th>}
<Th isNumeric>Отмечено</Th> <Th isNumeric>Отмечено</Th>
</Tr> </Tr>
</Thead> </Thead>
<Tbody> <Tbody>
{lessonCalc?.map(({ data: lessons, date }) => ( {lessonCalc?.map(({ data: lessons, date }) => (
<React.Fragment key={date}> <LessonItems
{date && <Tr><Td colSpan={isTeacher(user) ? 5 : 3}>{dayjs(date).format('DD MMMM YYYY')}</Td></Tr>} courseId={courseId}
{lessons.map((lesson) => ( date={date}
<Tr key={lesson._id}> isTeacher={isTeacher(user)}
{isTeacher(user) && ( lessons={lessons}
<Td> setlessonToDelete={setlessonToDelete}
<Link key={date}
to={`${getNavigationsValue('journal.main')}/lesson/${courseId}/${lesson._id}`} />
style={{ display: 'flex' }}
>
<img
width={24}
src={qrCode}
style={{ margin: '0 auto' }}
/>
</Link>
</Td>
)}
<Td textAlign="center">
{dayjs(lesson.date).format(groupByDate ? 'HH:mm' : 'HH:mm DD.MM.YY')}
</Td>
<Td>{lesson.name}</Td>
{isTeacher(user) && (
<Td>
<Menu>
<MenuButton as={Button}>
<EditIcon />
</MenuButton>
<MenuList>
<MenuItem
onClick={() => {
setShowForm(true)
setEditLesson(lesson)
}}
>
Edit
</MenuItem>
<MenuItem
onClick={() => setlessonToDelete(lesson)}
>
Delete
</MenuItem>
</MenuList>
</Menu>
</Td>
)}
<Td isNumeric>{lesson.students.length}</Td>
</Tr>
))}
</React.Fragment>
))} ))}
</Tbody> </Tbody>
</Table> </Table>
@@ -494,29 +305,3 @@ const LessonList = () => {
} }
export default LessonList export default LessonList
const Bar = ({ data }) => (
<ResponsiveBar
data={data}
keys={['count']}
indexBy="lessonIndex"
margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
padding={0.3}
valueScale={{ type: 'linear' }}
indexScale={{ type: 'band', round: true }}
colors={{ scheme: 'set3' }}
axisTop={null}
axisRight={null}
labelSkipWidth={12}
labelSkipHeight={12}
labelTextColor={{
from: 'color',
modifiers: [['brighter', 1.4]],
}}
role="application"
ariaLabel="График посещаемости лекций"
barAriaLabel={(e) =>
e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
}
/>
)

View File

@@ -0,0 +1,13 @@
import styled from '@emotion/styled';
export const BreadcrumbsWrapper = styled.div`
padding: 12px;
`;
export const ErrorSpan = styled.span`
color: #f9e2e2;
display: block;
padding: 16px;
background-color: #d32f0b;
border-radius: 11px;
`

View File

@@ -9,10 +9,8 @@ import {
Box, Box,
Center, Center,
Container, Container,
Heading,
Spinner, Spinner,
Text, Text,
Stack,
} from '@chakra-ui/react' } from '@chakra-ui/react'
import { UserCard } from '../components/user-card' import { UserCard } from '../components/user-card'

3
src/utils/time.ts Normal file
View File

@@ -0,0 +1,3 @@
import dayjs from "dayjs";
export const dateToCalendarFormat = (date?: string) => dayjs(date).format('YYYY-MM-DDTHH:mm')

17
src/ym.ts Normal file
View File

@@ -0,0 +1,17 @@
(function (m, e, t, r, i, k, a) {
m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
// @ts-ignore
m[i].l = 1 * new Date();
for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
// @ts-ignore
ym(98045358, "init", {
clickmap: true,
trackLinks: true,
accurateTrackBounce: true,
webvisor: true
});
export const dummy = true;

View File

@@ -3,16 +3,31 @@ const fs = require('node:fs')
const path = require('node:path') const path = require('node:path')
const timer = const timer =
(time = 1000) => (time = 1000) =>
(_req, _res, next) => (_req, _res, next) =>
setTimeout(next, time) setTimeout(next, time)
router.use(timer()) router.use(timer())
const config = {
examCreated: false
}
router.get('/course/list', (req, res) => { router.get('/course/list', (req, res) => {
res.send(require('../mocks/courses/list/success.json')) res.send(require('../mocks/courses/list/success.json'))
}) })
router.get('/course/:id', (req, res) => {
if(req.params.id === 'undefined')
return res.status(400).send({ success: false, error: 'Invalid course id' })
if (config.examCreated) {
config.examCreated = false
return res.send(require('../mocks/courses/by-id/with-exam.json'))
}
res.send(require('../mocks/courses/by-id/success.json'))
})
router.get('/course/students/:courseId', (req, res) => { router.get('/course/students/:courseId', (req, res) => {
res.send(require('../mocks/courses/all-students/success.json')) res.send(require('../mocks/courses/all-students/success.json'))
}) })
@@ -21,6 +36,11 @@ router.post('/course', (req, res) => {
res.send(require('../mocks/courses/create/success.json')) res.send(require('../mocks/courses/create/success.json'))
}) })
router.post('/course/toggle-exam-with-jury/:id', (req, res) => {
config.examCreated = true;
res.send({ success: true })
})
router.get('/lesson/list/:courseId', (req, res) => { router.get('/lesson/list/:courseId', (req, res) => {
res.send(require('../mocks/lessons/list/success.json')) res.send(require('../mocks/lessons/list/success.json'))
}) })

View File

@@ -0,0 +1,671 @@
{
"success": true,
"body": {
"_id": "66cb6c8109bcc33fddd63ee3",
"name": "Курс по JS",
"teachers": [],
"lessons": [
{
"_id": "65e2e5fbec37fec650f28489",
"name": "ВВЕДЕНИЕ В ВЕБ-РАЗРАБОТКУ. ИНСТРУМЕНТАРИЙ, ОБЗОР ВЕБ-ТЕХНОЛОГИЙ",
"students": [
{
"sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
"email_verified": true,
"name": "Мария Капитанова",
"preferred_username": "maryaKapitan@gmail.com",
"given_name": "Мария",
"family_name": "Капитанова",
"email": "maryaKapitan@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
},
{
"sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
"email_verified": true,
"name": "Евгений Кореной",
"preferred_username": "koren@gmail.com",
"given_name": "Кореной",
"family_name": "Евгений",
"email": "koren@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
},
{
"sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
"email_verified": true,
"name": "Ирина Игнатьева",
"preferred_username": "irign@gmailcom",
"given_name": "Ирина",
"family_name": "Игнатьева",
"email": "irign@gmailcom",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
},
{
"sub": "95ccc005-95b9-4305-9447-364a32033911",
"email_verified": true,
"name": "Иван Петров",
"preferred_username": "petrov@mail.ru",
"given_name": "Иван",
"family_name": "Петров",
"email": "petrov@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
},
{
"sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
"email_verified": true,
"name": "Константин Тимуров",
"preferred_username": "konstantK@gmail.com",
"given_name": "Константин",
"family_name": "Тимуров",
"email": "konstantK@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
},
{
"sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
"email_verified": true,
"name": "Александра Питерская",
"preferred_username": "piteralex@gmail.com",
"given_name": "Александра",
"family_name": "Питерская",
"email": "piteralex@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
},
{
"sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
"email_verified": true,
"name": "Анастасия Светлых",
"preferred_username": "anastasya@gmail.ocm",
"given_name": "Анастасия",
"family_name": "Светлых",
"email": "anastasya@gmail.ocm",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
},
{
"sub": "b4634921-00b3-4082-9284-8ac47f269394",
"email_verified": true,
"name": "Эмилия Снежко",
"preferred_username": "emi@mail.ru",
"given_name": "Эмилия",
"family_name": "Снежко",
"email": "emi@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
},
{
"sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
"email_verified": true,
"name": "Юлия Бобова",
"preferred_username": "bobova@gmail.com",
"given_name": "Юлия",
"family_name": "Бобова",
"email": "bobova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
},
{
"sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
"email_verified": true,
"name": "Анна Самоварова",
"preferred_username": "samovar@gmail.com",
"given_name": "Анна",
"family_name": "Самоварова",
"email": "samovar@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
},
{
"sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
"email_verified": true,
"name": "Евгения Жужова",
"preferred_username": "zhuzhova@gmail.com",
"given_name": "Евгения",
"family_name": "Жужова",
"email": "zhuzhova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
},
{
"sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
"email_verified": true,
"name": "Эдгар Петренко",
"preferred_username": "petrenk@mail.ru",
"given_name": "Эдгар",
"family_name": "Петренко",
"email": "petrenk@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
},
{
"sub": "4082b72a-4730-4841-ad68-06a0e19263df",
"email_verified": true,
"name": "Елена Вавилон",
"preferred_username": "elenvavil@mail.ru",
"given_name": "Елена",
"family_name": "Вавилон",
"email": "elenvavil@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
},
{
"sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
"email_verified": true,
"name": "Ольга Шарова",
"preferred_username": "julyashap",
"given_name": "Ольга",
"family_name": "Шарова",
"email": "sharova@mail.ru"
}
],
"date": "2024-03-02T08:40:27.390Z",
"created": "2024-03-02T08:40:27.390Z",
"__v": 0
},
{
"_id": "65e301c4ec37fec650f2aafe",
"name": "НАСТРОЙКА ОКРУЖЕНИЯ (GIT + VSCODE + NODEJS)",
"students": [
{
"sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
"email_verified": true,
"name": "Евгений Кореной",
"preferred_username": "koren@gmail.com",
"given_name": "Кореной",
"family_name": "Евгений",
"email": "koren@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
},
{
"sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
"email_verified": true,
"name": "Ирина Игнатьева",
"preferred_username": "irign@gmailcom",
"given_name": "Ирина",
"family_name": "Игнатьева",
"email": "irign@gmailcom",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
},
{
"sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
"email_verified": true,
"name": "Константин Тимуров",
"preferred_username": "konstantK@gmail.com",
"given_name": "Константин",
"family_name": "Тимуров",
"email": "konstantK@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
},
{
"sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
"email_verified": true,
"name": "Александра Питерская",
"preferred_username": "piteralex@gmail.com",
"given_name": "Александра",
"family_name": "Питерская",
"email": "piteralex@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
},
{
"sub": "b4634921-00b3-4082-9284-8ac47f269394",
"email_verified": true,
"name": "Эмилия Снежко",
"preferred_username": "emi@mail.ru",
"given_name": "Эмилия",
"family_name": "Снежко",
"email": "emi@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
},
{
"sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
"email_verified": true,
"name": "Юлия Бобова",
"preferred_username": "bobova@gmail.com",
"given_name": "Юлия",
"family_name": "Бобова",
"email": "bobova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
},
{
"sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
"email_verified": true,
"name": "Анна Самоварова",
"preferred_username": "samovar@gmail.com",
"given_name": "Анна",
"family_name": "Самоварова",
"email": "samovar@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
},
{
"sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
"email_verified": true,
"name": "Евгения Жужова",
"preferred_username": "zhuzhova@gmail.com",
"given_name": "Евгения",
"family_name": "Жужова",
"email": "zhuzhova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
},
{
"sub": "4082b72a-4730-4841-ad68-06a0e19263df",
"email_verified": true,
"name": "Елена Вавилон",
"preferred_username": "elenvavil@mail.ru",
"given_name": "Елена",
"family_name": "Вавилон",
"email": "elenvavil@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
},
{
"sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
"email_verified": true,
"name": "Ольга Шарова",
"preferred_username": "julyashap",
"given_name": "Ольга",
"family_name": "Шарова",
"email": "sharova@mail.ru"
}
],
"date": "2024-03-02T10:39:00.718Z",
"created": "2024-03-02T10:39:00.718Z",
"__v": 0
},
{
"_id": "65e78bebced789d2f6791315",
"name": "ПРОЕКТИРОВАНИЕ ИНТЕРФЕЙСОВ (MIND MAP. FIGMA)",
"students": [
{
"sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
"email_verified": true,
"name": "Мария Капитанова",
"preferred_username": "maryaKapitan@gmail.com",
"given_name": "Мария",
"family_name": "Капитанова",
"email": "maryaKapitan@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
},
{
"sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
"email_verified": true,
"name": "Евгений Кореной",
"preferred_username": "koren@gmail.com",
"given_name": "Кореной",
"family_name": "Евгений",
"email": "koren@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
},
{
"sub": "95ccc005-95b9-4305-9447-364a32033911",
"email_verified": true,
"name": "Иван Петров",
"preferred_username": "petrov@mail.ru",
"given_name": "Иван",
"family_name": "Петров",
"email": "petrov@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
},
{
"sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
"email_verified": true,
"name": "Константин Тимуров",
"preferred_username": "konstantK@gmail.com",
"given_name": "Константин",
"family_name": "Тимуров",
"email": "konstantK@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
},
{
"sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
"email_verified": true,
"name": "Александра Питерская",
"preferred_username": "piteralex@gmail.com",
"given_name": "Александра",
"family_name": "Питерская",
"email": "piteralex@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
},
{
"sub": "b4634921-00b3-4082-9284-8ac47f269394",
"email_verified": true,
"name": "Эмилия Снежко",
"preferred_username": "emi@mail.ru",
"given_name": "Эмилия",
"family_name": "Снежко",
"email": "emi@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
},
{
"sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
"email_verified": true,
"name": "Юлия Бобова",
"preferred_username": "bobova@gmail.com",
"given_name": "Юлия",
"family_name": "Бобова",
"email": "bobova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
},
{
"sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
"email_verified": true,
"name": "Анна Самоварова",
"preferred_username": "samovar@gmail.com",
"given_name": "Анна",
"family_name": "Самоварова",
"email": "samovar@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
},
{
"sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
"email_verified": true,
"name": "Евгения Жужова",
"preferred_username": "zhuzhova@gmail.com",
"given_name": "Евгения",
"family_name": "Жужова",
"email": "zhuzhova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
},
{
"sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
"email_verified": true,
"name": "Эдгар Петренко",
"preferred_username": "petrenk@mail.ru",
"given_name": "Эдгар",
"family_name": "Петренко",
"email": "petrenk@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
},
{
"sub": "4082b72a-4730-4841-ad68-06a0e19263df",
"email_verified": true,
"name": "Елена Вавилон",
"preferred_username": "elenvavil@mail.ru",
"given_name": "Елена",
"family_name": "Вавилон",
"email": "elenvavil@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
},
{
"sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
"email_verified": true,
"name": "Ольга Шарова",
"preferred_username": "julyashap",
"given_name": "Ольга",
"family_name": "Шарова",
"email": "sharova@mail.ru"
}
],
"date": "2024-03-08T21:17:31.401Z",
"created": "2024-03-05T21:17:31.401Z",
"__v": 1
},
{
"_id": "65e78c0fced789d2f679131b",
"name": "ТЕХНОЛОГИЯ HTML СТРУКТУРА ДОКУМЕНТА И ОСНОВНЫЕ ПОНЯТИЯ.",
"students": [
{
"sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
"email_verified": true,
"name": "Мария Капитанова",
"preferred_username": "maryaKapitan@gmail.com",
"given_name": "Мария",
"family_name": "Капитанова",
"email": "maryaKapitan@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
},
{
"sub": "b4634921-00b3-4082-9284-8ac47f269394",
"email_verified": true,
"name": "Эмилия Снежко",
"preferred_username": "emi@mail.ru",
"given_name": "Эмилия",
"family_name": "Снежко",
"email": "emi@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
},
{
"sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
"email_verified": true,
"name": "Юлия Бобова",
"preferred_username": "bobova@gmail.com",
"given_name": "Юлия",
"family_name": "Бобова",
"email": "bobova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
},
{
"sub": "c273a3e3-f7ba-4057-8c57-a1f43b6174a5",
"email_verified": true,
"name": "Анна Самоварова",
"preferred_username": "samovar@gmail.com",
"given_name": "Анна",
"family_name": "Самоварова",
"email": "samovar@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJOhIMdQkXPd55wTMgTTkUCnqbsu4EncgEPm67iz_mK=s96-c"
},
{
"sub": "8555885b-715c-4dee-a7c5-9563a6a05211",
"email_verified": true,
"name": "Евгения Жужова",
"preferred_username": "zhuzhova@gmail.com",
"given_name": "Евгения",
"family_name": "Жужова",
"email": "zhuzhova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJUtJBAVBm642AxoGpMDDMV8CPu3MEoLjU3hmO7oisG=s96-c"
},
{
"sub": "12dee54f-64e9-4be3-9cb0-02ff07ab24fe",
"email_verified": true,
"name": "Эдгар Петренко",
"preferred_username": "petrenk@mail.ru",
"given_name": "Эдгар",
"family_name": "Петренко",
"email": "petrenk@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocLgKAZag32kpGVHMVbh_GsU-rX_MAtmeVIPoov0ZPBYIA=s96-c"
},
{
"sub": "4082b72a-4730-4841-ad68-06a0e19263df",
"email_verified": true,
"name": "Елена Вавилон",
"preferred_username": "elenvavil@mail.ru",
"given_name": "Елена",
"family_name": "Вавилон",
"email": "elenvavil@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
}
],
"date": "2024-03-08T21:18:07.033Z",
"created": "2024-03-05T21:18:07.033Z",
"__v": 22
},
{
"_id": "65e78c0fced789d2f6791tt5",
"name": "ВВОДНАЯ ПО JS.ПРИМЕНЕНИЕ И СПОСОБЫ ПОДКЛЮЧЕНИЯ НА СТРАНИЦЕ. LET, CONST. БАЗОВЫЕ ТИПЫ ДАННЫХ, ПРИВЕДЕНИЕ ТИПОВ. ПЕРЕМЕННЫЕ, ОБЛАСТЬ ВИДИМОСТИ ПЕРЕМЕННЫХ",
"students": [
{
"sub": "fcde3f22-d9ba-412a-a572-c59e515a290f",
"email_verified": true,
"name": "Мария Капитанова",
"preferred_username": "maryaKapitan@gmail.com",
"given_name": "Мария",
"family_name": "Капитанова",
"email": "maryaKapitan@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJgIjjOFD2YUSyRF5kH4jaysE6X5p-kq0Cg0CFncfMi=s96-c"
},
{
"sub": "5b072deb-33ee-443e-9718-3b5720a3dfb7",
"email_verified": true,
"name": "Евгений Кореной",
"preferred_username": "koren@gmail.com",
"given_name": "Кореной",
"family_name": "Евгений",
"email": "koren@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJpVhDeG-Rpjjm2Un6r8ACz_s_injuIFKpzXf3qmyCn3Cg=s96-c"
},
{
"sub": "7adf0cd1-cf07-4079-88d8-1a5c9b8f42c2",
"email_verified": true,
"name": "Ирина Игнатьева",
"preferred_username": "irign@gmailcom",
"given_name": "Ирина",
"family_name": "Игнатьева",
"email": "irign@gmailcom",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocL45E4Gt8D5oyIl3ipkcGsv4ShWGs3bdlwEMA_1rzGZ=s96-c"
},
{
"sub": "95ccc005-95b9-4305-9447-364a32033911",
"email_verified": true,
"name": "Иван Петров",
"preferred_username": "petrov@mail.ru",
"given_name": "Иван",
"family_name": "Петров",
"email": "petrov@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocIgQn5mfDAh2djx-3ofG9z1Em26ZyuUgVPd-6rDOl6z=s96-c"
},
{
"sub": "ede1ef2c-6ecf-484a-8fb8-282a77e1caa1",
"email_verified": true,
"name": "Константин Тимуров",
"preferred_username": "konstantK@gmail.com",
"given_name": "Константин",
"family_name": "Тимуров",
"email": "konstantK@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJjnOfqaoAU_D4STrJPN9fPOeJ8tv60WbWVZu2ZWcHs=s96-c"
},
{
"sub": "92cc6a15-805c-4439-b592-b23f32d6d208",
"email_verified": true,
"name": "Александра Питерская",
"preferred_username": "piteralex@gmail.com",
"given_name": "Александра",
"family_name": "Питерская",
"email": "piteralex@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKhbCbWvBBc_m7bjU5sLCE-dQ-KygBk-aUCSR8XaYtq=s96-c"
},
{
"sub": "4a3ba8b8-4120-4877-a160-be9ba4d5b3e3",
"email_verified": true,
"name": "Анастасия Светлых",
"preferred_username": "anastasya@gmail.ocm",
"given_name": "Анастасия",
"family_name": "Светлых",
"email": "anastasya@gmail.ocm",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJnsM8UGhbH806yLVgWZ17g3-gJFVcG0Uz5kvqT7dvC=s96-c"
},
{
"sub": "b4634921-00b3-4082-9284-8ac47f269394",
"email_verified": true,
"name": "Эмилия Снежко",
"preferred_username": "emi@mail.ru",
"given_name": "Эмилия",
"family_name": "Снежко",
"email": "emi@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocI98dzSFQDPr2LXMPFEUX8KLY6bY2m08O_aAj2B5KVNKg=s96-c"
},
{
"sub": "bf1a95aa-39a2-4528-9b8d-319409995df5",
"email_verified": true,
"name": "Юлия Бобова",
"preferred_username": "bobova@gmail.com",
"given_name": "Юлия",
"family_name": "Бобова",
"email": "bobova@gmail.com",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocJ_Ud4iI-jgqcJ3QJcWpESbRLX_C1BnB8_7uTTC-4Dn=s96-c"
},
{
"sub": "4082b72a-4730-4841-ad68-06a0e19263df",
"email_verified": true,
"name": "Елена Вавилон",
"preferred_username": "elenvavil@mail.ru",
"given_name": "Елена",
"family_name": "Вавилон",
"email": "elenvavil@mail.ru",
"picture": "https://lh3.googleusercontent.com/a/ACg8ocKXcmzcqRch2--j2Ge2m9e8MIOZ8y1MjsQ0cSEoXOmW=s96-c"
},
{
"sub": "9e8a08d8-d76a-4f26-99c5-9a1d3c067104",
"email_verified": true,
"name": "Ольга Шарова",
"preferred_username": "julyashap",
"given_name": "Ольга",
"family_name": "Шарова",
"email": "sharova@mail.ru"
}
],
"date": "2024-03-08T21:18:07.033Z",
"created": "2024-03-05T21:18:07.033Z"
}
],
"creator": {
"sub": "developer",
"email": "email@email.ml"
},
"startDt": "2024-08-25T17:40:17.814Z",
"created": "2024-08-25T17:40:17.814Z",
"examWithJury2": {
"_id": "66cf3d3f4637d420d6271451",
"name": "Хакатон",
"description": "Сегодня командам предстоит Защитить свои проекты а жюри оценить по критериям",
"jury": [],
"date": "2024-08-28T15:07:43.927Z",
"created": "2024-08-28T15:07:43.927Z",
"criterias": [
[
{
"title": "Соответствие решения поставленной задаче",
"type": "number",
"min": 0,
"max": 5,
"wight": 1
},
{
"title": "Оригинальность - использование нестандартных технических и проектных подходов к решению задачи",
"type": "number",
"min": 0,
"max": 5,
"wight": 1
},
{
"title": "Характеристики решения",
"subcriterias": [
{
"title": "Работоспособность решения",
"type": "boolean",
"wight": 1,
"trueText": "Работоспособно",
"falseText": "Не работоспособно"
},
{
"title": "Технологическая сложность решения",
"type": "number",
"wight": 1,
"min": 0,
"max": 2
},
{
"title": "Объем функциональных возможностей решения (количество и качество реализации функций)",
"type": "number",
"wight": 1,
"min": 0,
"max": 2
}
]
},
{
"title": "Аргументация способа выбранного решения",
"type": "number",
"min": 0,
"max": 5,
"wight": 1
},
{
"title": "Качество предоставления информации",
"type": "number",
"min": 0,
"max": 5,
"wight": 1
},
{
"title": "Наличие удобного UX/UI",
"type": "number",
"min": 0,
"max": 5,
"wight": 1
}
]
],
"id": "66cf3d3f4637d420d6271451"
},
"id": "66cb6c8109bcc33fddd63ee3"
}
}

View File

@@ -0,0 +1,94 @@
{
"success": true,
"body": {
"_id": "660b19fc865d7a5d914636c0",
"name": "Курс по JS",
"teachers": [],
"lessons": [
{
"_id": "661e7f4f69f40b0ebebcd5e4",
"name": "555",
"students": [
{
"sub": "f62905b1-e223-40ca-910f-c8d84c6137c1",
"email_verified": true,
"name": "Александр Примаков",
"preferred_username": "primakov",
"given_name": "Александр",
"family_name": "Примаков",
"email": "primakovpro@gmail.com"
}
],
"date": "2024-04-16T13:38:00.000Z",
"created": "2024-04-16T13:38:23.381Z",
"id": "661e7f4f69f40b0ebebcd5e4"
},
{
"_id": "66af1e60a0eef5a89f99aa94",
"name": "111",
"students": [
{
"sub": "f62905b1-e223-40ca-910f-c8d84c6137c1",
"email_verified": true,
"name": "Александр Примаков",
"preferred_username": "primakov",
"given_name": "Александр",
"family_name": "Примаков",
"email": "primakovpro@gmail.com"
}
],
"date": "2024-08-04T07:00:00.000Z",
"created": "2024-08-04T06:23:28.491Z",
"id": "66af1e60a0eef5a89f99aa94"
},
{
"_id": "66ba1a01a0eef5a89f99ab27",
"name": "11111",
"students": [
{
"sub": "f62905b1-e223-40ca-910f-c8d84c6137c1",
"email_verified": true,
"name": "Александр Примаков",
"preferred_username": "primakov",
"given_name": "Александр",
"family_name": "Примаков",
"email": "primakovpro@gmail.com"
}
],
"date": "2024-08-18T10:00:00.000Z",
"created": "2024-08-12T14:19:46.004Z",
"id": "66ba1a01a0eef5a89f99ab27"
},
{
"_id": "66ba1a0da0eef5a89f99ab2d",
"name": "2222",
"students": [],
"date": "2024-08-18T14:19:00.000Z",
"created": "2024-08-12T14:19:57.798Z",
"id": "66ba1a0da0eef5a89f99ab2d"
}
],
"startDt": "2024-06-01T00:00:00.000Z",
"creator": {
"sub": "f62905b1-e223-40ca-910f-c8d84c6137c1",
"email_verified": true,
"name": "Александр Примаков",
"preferred_username": "primakov",
"given_name": "Александр",
"family_name": "Примаков",
"email": "primakovpro@gmail.com"
},
"created": "2024-04-01T20:33:00.912Z",
"examWithJury": {
"_id": "66d01766ce794e1fdb2bf097",
"name": "Хакатон",
"description": "Сегодня командам предстоит Защитить свои проекты а жюри оценить по критериям",
"jury": [],
"criterias": [],
"date": "2024-08-29T06:38:30.678Z",
"created": "2024-08-29T06:38:30.678Z",
"id": "66d01766ce794e1fdb2bf097"
},
"id": "660b19fc865d7a5d914636c0"
}
}

View File

@@ -2,7 +2,7 @@
"success": true, "success": true,
"body": [ "body": [
{ {
"_id": "65e73c21ced789d2f679128f", "id": "65e73c21ced789d2f679128f",
"name": "KFU-24-1", "name": "KFU-24-1",
"teachers": [], "teachers": [],
"lessons": [ "lessons": [
@@ -21,11 +21,11 @@
"email": "primakovpro@gmail.com" "email": "primakovpro@gmail.com"
}, },
"startDt": "2024-03-02T15:37:05.907Z", "startDt": "2024-03-02T15:37:05.907Z",
"created": "2024-03-02T15:37:05.908Z", "examWithJury": "66cf3d3f4637d420d6271451",
"__v": 2 "created": "2024-03-02T15:37:05.908Z"
}, },
{ {
"_id": "65e73c21ced789d2f679128z", "id": "65e73c21ced789d2f679128z",
"name": "KFU-24-2", "name": "KFU-24-2",
"teachers": [], "teachers": [],
"lessons": [ "lessons": [