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

Mypagedg #25

Closed
wants to merge 164 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
4d926aa
로그인 수정
hyunsunglimm Jan 30, 2024
3120869
Merge pull request #8 from hyunsunglimm/authentication-hs
hyunsunglimm Jan 30, 2024
b54d860
mypagemj
Jan 30, 2024
56ff690
Merge pull request #9 from hyunsunglimm/mypagemj
mj950313 Jan 30, 2024
93c4e9a
modalpage
Lee-donggeun Jan 30, 2024
6eead33
Merge pull request #10 from hyunsunglimm/mypagedg
Lee-donggeun Jan 30, 2024
1b5e494
test
Now-h Jan 30, 2024
04b6f58
Merge pull request #11 from hyunsunglimm/sidebar-jh
Now-h Jan 30, 2024
2b3f6bc
회원가입 유효성검증
hyunsunglimm Jan 30, 2024
bfbf116
Merge pull request #12 from hyunsunglimm/authentication-hs
hyunsunglimm Jan 30, 2024
4d358ef
로그인 유효성 검증 & 근무/비근무 직원 필터링
hyunsunglimm Jan 31, 2024
a038ac6
Merge pull request #14 from hyunsunglimm/authentication-hs
hyunsunglimm Jan 31, 2024
cbf3b61
mypage styling
Jan 31, 2024
9e6f3e8
mypage styling
Jan 31, 2024
a9148db
Merge branch 'develop' into mypagemj
mj950313 Jan 31, 2024
b7f3485
Merge pull request #15 from hyunsunglimm/mypagemj
mj950313 Jan 31, 2024
438ef29
mypage styling
Jan 31, 2024
ad1bc3e
Merge branch 'develop' into mypagemj
Jan 31, 2024
1e3639a
기업 공지 모음 갤러리 스타일링&데이터 추가
hyunsunglimm Jan 31, 2024
2f9ed89
Merge pull request #16 from hyunsunglimm/authentication-hs
hyunsunglimm Jan 31, 2024
592aeea
mypage style
Feb 1, 2024
58f819a
Merge branch 'develop' into mypagemj
Feb 1, 2024
647d539
모달 컴포넌트
Lee-donggeun Feb 1, 2024
b5022c3
헤더 부분 타이머 구현
Lee-donggeun Feb 1, 2024
c474e4d
icon install
Feb 1, 2024
5447cba
부재사유기재스타일링
Feb 1, 2024
1a78fb8
Merge pull request #18 from hyunsunglimm/mypagemj
mj950313 Feb 1, 2024
9eba139
데이터 변경 시 리로드
hyunsunglimm Feb 1, 2024
443582f
부재 사유 기재 스타일링
hyunsunglimm Feb 1, 2024
fd4d11b
부재 사유 기재 스타일링
hyunsunglimm Feb 1, 2024
529b8ad
직원정보 실시간 업데이트
hyunsunglimm Feb 1, 2024
7368a60
Merge pull request #19 from hyunsunglimm/authentication-hs
hyunsunglimm Feb 1, 2024
0ec0db0
employee page commit
Feb 1, 2024
325ac61
Merge branch 'develop' into mypagemj
mj950313 Feb 1, 2024
a7b0aa3
Merge pull request #20 from hyunsunglimm/mypagemj
mj950313 Feb 1, 2024
ef9e846
employee page commit
Feb 1, 2024
c7e2ded
Merge branch 'develop' into mypagemj
Feb 1, 2024
e5c45fd
시간 관리
Lee-donggeun Feb 1, 2024
fb1fafd
Merge branch 'develop' into mypagedg
Lee-donggeun Feb 1, 2024
2e3d2c8
Merge pull request #21 from hyunsunglimm/mypagedg
Lee-donggeun Feb 1, 2024
f7b202b
modal
Lee-donggeun Feb 1, 2024
08aef0a
modal
Lee-donggeun Feb 1, 2024
5358638
employee page commit
Feb 1, 2024
a5a4aaa
employee page commit
Feb 1, 2024
5bd0d7b
동근님 코드 에러 해결
hyunsunglimm Feb 1, 2024
2ca21e9
Merge pull request #23 from hyunsunglimm/authentication-hs
hyunsunglimm Feb 1, 2024
4b7943f
merge 충돌 오류
Lee-donggeun Feb 1, 2024
e494e9a
Merge branch 'develop' into mypagemj
mj950313 Feb 1, 2024
1e2f634
Merge pull request #24 from hyunsunglimm/mypagemj
mj950313 Feb 1, 2024
4f89dbd
Merge branch 'develop' into mypagedg
Lee-donggeun Feb 1, 2024
1d95aeb
Merge pull request #26 from hyunsunglimm/mypagedg
Lee-donggeun Feb 1, 2024
ecfafe7
App.jsx refactoring
hyunsunglimm Feb 2, 2024
1140c22
Merge pull request #28 from hyunsunglimm/authentication-hs
hyunsunglimm Feb 2, 2024
9152861
employee page styling
Feb 2, 2024
13e510d
Merge branch 'develop' into mypagemj
Feb 2, 2024
a119b5d
타이머 오류
Lee-donggeun Feb 2, 2024
6d7c7d1
employee page styling
Feb 2, 2024
dbe5bbe
Merge pull request #29 from hyunsunglimm/mypagemj
mj950313 Feb 2, 2024
f4ddfc1
부재 신청 내역 확인 구현
Feb 3, 2024
d65af81
Merge pull request #30 from hyunsunglimm/mypagemj
mj950313 Feb 3, 2024
3c45d57
근무중 부재중에 따른 토글버튼구현
Feb 4, 2024
11850c4
Merge pull request #31 from hyunsunglimm/mypagemj
mj950313 Feb 4, 2024
f49e694
timer
hyunsunglimm Feb 5, 2024
070ac61
Merge branch 'develop' of https://github.com/hyunsunglimm/toy-intrane…
hyunsunglimm Feb 5, 2024
38b406f
헤더 시간 수정
Lee-donggeun Feb 5, 2024
a4d5a0d
dropdownmenu
Lee-donggeun Feb 5, 2024
4a1aeca
Merge branch 'develop' into mypagedg
Lee-donggeun Feb 5, 2024
f19b61a
드롭다운, 타이머 수정
Lee-donggeun Feb 5, 2024
51351a6
Merge pull request #32 from hyunsunglimm/mypagedg
Lee-donggeun Feb 5, 2024
afad5a5
로그인한유저만 근무중부재중 수정기능
Feb 5, 2024
71cc8cf
Merge branch 'develop' into mypagemj
Feb 5, 2024
2080502
Merge branch 'develop' of https://github.com/hyunsunglimm/toy-intrane…
hyunsunglimm Feb 5, 2024
5749988
Merge pull request #34 from hyunsunglimm/mypagemj
mj950313 Feb 5, 2024
4f796e7
Merge branch 'develop' of https://github.com/hyunsunglimm/toy-intrane…
hyunsunglimm Feb 5, 2024
326885f
merged complete
hyunsunglimm Feb 5, 2024
84ff98a
modal, dropdown 개선
hyunsunglimm Feb 5, 2024
908e9f4
Merge pull request #36 from hyunsunglimm/authentication-hs
hyunsunglimm Feb 5, 2024
6f9a3a6
merge commit
Feb 5, 2024
bc206a4
Merge branch 'develop' into mypagemj
Feb 5, 2024
f5e2d39
modal close outside
hyunsunglimm Feb 5, 2024
2f2a643
Merge pull request #37 from hyunsunglimm/authentication-hs
hyunsunglimm Feb 5, 2024
671dd40
develop merge commit
Feb 5, 2024
4b77ded
직원 상세페이지 삭제버튼 추가
hyunsunglimm Feb 5, 2024
e53b128
Merge pull request #39 from hyunsunglimm/hyunsung
hyunsunglimm Feb 5, 2024
f2d44be
공지갤러리 슬라이더 구현
Now-h Feb 5, 2024
a8b712c
Merge pull request #40 from hyunsunglimm/sidebar-jh
Now-h Feb 5, 2024
ad7288a
공지, 직원카드 스켈레톤 UI추가
hyunsunglimm Feb 6, 2024
53c97ed
Merge pull request #41 from hyunsunglimm/hyunsung
hyunsunglimm Feb 6, 2024
d5f64c5
employpage styling
Feb 6, 2024
4cc8cc5
공지갤러리(NoticeGallery) 부분 슬라이더 디자인 여백 수정
Now-h Feb 6, 2024
ee7afb6
Working now 부분 페이지네이션 구현
Now-h Feb 6, 2024
19e63d0
employee page styling
Feb 6, 2024
bf65f2a
스켈레톤, 페이지네이션 구현
Now-h Feb 6, 2024
bb9f4f0
employee page styling
Feb 6, 2024
a1e41de
Merge pull request #43 from hyunsunglimm/mypagemj
mj950313 Feb 6, 2024
3800e83
global styling
hyunsunglimm Feb 6, 2024
183d0cd
timer 수정
Lee-donggeun Feb 6, 2024
f5d1827
Merge pull request #44 from hyunsunglimm/hyunsung
hyunsunglimm Feb 6, 2024
b866a0d
Merge branch 'develop' into mypagedg
Lee-donggeun Feb 6, 2024
7796fd2
페이지네이션 구현
Now-h Feb 6, 2024
ecdda24
Merge pull request #45 from hyunsunglimm/mypagedg
Lee-donggeun Feb 6, 2024
9a204be
전체적인 UI 스타일링
hyunsunglimm Feb 6, 2024
9e4fa0e
Merge pull request #46 from hyunsunglimm/hyunsung
hyunsunglimm Feb 6, 2024
d2dd767
employee page styling
Feb 6, 2024
39a6905
로그인한 유저의 상세페이지만 삭제버튼 구현
Feb 6, 2024
da5b5c7
Merge pull request #47 from hyunsunglimm/mypagemj
mj950313 Feb 6, 2024
ecabbf8
헤더, 모달, 드롭다운, 직원 카드 스타일링
hyunsunglimm Feb 6, 2024
5d4ed93
Merge branch 'develop' into hyunsung
hyunsunglimm Feb 6, 2024
f3ae91c
Merge pull request #48 from hyunsunglimm/hyunsung
hyunsunglimm Feb 6, 2024
8c47903
employee image styling
Feb 6, 2024
f938869
회의 후 수정사항
hyunsunglimm Feb 6, 2024
e77d63b
Merge pull request #49 from hyunsunglimm/hyunsung
hyunsunglimm Feb 6, 2024
ad0c848
페이지네이션 구현
Now-h Feb 6, 2024
b0253be
employee page styling
Feb 6, 2024
b0653ea
employee page styling
Feb 6, 2024
c4bba67
Merge branch 'develop' into sidebar-jh
Now-h Feb 6, 2024
b510264
페이지네이션 구현
Now-h Feb 6, 2024
9bc29bf
슬라이더 구현
Now-h Feb 6, 2024
2539b34
Merge pull request #51 from hyunsunglimm/sidebar-jh
Now-h Feb 6, 2024
6166d04
merge
hyunsunglimm Feb 6, 2024
09fc58d
Merge branch 'develop' into hyunsung
hyunsunglimm Feb 6, 2024
6b96f10
employeepage styling
Feb 6, 2024
076f3ab
employeepage styling
Feb 6, 2024
1b993bc
Merge pull request #53 from hyunsunglimm/mypagemj
mj950313 Feb 6, 2024
b1711ec
회원탈퇴 컨펌 모달 기능 구현
Feb 6, 2024
62bb9bf
Merge pull request #55 from hyunsunglimm/mypagemj
mj950313 Feb 6, 2024
a84e908
회원탈퇴컨펌 모달기능 구현
Feb 6, 2024
40b4a21
Merge pull request #56 from hyunsunglimm/mypagemj
mj950313 Feb 6, 2024
413011d
직원카드 스타일링
hyunsunglimm Feb 7, 2024
978be69
Merge branch 'develop' into hyunsung
hyunsunglimm Feb 7, 2024
6beb897
시간, 분 두자리로 맞춤
Lee-donggeun Feb 7, 2024
985ac05
시계 아이콘 추가
Lee-donggeun Feb 7, 2024
39cef78
Merge pull request #57 from hyunsunglimm/mypagedg
Lee-donggeun Feb 7, 2024
05dd42e
공지상세페이지 스켈레톤UI 스타일링
Feb 7, 2024
a424760
공지상세페이지 스켈레톤구현
Feb 7, 2024
83c0d6d
Merge pull request #58 from hyunsunglimm/mypagemj
mj950313 Feb 7, 2024
bf4fddd
직원 카드 개선&부재사유 수정기능 추가
hyunsunglimm Feb 7, 2024
295447f
직원 상세페이지 수정
hyunsunglimm Feb 7, 2024
41aa1c4
Merge pull request #59 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
eb2cb31
타이머 아이콘 수정
Lee-donggeun Feb 7, 2024
48686d6
Merge pull request #60 from hyunsunglimm/mypagedg
Lee-donggeun Feb 7, 2024
9b847cc
Merge branch 'develop' into mypagedg
Lee-donggeun Feb 7, 2024
ab19fe8
Merge pull request #61 from hyunsunglimm/mypagedg
Lee-donggeun Feb 7, 2024
74b2795
타이머 불필요한 코드 주석
Lee-donggeun Feb 7, 2024
ec08d2e
직원 상세페이지 이미지 수정 기능 추가
hyunsunglimm Feb 7, 2024
83fc2d3
이미지 수정기능 추가
hyunsunglimm Feb 7, 2024
a56f83c
Merge pull request #62 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
e7e59a6
SkeletonNoticePage 오타 수정
hyunsunglimm Feb 7, 2024
79950c9
Merge pull request #63 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
1aacfae
상세페이지 크기조정
hyunsunglimm Feb 7, 2024
773dfd4
Merge pull request #64 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
2b46709
Merge branch 'develop' of https://github.com/hyunsunglimm/toy-intrane…
Lee-donggeun Feb 7, 2024
8a56624
상세페이지 스켈레톤UI 구현
Feb 7, 2024
7afe01e
Merge pull request #66 from hyunsunglimm/mypagemj
mj950313 Feb 7, 2024
9ae6e4a
상세페이지 스켈레톤 UI 스타일수정
Feb 7, 2024
afb20c6
Merge pull request #67 from hyunsunglimm/mypagemj
mj950313 Feb 7, 2024
a25c19b
메인페이지 반응형 레이아웃
hyunsunglimm Feb 7, 2024
621532f
Merge pull request #68 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
ec97dce
코드 수정
hyunsunglimm Feb 7, 2024
a94219b
Merge pull request #69 from hyunsunglimm/hyunsung
hyunsunglimm Feb 7, 2024
85e11a8
24시 타이머 수정
Lee-donggeun Feb 7, 2024
179e390
Merge branch 'develop' of https://github.com/hyunsunglimm/toy-intrane…
Lee-donggeun Feb 7, 2024
d5eea34
Merge pull request #70 from hyunsunglimm/mypagedg
Lee-donggeun Feb 7, 2024
3490b69
코드 오류 수정
Lee-donggeun Feb 7, 2024
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
23 changes: 12 additions & 11 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
"eslint:recommended",
"plugin:react/recommended",
"plugin:react/jsx-runtime",
"plugin:react-hooks/recommended",
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parserOptions: { ecmaVersion: "latest", sourceType: "module" },
settings: { react: { version: "18.2" } },
plugins: ["react-refresh"],
rules: {
'react-refresh/only-export-components': [
'warn',
"react-refresh/only-export-components": [
"warn",
{ allowConstantExport: true },
],
"react/prop-types": "off",
},
}
};
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/png" href="/symbol.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Intranet Five</title>
</head>

<body>
<div id="root"></div>
<div id="modal"></div>
<script type="module" src="/src/main.jsx"></script>
</body>

Expand Down
Loading