3.2.0

openapi-config.ts

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

package.json

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

src/__data__/api/api.ts

@@ -7,6 +7,7 @@ import {
   BaseResponse,
   Course,
   Lesson,
+  PopulatedCourse,
   User,
   UserData,
 } from '../model'
@@ -32,7 +33,7 @@ export const api = createApi({
       headers.set('Authorization', `Bearer ${keycloak.token}`)
     },
   }),
-  tagTypes: ['LessonList', 'CourseList'],
+  tagTypes: ['LessonList', 'CourseList', 'Course'],
   endpoints: (builder) => ({
     coursesList: builder.query<BaseResponse<Course[]>, void>({
       query: () => '/course/list',
@@ -78,7 +79,7 @@ export const api = createApi({
       }),
       invalidatesTags: ['LessonList'],
     }),
-    updateLesson: builder.mutation<BaseResponse<Lesson>, Partial<Lesson> & Pick<Lesson, '_id'>>({
+    updateLesson: builder.mutation<BaseResponse<Lesson>, Partial<Lesson> & Pick<Lesson, 'id'>>({
       query: (data) => ({
         method: 'PUT',
         url: '/lesson',
@@ -116,5 +117,17 @@ export const api = createApi({
         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',
+      }),
+      invalidatesTags: ['Course']
+    })
   }),
 })

src/__data__/model.ts

@@ -50,7 +50,7 @@ export type BaseResponse<Data> = {
 };
 
 export interface Lesson {
-  _id: string;
+  id: string;
   name: string;
   students: User[];
   date: string;
@@ -79,10 +79,46 @@ export interface User {
 
 export interface Course {
   _id: string;
+  id: string;
   name: string;
   teachers: User[];
-  lessons: Lesson[];
+  lessons: string[];
   creator: User;
   startDt: string;
+  examWithJury?: 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;
+}

src/app.tsx

@@ -1,12 +1,13 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
-import { Global, css } from '@emotion/react'
+import { Global } from '@emotion/react'
 import { BrowserRouter } from 'react-router-dom';
 import ruLocale from 'dayjs/locale/ru';
 import dayjs from 'dayjs';
 import { ChakraProvider } from '@chakra-ui/react'
 
 import { Dashboard } from './dashboard';
+import { globalStyles } from './global.styles';
 
 dayjs.locale('ru', ruLocale);
 
@@ -17,65 +18,7 @@ const App = ({ store }) => (
                 <meta name="viewport" content="width=device-width, user-scalable=no" />
                 <title>Журнал</title>
             </Helmet>
-            <Global
+            <Global styles={globalStyles} />
-                styles={css`
-                      html {
-                          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>

src/components/page-loader/page-loader.tsx

@@ -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>
+)

src/components/xl-spinner/index.ts

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

src/components/xl-spinner/xl-spinner.tsx

@@ -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>
+)

src/global.styles.ts

@@ -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;
+}
+`

src/index.tsx

@@ -2,10 +2,13 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
   
 import App from './app';
-import './ym';
 import { keycloak } from "./__data__/kc";
 import { createStore } from "./__data__/store";
 
+if(!module.hot) {
+  import('./ym');
+}
+
 export default (props) => <App {...props} />;
   
 let rootElement: ReactDOM.Root

src/pages/course-list/course-card.tsx

@@ -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>
+    )
+}

src/pages/course-list/course-details.tsx

@@ -0,0 +1,83 @@
+import React from 'react'
+import dayjs from 'dayjs'
+import { Link as ConnectedLink } from 'react-router-dom'
+import { getNavigationsValue } 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'
+
+type CourseDetailsProps = {
+    populatedCourse: PopulatedCourse;
+}
+
+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">
+                Экзамен:
+            </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>
+        </>
+    )
+}

src/pages/course-list/course-list.tsx

@@ -1,56 +1,44 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useEffect, useRef, 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,
   Container,
   VStack,
-  Link,
   Input,
   CloseButton,
   FormControl,
   FormLabel,
   FormHelperText,
-  Center,
   FormErrorMessage,
   useToast,
 } from '@chakra-ui/react'
 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 {
   startDt: string
   name: string
 }
 
-const CoursesList = () => {
+export const CoursesList = () => {
   const toast = useToast()
   const user = useAppSelector((s) => s.user)
   const { data, isLoading } = api.useCoursesListQuery()
   const [createUpdateCourse, crucQuery] = api.useCreateUpdateCourseMutation()
   const [showForm, setShowForm] = useState(false)
-  const [courseDetailsOpenedId, setCourseDetailsOpenedId] = useState<
-    string | null
-  >(null)
   const toastRef = useRef(null)
 
   const {
@@ -61,8 +49,8 @@ const CoursesList = () => {
     getValues,
   } = useForm<NewCourseForm>({
     defaultValues: {
-      startDt: '',
+      startDt: dayjs().format('YYYY-MM-DD'),
-      name: '',
+      name: 'Название',
     },
   })
 
@@ -93,17 +81,7 @@ const CoursesList = () => {
 
   if (isLoading) {
     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">
         {data?.body?.map((c) => (
           <CourseCard
-            isOpened={courseDetailsOpenedId === c._id}
             key={c._id}
             course={c}
-            openDetails={() =>
-              courseDetailsOpenedId === c._id
-                ? setCourseDetailsOpenedId(null)
-                : setCourseDetailsOpenedId(c._id)
-            }
           />
         ))}
       </VStack>
     </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

src/pages/course-list/index.ts

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

src/pages/index.ts

@@ -1,8 +1,6 @@
 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'));

src/pages/lesson-list/components/bar.tsx

@@ -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
+        }
+    />
+)

src/pages/lesson-list/components/lessons-form.tsx

@@ -0,0 +1,137 @@
+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>
+    )
+}

src/pages/lesson-list/index.ts

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

src/pages/lesson-list/lesson-list.tsx

@@ -4,31 +4,18 @@ import React, {
   useRef,
   useState,
 } from 'react'
-import { ResponsiveBar } from '@nivo/bar'
 import dayjs from 'dayjs'
 import { Link, useParams } from 'react-router-dom'
 import { getNavigationsValue, getFeatures } from '@brojs/cli'
-import { useForm, Controller } from 'react-hook-form'
 import {
   Breadcrumb,
   BreadcrumbItem,
   BreadcrumbLink,
   Container,
   Box,
-  Card,
-  CardBody,
-  CardHeader,
-  Heading,
   Button,
-  CloseButton,
   useToast,
-  VStack,
-  FormControl,
-  FormLabel,
   Toast,
-  FormHelperText,
-  FormErrorMessage,
-  Input,
   TableContainer,
   Table,
   Thead,
@@ -41,8 +28,6 @@ import {
   MenuItem,
   Text,
   MenuList,
-  Center,
-  Spinner,
   AlertDialog,
   AlertDialogBody,
   AlertDialogContent,
@@ -52,134 +37,22 @@ import {
 } from '@chakra-ui/react'
 import { AddIcon, EditIcon } 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 { 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 { BreadcrumbsWrapper } from './style'
+import { Bar } from './components/bar'
 
 const features = getFeatures('journal')
 
 const barFeature = features?.['lesson.bar']
 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 { courseId } = useParams()
   const user = useAppSelector((s) => s.user)
@@ -201,7 +74,6 @@ const LessonList = () => {
       return []
     }
 
-
     if (!groupByDate) {
       return [{ date: '', data: sorted }]
     }
@@ -308,19 +180,7 @@ const LessonList = () => {
   }, [updateLessonRqst.isSuccess])
 
   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 (
@@ -494,29 +354,3 @@ const 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
-    }
-  />
-)

src/pages/lesson-list/style.ts

@@ -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;
+`

src/pages/user-page.tsx

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

src/utils/time.ts

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

src/ym.ts

@@ -13,3 +13,5 @@ ym(98045358, "init", {
     accurateTrackBounce: true,
     webvisor: true
 });
+
+export const dummy = true;

stubs/api/index.js

@@ -3,7 +3,7 @@ const fs = require('node:fs')
 const path = require('node:path')
 
 const timer =
-  (time = 1000) =>
+(time = 1000) =>
   (_req, _res, next) =>
     setTimeout(next, time)
 
@@ -13,6 +13,10 @@ router.get('/course/list', (req, res) => {
   res.send(require('../mocks/courses/list/success.json'))
 })
 
+router.get('/course/:id', (_req, res) => {
+  res.send(require('../mocks/courses/by-id/success.json'))
+})
+
 router.get('/course/students/:courseId', (req, res) => {
   res.send(require('../mocks/courses/all-students/success.json'))
 })
@@ -21,6 +25,10 @@ router.post('/course', (req, res) => {
   res.send(require('../mocks/courses/create/success.json'))
 })
 
+router.post('/course/toggle-exam-with-jury/:id', (req, res) => {
+  res.send({ success: true })
+})
+
 router.get('/lesson/list/:courseId', (req, res) => {
   res.send(require('../mocks/lessons/list/success.json'))
 })

stubs/mocks/courses/by-id/success.json

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

stubs/mocks/courses/list/success.json

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