-
Notifications
You must be signed in to change notification settings - Fork 0
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
Y_FE_Toy1_Team9 (9굴 WIKI) #3
Open
2YH02
wants to merge
311
commits into
main
Choose a base branch
from
Y_FE_Toy1_Team9
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
311 commits
Select commit
Hold shift + click to select a range
234922d
Merge pull request #10 from toy-1/feature/#5
2YH02 ef9f72c
Env: firebase.ts내 auth추가
663abb0
Merge branch 'develop' into feature/#6
ewinkite aa51ed6
Merge pull request #16 from toy-1/feature/#6
ewinkite e94945d
Fix
2YH02 3eb36c7
.
27acffb
Merge pull request #17 from toy-1/test2
KSJT 78037e8
Delete test.txt
2YH02 a7a014f
Design: 로그인화면에서 헤더 미표시
jseo9732 1408d6a
Refactor: 홈 화면 레이아웃 코드 변경
9d4d2e2
Design: Change gallery sidebar design
2YH02 bf42b28
Feat: view current img
2YH02 ddcc086
Refactor: 콘솔로그 삭제
0479822
Feat: 플레이스홀더 추가 및 중복 폼 제거
e9699a8
Feat: 로그인 여부에 따른 페이지 라우팅 기능 추가
105c77c
Feat: 로그인 유저 ID 전달 기능 추가
92334fa
Feat: 이메일 주소 부분 자르는 로직 삭제
f8cca05
Refactor: 미사용 코드 삭제
8172954
Merge pull request #22 from toy-1/feat/#14
KSJT 24a23f5
Feat: 캐러셀 추가
3db9bca
Fix: firestorage img path
2YH02 452e0cb
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#20
df82caa
Feat: Add img loading skeleton
2YH02 72f3b88
Merge pull request #24 from toy-1/feat/#21
ewinkite 2c8678f
Feat: 위키 리스트를 상위위키-하위위키 방식으로 변경
yangjaejun 131b97c
Merge pull request #28 from toy-1/feat/#20
KSJT df043b5
Feat: 위키 카테고리 스타일 변경, 초기 선택 기능 추가
yangjaejun 820883b
Merge pull request #26 from toy-1/feature/#5
2YH02 7578597
Feat: 위키 폼에 MarkDown 에디터 적용
yangjaejun 9cb1383
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#7
yangjaejun 717cebc
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#29
c63ebdb
Feat: 위키 등록, 수정 페이지 부모 위키 select 태그 추가
yangjaejun 4479310
Fix: Transient Props 적용
yangjaejun 60e3967
Feat: type들 공통 파일로 분리, email props로 내려주기
yangjaejun fcb5a0b
Merge pull request #30 from toy-1/feat/#7
yangjaejun d4c8c9a
Feat: Add img metadata
2YH02 9c0ce63
Feat: Add img loading component
2YH02 b36478e
Feat: Add img upload and delete
2YH02 b3703d5
Merge branch 'develop' of https://github.com/toy-1/wiki into feature/#27
2YH02 0f185bb
Merge pull request #32 from toy-1/feature/#27
2YH02 3332989
Design: Change gallery sidebar design
2YH02 ebe5f1d
Fix: fix change current image
2YH02 4142434
Design: Change Add img component
2YH02 924f071
Fix: Add change current image condition
2YH02 6972028
update current img
2YH02 64ef7cb
Design: 로그아웃 버튼 가운데 정렬
jseo9732 69cb8fd
Design: 헤더 상단 고정
jseo9732 60660ea
Refactor: 최신 업데이트 사진 미리보기
57d22e4
Newly updated photos can be seen on our main page.
8dd3977
Design: 통근 모달 레이아웃
jseo9732 a9b0d8f
Feat: 통근 시계 추가
jseo9732 aaaf632
Refactor: 코드 수정
jseo9732 67984cc
Feat: 위키 CRUD 기능 추가, 컴포넌트 분리 및 파일 분리, utils 추가
yangjaejun fb4808d
Design: sideBar border radius
2YH02 cbc655d
Rename: 위키 더미 데이터 삭제
yangjaejun 8f12c58
Refactor: 미사용 코드 삭제
bb60edd
Feat: 로그인/회원가입 얼럿 업데이트
19e4d2b
Merge pull request #37 from toy-1/feat/#29
KSJT afb5819
Merge pull request #38 from toy-1/feat/#31
yangjaejun 490d1f5
Merge pull request #34 from toy-1/feature/#33
2YH02 28e3f55
Merge pull request #42 from toy-1/feat/#41
ewinkite 5077173
Docs: Update readme.md
2YH02 9d90ec4
Docs: Update readme.md
2YH02 1ef9e64
Merge pull request #43 from toy-1/feature/#40
2YH02 059defd
Design: 글로벌 스타일 수정
jseo9732 9015c05
Feat: 출퇴근 기능 임시 추가
jseo9732 7badb4a
Merge branch 'develop' into feat/#4
2YH02 6a2c520
Merge pull request #44 from toy-1/feat/#4
2YH02 9d34984
Design: z-index 수정
jseo9732 79eccab
Docs: Update gallery readme
2YH02 cbcb5ab
Merge pull request #47 from toy-1/feature/#45
2YH02 c999316
Update README.md
2YH02 a2ce040
Merge pull request #48 from toy-1/2YH02-patch-1
2YH02 44ebbbb
Feat: 최근 위키 조회 기능 추가
jseo9732 d4e177e
Design: 더보기 버튼 추가
jseo9732 b62596b
Design: 헤더 유저 이메일 추가
jseo9732 a893435
Feat: 로그아웃 기능 추가
jseo9732 cc0c4f1
Update readme.md
2YH02 b50a9c3
Fix: 타입 에러 수정
jseo9732 d2e31f8
Merge pull request #53 from toy-1/feat/#4
jseo9732 4f1528f
Merge pull request #50 from toy-1/feat/#46
jseo9732 b9fa762
Merge pull request #52 from toy-1/feat/#51
jseo9732 f72512b
Merge branch 'develop' of https://github.com/toy-1/wiki into feature/#45
2YH02 8f4aa02
Fix: modal z-index and delete img btn
2YH02 2708a4e
Merge pull request #54 from toy-1/feature/#45
2YH02 f782c51
Design: 더보기 밑줄 추가
jseo9732 c92afa0
Merge pull request #55 from toy-1/feat/#46
jseo9732 928595a
Feat: esc 키 누르면 모달 종료
jseo9732 095704a
Feat: 위키 쿼리스트링 받아 오는 로직 추가 등 기능 추가
yangjaejun 01851d8
Feat: 홈 공지사항과 wiki 연결
8e19b8b
Homestyle merge conflicts resolved
da18273
Feat: 홈 공지 위키 연결/ 머지 충돌 해결
429ddf6
Docs: Update readme.md
2YH02 8907c26
Merge pull request #60 from toy-1/feature/#45
2YH02 82acbb1
Merge pull request #57 from toy-1/feat/#39
yangjaejun 0c67028
Merge pull request #58 from toy-1/feat/#35
KSJT 4afe716
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#56
jseo9732 73caa2a
Fix: id를 key로 수정
jseo9732 1c36a6b
Fix: fix bug #61
yangjaejun 53825ab
Merge pull request #62 from toy-1/feat/#61
yangjaejun eb4d79d
Style: fixing it...
a751ca3
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#59
4c2699f
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#56
jseo9732 ce0dd7a
Feat: 로고 홈화면 이동 추가
jseo9732 2db9e3d
Refactor: 위키 페이지 경로 수정
jseo9732 1feebaf
Fix: authProvider type error
2YH02 06b0c95
Fix: gallery main img
2YH02 bb669be
Merge pull request #64 from toy-1/feature/#45
2YH02 75f4aba
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#59
5554c3c
Fix: 위키 최종수정일 날짜 표시 오류 수정
yangjaejun c947a35
Fix: 부모 위키 설정 기능 오류 수정
yangjaejun 0aeaeb2
Fix: fixing react router dom custom props errors...
be9ea3f
Merge pull request #65 from toy-1/develop
2YH02 3e7c894
Config: netlify
2YH02 3557a41
Merge pull request #66 from toy-1/feature/#45
2YH02 fca8864
Fix: snapshot 관련 로직을 제거 및 수정 삭제 후 UX 개선
yangjaejun 6abb136
Feat: 미로그인으로 인한 접근제한시 경로 이동하는 속도 조절
bd219ac
Merge pull request #70 from toy-1/feat/#68
ewinkite 12bd764
Fix: 위키 폼에서 제목이 잘리는 문제를 수정
yangjaejun a1b7bd6
Config: delete netlify.toml
2YH02 b8cf11b
Merge pull request #71 from toy-1/feature/#45
2YH02 42fdd56
Feat: 통근 기능 구현
jseo9732 0d8bb2f
Docs: REAME.md 유저플로우, 디렉토리구조, 협업방식, 세부구현사항(로그인)추가
f5b3776
Docs: REAME.md 로그인 업데이트
d9c59dc
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#56
jseo9732 574530e
Fix: 위키 페이지 사이드메뉴 overflow 스타일 변경
yangjaejun 6f5a3c0
Merge pull request #73 from toy-1/feat/#67
ewinkite 62760ec
Merge pull request #72 from toy-1/feat/#56
jseo9732 6b58c9a
Design: Add footer
2YH02 1cf08c2
Style: 위키 헤더 마진 값 미세 조정
yangjaejun 66152b8
Merge pull request #74 from toy-1/feat/#56
jseo9732 1623685
Fix: working on fixing map function unique key issues...
927e3d1
Fix: push mistake...
5b5d73a
Merge pull request #76 from toy-1/bug/#63
yangjaejun 09ad401
Feat: favicon 추가
yangjaejun 7981dab
Merge pull request #79 from toy-1/feat/#78
yangjaejun 65c5737
fixing fixing...
46fd082
Design: 모달 표시 영역 수정
jseo9732 1e272fb
Merge branch 'main' of https://github.com/toy-1/wiki into develop
2YH02 5317bdf
Merge pull request #80 from toy-1/feat/#56
jseo9732 958f6c2
Merge pull request #81 from toy-1/develop
2YH02 6f9c2bc
Merge pull request #77 from toy-1/feat/#59
jseo9732 855b5d7
Merge branch 'develop' of https://github.com/toy-1/wiki into feature/#45
2YH02 3c21f56
Merge pull request #82 from toy-1/feature/#45
2YH02 1f3541f
test
2YH02 8e4e37e
Merge pull request #83 from toy-1/feature/#45
2YH02 0316002
Fix: 메인 화면 오류, 경고 수정
jseo9732 50de806
delete netlify config
2YH02 71adff9
Merge pull request #84 from toy-1/feature/#45
2YH02 0d030ee
Merge branch 'develop' of https://github.com/toy-1/wiki
2YH02 cdd1a61
fixing...
c724fc6
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#59
c390a99
Merge branch 'develop' of https://github.com/toy-1/wiki into develop
2YH02 0ef5592
Merge pull request #85 from toy-1/fix/main
KSJT 7302be6
Merge branch 'develop' of https://github.com/toy-1/wiki into develop
2YH02 a233523
Merge branch 'develop' of https://github.com/toy-1/wiki
2YH02 4005af3
Merge branch 'develop' of https://github.com/toy-1/wiki into feature/#45
2YH02 2e69cc8
Merge pull request #86 from toy-1/develop
2YH02 7e8f93d
Merge branch 'main' of https://github.com/toy-1/wiki
2YH02 6dc4d67
install type
2YH02 efa4cef
Create netlify.toml
2YH02 11ab27b
Merge pull request #90 from toy-1/2YH02-patch-1
2YH02 a1f681e
Style: 네비게이션 메뉴 스타일 변경
yangjaejun 9c690c0
Fix: icon
2YH02 ddd9b4c
Fix: 위키 사이드 메뉴에서 자식 위키가 없는 부모 위키는 전개 버튼을 감추도록 변경
yangjaejun e8f8dfd
Style: 수정을 위한 수정
4ef000c
Fix: reinstall modules
2YH02 1d75377
Fix: reinstall react-icon
2YH02 76c798b
Fix: Add vite/client type
2YH02 c927e62
Merge pull request #93 from toy-1/feature/#45
2YH02 d9984cf
Config: Add netlify config
2YH02 c379023
Merge pull request #96 from toy-1/feature/#45
2YH02 d9dd40e
Merge branch 'main' into develop
2YH02 3e30053
Merge pull request #94 from toy-1/feat/#92
2YH02 be9a91d
Merge pull request #91 from toy-1/style/#89
2YH02 85b076d
Design: 로그아웃 대문자로 수정
jseo9732 9ac2aed
Config: Change netlify config
2YH02 8f7f332
Merge pull request #98 from toy-1/feature/#45
2YH02 11a582c
Design: 메인 레이아웃 수정
jseo9732 0c16c18
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#59
f5b078e
Merge pull request #99 from toy-1/feat/#88-2
jseo9732 830f9c9
Refactor: 근무 시간 계산 개선
jseo9732 928a535
Merge pull request #101 from toy-1/feat/#56
jseo9732 47f36c6
Feat: 스켈레톤 추가
a0c966f
Fix: Change icon
2YH02 e1fbda1
Feat: 스켈레톤 수정
243a6f4
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#59
41e7ab7
Refactor: firebase.ts 이동 및 관련 경로 수정
yangjaejun ab33624
GallerySideProps 롤백
yangjaejun d6eb2ba
Merge pull request #104 from toy-1/refactor/#100
yangjaejun d1fda0c
Feat: 스켈레톤 추가 완료
e48fcb2
Rename: fooder에서 footer로 파일명변경
1ab3bc5
Merge branch 'develop' into feat/#59
KSJT 776f8db
Design: 푸터 업데이트
e3b5fd6
Merge pull request #106 from toy-1/feat/#97
ewinkite 0536cf1
Refactor: 근무 시간 분 계산 수정
jseo9732 f510e0f
Merge pull request #107 from toy-1/feat/#56
jseo9732 9a0f402
Design: 갤러리 사이드바 수정
c89799a
Merge pull request #110 from toy-1/feat/#108
ewinkite 189a7dd
Merge pull request #105 from toy-1/feat/#59
jseo9732 7819047
Refactor: Change gallery type
2YH02 b83d94b
Design: 푸터로 인한 메인 레이아웃 수정
jseo9732 ac5384b
Merge pull request #113 from toy-1/feat/#97
jseo9732 6596b27
Design: 푸터 디자인 업데이트
09a474e
Update README.md
KSJT 636eea3
Refactor: 위키 컴포넌트 폴더 분리 및 firebase 관련 함수 분리
yangjaejun 433e473
Refactor: Change arrow icon
2YH02 276c346
Merge pull request #103 from toy-1/feature/#45
2YH02 af9927b
Merge pull request #111 from toy-1/feature/galleryType
2YH02 b779b25
Fix: Gallery Preview Type Error
2YH02 7c6595d
Merge pull request #116 from toy-1/feature/#45
2YH02 323b1f6
Design: 수정 중...
4aa6c10
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#109
7e27281
Merge pull request #95 from toy-1/develop
2YH02 37928a7
Refactor: 위키 사이드메뉴 컴포넌트 분리
yangjaejun a6af0ff
Docs: README.md 세부구현사항(로그인)업데이트
88e4e98
Merge pull request #115 from toy-1/feat/#108
ewinkite 254306b
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#109
3e36212
Feat: 로그인페이지 미노출 기능 추가
4324fde
Merge pull request #118 from toy-1/feat/#108
ewinkite 0c64ba3
Design: 홈 캐러셀 css 수정
a37759e
Resolve conflicts
yangjaejun 23db4b4
Merge branch 'develop' of https://github.com/toy-1/wiki into feat/#109
dd60490
Merge pull request #120 from toy-1/feat/#109
KSJT 4c0ccaf
Merge pull request #117 from toy-1/refactor/#100
yangjaejun 749df67
Design: 더보기 가운데 맞춤
jseo9732 d585b86
Merge pull request #123 from toy-1/feat/#88-2
jseo9732 dc274e8
Fix: click same album problem
2YH02 5e05697
Docs: 헤더, 메인관련 리드미 작성
jseo9732 c95efb1
Docs: 헤더, 메인 리드미 수정
jseo9732 98ce90f
Update README.md
jseo9732 9a75579
Fix: change img btn array error
2YH02 db654d3
Docs: Update README.md
yangjaejun 2daff67
Merge pull request #125 from toy-1/feature/#45
2YH02 9d5f610
Update README.md
yangjaejun 0f894e2
Merge pull request #121 from toy-1/develop
2YH02 3c4f790
Merge pull request #124 from toy-1/feat/#119
jseo9732 308a62a
Fix: github logo
2YH02 f325499
Merge branch 'develop' of https://github.com/toy-1/wiki into develop
2YH02 fce2145
Merge pull request #127 from toy-1/develop
2YH02 d4d1165
Merge pull request #126 from toy-1/docs/#122
2YH02 0f9c279
Merge pull request #114 from toy-1/KSJT-patch-1-1
2YH02 2287b87
Docs: Update readme.md
2YH02 ee4a52e
Docs: Update readme.md
2YH02 3229c56
Merge pull request #128 from toy-1/develop
2YH02 2ab5131
Merge branch 'main' of https://github.com/toy-1/wiki
2YH02 1fb786c
Docs: Update readme.md
2YH02 27db845
Merge pull request #129 from toy-1/develop
2YH02 8ec214e
Merge branch 'main' of https://github.com/toy-1/wiki
2YH02 b592331
Docs: Update readme.md
2YH02 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
module.exports = { | ||
root: true, | ||
env: { browser: true, es2020: true }, | ||
extends: [ | ||
"eslint:recommended", | ||
"plugin:@typescript-eslint/recommended", | ||
"plugin:react-hooks/recommended", | ||
], | ||
ignorePatterns: ["dist", ".eslintrc.cjs"], | ||
parser: "@typescript-eslint/parser", | ||
plugins: ["react-refresh"], | ||
rules: { | ||
"react-refresh/only-export-components": [ | ||
"warn", | ||
{ allowConstantExport: true }, | ||
], | ||
semi: "warn", | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--- | ||
name: "✅FEATURE" | ||
about: Feature 작업 사항을 입력해주세요. | ||
title: "✅[Feat]" | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
## Description | ||
대략적인 기능 설명을 작성해 주세요. | ||
|
||
## Todo | ||
- [ ] todo | ||
- [ ] todo | ||
|
||
## ETC | ||
기타사항 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
--- | ||
name: "\U0001F41EBUG" | ||
about: BUG 발생 시 작성해주세요 | ||
title: "\U0001F41E[BUG]" | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
## Description | ||
설명을 작성해 주세요 | ||
|
||
## Todo | ||
- [ ] todo | ||
- [ ] todo | ||
|
||
## ETC | ||
기타사항 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
## Summary | ||
|
||
## Describe your changes | ||
|
||
## Issue number and link |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# Logs | ||
logs | ||
*.log | ||
npm-debug.log* | ||
yarn-debug.log* | ||
yarn-error.log* | ||
pnpm-debug.log* | ||
lerna-debug.log* | ||
|
||
node_modules | ||
dist | ||
dist-ssr | ||
*.local | ||
|
||
# Editor directories and files | ||
.vscode/* | ||
!.vscode/extensions.json | ||
.idea | ||
.DS_Store | ||
*.suo | ||
*.ntvs* | ||
*.njsproj | ||
*.sln | ||
*.sw? | ||
|
||
|
||
.env |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"printWidth": 80, | ||
"singleQuote": false, | ||
"jsxSingleQuote": false, | ||
"tabWidth": 2, | ||
"semi": true, | ||
"trailingComma": "all", | ||
"bracketSpacing": true | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
issue와 PR을 통해 협업하신 점 너무 멋집니다.
PR을 생성할 때 closed #이슈번호 라고 명시해두면, 해당 PR이 닫힐 때 issue도 같이 닫히는데 다음에 한 번 적용해보시면 좋을 것 같아요
그리고 issue template에 yml 파일로도 템플릿화가 가능한데, 다음에 찾아보시고 적용해보시면 좋을 것 같습니다~!