Jenkinsfile

@@ -1,57 +1,37 @@
 pipeline {
-    agent {
-        docker {
-            image 'node:20'
-        }
+  agent {
+    docker {
+      image 'node:18'
+    }
+  }
+
+  stages {
+    stage('install') {
+      steps {
+        sh 'node -v'
+        sh 'npm -v'
+        sh 'npm ci'
+      }
     }
 
-    stages {
-        stage('install') {
-            steps {
-                sh 'node -v'
-                sh 'npm -v'
-                script {
-                    String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
-                    String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
-                    String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
-                    String commitMsg = commit.substring(commit.indexOf(' ')).trim()
-
-                    if (tag) {
-                        currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
-                    } else {
-                        currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
-                    }
-
-                    String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
-                    currentBuild.description = "${author}<br />${commitMsg}"
-                    echo 'starting installing'
-                    sh 'npm ci'
-                }
-            }
-        }
-
-        stage('checks') {
-            parallel {
-                stage('eslint') {
-                    steps {
-                        sh 'npm run eslint'
-                    }
-                }
-
-                stage('build') {
-                    steps {
-                        sh 'npm run build'
-                    }
-                }
-            }
-        }
-
-        stage('clean-all') {
-            steps {
-                sh 'rm -rf .[!.]*'
-                sh 'rm -rf ./*'
-                sh 'ls -a'
-            }
-        }
+    stage('eslint') {
+      steps {
+        sh 'npm run eslint'
+      }
     }
+
+    stage('build') {
+      steps {
+        sh 'npm run build'
+      }
+    }
+
+    stage('clean-all') {
+      steps {
+        sh 'rm -rf .[!.]*'
+        sh 'rm -rf ./*'
+        sh 'ls -a'
+      }
+    }
+  }
 }

README.md

@@ -19,7 +19,7 @@ npm install
 пропишите в hosts строку
 
 ```
-127.0.0.1 journal.test
+127.0.0.1 ift-b1.kc.inno-js.test
 ```
 
 ## Запуск
@@ -28,4 +28,4 @@ npm install
 npm start
 ```
 
-откройте в браузере [проект](http://journal.test)
+откройте в браузере [проект](http://ift-b1.kc.inno-js.test)

ijl.config.js

@@ -1,34 +1,22 @@
 const pkg = require('./package')
 
 module.exports = {
-  apiPath: 'stubs/api',
-  webpackConfig: {
-    output: {
-      publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
+    apiPath: 'stubs/api',
+    webpackConfig: {
+        output: {
+            publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`
+        }
     },
-  },
-  navigations: {
-    'journal.main': '/journal.pl',
-    'exam.main': '/exam',
-    'link.exam.details': '/details/:courseId/:examId',
-    'link.journal.attendance': '/attendance/:courseId',
-  },
-  features: {
-    journal: {
-      'lesson.bar': {
-        on: true,
-        value: '',
-        key: 'lesson.bar',
-      },
-      'group.by.date': {
-        on: true,
-        value: '',
-        key: 'group.by.date',
-      },
+    navigations: {
+        'journal.main': '/journal.pl'
     },
-  },
-  config: {
-    'journal.back.url': '/api',
-    'journal.polling-interval': '10000',
-  },
+    features: {
+        'journal': {
+            // add your features here in the format [featureName]: { value: string }
+        },
+    },
+    config: {
+    "journal.back.url": "/api",
+    "journal.polling-interval": "10000"
+  }
 }

index.d.ts

@@ -2,5 +2,3 @@ declare module '*.svg' {
     const src: string;
     export default src;
 }
-
-declare const __webpack_public_path__: string;

package.json

@@ -1,54 +1,51 @@
 {
     "name": "journal.pl",
-    "version": "3.6.5",
-    "description": "bro-js platform journal ui repo",
+    "version": "2.1.1",
+    "description": "inno-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {
-        "start": "brojs server --port=8099 --with-open-browser",
-        "build": "npm run clean && brojs build --dev",
-        "build:prod": "npm run clean && brojs build",
+        "start": "start chrome http://ift-b1.kc.inno-js.test/journal.pl & ijl-cli server --port=80",
+        "build": "npm run clean && ijl-cli build --dev",
+        "build:prod": "npm run clean && ijl-cli build",
         "clean": "rimraf dist",
         "test": "echo ok",
         "eslint": "npx eslint ."
     },
     "repository": {
         "type": "git",
-        "url": "ssh://git@85.143.175.152:222/bro-js/journal.pl.git"
+        "url": "ssh://git@85.143.175.152:10022/omni-tech/journal.pl.git"
     },
     "keywords": [],
     "author": "",
     "license": "MIT",
     "devDependencies": {
+        "@ijl/cli": "^5.0.3",
         "@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-beta.0",
         "@chakra-ui/icons": "^2.1.1",
         "@chakra-ui/react": "^2.8.2",
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.0",
-        "@nivo/bar": "^0.85.1",
         "@reduxjs/toolkit": "^2.2.1",
         "@types/react": "^18.2.60",
         "@types/react-dom": "^18.2.19",
         "dayjs": "^1.11.10",
-        "express": "^4.19.2",
+        "express": "^4.18.2",
         "js-sha256": "^0.11.0",
         "keycloak-js": "^23.0.7",
         "prettier": "^3.2.5",
         "qrcode": "^1.5.3",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "react-helmet": "^6.1.0",
         "react-hook-form": "^7.51.2",
         "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"
+        "typescript": "^5.3.3"
     }
 }

src/__data__/api/api.ts

@@ -1,5 +1,5 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import { getConfigValue } from '@brojs/cli'
+import { getConfigValue } from '@ijl/cli'
 
 import { keycloak } from '../kc'
 import {
@@ -7,7 +7,6 @@ import {
   BaseResponse,
   Course,
   Lesson,
-  PopulatedCourse,
   User,
   UserData,
 } from '../model'
@@ -33,7 +32,7 @@ export const api = createApi({
       headers.set('Authorization', `Bearer ${keycloak.token}`)
     },
   }),
-  tagTypes: ['LessonList', 'CourseList', 'Course'],
+  tagTypes: ['LessonList', 'CourseList'],
   endpoints: (builder) => ({
     coursesList: builder.query<BaseResponse<Course[]>, void>({
       query: () => '/course/list',
@@ -79,7 +78,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',
@@ -117,18 +116,5 @@ 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',
-        body: {},
-      }),
-      invalidatesTags: ['Course']
-    })
   }),
 })

src/__data__/kc.ts

@@ -1,8 +1,8 @@
 import Keycloak from 'keycloak-js';
 
 export const keycloak = new Keycloak({
-  url: 'https://kc.bro-js.ru',
-  realm: 'bro-js',
+  url: 'https://kc.inno-js.ru',
+  realm: 'inno-js',
   clientId: 'journal'
 });
 

src/__data__/model.ts

@@ -50,20 +50,13 @@ export type BaseResponse<Data> = {
 };
 
 export interface Lesson {
-  id: string;
+  _id: string;
   name: string;
   students: User[];
-  teachers: Teacher[];
   date: string;
   created: string;
 }
 
-interface Teacher {
-  sub: string;
-  email_verified: boolean;
-  preferred_username: string;
-}
-
 export interface AccessCode {
   expires: string;
   lesson: Lesson;
@@ -86,46 +79,10 @@ export interface User {
 
 export interface Course {
   _id: string;
-  id: string;
   name: string;
   teachers: User[];
-  lessons: string[];
+  lessons: Lesson[];
   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,28 +1,87 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
-import { Global } from '@emotion/react'
+import { Global, css  } 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);
 
-const App = ({ store }) => (
-    <ChakraProvider>
-        <BrowserRouter>
-            <Helmet>
-                <meta name="viewport" content="width=device-width, user-scalable=no" />
-                <title>Журнал</title>
-            </Helmet>
-            <Global styles={globalStyles} />
-            <Dashboard store={store} />
-        </BrowserRouter>
-    </ChakraProvider>
-)
+const App = ({ store }) => {
+    return(
+      <ChakraProvider>
+          <BrowserRouter>
+              <Helmet>
+                  <meta name="viewport" content="width=device-width, user-scalable=no" />
+                  <title>Журнал</title>
+              </Helmet>
+              <Global
+                  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>
+    )
+}
 
 export default App;
 

src/components/error-boundary/index.tsx

@@ -1,26 +0,0 @@
-import { Alert } from '@chakra-ui/react'
-import React from 'react'
-
-export class ErrorBoundary extends React.Component<
-  React.PropsWithChildren,
-  { hasError: boolean, error?: string }
-> {
-  state = { hasError: false, error: null }
-
-  static getDerivedStateFromError(error: Error) {
-    return { hasError: true, error: error.message }
-  }
-
-  render() {
-    if (this.state.hasError) {
-      return (
-        <Alert status="error" title="Ошибка">
-          Что-то пошло не так<br />
-          {this.state.error && <span>{this.state.error}</span>}
-        </Alert>
-      )
-    }
-
-    return this.props.children
-  }
-}

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

@@ -1,20 +0,0 @@
-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

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

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

@@ -1,20 +0,0 @@
-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/dashboard.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, Suspense } from 'react'
 import { Routes, Route, useNavigate } from 'react-router-dom'
 import { Provider } from 'react-redux'
-import { getNavigationsValue } from '@brojs/cli'
+import { getNavigationsValue } from '@ijl/cli'
 import { Box, Container, Spinner, VStack } from '@chakra-ui/react'
 
 import {
@@ -9,28 +9,23 @@ import {
   LessonDetailsPage,
   LessonListPage,
   UserPage,
-  AttendancePage,
 } from './pages'
-import { ErrorBoundary } from './components/error-boundary'
 
 const Wrapper = ({ children }: { children: React.ReactElement }) => (
   <Suspense
     fallback={
-      <ErrorBoundary>
-        <Container>
-          <VStack>
-            <Box mt="150">
-              <Spinner
-                thickness="4px"
-                speed="0.65s"
-                emptyColor="gray.200"
-                color="blue.500"
-                size="xl"
-              />
-            </Box>
-          </VStack>
-        </Container>
-      </ErrorBoundary>
+      <Container>
+        <VStack>
+          <Box mt="150">
+          <Spinner
+            thickness="4px"
+            speed="0.65s"
+            emptyColor="gray.200"
+            color="blue.500"
+            size="xl"
+          /></Box>
+        </VStack>
+      </Container>
     }
   >
     {children}
@@ -72,14 +67,6 @@ export const Dashboard = ({ store }) => (
           </Wrapper>
         }
       />
-      <Route
-        path={`${getNavigationsValue('journal.main')}${getNavigationsValue('link.journal.attendance')}`}
-        element={
-          <Wrapper>
-            <AttendancePage />
-          </Wrapper>
-        }
-      />
     </Routes>
   </Provider>
 )

src/global.styles.ts

@@ -1,60 +0,0 @@
-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

@@ -1,4 +1,3 @@
-/* eslint-disable react/display-name */
 import React from 'react';
 import ReactDOM from 'react-dom/client';
   
@@ -6,18 +5,14 @@ import App from './app';
 import { keycloak } from "./__data__/kc";
 import { createStore } from "./__data__/store";
 
-if(!module.hot) {
-  import('./ym');
-}
-
 export default (props) => <App {...props} />;
   
 let rootElement: ReactDOM.Root
   
-export const mount = async (Component, element = document.getElementById('app')) => {
+export const mount = async (Сomponent, element = document.getElementById('app')) => {
   let user = null;
   try {
-    await keycloak.init({ onLoad: "login-required" });
+    await keycloak.init({ onLoad: "login-required" }); // 'login-required' });
     user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
   } catch (error) {
     console.error("Failed to initialize adapter:", error);
@@ -25,12 +20,12 @@ export const mount = async (Component, element = document.getElementById('app'))
   }
   const store = createStore({ user });
 
-  rootElement = ReactDOM.createRoot(element);
-  rootElement.render(<Component store={store} />);
+  const rootElement = ReactDOM.createRoot(element);
+  rootElement.render(<Сomponent store={store} />);
 
   if(module.hot) {
       module.hot.accept('./app', ()=> {
-        rootElement.render(<Component store={store} />);
+        rootElement.render(<Сomponent store={store} />);
       })
   }
 };

src/pages/attendance/attendance.tsx

@@ -1,140 +0,0 @@
-import React, { useMemo } from 'react'
-import { useParams } from 'react-router-dom'
-import { Box, Heading, Tooltip, Text } from '@chakra-ui/react'
-import dayjs from 'dayjs'
-
-import { api } from '../../__data__/api/api'
-import { PageLoader } from '../../components/page-loader/page-loader'
-
-export const Attendance = () => {
-  const { courseId } = useParams()
-  const { data: attendance, isLoading } = api.useLessonListQuery(courseId, {
-    selectFromResult: ({ data, isLoading }) => ({
-      data: data?.body,
-      isLoading,
-    }),
-  })
-  const { data: courseInfo, isLoading: courseInfoIssLoading } =
-    api.useGetCourseByIdQuery(courseId)
-
-  const data = useMemo(() => {
-    if (!attendance) return null
-
-    const studentsMap = new Map()
-    const teachersMap = new Map()
-
-    attendance.forEach((lesson) => {
-      lesson.teachers?.map((teacher: any) => {
-        teachersMap.set(teacher.sub, {  id: teacher.sub, ...teacher, value: teacher.value || (teacher.family_name && teacher.given_name
-          ? `${teacher.family_name} ${teacher.given_name}`
-          : teacher.name || teacher.email || teacher.preferred_username || teacher.family_name || teacher.given_name), })
-      })
-
-      lesson.students.forEach((student) => {
-        const current = studentsMap.get(student.sub) || {}
-
-        studentsMap.set(student.sub, {
-          ...student,
-          id: student.sub,
-          value: current.value || (student.family_name && student.given_name
-              ? `${student.family_name} ${student.given_name}`
-              : student.name || student.email || student.preferred_username || student.family_name || student.given_name),
-        })
-      })
-    })
-
-    const compare = Intl.Collator('ru').compare
-
-    const students = [...studentsMap.values()]
-    const taechers = [...teachersMap.values()]
-    students.sort(({ family_name: name }, { family_name: nname }) =>
-      compare(name, nname),
-    )
-    return {
-      students,
-      taechers,
-    }
-  }, [attendance])
-
-  if (!data || isLoading || courseInfoIssLoading) {
-    return <PageLoader />
-  }
-
-  return (
-    <Box>
-      <Box mt={12} mb={12}>
-        <Heading>{courseInfo.name}</Heading>
-      </Box>
-      <Box>
-        <table>
-          <thead>
-            <tr>
-              {data.taechers.map(teacher => (
-                <th id={teacher.id} key={teacher.id}>{teacher.value}</th>
-              ))}
-              <th>Дата</th>
-              <th>Название занятия</th>
-              {data.students.map((student) => (
-                <th id={student.id || student.sub} key={student.sub}>{student.name || student.value || 'Имя не определено'}</th>
-              ))}
-            </tr>
-          </thead>
-          <tbody>
-            {attendance.map((lesson, index) => (
-              <tr key={lesson.name}>
-                {data?.taechers?.map((teacher) => {
-
-                  const wasThere = Boolean(lesson.teachers) &&
-                    lesson?.teachers?.findIndex((u) => u.sub === teacher.sub) !== -1
-                  return (
-                    <td
-                      style={{
-                        textAlign: 'center',
-                        backgroundColor: wasThere ? '#8ef78a' : '#e09797',
-                      }}
-                      key={teacher.sub}
-                    >
-                      {wasThere ? '+' : '-'}
-                    </td>
-                  )
-                })}
-                <td>{dayjs(lesson.date).format('DD.MM.YYYY')}</td>
-                <td>{<ShortText text={lesson.name} />}</td>
-
-                {data.students.map((st) => {
-                  const wasThere =
-                    lesson.students.findIndex((u) => u.sub === st.sub) !== -1
-                  return (
-                    <td
-                      style={{
-                        textAlign: 'center',
-                        backgroundColor: wasThere ? '#8ef78a' : '#e09797',
-                      }}
-                      key={st.sub}
-                    >
-                      {wasThere ? '+' : '-'}
-                    </td>
-                  )
-                })}
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </Box>
-    </Box>
-  )
-}
-
-const ShortText = ({ text }: { text: string }) => {
-  const needShortText = text.length > 20
-
-  if (needShortText) {
-    return (
-      <Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
-        <Text>{text.slice(0, 20)}...</Text>
-      </Tooltip>
-    )
-  }
-
-  return text
-}

src/pages/attendance/index.ts

@@ -1,3 +0,0 @@
-import { Attendance } from './attendance'
-
-export default Attendance

src/pages/course-list.tsx

@@ -1,44 +1,56 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 import dayjs from 'dayjs'
+import { Link as ConnectedLink } from 'react-router-dom'
+import { getNavigationsValue } from '@ijl/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 { api } from '../../__data__/api/api'
-import { isTeacher } from '../../utils/user'
-import { AddIcon } from '@chakra-ui/icons'
-import { PageLoader } from '../../components/page-loader/page-loader'
-import { CourseCard } from './course-card'
+import { useAppSelector } from '../__data__/store'
+import { api } from '../__data__/api/api'
+import { isTeacher } from '../utils/user'
+import { AddIcon, ArrowDownIcon, ArrowUpIcon, LinkIcon } from '@chakra-ui/icons'
+import { Course } from '../__data__/model'
 
 interface NewCourseForm {
   startDt: string
   name: string
 }
 
-export const CoursesList = () => {
+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 {
@@ -49,8 +61,8 @@ export const CoursesList = () => {
     getValues,
   } = useForm<NewCourseForm>({
     defaultValues: {
-      startDt: dayjs().format('YYYY-MM-DD'),
-      name: 'Название',
+      startDt: '',
+      name: '',
     },
   })
 
@@ -81,7 +93,17 @@ export const CoursesList = () => {
 
   if (isLoading) {
     return (
-      <PageLoader />
+      <Container maxW="container.xl">
+        <Center h="300px">
+          <Spinner
+            thickness="4px"
+            speed="0.65s"
+            emptyColor="gray.200"
+            color="blue.500"
+            size="xl"
+          />
+        </Center>
+      </Container>
     )
   }
 
@@ -190,11 +212,109 @@ export const CoursesList = () => {
       <VStack as="ul" align="stretch">
         {data?.body?.map((c) => (
           <CourseCard
-            key={c.id}
+            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/course-card.tsx

@@ -1,121 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import dayjs from 'dayjs'
-import { Link as ConnectedLink, generatePath } 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} />
-            )}
-
-            {getNavigationsValue('link.journal.attendance') && (
-              <Tooltip
-                label="На страницу с лекциями"
-                fontSize="12px"
-                top="16px"
-              >
-                <Button
-                  leftIcon={<LinkIcon />}
-                  as={ConnectedLink}
-                  variant="outline"
-                  colorScheme="blue"
-                  to={generatePath(
-                    `${getNavigationsValue('journal.main')}${getNavigationsValue('link.journal.attendance')}`,
-                    { courseId: course.id },
-                  )}
-                >
-                  <Box mt={3}></Box>
-                  Посещаемость
-                </Button>
-              </Tooltip>
-            )}
-          </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

@@ -1,108 +0,0 @@
-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 (
-    <>
-      {isTeacher(user) && (
-        <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>
-    </>
-  )
-}

src/pages/course-list/index.ts

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

src/pages/index.ts

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

src/pages/lesson-details.tsx

@@ -3,7 +3,7 @@ import { useParams, Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import QRCode from 'qrcode'
 import { sha256 } from 'js-sha256'
-import { getConfigValue, getNavigationsValue } from '@brojs/cli'
+import { getConfigValue, getNavigationsValue } from '@ijl/cli'
 import {
   Box,
   Breadcrumb,
@@ -24,8 +24,6 @@ import {
   StudentList,
   BreadcrumbsWrapper,
 } from './style'
-import { useAppSelector } from '../__data__/store'
-import { isTeacher } from '../utils/user'
 
 export function getGravatarURL(email, user) {
   if (!email) return void 0
@@ -39,8 +37,6 @@ export function getGravatarURL(email, user) {
 const LessonDetail = () => {
   const { lessonId, courseId } = useParams()
   const canvRef = useRef(null)
-  const user = useAppSelector((s) => s.user)
-  
   const {
     isFetching,
     data: accessCode,
@@ -49,7 +45,6 @@ const LessonDetail = () => {
   } = api.useCreateAccessCodeQuery(
     { lessonId },
     {
-      skip: !isTeacher(user),
       pollingInterval:
         Number(getConfigValue('journal.polling-interval')) || 3000,
       skipPollingIfUnfocused: true,
@@ -149,7 +144,7 @@ const LessonDetail = () => {
             <QRCanvas ref={canvRef} />
           </a>
           <StudentList>
-            {isTeacher(user) && studentsArr.map((student) => (
+            {studentsArr.map((student) => (
               <UserCard
                 wrapperAS="li"
                 key={student.sub}

src/pages/lesson-list.tsx

@@ -0,0 +1,429 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react'
+import dayjs from 'dayjs'
+import { Link, useParams } from 'react-router-dom'
+import { getNavigationsValue } from '@ijl/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,
+  Tr,
+  Th,
+  Tbody,
+  Td,
+  Menu,
+  MenuButton,
+  MenuItem,
+  Text,
+  MenuList,
+  Center,
+  Spinner,
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogOverlay,
+} from '@chakra-ui/react'
+import { AddIcon, EditIcon } from '@chakra-ui/icons'
+
+import { useAppSelector } from '../__data__/store'
+import { api } from '../__data__/api/api'
+import { isTeacher } from '../utils/user'
+import { qrCode } from '../assets'
+import { Lesson } from '../__data__/model'
+
+import { ErrorSpan, BreadcrumbsWrapper } from './style'
+
+interface NewLessonForm {
+  name: string
+  date: string
+}
+
+interface LessonFormProps {
+  lesson?: Partial<Lesson>
+  isLoading: boolean
+  onCancel: () => void
+  onSubmit: (lesson: Lesson) => void
+  error?: string
+}
+
+const LessonForm = ({
+  lesson,
+  isLoading,
+  onCancel,
+  onSubmit,
+  error,
+}: 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">
+          Создание лекции
+        </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}
+              >
+                Создать
+              </Button>
+            </Box>
+          </VStack>
+
+          {error && <ErrorSpan>{error}</ErrorSpan>}
+        </form>
+      </CardBody>
+    </Card>
+  )
+}
+
+const LessonList = () => {
+  const { courseId } = useParams()
+  const user = useAppSelector((s) => s.user)
+  const { data, isLoading, error } = api.useLessonListQuery(courseId)
+  const [createLesson, crLQuery] = api.useCreateLessonMutation()
+  const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
+  const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
+  const [showForm, setShowForm] = useState(false)
+  const [lessonToDelete, setlessonToDelete] = useState<Lesson>(null)
+  const cancelRef = React.useRef()
+  const toast = useToast()
+  const toastRef = useRef(null)
+  const createdLessonRef = useRef(null)
+  const [editLesson, setEditLesson] = useState<Lesson>(null)
+
+  const onSubmit = (lessonData) => {
+    toastRef.current = toast({
+      title: 'Отправляем',
+      status: 'loading',
+      duration: 9000,
+    })
+    createdLessonRef.current = lessonData
+    if (editLesson) updateLesson(lessonData)
+    else createLesson({ courseId, ...lessonData })
+  }
+
+  useEffect(() => {
+    if (deletingRqst.isError) {
+      toast({
+        title: (deletingRqst.error as any)?.error,
+        status: 'error',
+        duration: 3000,
+      })
+    }
+
+    if (deletingRqst.isSuccess) {
+      const lesson = { ...lessonToDelete }
+      toast({
+        status: 'warning',
+        duration: 9000,
+        render: ({ id, ...toastProps }) => (
+          <Toast
+            {...toastProps}
+            id={id}
+            title={
+              <>
+                <Box pb={3}>
+                  <Text fontSize="xl">{`Удалена лекция ${lesson.name}`}</Text>
+                </Box>
+                <Button
+                  onClick={() => {
+                    createLesson({ courseId, ...lesson })
+                    toast.close(id)
+                  }}
+                >
+                  Восстановить
+                </Button>
+              </>
+            }
+          />
+        ),
+      })
+      setlessonToDelete(null)
+    }
+  }, [deletingRqst.isLoading, deletingRqst.isSuccess, deletingRqst.isError])
+
+  useEffect(() => {
+    if (crLQuery.isSuccess) {
+      const toastProps = {
+        title: 'Лекция создана',
+        description: `Лекция ${createdLessonRef.current.name} успешно создана`,
+        status: 'success' as 'success',
+        duration: 9000,
+        isClosable: true,
+      }
+      if (toastRef.current) toast.update(toastRef.current, toastProps)
+      else toast(toastProps)
+      setShowForm(false)
+    }
+  }, [crLQuery.isSuccess])
+
+  useEffect(() => {
+    if (updateLessonRqst.isSuccess) {
+      const toastProps = {
+        title: 'Лекция Обновлена',
+        description: `Лекция ${createdLessonRef.current.name} успешно обновлена`,
+        status: 'success' as 'success',
+        duration: 9000,
+        isClosable: true,
+      }
+      if (toastRef.current) toast.update(toastRef.current, toastProps)
+      else toast(toastProps)
+      setShowForm(false)
+    }
+  }, [updateLessonRqst.isSuccess])
+
+  if (isLoading) {
+    return (
+      <Container maxW="container.xl">
+        <Center h="300px">
+          <Spinner
+            thickness="4px"
+            speed="0.65s"
+            emptyColor="gray.200"
+            color="blue.500"
+            size="xl"
+          />
+        </Center>
+      </Container>
+    )
+  }
+
+  return (
+    <>
+      <AlertDialog
+        isOpen={Boolean(lessonToDelete)}
+        leastDestructiveRef={cancelRef}
+        onClose={() => setlessonToDelete(null)}
+      >
+        <AlertDialogOverlay>
+          <AlertDialogContent>
+            <AlertDialogHeader fontSize="lg" fontWeight="bold">
+              Удалить занятие от{' '}
+              {dayjs(lessonToDelete?.date).format('DD.MM.YY')}?
+            </AlertDialogHeader>
+
+            <AlertDialogBody>
+              Все данные о посещении данного занятия будут удалены
+            </AlertDialogBody>
+
+            <AlertDialogFooter>
+              <Button
+                isDisabled={deletingRqst.isLoading}
+                ref={cancelRef}
+                onClick={() => setlessonToDelete(null)}
+              >
+                Cancel
+              </Button>
+              <Button
+                colorScheme="red"
+                loadingText=""
+                isLoading={deletingRqst.isLoading}
+                onClick={() => deleteLesson(lessonToDelete._id)}
+                ml={3}
+              >
+                Delete
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
+      <BreadcrumbsWrapper>
+        <Breadcrumb>
+          <BreadcrumbItem>
+            <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
+              Журнал
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+
+          <BreadcrumbItem isCurrentPage>
+            <BreadcrumbLink href="#">Курс</BreadcrumbLink>
+          </BreadcrumbItem>
+        </Breadcrumb>
+      </BreadcrumbsWrapper>
+      <Container maxW="container.xl">
+        {isTeacher(user) && (
+          <Box mt="15" mb="15">
+            {showForm ? (
+              <LessonForm
+                key={editLesson?._id}
+                isLoading={crLQuery.isLoading}
+                onSubmit={onSubmit}
+                onCancel={() => {
+                  setShowForm(false)
+                  setEditLesson(null)
+                }}
+                error={(crLQuery.error as any)?.error}
+                lesson={editLesson}
+              />
+            ) : (
+              <Box p="2" m="2">
+                <Button
+                  leftIcon={<AddIcon />}
+                  colorScheme="green"
+                  onClick={() => setShowForm(true)}
+                >
+                  Добавить
+                </Button>
+              </Box>
+            )}
+          </Box>
+        )}
+        <TableContainer whiteSpace="wrap">
+          <Table variant="striped" colorScheme="cyan">
+            <Thead>
+              <Tr>
+                {isTeacher(user) && (
+                  <Th align="center" width={1}>
+                    ссылка
+                  </Th>
+                )}
+                <Th textAlign="center" width={1}>
+                  Дата
+                </Th>
+                <Th>Название</Th>
+                <Th>action</Th>
+                <Th isNumeric>Отмечено</Th>
+              </Tr>
+            </Thead>
+            <Tbody>
+              {data?.body?.map((lesson) => (
+                <Tr key={lesson._id}>
+                  {isTeacher(user) && (
+                    <Td>
+                      <Link
+                        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('H:mm DD.MM.YY')}
+                  </Td>
+                  <Td>{lesson.name}</Td>
+                  <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>
+              ))}
+            </Tbody>
+          </Table>
+        </TableContainer>
+      </Container>
+    </>
+  )
+}
+
+export default LessonList

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

@@ -1,28 +0,0 @@
-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/item.tsx

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

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

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

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

@@ -1,140 +0,0 @@
-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

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

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

@@ -1,305 +0,0 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react'
-import dayjs from 'dayjs'
-import { generatePath, Link, useParams } from 'react-router-dom'
-import { getNavigationsValue, getFeatures } from '@brojs/cli'
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  Container,
-  Box,
-  Button,
-  useToast,
-  Toast,
-  TableContainer,
-  Table,
-  Thead,
-  Tr,
-  Th,
-  Tbody,
-  Text,
-  AlertDialog,
-  AlertDialogBody,
-  AlertDialogContent,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogOverlay,
-} from '@chakra-ui/react'
-import { AddIcon } from '@chakra-ui/icons'
-
-import { useAppSelector } from '../../__data__/store'
-import { api } from '../../__data__/api/api'
-import { isTeacher } from '../../utils/user'
-import { Lesson } from '../../__data__/model'
-import { XlSpinner } from '../../components/xl-spinner'
-
-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 barFeature = features?.['lesson.bar']
-const groupByDate = features?.['group.by.date']
-
-const LessonList = () => {
-  const { courseId } = useParams()
-  const user = useAppSelector((s) => s.user)
-  const { data, isLoading, error, isSuccess } = api.useLessonListQuery(courseId)
-  const [createLesson, crLQuery] = api.useCreateLessonMutation()
-  const [deleteLesson, deletingRqst] = api.useDeleteLessonMutation()
-  const [updateLesson, updateLessonRqst] = api.useUpdateLessonMutation()
-  const [showForm, setShowForm] = useState(false)
-  const [lessonToDelete, setlessonToDelete] = useState<Lesson>(null)
-  const cancelRef = React.useRef()
-  const toast = useToast()
-  const toastRef = useRef(null)
-  const createdLessonRef = useRef(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 lessonCalc = useMemo(() => {
-    if (!isSuccess) {
-      return []
-    }
-
-    if (!groupByDate) {
-      return [{ date: '', data: sorted }]
-    }
-
-    const lessonsData = []
-    for (let i = 0; i < sorted.length; i++) {
-      const element = sorted[i]
-      const find = lessonsData.find(
-        (item) => dayjs(element.date).diff(dayjs(item.date), 'day') === 0,
-      )
-
-      if (find) {
-        find.data.push(element)
-      } else {
-        lessonsData.push({
-          date: element.date,
-          data: [element],
-        })
-      }
-    }
-
-    return lessonsData.sort((a, b) => (a.date < b.date ? 1 : -1))
-  }, [groupByDate, isSuccess, sorted])
-
-  const onSubmit = (lessonData) => {
-    toastRef.current = toast({
-      title: 'Отправляем',
-      status: 'loading',
-      duration: 9000,
-    })
-    createdLessonRef.current = lessonData
-    if (editLesson) updateLesson(lessonData)
-    else createLesson({ courseId, ...lessonData })
-  }
-
-  useEffect(() => {
-    if (deletingRqst.isError) {
-      toast({
-        title: (deletingRqst.error as any)?.error,
-        status: 'error',
-        duration: 3000,
-      })
-    }
-
-    if (deletingRqst.isSuccess) {
-      const lesson = { ...lessonToDelete }
-      toast({
-        status: 'warning',
-        duration: 9000,
-        render: ({ id, ...toastProps }) => (
-          <Toast
-            {...toastProps}
-            id={id}
-            title={
-              <>
-                <Box pb={3}>
-                  <Text fontSize="xl">{`Удалена лекция ${lesson.name}`}</Text>
-                </Box>
-                <Button
-                  onClick={() => {
-                    createLesson({ courseId, ...lesson })
-                    toast.close(id)
-                  }}
-                >
-                  Восстановить
-                </Button>
-              </>
-            }
-          />
-        ),
-      })
-      setlessonToDelete(null)
-    }
-  }, [deletingRqst.isLoading, deletingRqst.isSuccess, deletingRqst.isError])
-
-  useEffect(() => {
-    if (crLQuery.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)
-      setShowForm(false)
-    }
-  }, [crLQuery.isSuccess])
-
-  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)
-      setShowForm(false)
-    }
-  }, [updateLessonRqst.isSuccess])
-
-  if (isLoading) {
-    return <XlSpinner />
-  }
-
-  return (
-    <>
-      <AlertDialog
-        isOpen={Boolean(lessonToDelete)}
-        leastDestructiveRef={cancelRef}
-        onClose={() => setlessonToDelete(null)}
-      >
-        <AlertDialogOverlay>
-          <AlertDialogContent>
-            <AlertDialogHeader fontSize="lg" fontWeight="bold">
-              Удалить занятие от{' '}
-              {dayjs(lessonToDelete?.date).format('DD.MM.YY')}?
-            </AlertDialogHeader>
-
-            <AlertDialogBody>
-              Все данные о посещении данного занятия будут удалены
-            </AlertDialogBody>
-
-            <AlertDialogFooter>
-              <Button
-                isDisabled={deletingRqst.isLoading}
-                ref={cancelRef}
-                onClick={() => setlessonToDelete(null)}
-              >
-                Cancel
-              </Button>
-              <Button
-                colorScheme="red"
-                loadingText=""
-                isLoading={deletingRqst.isLoading}
-                onClick={() => deleteLesson(lessonToDelete.id)}
-                ml={3}
-              >
-                Delete
-              </Button>
-            </AlertDialogFooter>
-          </AlertDialogContent>
-        </AlertDialogOverlay>
-      </AlertDialog>
-      <BreadcrumbsWrapper>
-        <Breadcrumb>
-          <BreadcrumbItem>
-            <BreadcrumbLink as={Link} to={getNavigationsValue('journal.main')}>
-              Журнал
-            </BreadcrumbLink>
-          </BreadcrumbItem>
-
-          <BreadcrumbItem isCurrentPage>
-            <BreadcrumbLink href="#">Курс</BreadcrumbLink>
-          </BreadcrumbItem>
-        </Breadcrumb>
-      </BreadcrumbsWrapper>
-      <Container maxW="container.xl" position="relative">
-        {isTeacher(user) && (
-          <Box mt="15" mb="15">
-            {showForm ? (
-              <LessonForm
-                key={editLesson?.id}
-                isLoading={crLQuery.isLoading}
-                onSubmit={onSubmit}
-                onCancel={() => {
-                  setShowForm(false)
-                  setEditLesson(null)
-                }}
-                error={(crLQuery.error as any)?.error}
-                lesson={editLesson}
-                title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
-                nameButton={editLesson ? 'Редактировать' : 'Создать'}
-              />
-            ) : (
-              <Button
-                leftIcon={<AddIcon />}
-                colorScheme="green"
-                onClick={() => setShowForm(true)}
-              >
-                Добавить
-              </Button>
-            )}
-          </Box>
-        )}
-        {barFeature && sorted?.length > 1 && (
-          <Box height="300">
-            <Bar
-              data={sorted.map((lesson, index) => ({
-                lessonIndex: `#${index + 1}`,
-                count: lesson.students.length,
-              }))}
-            />
-          </Box>
-        )}
-        <TableContainer whiteSpace="wrap" pb={13}>
-          <Table variant="striped" colorScheme="cyan">
-            <Thead>
-              <Tr>
-                {isTeacher(user) && (
-                  <Th align="center" width={1}>
-                    ссылка
-                  </Th>
-                )}
-                <Th textAlign="center" width={1}>
-                  {groupByDate ? 'Время' : 'Дата'}
-                </Th>
-                <Th width="100%">Название</Th>
-                {isTeacher(user) && <Th>action</Th>}
-                <Th isNumeric>Отмечено</Th>
-              </Tr>
-            </Thead>
-            <Tbody>
-              {lessonCalc?.map(({ data: lessons, date }) => (
-                <LessonItems
-                  courseId={courseId}
-                  date={date}
-                  isTeacher={isTeacher(user)}
-                  lessons={lessons}
-                  setlessonToDelete={setlessonToDelete}
-                  key={date}
-                />
-              ))}
-            </Tbody>
-          </Table>
-        </TableContainer>
-      </Container>
-    </>
-  )
-}
-
-export default LessonList

src/pages/lesson-list/style.ts

@@ -1,13 +0,0 @@
-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,8 +9,10 @@ import {
   Box,
   Center,
   Container,
+  Heading,
   Spinner,
   Text,
+  Stack,
 } from '@chakra-ui/react'
 import { UserCard } from '../components/user-card'
 

src/utils/time.ts

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

src/ym.ts

@@ -1,17 +0,0 @@
-(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;

stubs/api/index.js

@@ -3,31 +3,16 @@ const fs = require('node:fs')
 const path = require('node:path')
 
 const timer =
-(time = 1000) =>
+  (time = 1000) =>
   (_req, _res, next) =>
     setTimeout(next, time)
 
 router.use(timer())
 
-const config = {
-  examCreated: false
-}
-
 router.get('/course/list', (req, res) => {
   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) => {
   res.send(require('../mocks/courses/all-students/success.json'))
 })
@@ -36,11 +21,6 @@ router.post('/course', (req, res) => {
   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) => {
   res.send(require('../mocks/lessons/list/success.json'))
 })

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

@@ -1,671 +0,0 @@
-{
-    "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/by-id/with-exam.json

@@ -1,94 +0,0 @@
-{
-    "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"
-    }
-}

stubs/mocks/courses/list/success.json

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