4 Commits

Author SHA1 Message Date
4d498662f8 Merge pull request '#19 Неверные надписи в форме редактирования лекции' (#21) from bugfix/wrong-title-edit-lesson into master
All checks were successful
platform/bro/pipeline/head This commit looks good
Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/21
Reviewed-by: primakov <primakovpro@gmail.com>
2024-04-07 12:39:35 +03:00
1320a50af0 #19 Неверные надписи в форме редактирования лекции
All checks were successful
platform/bro/pipeline/head This commit looks good
platform/bro/pipeline/pr-master This commit looks good
2024-04-07 16:15:08 +10:00
4504961fa0 2.2.0
All checks were successful
platform/bro/pipeline/head This commit looks good
2024-04-04 10:37:12 +03:00
3e54f0099b Merge pull request 'Верстка страницы со списком студентов' (#20) from feature/students-layout into master
All checks were successful
platform/bro/pipeline/head This commit looks good
Reviewed-on: https://git.inno-js.ru/bro-js/journal.pl/pulls/20
2024-04-04 10:36:49 +03:00
3 changed files with 11 additions and 5 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "journal.pl",
"version": "2.1.1",
"version": "2.2.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "journal.pl",
"version": "2.1.1",
"version": "2.2.0",
"license": "MIT",
"dependencies": {
"@chakra-ui/icons": "^2.1.1",

View File

@@ -1,6 +1,6 @@
{
"name": "journal.pl",
"version": "2.1.1",
"version": "2.2.0",
"description": "inno-js platform journal ui repo",
"main": "./src/index.tsx",
"scripts": {

View File

@@ -65,6 +65,8 @@ interface LessonFormProps {
onCancel: () => void
onSubmit: (lesson: Lesson) => void
error?: string
title: string
nameButton: string
}
const LessonForm = ({
@@ -73,6 +75,8 @@ const LessonForm = ({
onCancel,
onSubmit,
error,
title,
nameButton,
}: LessonFormProps) => {
const {
control,
@@ -90,7 +94,7 @@ const LessonForm = ({
<Card align="left">
<CardHeader display="flex">
<Heading as="h2" mt="0">
Создание лекции
{title}
</Heading>
<CloseButton
ml="auto"
@@ -153,7 +157,7 @@ const LessonForm = ({
colorScheme="blue"
isLoading={isLoading}
>
Создать
{nameButton}
</Button>
</Box>
</VStack>
@@ -343,6 +347,8 @@ const LessonList = () => {
}}
error={(crLQuery.error as any)?.error}
lesson={editLesson}
title={editLesson ? 'Редактирование лекции' : 'Создание лекции'}
nameButton={editLesson ? 'Редактировать' : 'Создать'}
/>
) : (
<Box p="2" m="2">