3.1.2

fix: поправил автоподстановку даты в форму редактирования лекции [#29 ]
metrix on production mode + up cli version
2024-08-12 16:30:51 +03:00 · 2024-08-12 16:30:01 +03:00 · 2024-08-12 15:50:30 +03:00 · 2024-08-12 10:59:09 +03:00 · 2024-08-12 00:05:37 +03:00 · 2024-08-12 00:05:30 +03:00
25 changed files with 4165 additions and 5331 deletions
--- a/22
+++ b/22
@@ -1,7 +1,7 @@
 pipeline {
    agent {
        docker {
-      image 'node:18'
+            image 'node:20'
        }
    }

@@ -10,10 +10,28 @@ pipeline {
            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'
@@ -25,6 +43,8 @@ pipeline {
                        sh 'npm run build'
                    }
                }
+            }
+        }

        stage('clean-all') {
            steps {
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ npm install
 пропишите в hosts строку

 ```
-127.0.0.1 ift-b1.kc.inno-js.test
+127.0.0.1 journal.test
 ```

 ## Запуск
@@ -28,4 +28,4 @@ npm install
 npm start
 ```

-откройте в браузере [проект](http://ift-b1.kc.inno-js.test)
+откройте в браузере [проект](http://journal.test)
--- a/index.d.ts
+++ b/index.d.ts
@@ -2,3 +2,5 @@ declare module '*.svg' {
    const src: string;
    export default src;
 }
+
+declare const __webpack_public_path__: string;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,31 +1,31 @@
 {
    "name": "journal.pl",
-    "version": "2.4.4",
-    "description": "inno-js platform journal ui repo",
+    "version": "3.1.2",
+    "description": "bro-js platform journal ui repo",
    "main": "./src/index.tsx",
    "scripts": {
-        "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",
+        "start": "brojs server --port=8099 --with-open-browser",
+        "build": "npm run clean && brojs build --dev",
+        "build:prod": "npm run clean && brojs build",
        "clean": "rimraf dist",
        "test": "echo ok",
        "eslint": "npx eslint ."
    },
    "repository": {
        "type": "git",
-        "url": "ssh://git@85.143.175.152:10022/omni-tech/journal.pl.git"
+        "url": "ssh://git@85.143.175.152:222/bro-js/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-alpha.10",
        "@chakra-ui/icons": "^2.1.1",
        "@chakra-ui/react": "^2.8.2",
        "@emotion/react": "^11.11.4",
@@ -35,18 +35,19 @@
        "@types/react": "^18.2.60",
        "@types/react-dom": "^18.2.19",
        "dayjs": "^1.11.10",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
        "js-sha256": "^0.11.0",
        "keycloak-js": "^23.0.7",
        "prettier": "^3.2.5",
        "qrcode": "^1.5.3",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
        "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",
-        "typescript": "^5.3.3"
+        "typescript": "^5.3.3",
+        "webpack-hot-middleware": "^2.26.1"
    }
 }
--- a/src/data/api/api.ts
+++ b/src/data/api/api.ts
@@ -1,5 +1,5 @@
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import { getConfigValue } from '@ijl/cli'
+import { getConfigValue } from '@brojs/cli'

 import { keycloak } from '../kc'
 import {
--- a/src/data/kc.ts
+++ b/src/data/kc.ts
@@ -1,8 +1,8 @@
 import Keycloak from 'keycloak-js';

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

--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,87 +1,28 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
-import { Global, css  } from '@emotion/react'
+import { Global } from '@emotion/react'
 import { BrowserRouter } from 'react-router-dom';
 import ruLocale from 'dayjs/locale/ru';
 import dayjs from 'dayjs';
 import { ChakraProvider } from '@chakra-ui/react'

 import { Dashboard } from './dashboard';
+import { globalStyles } from './global.styles';

 dayjs.locale('ru', ruLocale);

-const App = ({ store }) => {
-    return(
+const App = ({ store }) => (
    <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;
-                      }
-                  `}
-              />
+            <Global styles={globalStyles} />
            <Dashboard store={store} />
        </BrowserRouter>
    </ChakraProvider>
 )
-}

 export default App;

--- a/src/components/xl-spinner/index.ts
+++ b/src/components/xl-spinner/index.ts
@@ -0,0 +1 @@
+export { XlSpinner } from './xl-spinner';
--- a/src/components/xl-spinner/xl-spinner.tsx
+++ b/src/components/xl-spinner/xl-spinner.tsx
@@ -0,0 +1,20 @@
+import React from 'react'
+import {
+    Container,
+    Center,
+    Spinner,
+} from '@chakra-ui/react'
+
+export const XlSpinner = () => (
+    <Container maxW="container.xl">
+        <Center h="300px">
+            <Spinner
+                thickness="4px"
+                speed="0.65s"
+                emptyColor="gray.200"
+                color="blue.500"
+                size="xl"
+            />
+        </Center>
+    </Container>
+)
--- a/src/dashboard.tsx
+++ b/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 '@ijl/cli'
+import { getNavigationsValue } from '@brojs/cli'
 import { Box, Container, Spinner, VStack } from '@chakra-ui/react'

 import {
--- a/src/global.styles.ts
+++ b/src/global.styles.ts
@@ -0,0 +1,60 @@
+import { css } from '@emotion/react'
+
+export const globalStyles = css`
+html {
+    height: 100%;
+    max-width: 100%;
+    min-width: 320px;
+    overflow: hidden;
+}
+body {
+    color: #000;
+    /* background: radial-gradient(circle at top right, rgb(154 227 33), rgb(33 160 56)); */
+    background: radial-gradient(
+        farthest-side at bottom left,
+        rgba(35, 235, 4, 0.709), 
+        rgba(255, 255, 255, 0) 65%
+    ),
+    radial-gradient(
+        farthest-corner at bottom center,
+        rgba(244, 244, 8, 0.6), 
+        rgba(255, 255, 255, 0) 40%
+    ),
+    radial-gradient(
+        farthest-side at bottom right,
+        rgba(0, 195, 255, 0.648), 
+        rgb(239 244 246) 65%
+        /* rgba(255, 255, 255, 0) 65% */
+    );
+    height: 100%;
+    /* font-family: KiyosunaSans, Montserrat, RFKrabuler, sans-serif; */
+    font-weight: 600;
+}
+#app {
+    height: 100%;
+    overflow-y: auto;
+}
+
+@font-face {
+    font-family: 'KiyosunaSans';
+    src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-B.otf'}');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'KiyosunaSans';
+    src: url('${__webpack_public_path__ + '/remote-assets/KiyosunaSans/KiyosunaSans-L.otf'}');
+    font-weight: lighter;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'RFKrabuler';
+    src: url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.eot'}');
+    src:
+        url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff2'}') format('woff2'),
+        url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/WEB/RFKrabuler-Regular.woff'}') format('woff'),
+        url('${__webpack_public_path__ + '/remote-assets/RF-Krabuler/TTF/RF-Krabuler-Regular.ttf'}') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+`
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -5,6 +5,10 @@ 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
@@ -12,7 +16,7 @@ let rootElement: ReactDOM.Root
 export const mount = async (Сomponent, element = document.getElementById('app')) => {
  let user = null;
  try {
-    await keycloak.init({ onLoad: "login-required" }); // 'login-required' });
+    await keycloak.init({ onLoad: "login-required" });
    user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
  } catch (error) {
    console.error("Failed to initialize adapter:", error);
--- a/src/pages/course-list.tsx
+++ b/src/pages/course-list.tsx
@@ -1,7 +1,7 @@
 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 { getNavigationsValue } from '@brojs/cli'
 import {
  Box,
  CardHeader,
@@ -61,8 +61,8 @@ const CoursesList = () => {
    getValues,
  } = useForm<NewCourseForm>({
    defaultValues: {
-      startDt: '',
-      name: '',
+      startDt: dayjs().format('YYYY-MM-DD'),
+      name: 'Название',
    },
  })

@@ -288,7 +288,7 @@ const CourseCard = ({
        </CardBody>
      )}
      <CardFooter>
-        <ButtonGroup spacing="4" mt="16px">
+        <ButtonGroup spacing={[0, 4]} mt="16px" flexDirection={['column', 'row']}>
          <Tooltip label="На страницу с лекциями" fontSize="12px" top="16px">
            <Button
              leftIcon={<LinkIcon />}
@@ -302,6 +302,7 @@ const CourseCard = ({
          <Tooltip label="Детали" fontSize="12px" top="16px">
            <Button
              colorScheme="blue"
+              mt={["16px", 0]}
              variant="outline"
              leftIcon={isOpened ? <ArrowUpIcon /> : <ArrowDownIcon />}
              loadingText="Загрузка"
--- a/src/pages/index.ts
+++ b/src/pages/index.ts
@@ -1,8 +1,6 @@
 import { lazy } from 'react'

-export const CourseListPage = lazy(/* chank-name="course-details" */() => import('./course-list'));
-
-export const 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'));
+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'));
--- a/src/pages/lesson-details.tsx
+++ b/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 '@ijl/cli'
+import { getConfigValue, getNavigationsValue } from '@brojs/cli'
 import {
  Box,
  Breadcrumb,
--- a/src/pages/lesson-list/components/bar.tsx
+++ b/src/pages/lesson-list/components/bar.tsx
@@ -0,0 +1,28 @@
+import React from 'react'
+import { ResponsiveBar } from '@nivo/bar'
+
+export const Bar = ({ data }) => (
+    <ResponsiveBar
+        data={data}
+        keys={['count']}
+        indexBy="lessonIndex"
+        margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
+        padding={0.3}
+        valueScale={{ type: 'linear' }}
+        indexScale={{ type: 'band', round: true }}
+        colors={{ scheme: 'set3' }}
+        axisTop={null}
+        axisRight={null}
+        labelSkipWidth={12}
+        labelSkipHeight={12}
+        labelTextColor={{
+            from: 'color',
+            modifiers: [['brighter', 1.4]],
+        }}
+        role="application"
+        ariaLabel="График посещаемости лекций"
+        barAriaLabel={(e) =>
+            e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
+        }
+    />
+)
--- a/src/pages/lesson-list/components/lessons-form.tsx
+++ b/src/pages/lesson-list/components/lessons-form.tsx
@@ -0,0 +1,137 @@
+import React from 'react'
+import { useForm, Controller } from 'react-hook-form'
+import {
+    Box,
+    Card,
+    CardBody,
+    CardHeader,
+    Heading,
+    Button,
+    CloseButton,
+    VStack,
+    FormControl,
+    FormLabel,
+    FormHelperText,
+    FormErrorMessage,
+    Input,
+} from '@chakra-ui/react'
+import { AddIcon } from '@chakra-ui/icons'
+
+import { dateToCalendarFormat } from '../../../utils/time'
+import { Lesson } from '../../../__data__/model'
+import { ErrorSpan } from '../style'
+
+interface NewLessonForm {
+    name: string;
+    date: string;
+}
+
+interface LessonFormProps {
+    lesson?: Partial<Lesson>
+    isLoading: boolean
+    onCancel: () => void
+    onSubmit: (lesson: Lesson) => void
+    error?: string
+    title: string
+    nameButton: string
+}
+
+export const LessonForm = ({
+    lesson,
+    isLoading,
+    onCancel,
+    onSubmit,
+    error,
+    title,
+    nameButton,
+}: LessonFormProps) => {
+    const {
+        control,
+        handleSubmit,
+        reset,
+        formState: { errors },
+    } = useForm<NewLessonForm>({
+        defaultValues: (lesson && { ...lesson, date: dateToCalendarFormat(lesson.date) }) || {
+            name: '',
+            date: dateToCalendarFormat(),
+        },
+    })
+    
+    return (
+        <Card align="left">
+        <CardHeader display="flex">
+        <Heading as="h2" mt="0">
+        {title}
+        </Heading>
+        <CloseButton
+        ml="auto"
+        onClick={() => {
+            reset()
+            onCancel()
+        }}
+        />
+        </CardHeader>
+        <CardBody>
+        <form onSubmit={handleSubmit(onSubmit)}>
+        <VStack spacing="10" align="left">
+        <Controller
+        control={control}
+        name="date"
+        rules={{ required: 'Обязательное поле' }}
+        render={({ field }) => (
+            <FormControl>
+            <FormLabel>Дата</FormLabel>
+            <Input
+            {...field}
+            required={false}
+            placeholder="Укажите дату лекции"
+            size="md"
+            type="datetime-local"
+            />
+            {errors.date ? (
+                <FormErrorMessage>{errors.date?.message}</FormErrorMessage>
+            ) : (
+                <FormHelperText>Укажите дату и время лекции</FormHelperText>
+            )}
+            </FormControl>
+        )}
+        />
+        
+        <Controller
+        control={control}
+        name="name"
+        rules={{ required: 'Обязательное поле' }}
+        render={({ field }) => (
+            <FormControl isRequired isInvalid={Boolean(errors.name)}>
+            <FormLabel>Название новой лекции:</FormLabel>
+            <Input
+            {...field}
+            required={false}
+            placeholder="Название лекции"
+            size="md"
+            />
+            {errors.name && (
+                <FormErrorMessage>{errors.name.message}</FormErrorMessage>
+            )}
+            </FormControl>
+        )}
+        />
+        <Box mt="10">
+        <Button
+        size="lg"
+        type="submit"
+        leftIcon={<AddIcon />}
+        colorScheme="blue"
+        isLoading={isLoading}
+        >
+        {nameButton}
+        </Button>
+        </Box>
+        </VStack>
+        
+        {error && <ErrorSpan>{error}</ErrorSpan>}
+        </form>
+        </CardBody>
+        </Card>
+    )
+}
--- a/src/pages/lesson-list/index.ts
+++ b/src/pages/lesson-list/index.ts
@@ -0,0 +1,3 @@
+import LessonsList from './lesson-list';
+
+export default LessonsList;
--- a/src/pages/lesson-list/lesson-list.tsx
+++ b/src/pages/lesson-list/lesson-list.tsx
@@ -4,31 +4,18 @@ import React, {
  useRef,
  useState,
 } from 'react'
-import { ResponsiveBar } from '@nivo/bar'
 import dayjs from 'dayjs'
 import { Link, useParams } from 'react-router-dom'
-import { getNavigationsValue, getFeatures } from '@ijl/cli'
-import { useForm, Controller } from 'react-hook-form'
+import { getNavigationsValue, getFeatures } from '@brojs/cli'
 import {
  Breadcrumb,
  BreadcrumbItem,
  BreadcrumbLink,
  Container,
  Box,
-  Card,
-  CardBody,
-  CardHeader,
-  Heading,
  Button,
-  CloseButton,
  useToast,
-  VStack,
-  FormControl,
-  FormLabel,
  Toast,
-  FormHelperText,
-  FormErrorMessage,
-  Input,
  TableContainer,
  Table,
  Thead,
@@ -41,8 +28,6 @@ import {
  MenuItem,
  Text,
  MenuList,
-  Center,
-  Spinner,
  AlertDialog,
  AlertDialogBody,
  AlertDialogContent,
@@ -52,134 +37,22 @@ import {
 } from '@chakra-ui/react'
 import { AddIcon, EditIcon } from '@chakra-ui/icons'

-import { useAppSelector } from '../__data__/store'
-import { api } from '../__data__/api/api'
-import { isTeacher } from '../utils/user'
-import { qrCode } from '../assets'
-import { Lesson } from '../__data__/model'
+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 { XlSpinner } from '../../components/xl-spinner'

-import { ErrorSpan, BreadcrumbsWrapper } from './style'
+import { LessonForm } from './components/lessons-form'
+import { BreadcrumbsWrapper } from './style'
+import { Bar } from './components/bar'

 const features = getFeatures('journal')

 const barFeature = features?.['lesson.bar']
 const groupByDate = features?.['group.by.date']

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

-
    if (!groupByDate) {
      return [{ date: '', data: sorted }]
    }
@@ -308,19 +180,7 @@ const LessonList = () => {
  }, [updateLessonRqst.isSuccess])

  if (isLoading) {
-    return (
-      <Container maxW="container.xl">
-        <Center h="300px">
-          <Spinner
-            thickness="4px"
-            speed="0.65s"
-            emptyColor="gray.200"
-            color="blue.500"
-            size="xl"
-          />
-        </Center>
-      </Container>
-    )
+    return <XlSpinner />;
  }

  return (
@@ -494,29 +354,3 @@ const LessonList = () => {
 }

 export default LessonList
-
-const Bar = ({ data }) => (
-  <ResponsiveBar
-    data={data}
-    keys={['count']}
-    indexBy="lessonIndex"
-    margin={{ top: 50, right: 130, bottom: 50, left: 60 }}
-    padding={0.3}
-    valueScale={{ type: 'linear' }}
-    indexScale={{ type: 'band', round: true }}
-    colors={{ scheme: 'set3' }}
-    axisTop={null}
-    axisRight={null}
-    labelSkipWidth={12}
-    labelSkipHeight={12}
-    labelTextColor={{
-      from: 'color',
-      modifiers: [['brighter', 1.4]],
-    }}
-    role="application"
-    ariaLabel="График посещаемости лекций"
-    barAriaLabel={(e) =>
-      e.id + ': ' + e.formattedValue + ' on lection: ' + e.indexValue
-    }
-  />
-)
--- a/src/pages/lesson-list/style.ts
+++ b/src/pages/lesson-list/style.ts
@@ -0,0 +1,13 @@
+import styled from '@emotion/styled';
+
+export const BreadcrumbsWrapper = styled.div`
+  padding: 12px;
+`;
+
+export const ErrorSpan = styled.span`
+  color: #f9e2e2;
+  display: block;
+  padding: 16px;
+  background-color: #d32f0b;
+  border-radius: 11px;
+`
--- a/src/pages/user-page.tsx
+++ b/src/pages/user-page.tsx
@@ -9,10 +9,8 @@ import {
  Box,
  Center,
  Container,
-  Heading,
  Spinner,
  Text,
-  Stack,
 } from '@chakra-ui/react'
 import { UserCard } from '../components/user-card'

--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -0,0 +1,3 @@
+import dayjs from "dayjs";
+
+export const dateToCalendarFormat = (date?: string) => dayjs(date).format('YYYY-MM-DDTHH:mm')
--- a/src/ym.ts
+++ b/src/ym.ts
@@ -0,0 +1,17 @@
+(function (m, e, t, r, i, k, a) {
+    m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
+    // @ts-ignore
+    m[i].l = 1 * new Date();
+    for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
+    k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
+})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+// @ts-ignore
+ym(98045358, "init", {
+    clickmap: true,
+    trackLinks: true,
+    accurateTrackBounce: true,
+    webvisor: true
+});
+
+export const dummy = true;
Author	SHA1	Message	Date
Primakov Alexandr Alexandrovich	bdf6c5e8a1	3.1.2 Some checks failed platform/bro/pipeline/head This commit looks good Details platform/bro/pipeline/tag This commit looks good Details platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit Details platform/bro-js/journal.pl/pipeline/head This commit looks good Details	2024-08-12 16:30:51 +03:00
Primakov Alexandr Alexandrovich	87c08e18bd	fix: поправил автоподстановку даты в форму редактирования лекции [#29 ] All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-12 16:30:01 +03:00
Primakov Alexandr Alexandrovich	2d98b55bbc	metrix on production mode + up cli version All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-12 15:50:30 +03:00
Primakov Alexandr Alexandrovich	ced1f85a7f	fix: поправил мобильную вёрстку на экране списка курсов All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-12 10:59:09 +03:00
Primakov Alexandr Alexandrovich	e21b41f9ca	3.1.1 Some checks failed platform/bro/pipeline/head This commit looks good Details platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit Details platform/bro/pipeline/tag This commit looks good Details	2024-08-12 00:05:37 +03:00
Primakov Alexandr Alexandrovich	cb3629bd43	global __webpack_public_path__	2024-08-12 00:05:30 +03:00
Primakov Alexandr Alexandrovich	65216843ac	3.1.0 All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-11 23:55:48 +03:00
Primakov Alexandr Alexandrovich	a76fce5506	ym All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-11 23:54:27 +03:00
Primakov Alexandr Alexandrovich	c842befc8f	3.0.0 All checks were successful platform/bro/pipeline/head This commit looks good Details platform/bro/pipeline/tag This commit looks good Details	2024-08-11 23:36:53 +03:00
Primakov Alexandr Alexandrovich	fb267a11f9	remove comment Some checks failed platform/bro/pipeline/head This commit looks good Details platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit Details platform/bro-js/journal.pl/pipeline/head This commit looks good Details	2024-08-07 23:37:45 +03:00
Primakov Alexandr Alexandrovich	a94acbf7d3	better Jenkins file Some checks failed platform/bro/pipeline/head This commit looks good Details platform/gitea-bro-js/journal.pl/pipeline/head There was a failure building this commit Details platform/bro-js/journal.pl/pipeline/head This commit looks good Details	2024-08-07 23:32:19 +03:00
primakov	1cd1e26751	Merge pull request 'move 2 brojs' (#28 ) from feature/bro-js into master All checks were successful platform/bro/pipeline/head This commit looks good Details Reviewed-on: #28	2024-08-05 22:30:26 +03:00
Primakov Alexandr Alexandrovich	d7b521c2ec	move 2 brojs All checks were successful platform/bro/pipeline/head This commit looks good Details platform/bro/pipeline/pr-master This commit looks good Details	2024-08-05 22:10:34 +03:00
Primakov Alexandr Alexandrovich	a669e2af81	2.4.5 All checks were successful platform/bro/pipeline/head This commit looks good Details	2024-08-03 22:59:57 +03:00
Primakov Alexandr Alexandrovich	f093c0f3ad	fix kc config -> bro-js	2024-08-03 22:59:49 +03:00