Merge pull request #10 from HGU-WALAB/issue/#7

BUG : 버전 관리 관련 오류가 있어 revert 후 PR 재시도 (#7)

package.json

@@ -50,9 +50,11 @@
     "autosuggest-highlight": "^3.3.4",
     "axios": "^1.2.3",
     "change-case": "^4.1.2",
+    "commit": "^0.0.4",
     "date-fns": "^2.29.3",
     "dayjs": "^1.11.9",
     "firebase": "^9.15.0",
+    "formik": "^2.4.3",
     "framer-motion": "^9.0.4",
     "highlight.js": "^11.7.0",
     "i18next": "^22.4.9",
@@ -88,7 +90,7 @@
     "stylis-plugin-rtl": "^2.1.1",
     "yarn": "^1.22.19",
     "yet-another-react-lightbox": "^2.4.2",
-    "yup": "^1.0.0"
+    "yup": "^1.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",

src/assets/data/fields.ts

@@ -28,3 +28,15 @@ export const FREQUENCY = 'frequency';
 export const ACCEPT = 'accept';
 export const REJECT = 'reject';
 export const SCHOLARSHIP = 'scholarship';
+
+export const DESCRIPTION1 = 'description1';
+export const DESCRIPTION2 = 'description2';
+export const FILE_DESCRIPTION = 'fileDescription';
+
+export const ISVISIBLE_STUDENT = 'isVisibleStudent';
+export const ISINPUT_STUDENT = 'isInputStudent';
+export const ISDUPLICATE_RECORD = 'isDuplicateRecord';
+export const ISEVALUATE_CSEE = 'isEvaluateCsee';
+export const ISEVALUATE_PORTFOLIO = 'isEvaluatePortfolio';
+export const ISEVALUATE_FUSION = 'isEvaluateFusion';
+export const MAX_MAILEAGE = 'maxMileage';

src/assets/data/modal/modals.ts

@@ -0,0 +1,7 @@
+export const ADDCATEGORY = 'addCategory';
+export const EDITCATEGORY = 'editCategory';
+export const DELETECATEGORY = 'deleteCategory';
+
+export const ADDITEM = 'addItem';
+export const EDITITEM = 'editItem';
+export const DELETEITEM = 'deleteItme';

src/components/Template/CustomModal2.tsx

@@ -0,0 +1,44 @@
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import Typography from '@mui/material/Typography';
+import Modal from '@mui/material/Modal';
+
+const style = {
+  position: 'absolute' as 'absolute',
+  top: '50%',
+  left: '50%',
+  transform: 'translate(-50%, -50%)',
+  width: 400,
+  bgcolor: 'background.paper',
+  border: '2px solid #000',
+  boxShadow: 24,
+  p: 4,
+};
+
+export default function CustomModal2() {
+  const [open, setOpen] = React.useState(false);
+  const handleOpen = () => setOpen(true);
+  const handleClose = () => setOpen(false);
+
+  return (
+    <div>
+      <Button onClick={handleOpen}>Open modal</Button>
+      <Modal
+        open={open}
+        onClose={handleClose}
+        aria-labelledby="modal-modal-title"
+        aria-describedby="modal-modal-description"
+      >
+        <Box sx={style}>
+          <Typography id="modal-modal-title" variant="h6" component="h2">
+            Text in a modal
+          </Typography>
+          <Typography id="modal-modal-description" sx={{ mt: 2 }}>
+            Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
+          </Typography>
+        </Box>
+      </Modal>
+    </div>
+  );
+}