diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f6d7cd6a9..1ee9ef13d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -2,7 +2,7 @@ name: Bug report about: Create a report to help us improve title: "[BUG] " -labels: bugfix +labels: '' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index 7728f971d..d4eadbc4b 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -1,7 +1,7 @@ --- name: Feature about: New feature on the front-end site -title: "[FEATURE]" +title: '' labels: feature assignees: '' diff --git a/public/icons/halloween-logo.svg b/public/icons/halloween-logo.svg new file mode 100644 index 000000000..29862a3ee --- /dev/null +++ b/public/icons/halloween-logo.svg @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/common/layout/header/components/mobile-header/MobileHeader.tsx b/src/components/common/layout/header/components/mobile-header/MobileHeader.tsx index e953921a8..9ec18b408 100644 --- a/src/components/common/layout/header/components/mobile-header/MobileHeader.tsx +++ b/src/components/common/layout/header/components/mobile-header/MobileHeader.tsx @@ -4,7 +4,6 @@ import { AppBar, Box, Link } from '@mui/material'; import Image from 'next/image'; import NextLink from 'next/link'; -// import { BurgerMenu } from '@/components/common/icons/BurgerMenu'; import { TransformedUser } from '@/components/common/layout/header/types'; import IconButton from '@/components/common/ui/icon-button-mui'; import { diff --git a/src/components/common/ui/form/input-mui/Input.styles.ts b/src/components/common/ui/form/input-mui/Input.styles.ts index be24d00b2..5a5f93e90 100644 --- a/src/components/common/ui/form/input-mui/Input.styles.ts +++ b/src/components/common/ui/form/input-mui/Input.styles.ts @@ -57,7 +57,7 @@ export const label = (state: InputState): SxProps => ({ export const remark = (state: InputState): SxProps => ({ margin: '2px 8px 0 16px', '&.MuiFormHelperText-root': { - textTransform: 'lowercase', + textTransform: 'none', }, ...(state === InputState.ERROR && { diff --git a/src/components/pages/account-page/components/group-tab/components/table/grid.styles.ts b/src/components/pages/account-page/components/group-tab/components/table/grid.styles.ts index 3a3496ce6..854f3fc3c 100644 --- a/src/components/pages/account-page/components/group-tab/components/table/grid.styles.ts +++ b/src/components/pages/account-page/components/group-tab/components/table/grid.styles.ts @@ -31,8 +31,7 @@ export const row: SxProps = { mobile: '8px', desktop: '16px', }, - '& img': { - borderRadius: '50%', + '& .MuiAvatar-root': { width: { mobile: '36px', desktop: '48px' }, height: { mobile: '36px', desktop: '48px' }, }, diff --git a/src/components/pages/account-page/components/group-tab/components/table/student-table/StudentsTable.tsx b/src/components/pages/account-page/components/group-tab/components/table/student-table/StudentsTable.tsx index 9c30815e0..4e2041b84 100644 --- a/src/components/pages/account-page/components/group-tab/components/table/student-table/StudentsTable.tsx +++ b/src/components/pages/account-page/components/group-tab/components/table/student-table/StudentsTable.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { PlusIcon } from '@heroicons/react/24/solid'; -import { Box, Grid, Typography, useMediaQuery } from '@mui/material'; +import { Avatar, Box, Grid, Typography, useMediaQuery } from '@mui/material'; import { Captain } from '@/components/common/icons/Captain'; import { Moderator } from '@/components/common/icons/Moderator'; @@ -88,7 +88,7 @@ const StudentsTable: React.FC = ({ {row.imgSrc && ( - avatar + {!isMobile && ( {row.fullName} )} diff --git a/src/components/pages/account-page/components/security-tab/components/change-password-form/ChangePasswordForm.tsx b/src/components/pages/account-page/components/security-tab/components/change-password-form/ChangePasswordForm.tsx index 799b24f5b..6e38570fc 100644 --- a/src/components/pages/account-page/components/security-tab/components/change-password-form/ChangePasswordForm.tsx +++ b/src/components/pages/account-page/components/security-tab/components/change-password-form/ChangePasswordForm.tsx @@ -58,6 +58,7 @@ const ChangePasswordForm = () => { type={InputType.PASSWORD} name="oldPassword" isSuccessOnDefault={true} + showRemark={true} /> {errors.oldPassword === 'Введений пароль недійсний' && ( @@ -77,6 +78,7 @@ const ChangePasswordForm = () => { name="newPassword" disabled={!!errors.oldPassword} isSuccessOnDefault={true} + showRemark={true} /> { name="confirmationPassword" disabled={!!errors.oldPassword || !!errors.newPassword} isSuccessOnDefault={true} + showRemark={true} />