Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 23 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0377cea
Feat: 마일리지 카테고리 모달관련 reducers를 만듬 (open , close) (#7)
ohinhyuk Aug 23, 2023
78c2500
Feat: 마일리지 카테고리 관련 모달을 열고 닫는 액션 export(#7)
ohinhyuk Aug 23, 2023
db81d1b
Fix: 문법에 맞게 reducers return 값 수정(#7)
ohinhyuk Aug 23, 2023
8320c97
Feat: mUI 모달 컴포넌트 생성(#7)
ohinhyuk Aug 23, 2023
fdddb78
Feat: root Reducer에 modal Reducer를 연결하고 모달의 useState를 selector와 dispa…
ohinhyuk Aug 23, 2023
d9f5d5b
Feat: 카테고리 관련 모달 이름 data파일에 정의(#7)
ohinhyuk Aug 23, 2023
19379fc
Fix: 모달 관련 state를 재사용 하기로 결정하여 state의 갯수를 줄임(#7)
ohinhyuk Aug 23, 2023
4b821f3
Feat: icon Converter를 통해 어떤 타입의 모달이냐에 따라 다른 아이콘을 부여(#7)
ohinhyuk Aug 23, 2023
c27d116
Feat: title Converter를 두어 모달의 제목을 모달의 타입에 따라 융통성있게 가져감(#7)
ohinhyuk Aug 23, 2023
856e099
Fix: 모달이 type을 인식하지 못하는 이슈로 인해 modalType을 reducer에서 관리(#7)
ohinhyuk Aug 23, 2023
3a17867
Feat: formik , yup 설치 및 활용을 통한 모달 속 폼 제작(#7)
ohinhyuk Aug 23, 2023
d0d73ae
Feat: 마일리지 카테고리 추가 기능 폼 구현 완료(#7)
ohinhyuk Aug 23, 2023
2eff095
Style: mui템플릿 Theme기본 설정을 변경 시켜서 텍스트 필드의 스타일을 변경시킴(#7)
ohinhyuk Aug 24, 2023
b5ad0bb
Feat: 관리를 눌렀을 때 초기값을 전달하여 세팅하는 것 까지 연결 (#7)
ohinhyuk Aug 24, 2023
9f4c780
Feat: 마일리지 카테고리 모달 완성 + 컴포넌트 분리(#7)
ohinhyuk Aug 24, 2023
ea5c8c0
Refactor: 모달 제목 , 모달 열기 버튼 리펙터링(#7)
ohinhyuk Aug 24, 2023
81ad561
Feat: 테이블에 타입 지정하고 타입을 활용해서 제목 변경(#7)
ohinhyuk Aug 24, 2023
7154596
Feat: 타입 컨버터를 통해 각 모달의 기능에 맞춰줌(#7)
ohinhyuk Aug 24, 2023
f00e244
Feat: 카테고리 항목 모달 폼 제작(#7)
ohinhyuk Aug 24, 2023
d12c59d
Feat: 카테고리 항목 모달에 토글 추가(#7)
ohinhyuk Aug 24, 2023
cf69c89
Feat: 영어를 한글로 UI를 보여주는 함수 구현(#7)
ohinhyuk Aug 24, 2023
7ec4b44
Feat: 마일리지 항목 모달 리펙터링(#7)
ohinhyuk Aug 24, 2023
c222793
Feat: 마일리지 카테고리, 마일리지 항목 모달 연결(#7)
ohinhyuk Aug 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 84 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 12 additions & 0 deletions src/assets/data/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
7 changes: 7 additions & 0 deletions src/assets/data/modal/modals.ts
Original file line number Diff line number Diff line change
@@ -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';
44 changes: 44 additions & 0 deletions src/components/Template/CustomModal2.tsx
Original file line number Diff line number Diff line change
@@ -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>
);
}
Loading