diff --git a/src/assets/images/logo/darkLogo.png b/src/assets/images/logo/darkLogo.png new file mode 100644 index 0000000..184a084 Binary files /dev/null and b/src/assets/images/logo/darkLogo.png differ diff --git a/src/assets/images/logo/lightLogo.png b/src/assets/images/logo/lightLogo.png new file mode 100644 index 0000000..8a03021 Binary files /dev/null and b/src/assets/images/logo/lightLogo.png differ diff --git a/src/assets/images/logo/lightLogo.svg b/src/assets/images/logo/lightLogo.svg new file mode 100644 index 0000000..94ed45e --- /dev/null +++ b/src/assets/images/logo/lightLogo.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 3b6390c..2f05622 100755 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -218,4 +218,14 @@ .colored-toast .swal2-html-container { color: white; +} + +.logoTest{ + border: 0px solid red; + max-width: 130px; + padding-top: 10px; +} +.css-1c42uvn-MuiAvatar-root { + border: 0px solid red; + top: 13px; } \ No newline at end of file diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index add6aaa..7874302 100755 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -1,6 +1,6 @@ // material-ui import { useTheme } from '@mui/material/styles'; -import { Avatar, Box } from '@mui/material'; +import { Avatar, Box, Link } from '@mui/material'; // project imports import LogoSection from '../LogoSection'; @@ -8,6 +8,8 @@ import ProfileSection from './ProfileSection'; import { useDispatch, useSelector } from 'store'; import { openDrawer } from 'store/slices/menu'; +/* import LogoTest from '../../../assets/images/logo/darkLogo.png'; */ + // assets import { IconMenu2 } from '@tabler/icons'; @@ -34,6 +36,12 @@ const Header = () => { + {/* + + eslint-disable-next-line jsx-a11y/alt-text + + + */} { @@ -21,48 +23,49 @@ const Logo = () => { * Berry * */ - - - - - - - - - - - - + Berry + // + // + // + // + // + // + // + // + // + // + // + // ); }; diff --git a/src/views/biz/admin/judge/JudgeReview.jsx b/src/views/biz/admin/judge/JudgeReview.jsx index 845d38c..a3508da 100644 --- a/src/views/biz/admin/judge/JudgeReview.jsx +++ b/src/views/biz/admin/judge/JudgeReview.jsx @@ -26,6 +26,9 @@ import { removeAlert } from '../../../../commons/XitCmm'; const year = getYear(new Date()); const years = _.range(year, year - 14, -1); +const JudgeReview = ({ msDatagb, menuName }) => { + const showAlert = useAlert(); + const JudgeReview = ({ msDatagb, menuName }) => { const showAlert = useAlert(); diff --git a/src/views/biz/judge/JudgeByUserReview.jsx b/src/views/biz/judge/JudgeByUserReview.jsx index c66ed64..18a7dfa 100644 --- a/src/views/biz/judge/JudgeByUserReview.jsx +++ b/src/views/biz/judge/JudgeByUserReview.jsx @@ -93,13 +93,13 @@ const JudgeByUserReview = ({ msDatagb, menuName }) => { return '심의전'; // break; case '1': - return '부과'; + return '미부과'; // break; case '2': - return '미부과'; + return '부과'; // break; default: - return params.row.msResult; + return params.row.msuResult; } }, width: 100