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

main에 들어가가거라 ~~~~~~!!!!!!!!!!!!!!!!!!!!! #217

Merged
merged 892 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
892 commits
Select commit Hold shift + click to select a range
5659a16
Merge branch 'feature/Common' of https://github.com/Team-Lecue/Lecue-…
Arooming Jan 17, 2024
a5501ae
Merge branch 'feature/DetailPage' into DetailPage/#120-emptyview
jungwoo3490 Jan 17, 2024
78d4500
feat: 오른쪽버튼 클릭 시 원하는 기능 넣을 수 있게 props 뚫어둠
Arooming Jan 17, 2024
c12ce89
feat: post 성공시 navigate
Arooming Jan 17, 2024
9d240da
feat: Patch API 완료
doyn511 Jan 17, 2024
895eb87
feat: 모달 클릭 시 post
Arooming Jan 17, 2024
4c05d00
feat: 모달버튼 클릭 시 로그인 페이지로 이동
Arooming Jan 17, 2024
4150c2e
docs: img 파일 추가
jungwoo3490 Jan 17, 2024
47d3be4
feat: EmptyView 구현 완료
jungwoo3490 Jan 17, 2024
86a81ed
feat: uuid 포함한 경로로 navigate(아직 수정필요)
Arooming Jan 17, 2024
0139b5f
chore: uuid 관련 상태 제거
Arooming Jan 17, 2024
4f785de
Merge pull request #148 from Team-Lecue/TargetPage/#145-targetpage-re…
jungwoo3490 Jan 17, 2024
594491c
Merge pull request #153 from Team-Lecue/feature/TargetPage
jungwoo3490 Jan 17, 2024
ddbdaf6
feat: GET 메소드 React-Query 연동
jungwoo3490 Jan 17, 2024
94d98d1
feat: PUT method react-query hook 구현
jungwoo3490 Jan 17, 2024
c25ab55
feat: page routing
doyn511 Jan 17, 2024
b340f09
feat: TargetPage React-Query 연동
jungwoo3490 Jan 17, 2024
a056556
chore: prop 이름 수정
jungwoo3490 Jan 17, 2024
94a9f23
src/Target
jungwoo3490 Jan 17, 2024
710b015
Revert "chore: prop 이름 수정"
jungwoo3490 Jan 17, 2024
b41234e
Merge pull request #144 from Team-Lecue/Common/#123-ErrorPage
jungwoo3490 Jan 17, 2024
289f544
chore: 콘솔 삭제
eunbeann Jan 18, 2024
a52c06e
chore: 스티터팩 get 데이터 수정
eunbeann Jan 18, 2024
d4f9443
feat: getBookUuid api+query
eunbeann Jan 18, 2024
48a04ae
feat: 북 uuid에 따른 다이나믹 라우팅 추가
eunbeann Jan 18, 2024
c6fbabb
style: 자잘한 수정
eunbeann Jan 18, 2024
b218b20
feat: 버튼 분리
eunbeann Jan 18, 2024
479f7e7
feat: bookId로 스티커 받아오기
eunbeann Jan 18, 2024
7710484
Merge pull request #143 from Team-Lecue/StickerAttach/#137-HeightFrom…
eunbeann Jan 18, 2024
4f6f762
Merge remote-tracking branch 'origin/feature/StickerAttach' into Stic…
eunbeann Jan 18, 2024
20184fd
style: 진짜 bookId 넣기
eunbeann Jan 18, 2024
7835525
feat: 레큐북 삭제 구현
eunbeann Jan 18, 2024
667ce96
docs: 주석+코멘트 추가
eunbeann Jan 18, 2024
bc7e8d9
feat: header 수정
Arooming Jan 18, 2024
0dd1fcf
chore: 홈 경로관련 수정
Arooming Jan 18, 2024
50ec869
Merge branch 'feature/Register' of https://github.com/Team-Lecue/Lecu…
doyn511 Jan 18, 2024
b195f2a
Merge branch 'feature/Common' of https://github.com/Team-Lecue/Lecue-…
Arooming Jan 18, 2024
b9974f1
Merge branch 'feature/Register' of https://github.com/Team-Lecue/Lecu…
doyn511 Jan 18, 2024
dad5f38
feat: Home 라우팅
doyn511 Jan 18, 2024
0d1de58
style: asset 추가 및 정의
Arooming Jan 18, 2024
2ac4d2f
style: 모달 내부 내용 수정
Arooming Jan 18, 2024
0aeeafe
fix: navigate 경로 이상 해결
eunbeann Jan 18, 2024
93fe93d
Merge pull request #146 from Team-Lecue/Mypage/#48-DataFetching
eunbeann Jan 18, 2024
e2be53a
Merge pull request #156 from Team-Lecue/Mypage/#50-delete-api
eunbeann Jan 18, 2024
f8eae4a
Merge pull request #159 from Team-Lecue/Mypage/#48-DataFetching
eunbeann Jan 18, 2024
79b3826
Merge pull request #151 from Team-Lecue/DetailPage/#120-EmptyView
jungwoo3490 Jan 18, 2024
e3a8ec9
Merge pull request #154 from Team-Lecue/TargetPage/#152-ReactQuery
jungwoo3490 Jan 18, 2024
11ace33
Merge remote-tracking branch 'origin/develop' into feature/Mypage
eunbeann Jan 18, 2024
063f966
Merge pull request #155 from Team-Lecue/StickerAttach/#147-uuidRoute
eunbeann Jan 18, 2024
3eaedca
feat: 접근 페이지 별 라우팅 설정
doyn511 Jan 18, 2024
452c4f9
Merge branch 'feature/DetailPage' of https://github.com/Team-Lequu/Le…
jungwoo3490 Jan 18, 2024
665517a
Merge pull request #160 from Team-Lecue/feature/DetailPage
jungwoo3490 Jan 18, 2024
879d1ed
Merge remote-tracking branch 'origin/develop' into feature/StickerPack
eunbeann Jan 18, 2024
e9097de
Merge pull request #161 from Team-Lecue/feature/TargetPage
jungwoo3490 Jan 18, 2024
7fb7f5a
Merge remote-tracking branch 'origin/develop' into feature/StickerPack
eunbeann Jan 18, 2024
c912eca
Merge pull request #163 from Team-Lecue/feature/StickerPack
eunbeann Jan 18, 2024
89f285b
Merge remote-tracking branch 'origin/develop' into feature/StickerAttach
eunbeann Jan 18, 2024
9cc308c
Merge pull request #164 from Team-Lecue/feature/StickerAttach
eunbeann Jan 18, 2024
9123c15
Merge remote-tracking branch 'origin/develop' into feature/Mypage
eunbeann Jan 18, 2024
1439e1d
Merge pull request #165 from Team-Lecue/feature/Mypage
eunbeann Jan 18, 2024
3983b8c
feat: Loading View 구현
jungwoo3490 Jan 18, 2024
082ca9b
refactor: 오타 수정
Arooming Jan 18, 2024
ca40c2e
Merge branch 'feature/Common' of https://github.com/Team-Lecue/Lecue-…
Arooming Jan 18, 2024
2e4d1a7
Merge pull request #157 from Team-Lecue/Common/#127-faeture-modal
Arooming Jan 18, 2024
2b14574
Merge pull request #169 from Team-Lecue/feature/Common
Arooming Jan 18, 2024
0fbe7b6
chore: component 위치 변경
eunbeann Jan 18, 2024
e3a709a
feat: uuid로 연결
eunbeann Jan 18, 2024
2256082
refactor: 필요없는 주석 제거
doyn511 Jan 18, 2024
2d4f3b8
Merge pull request #166 from Team-Lecue/Common/#158-Loading
jungwoo3490 Jan 18, 2024
6cbe6a7
Merge pull request #170 from Team-Lecue/feature/Common
jungwoo3490 Jan 18, 2024
2feb754
feat: 노트 개수 받아오는 api 붙이기
Arooming Jan 18, 2024
71b238f
feat: 노트 개수 받아와서 화면에 뿌려줌
Arooming Jan 18, 2024
2946512
Merge branch 'feature/Splash' of https://github.com/Team-Lecue/Lecue-…
Arooming Jan 18, 2024
99cdd24
docs: 오타 수정
eunbeann Jan 18, 2024
7e0b18b
docs: 린트 당함
eunbeann Jan 18, 2024
3e2879b
feat: 로딩페이지 붙임
Arooming Jan 18, 2024
5ef11d1
feat: Uuid로 라우팅
eunbeann Jan 18, 2024
a6f390f
feat: 현재 북 Id에 post보내기
eunbeann Jan 18, 2024
3d79f58
feat: 마이페이지 emptyView 구현
doyn511 Jan 18, 2024
acea2d7
feat: bookId로 변경
eunbeann Jan 18, 2024
ea44da8
feat: modal Fn 달기
eunbeann Jan 18, 2024
3cecc8a
chore: 필요없는 주석 제거
doyn511 Jan 18, 2024
bdf30ab
chore: 필요없는 파일 제거
doyn511 Jan 18, 2024
e40876f
Merge pull request #162 from Team-Lecue/Register/#45-PATCH-API
doyn511 Jan 18, 2024
ef23baa
fix: 로티 끊김 해결
eunbeann Jan 18, 2024
54b1cc4
fix: Modal 렌더 시 깜빡거림 이슈 해결
jungwoo3490 Jan 18, 2024
922e8b3
feat: 공통 Modal 연결
jungwoo3490 Jan 18, 2024
24a8294
style: 확성기 아이콘 정렬 변경
doyn511 Jan 18, 2024
e98cd39
style: grid, 전체 height 수정
doyn511 Jan 18, 2024
8bc11ea
chore: 공통 Modal UX라이팅 수정
jungwoo3490 Jan 18, 2024
42f9171
feat: 로딩, 에러 시 띄워줄 뷰 연결
Arooming Jan 18, 2024
e3cfba5
Update CD.yml
dong2ast Jan 18, 2024
5177cae
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 18, 2024
431967b
Merge branch 'feature/createBook' of https://github.com/Team-Lequu/Le…
jungwoo3490 Jan 18, 2024
e6c1749
Merge pull request #176 from Team-Lecue/feature/Register
doyn511 Jan 18, 2024
8e5d30d
chore: 스티커팩 모달 위치 변경
eunbeann Jan 18, 2024
543478d
chore: console 삭제
eunbeann Jan 18, 2024
f86b013
style: 레큐 노트 작성 닉네임 진짜가 뜨게
eunbeann Jan 18, 2024
5e23f8e
feat: 각자 받아온 토큰으로 사용하도록 코드 수정
Arooming Jan 18, 2024
e7ea109
Merge branch 'feature/Splash' of https://github.com/Team-Lecue/Lecue-…
Arooming Jan 18, 2024
fe12cab
Merge pull request #171 from Team-Lecue/Splash/#36-data-fetching
Arooming Jan 18, 2024
48b0c20
Merge pull request #179 from Team-Lecue/feature/Splash
Arooming Jan 18, 2024
07a7b96
fix: 터짐 해결
eunbeann Jan 18, 2024
b5529df
feat: 비정상적인 경로로 접근 시, 에러 페이지 띄우기
Arooming Jan 18, 2024
cbcc3b3
refactor: ListWrapper 스타일 수정
doyn511 Jan 18, 2024
4e75a4c
chore: stylelint 적용
doyn511 Jan 18, 2024
668c758
feat: 홈화면 이동 시, 스플래시로 안 넘어감
Arooming Jan 18, 2024
09b723f
feat: LecueBook 정렬, 스크롤 수정
doyn511 Jan 18, 2024
323c1ff
feat: 홈으로 넘어가게 수정(스플래시x)
Arooming Jan 18, 2024
c6c6238
Merge pull request #174 from Team-Lecue/Home/#173-style-refactor
doyn511 Jan 18, 2024
ce3829e
Update CD.yml
dong2ast Jan 18, 2024
ea8324e
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 18, 2024
c1611ae
Merge pull request #180 from Team-Lecue/feature/Home
doyn511 Jan 18, 2024
c0ea126
Merge pull request #172 from Team-Lecue/Mypage/#168-zero-ui
doyn511 Jan 18, 2024
9a88821
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 18, 2024
84b56b1
Merge pull request #181 from Team-Lecue/feature/Mypage
doyn511 Jan 18, 2024
414283f
feat: 노트 생성 후 타임아웃
Arooming Jan 18, 2024
0f5742a
fix: BugFix - DetailView height BugFix
jungwoo3490 Jan 18, 2024
77b75cc
Merge pull request #177 from Team-Lecue/feature/createBook
jungwoo3490 Jan 18, 2024
a67fbb0
Merge pull request #182 from Team-Lecue/DetailPage/#178-bugfix-height
jungwoo3490 Jan 18, 2024
18e75d3
Merge pull request #183 from Team-Lecue/feature/DetailPage
jungwoo3490 Jan 18, 2024
4954155
chore: props 삭제
doyn511 Jan 18, 2024
cb29dd9
fix: 타이틀 두개 뜨는 이슈 해결
Arooming Jan 18, 2024
9bcbd39
fix: 회원가입 후 토큰 저장되도록 수정
Arooming Jan 18, 2024
3dd1e7c
chore: react-error-boundary 설치
eunbeann Jan 18, 2024
cedf9f8
feat: 에러 바운더리 세팅
eunbeann Jan 18, 2024
f85b0f4
feat: 글쓰기 버튼 로그인 될 때만 이동
eunbeann Jan 18, 2024
ca63656
fix: 확장자명 수정
eunbeann Jan 18, 2024
a1a9766
feat: placeholder 추가
Arooming Jan 18, 2024
e4144b7
Merge pull request #185 from Team-Lecue/feature/CreateNote
Arooming Jan 18, 2024
7749ece
refactor: 스크롤 마진 수정
Arooming Jan 18, 2024
611f240
style: 포스트잇 패딩 값 수정
eunbeann Jan 18, 2024
1615063
feat: 에러 라우트 튕겨주기
eunbeann Jan 18, 2024
061bef5
refactor: 패딩 수정
Arooming Jan 18, 2024
28a2161
refactor: textarea outline 색상 추가
Arooming Jan 18, 2024
b45e0b1
style: Date 색상 변경
doyn511 Jan 18, 2024
b00b0a5
style: 색상 추가
Arooming Jan 18, 2024
0a8d295
feat: CreateBook React-Query 연동
jungwoo3490 Jan 18, 2024
32825ce
feat: 모바일 뷰 리사이징 코드 추가
Arooming Jan 18, 2024
886a4bc
feat: Link isLoading Event
jungwoo3490 Jan 18, 2024
3483629
Merge pull request #190 from Team-Lecue/Hotfix-Rooming
Arooming Jan 18, 2024
b3277c2
Merge pull request #188 from Team-Lecue/CreateBook/#184-react-query
jungwoo3490 Jan 18, 2024
b61c624
Merge pull request #191 from Team-Lecue/feature/createBook
jungwoo3490 Jan 18, 2024
dec50d9
style: 간격 조절
Arooming Jan 18, 2024
44c30e3
style: 간격 조절2
Arooming Jan 18, 2024
6281fd1
style: 간격 조절3
Arooming Jan 18, 2024
e1fc0d4
style: Mypage-Book cursor 추가
doyn511 Jan 18, 2024
57223c0
style: 간격 조절4
Arooming Jan 18, 2024
7a468b6
fix: useQuery에 refetchOnWindowFocus를 false로 적용
jungwoo3490 Jan 18, 2024
0bc7612
chore: console.log 제거
jungwoo3490 Jan 18, 2024
60f14ae
style: 스티커 사이즈 맞추기
eunbeann Jan 18, 2024
40128a8
Merge pull request #192 from Team-Lecue/hotfix/refetchOnWindowFocus
jungwoo3490 Jan 18, 2024
49b3e59
Merge remote-tracking branch 'origin/develop' into hotfix/#187-SyncSt…
eunbeann Jan 18, 2024
6374cc8
fix: 에러 바운더리 수정
eunbeann Jan 18, 2024
5064643
fix: 에러 바운더리 리셋 추가
eunbeann Jan 18, 2024
02f50a4
chore: refetchOnMount always 추가
eunbeann Jan 18, 2024
56cdbc6
refactor: setTimeOut 삭제
eunbeann Jan 18, 2024
9e9040c
chore: 주석 삭제
eunbeann Jan 18, 2024
a0d39fa
Merge pull request #193 from Team-Lecue/hotfix/#187-SyncSticker
eunbeann Jan 18, 2024
f38df57
feat: errorBoundary 수정
eunbeann Jan 18, 2024
a0878e0
feat: 에러바운더라 에러페이지 리로드로 수정
eunbeann Jan 18, 2024
4193437
feat: 안쓰는 props 삭제
eunbeann Jan 18, 2024
cd62b92
style: 스타일 수정
eunbeann Jan 18, 2024
a350eaa
fix: Mypage 레큐북 삭제 이벤트 수정
doyn511 Jan 18, 2024
3518767
fix: usePostBookError 버그 수정 완료
jungwoo3490 Jan 18, 2024
aba004c
Update CD.yml
dong2ast Jan 18, 2024
81bfacd
fix: mypage book 삭제시 reload 타이밍 조정
doyn511 Jan 18, 2024
3b451fb
Merge pull request #195 from Team-Lecue/hotfix/usePostBookError
jungwoo3490 Jan 18, 2024
2788272
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 18, 2024
29df05d
Merge pull request #196 from Team-Lecue/Hotfix-Dori
doyn511 Jan 18, 2024
2f71e64
fix: 생성한 레큐노트가 북에 바로 붙게 수정
Arooming Jan 18, 2024
fbfbb06
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
Arooming Jan 18, 2024
212a45b
Merge pull request #197 from Team-Lecue/Hotfix-Rooming
Arooming Jan 18, 2024
c69a19d
fix: 버튼에 분기처리
eunbeann Jan 19, 2024
fa91372
fix: 레큐북 생성 글자수 수정
eunbeann Jan 19, 2024
e5df21f
fix: 에러 체크용 알럿창 추가
eunbeann Jan 19, 2024
3469924
fix: UX라이팅 반영
jungwoo3490 Jan 19, 2024
761c40e
Merge pull request #198 from Team-Lecue/hotfix/uxwriting
jungwoo3490 Jan 19, 2024
4e4d84d
chore: stylelint 정렬 적용
doyn511 Jan 19, 2024
206b34f
feat: 공백포함 2자 이상 입력시 에러 핸들링
doyn511 Jan 19, 2024
4bf0c53
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 19, 2024
71cdb6c
Merge pull request #199 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
2f10e5b
style: 파비콘 추가
Arooming Jan 19, 2024
41334b1
feat: 이미 로그인한 사용자는 스플래시뷰로 넘어가지 않게 수정
Arooming Jan 19, 2024
fe4bef9
Update README.md
Arooming Jan 19, 2024
261bf42
fix: 지그재그뷰 모달 텍스트 색상 적용
doyn511 Jan 19, 2024
8291842
Merge pull request #200 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
c0321ab
style: UX 라이팅 반영
Arooming Jan 19, 2024
a58d4a2
fix: 홈 리스트 배경 적용 안되는 이슈 해결
Arooming Jan 19, 2024
e7d402a
style: UX 라이팅 수정
Arooming Jan 19, 2024
f596464
fix: 짧은 글은 외부에서 중앙정렬로 보이는 이슈 수정
jungwoo3490 Jan 19, 2024
7686b7c
style: object-fit: cover 추가
Arooming Jan 19, 2024
34b2d7c
style: 전체 높이 수정
Arooming Jan 19, 2024
7a317e3
style: 포스트잇 내부 사진 크기 맞춤
Arooming Jan 19, 2024
5ace06f
Merge pull request #201 from Team-Lecue/Hotfix-Rooming
Arooming Jan 19, 2024
e3c0572
style: 이미지 너비, 높이 변경
Arooming Jan 19, 2024
4e0d632
style: UX 라이팅 반영
Arooming Jan 19, 2024
74a73a4
style: 마이페이지 모달 레이아웃 수정
doyn511 Jan 19, 2024
c46cf99
fix: 개행문자 안 먹히는 이슈 해결
Arooming Jan 19, 2024
f87af9c
Merge pull request #202 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
242a045
fix: 로컬 스토리지 비우기 추가
doyn511 Jan 19, 2024
862c22a
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 19, 2024
62eca66
Merge pull request #203 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
216a02d
fix: bookId null이면 빈배열 보내기
eunbeann Jan 19, 2024
7885fd4
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
Arooming Jan 19, 2024
40297d2
fix: 라우터 수정
eunbeann Jan 19, 2024
e274e7c
fix: 모달 text padding값 수정
doyn511 Jan 19, 2024
82ea7e3
fix: textarea resize 속성 부여
doyn511 Jan 19, 2024
c7fa431
style: 드래그 겹칠 때 안움직이는 이슈 해결
eunbeann Jan 19, 2024
c65091b
fix: 레큐노트 모달 수정
doyn511 Jan 19, 2024
a7175d8
fix: lecue-book 전부 막아두기
eunbeann Jan 19, 2024
85dce46
fix/UX라이팅 반영
jungwoo3490 Jan 19, 2024
95eec1e
Merge pull request #204 from Team-Lecue/HOTFIX/eunbean
eunbeann Jan 19, 2024
07053fb
Merge pull request #205 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
b68afd3
Merge pull request #206 from Team-Lecue/Hotfix-Rooming
Arooming Jan 19, 2024
dbf3d69
fix: 마이페이지 레큐노트 정렬
doyn511 Jan 19, 2024
90a0ee3
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 19, 2024
8ef6df2
Merge pull request #207 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
bc0552b
feat: 에러바운더리 컴포넌트 갈아끼우기
eunbeann Jan 19, 2024
b5fc643
fix: 뒤로가기 시 기존 데이터 유지 반영
jungwoo3490 Jan 19, 2024
ac5095f
Merge pull request #208 from Team-Lecue/HOTFIX/eunbean
eunbeann Jan 19, 2024
1cd299b
Merge branch 'develop' of https://github.com/Team-Lequu/Lequu-Client …
jungwoo3490 Jan 19, 2024
14a5775
Merge pull request #209 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
7327baf
fix: 레큐북 제작 취소 모달 연결, navigate 경로 수정
jungwoo3490 Jan 19, 2024
5518903
Merge pull request #210 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
2e354ad
fix: SessionStorage 초기화
jungwoo3490 Jan 19, 2024
c736182
Merge pull request #211 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
ee68423
fix: 마이페이지 리스트 padding 조절
doyn511 Jan 19, 2024
3f51ec1
fix: 레큐북 생성 후 노트 생성 시 에러 발생하는 이슈 해결
Arooming Jan 19, 2024
dbc321a
feat: og 이미지 및 타이틀 지정
Arooming Jan 19, 2024
2e19d62
Merge pull request #212 from Team-Lecue/Hotfix-Rooming
Arooming Jan 19, 2024
905f143
fix: 모바일 overScroll 차단
jungwoo3490 Jan 19, 2024
5962000
Merge pull request #213 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
088e1af
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 19, 2024
2048211
feat: 스티커 내려가기 수정 반영
eunbeann Jan 19, 2024
4a18bd3
fix: 스티커뷰에서 리스트뷰로 이동 금지
eunbeann Jan 19, 2024
f232cd8
feat: 개행문자 반영
Arooming Jan 19, 2024
303fd85
fix: vh -> dvh로 높이 조정
jungwoo3490 Jan 19, 2024
8950835
Merge pull request #214 from Team-Lecue/hotfix/jungwoo
jungwoo3490 Jan 19, 2024
2c7155d
feat: 선형뷰 이동시 상단 스크롤
eunbeann Jan 19, 2024
f579138
Merge remote-tracking branch 'origin/develop' into develop
eunbeann Jan 19, 2024
9805d30
feat: 토큰 지우는 경로 추가
Arooming Jan 19, 2024
c7cd917
fix: vh -> dvh로 높이 조정
jungwoo3490 Jan 19, 2024
d71d5bb
chore: 필요없는 코드 삭제
Arooming Jan 19, 2024
81b9313
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
Arooming Jan 19, 2024
5d994a6
Merge pull request #215 from Team-Lecue/Hotfix-Rooming
Arooming Jan 19, 2024
7b32209
fix: 지그재그뷰 모달 폰트 수정
doyn511 Jan 19, 2024
0a752b0
Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …
doyn511 Jan 19, 2024
ee5c6c1
Merge pull request #216 from Team-Lecue/Hotfix-Dori
doyn511 Jan 19, 2024
aefd80c
feat: 개행문자 반영
Arooming Jan 19, 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
51 changes: 51 additions & 0 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: CD

on:
push:
branches: [ "develop" ]

env:
HOST: ${{ secrets.HOST }}
USERNAME: ${{ secrets.USERNAME }}
KEY: ${{ secrets.SSH_KEY }}

jobs:
deploy-ci:
runs-on: ubuntu-22.04

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Docker build 가능하도록 환경 설정
uses: docker/setup-buildx-action@v2.9.1

- name: Docker Hub에 로그인
uses: docker/login-action@v2.2.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}

- name: Build and push Docker image
uses: docker/build-push-action@v2
with:
context: .
file: ./deploy/Dockerfile
push: true
tags: lequu/lequu-client:latest

deploy-cd:
needs: deploy-ci
runs-on: ubuntu-22.04

steps:
- name: 도커 컨테이너 실행
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.RELEASE_SERVER_IP }}
username: ${{ secrets.RELEASE_SERVER_USER }}
key: ${{ secrets.RELEASE_SERVER_KEY }}
script: |
cd ~
./deploy.sh
docker image prune -f
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ dist-ssr
*.sln
*.sw?

.env
.env
# Sentry Config File
.env.sentry-build-plugin
68 changes: 47 additions & 21 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,37 @@
}
],
"order/order": ["custom-properties", "declarations"],

"order/properties-order": [
{
"groupName": "Layout",
"emptyLineBefore": "always",
"noEmptyLineBetween": true,
"properties": [
"display",
"visibility",
"overflow",
"float",
"clear",
"gap",
"justify-content",
"align-items",
"flex-direction",
"flex-wrap",
"flex-flow",
"flex-grow",
"flex-shrink",
"flex-basis",
"grid-template-columns",
"grid-area",
"grid-template-rows",
"grid-column",
"grid-template-areas",
"grid-gap",
"position",
"top",
"right",
"bottom",
"left",
"float",
"clear",
"visibility",
"overflow",
"z-index"
]
},
Expand All @@ -41,30 +56,36 @@
"properties": [
"width",
"height",
"margin",
"margin-top",
"margin-right",
"margin-bottom",
"margin-left",
"padding",
"padding-top",
"padding-right",
"padding-bottom",
"padding-left",
"border"
"margin",
"margin-top",
"margin-right",
"margin-bottom",
"margin-left"
]
},
{
"groupName": "Background",
"emptyLineBefore": "always",
"noEmptyLineBetween": true,
"properties": ["background-color"]
},
{
"groupName": "Font",
"emptyLineBefore": "always",
"noEmptyLineBetween": true,
"properties": [
"border",
"border-radius",
"border-top",
"border-right",
"border-bottom",
"border-left",
"border-color",
"border-width",
"border-style",
"background",
"background-color",
"background-position",
"background-size",
"color",
"font-style",
"font-weight",
Expand All @@ -73,15 +94,20 @@
"letter-spacing",
"text-align",
"text-indent",
"vertical-align",
"white-space"
"vertical-align"
]
},
{
"groupName": "Animation",
"groupName": "Text",
"emptyLineBefore": "always",
"noEmptyLineBetween": true,
"properties": ["text-decoration", "text-align", "vertical-align"]
},
{
"groupName": "ETC",
"emptyLineBefore": "always",
"noEmptyLineBetween": true,
"properties": ["animation"]
"properties": ["white-space"]
}
]
}
Expand Down
32 changes: 29 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<h1> 💌 Lecue 💌 </h1>

<img alt="로고 대문 이미지" src="https://private-user-images.githubusercontent.com/67463603/294701719-77faaad4-1dc0-49ff-a19c-71f07e52b9ac.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MDQ4NTc4MjEsIm5iZiI6MTcwNDg1NzUyMSwicGF0aCI6Ii82NzQ2MzYwMy8yOTQ3MDE3MTktNzdmYWFhZDQtMWRjMC00OWZmLWExOWMtNzFmMDdlNTJiOWFjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAxMTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMTEwVDAzMzIwMVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTBkOTYxY2U3Y2E1Mjg5YzVjOTg0MTNkODA2ZWY3ZTI3N2MzN2I2NmUxNjkwNDA1OGVjNzljMGE3NzAwMjg5YjAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.rFdpID458vCvpq31f0EFZxZ1bT8OSHCf_XAIDs5SH-s">
<img alt="로고 대문 이미지" width="257" alt="image" src="https://github.com/Team-Lecue/Lecue-Client/assets/65286685/f5211974-831b-4743-9948-345ec16fc196">
</div>

<br/>
Expand All @@ -15,12 +15,39 @@

<br/>

## 🍟핵심 기능
[핵심 기능]
- 레큐북 : 레큐노트를 부착할 수 있는 롤링페이퍼 기능
<br />
<img alt="레큐북 이미지" width="257" alt="image" src="https://velog.velcdn.com/images/aroo_ming/post/9a7698ef-8e26-4065-91be-0b2dab43e3c2/image.png" />
- 레큐노트 : 텍스트와 이미지를 업로드할 수 있는 포스트잇 기능
<br />
<img alt="레큐노트 이미지" width="257" alt="image" src="https://velog.velcdn.com/images/aroo_ming/post/b5d0dc9c-937f-40f8-a008-82e341bd619e/image.png" />
- 스티커 : 스티커 이미지로 레큐북을 꾸밀 수 있는 기능
<br />
<img alt="스티커 부착 이미지" width="257" alt="image" src="https://velog.velcdn.com/images/aroo_ming/post/dd433bca-c7de-4815-b5a3-0b6dc779b083/image.png" />

[팬덤 특화 기능]
- 커스텀 기능 : 레큐북, 레큐노트, 스티커 유저 커스텀 기능
- 인기 롤링페이퍼 기능 : 레큐노트가 많이 부착된 레큐북 홈화면에 노출
→ 추후 스프린트로는 최애 등록하고 등록한 최애 관련 레큐북을 노출
- 텍스트 추출 요청을 통한 굿즈 제작 : 기능 개발보다 팬덤이 레큐에 요청하면 텍스트 파일로 제공하는 형태

[기본 기능]
- 내 기록 보기 - 유저가 남긴 레큐노트 / 제작한 레큐북 모아보기
<br />
<img alt="마이페이지 이미지" width="257" alt="image" src="https://velog.velcdn.com/images/aroo_ming/post/7c027d28-dcad-4f07-a3e7-a2b20fc05a0d/image.png" />
<img alt="마이페이지 이미지" width="257" alt="image" src="https://velog.velcdn.com/images/aroo_ming/post/05e91732-8495-4f4d-87b9-38a5bc400c0d/image.png" />
- 문의 요청 기능

<br/>

## ✨ OUR TEAM

| <img src="https://avatars.githubusercontent.com/u/80264647?v=4" width="200" height="200" alt="프로필사진"> | <img src="https://avatars.githubusercontent.com/u/65286685?v=4" width="200" height="200" alt="프로필사진"> | <img src="https://avatars.githubusercontent.com/u/60962533?v=4" width="200" height="200" alt="프로필사진"> | <img src="https://velog.velcdn.com/images/aroo_ming/post/a9437eb2-9104-4c8b-912f-1a8b6eaf6f9d/image.jpeg" width="200" height="200" alt="프로필사진"> |
| :-------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------: |
| <div align = "center"><b>[짱리드]아름</b></div> | <div align = "center"><b>은빈</b></div> | <div align = "center"><b>정우</b></div> | <div align = "center"><b>도윤</b></div> |
| [@Arooming](https://github.com/Arooming) | [@eunbeann](https://github.com/eunbeann/300x300) | [@jungwoo3490](https://github.com/jungwoo3490) | [@binllionaire](https://github.com/binllionaire) |
| [@Arooming](https://github.com/Arooming) | [@eunbeann](https://github.com/eunbeann) | [@jungwoo3490](https://github.com/jungwoo3490) | [@doyn511](https://github.com/doyn511) |


<br/>
Expand Down Expand Up @@ -78,7 +105,6 @@
| refactor | 코드 리팩토링에 대한 커밋 |
| docs | 문서를 수정한 경우, 파일 삭제, 파일명 수정 등 |
| chore | 빌드 테스트 업데이트, 패키지 매니저를 설정하는 경우, 주석 추가, 자잘한 문서 수정 |
| code review | 코드 리뷰 반영 |

<br/>

Expand Down
12 changes: 12 additions & 0 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM node:18.17.0-slim

WORKDIR /app

COPY package.json .
COPY yarn.lock .

RUN yarn

COPY . .

CMD ["yarn", "dev"]
53 changes: 47 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,58 @@
<html lang="ko">
<head>
<meta charset="UTF-8" />
<link
rel="stylesheet"
as="style"
crossorigin
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css"
/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/svg+xml" href="./src/assets/favicon.svg" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=0"
/>

<meta property="og:title" content="레큐 lecue" />
<meta
property="og:description"
content="레큐노트에 우리의 마음을 담아 전달해요"
/>
<meta
property="og:image"
content="https://dzfv99wxq6tx0.cloudfront.net/lecue.png"
/>

<title>Lecue</title>
</head>

<!-- Google Tag Manager -->
<script>
(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start': new Date().getTime(),
event: 'gtm.js',
});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s),
dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-PS49HW2G');
</script>
<!-- End Google Tag Manager -->

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

<!-- Google Tag Manager (noscript) -->
<noscript
><iframe
src="https://www.googletagmanager.com/ns.html?id=GTM-PS49HW2G"
height="0"
width="0"
style="display: none; visibility: hidden"
></iframe
></noscript>
<!-- End Google Tag Manager (noscript) -->
</html>
15 changes: 14 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,28 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"dev": "vite --host 0.0.0.0 --port 3000",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@sentry/browser": "^7.93.0",
"@sentry/react": "^7.93.0",
"@sentry/vite-plugin": "^2.10.2",
"axios": "^1.6.5",
"eslint-plugin-react": "^7.33.2",
"grapheme-splitter": "^1.0.4",
"lottie-react": "^2.4.0",
"postcss": "^8.4.33",
"postcss-styled-syntax": "^0.6.3",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.6",
"react-error-boundary": "^4.0.12",
"react-query": "^3.39.3",
"react-router-dom": "^6.21.1",
"vite-plugin-svgr": "^4.2.0"
Expand All @@ -31,6 +41,9 @@
"eslint-plugin-react-refresh": "^0.4.5",
"eslint-plugin-simple-import-sort": "^10.0.0",
"husky": "^8.0.3",
"stylelint": "^16.1.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-order": "^6.0.4",
"typescript": "^5.2.2",
"vite": "^5.0.8"
}
Expand Down
Loading
Loading