diff --git a/public/images/logo/darkLogo.png b/public/images/logo/darkLogo.png new file mode 100644 index 0000000..184a084 Binary files /dev/null and b/public/images/logo/darkLogo.png differ diff --git a/public/images/logo/lightLogo.png b/public/images/logo/lightLogo.png new file mode 100644 index 0000000..8a03021 Binary files /dev/null and b/public/images/logo/lightLogo.png differ diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js index 62711c4..ede11c5 100755 --- a/src/routes/MainRoutes.js +++ b/src/routes/MainRoutes.js @@ -6,7 +6,6 @@ import Loadable from 'ui-component/Loadable'; import AuthGuard from 'utils/route-guard/AuthGuard'; // sample page routing -const SamplePage = Loadable(lazy(() => import('views/sample-page'))); const Dashboard = Loadable(lazy(() => import('views/dashboard'))); // admin page routing @@ -113,15 +112,6 @@ const MainRoutes = { { path: '/judge/disabled/review', element: - }, - - { - path: '/sample-page', - element: - }, - { - path: '/modalForm', - element: } ] }; diff --git a/src/ui-component/Logo.js b/src/ui-component/Logo.js index b7df54f..462e323 100755 --- a/src/ui-component/Logo.js +++ b/src/ui-component/Logo.js @@ -1,14 +1,6 @@ // material-ui import { useTheme } from '@mui/material/styles'; -/** - * if you want to use image instead of uncomment following. - * - * import logoDark from 'assets/images/logo-dark.svg'; - * import logo from 'assets/images/logo.svg'; - * - */ - import Llogo from '../assets/images/logo/lightLogo.png'; import Dlogo from '../assets/images/logo/darkLogo.png'; // ==============================|| LOGO SVG ||============================== // @@ -16,57 +8,7 @@ import Dlogo from '../assets/images/logo/darkLogo.png'; const Logo = () => { const theme = useTheme(); - return ( - /** - * if you want to use image instead of svg uncomment following, and comment out element. - * - * Berry - * - */ - Berry - // - // - // - // - // - // - // - // - // - // - // - // - ); + return Berry; }; export default Logo; diff --git a/src/views/biz/judge/ProcessJudge.jsx b/src/views/biz/judge/ProcessJudge.jsx index 6893218..4dc6910 100644 --- a/src/views/biz/judge/ProcessJudge.jsx +++ b/src/views/biz/judge/ProcessJudge.jsx @@ -94,7 +94,7 @@ const ProcessJudge = (props) => { return ( <> - + {frecadImgs?.map((img, idx) => ( @@ -111,21 +111,18 @@ const ProcessJudge = (props) => { ))} - - + + {selectedImg && ( - {selectedImg.imgName} + + {selectedImg.imgName} + )} - + diff --git a/src/views/cmm/CmmFullModal.jsx b/src/views/cmm/CmmFullModal.jsx index 6ba89bc..cac251e 100644 --- a/src/views/cmm/CmmFullModal.jsx +++ b/src/views/cmm/CmmFullModal.jsx @@ -10,8 +10,8 @@ const style = { top: '50%', left: '50%', transform: 'translate(-50%, -50%)', - width: '98%', - minHeight: '98%', + width: '80%', + height: '93%', bgcolor: 'background.paper', border: '2px solid #000', boxShadow: 24, diff --git a/src/views/cmm/CmmImgViewModal.jsx b/src/views/cmm/CmmImgViewModal.jsx index 0020861..dba5890 100644 --- a/src/views/cmm/CmmImgViewModal.jsx +++ b/src/views/cmm/CmmImgViewModal.jsx @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import Modal from '@mui/material/Modal'; -import { Grid, IconButton } from '@mui/material'; +import { Grid, IconButton, ImageList } from '@mui/material'; import CloseOutlined from '@mui/icons-material/CloseOutlined'; import MainCard from 'ui-component/cards/MainCard'; @@ -11,7 +11,7 @@ const style = { left: '50%', transform: 'translate(-50%, -50%)', width: 1000, - minHeight: 800, + height: 800, bgcolor: 'background.paper', border: '2px solid #000', boxShadow: 24, @@ -38,16 +38,11 @@ const CmmImgViewModal = ({ isBackdrop = false, open, setOpen, title, imgUrl, img } > - - {imgName} - + + + {imgName} + + diff --git a/src/views/cmm/ImgItem.js b/src/views/cmm/ImgItem.js index 9a55f27..e67bc46 100644 --- a/src/views/cmm/ImgItem.js +++ b/src/views/cmm/ImgItem.js @@ -4,19 +4,14 @@ import PropTypes from 'prop-types'; const ImgItem = ({ idx, title, imgInfo, onViewImage }) => ( - {imgInfo.imgName} + {imgInfo.imgName} {imgInfo.imgName && ( diff --git a/src/views/sample-page/index.js b/src/views/sample-page/index.js deleted file mode 100755 index 30d7a7a..0000000 --- a/src/views/sample-page/index.js +++ /dev/null @@ -1,20 +0,0 @@ -// material-ui -import { Typography } from '@mui/material'; - -// project imports -import MainCard from 'ui-component/cards/MainCard'; - -// ==============================|| SAMPLE PAGE ||============================== // - -const SamplePage = () => ( - - - Lorem ipsum dolor sit amen, consenter nipissing eli, sed do elusion tempos incident ut laborers et doolie magna alissa. Ut enif ad - minim venice, quin nostrum exercitation illampu laborings nisi ut liquid ex ea commons construal. Duos aube grue dolor in reprehended - in voltage veil esse colum doolie eu fujian bulla parian. Exceptive sin ocean cuspidate non president, sunk in culpa qui officiate - descent molls anim id est labours. - - -); - -export default SamplePage;