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.

Sign up for GitHub

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

Jump to bottom

배포를 위한 Main 1차 병합 #117

Merged
merged 489 commits into from
Jan 18, 2025
Merged

배포를 위한 Main 1차 병합 #117

merged 489 commits into from
Jan 18, 2025

Conversation

ocahs9
Copy link
Collaborator

@ocahs9 ocahs9 commented Jan 18, 2025

No description provided.

yarimu and others added 30 commits January 15, 2025 18:35
@yarimu
fix: 에러메시지 수정사항 반영
8839b74
@ocahs9
Merge branch 'feat/#36/Toast' of https://github.com/SOPT-all/35-APPJA…
b9f9662 
…M-WEB-COCOS into feat/#36/Toast
@Leeyoonji23
fix: 목데이터 분리
d6b76e1
@ocahs9
fix: svg 컴포넌트 width 값 고정되지 않도록 수정
912cc3f
@ocahs9
fix: 기존 svg파일들 수정
46f81ff
@ocahs9
Merge pull request #55 from SOPT-all/bug/#54/SvgBugFix
f237bdf 
[Bug/#54] SVG 파일 width값 조절 못하던 문제 해결
@Leeyoonji23
Merge pull request #52 from SOPT-all/refactor/#51/Comment
864a5b8 
[Refactor/#51] 댓글 컴포넌트
@minjeoong
Merge pull request #37 from SOPT-all/feat/#36/Toast
0f68118 
[Feat/#36] Toast component
@minjeoong
Merge branch 'develop' into feat/#42/searchDone
daf8427
@minjeoong
Merge remote-tracking branch 'origin/develop' into feat/#49/postDetail
5cb1e1a 
# Conflicts:
#	src/asset/svg/index.ts
@ocahs9
feat: 마이페이지 상단 부분 구현, 스티키 테스트
caa574f
@yarimu
feat: 유효성 검사 구현 완료
10858d5
@minjeoong
Merge pull request #45 from SOPT-all/feat/#42/searchDone
87bce13 
[Feat/#42] 검색 완료 뷰 구현
@ocahs9
구현 중
f017215
@ocahs9
Merge branch 'develop' into feat/#23/TabAndBottomSheet
63a320a
@ocahs9
fix: 사용하지 않는 코드 제거
840000a
@ocahs9
Merge pull request #34 from SOPT-all/feat/#23/TabAndBottomSheet
dded531 
[Feat/#23] Tab & TextBox & BottomSheet & FilterBottomSheet
@ocahs9
Merge branch 'feat/#38/headerNav2CommonComponent' of https://github.c…
4472cc0 
…om/SOPT-all/35-APPJAM-WEB-COCOS into feat/#38/headerNav2CommonComponent
@ocahs9
fix: x버튼 눌렀을 때 콘솔 제거
cf51c7e
@ocahs9
Merge pull request #46 from SOPT-all/feat/#38/headerNav2CommonComponent
6e67851 
[Feat/#38] 헤더 네브 공통 컴포넌트 구현
@ocahs9
Merge branch 'develop' into feat/#53/MypageView
903893e
@yarimu
design: 에러 메시지 레이아웃 변경
5f03d54
@yarimu
feat: 닉네임 중복검사 로직 추가
1c5cb2e
@yarimu
design: 하단 버튼 사이즈 조정
1066d8a
@ocahs9
fix: Tab 선택적으로 width 정할 수 있도록 수정
b2f42b2
@ocahs9
chore: fontSize 10px로 임시 통일
f992fb3
@minjeoong
Merge remote-tracking branch 'origin/develop' into feat/#49/postDetail
29dbc65 
# Conflicts:
#	src/asset/svg/index.ts
#	src/common/component/Button/styles.css.ts
#	src/common/component/Chip/Chip.tsx
@yarimu
design: 반응형에 맞게 버튼 레이아웃 수정
21bda98
@ocahs9
feat: 탭 선택 가능하도록 구현
204db10
@ocahs9
chore: 마우스 이벤트 biome 경고 off
5202935
minjeoong and others added 25 commits January 18, 2025 05:17
@minjeoong
fix: chip 스크롤 바 제거
5d4604b
@minjeoong
fix: bottomsheet 강아지, 고양이만 하나만 선택 가능하도록 수정
95725fa
@minjeoong
feat: tag 필터랑 동기화 작업
84e7767
@minjeoong
feat: fill 다 채워져 있는지 확인하는 코드 추가
0c0b1ac
@minjeoong
feat: 빌드 에러 해결
4f4ccec
@ocahs9
Merge pull request #102 from SOPT-all/feat/#73/postWrite
4ff70cc 
[Feat/#73] 게시물 작성 페이지 구현
@yarimu
fix: url 변경사항 반영
c4c977f
@yarimu
chore: 폴더구조 변경
83b553e
@yarimu
chore: 폴더명 변경
16369a2
@yarimu
fix: UX 확정 워딩 반영
128758d
@minjeoong
feat: 스키마 세팅 배포 api url 적용
d5c942f
@yarimu
feat: 뷰 변경사항 반영
07dee59
@minjeoong
feat: API_PATH 미리 세팅
c10c81f
@yarimu
chore: 폴더구조 변경
1f31335
@minjeoong
fix: 에러 해결
8e317b6
@yarimu
feat: 빌드에러 해결
a30ddaa
@ocahs9
Merge pull request #108 from SOPT-all/feat/#100/newPetHealthView
08bacac 
[Feat/#100] 뷰 변경사항 반영
@ocahs9
Merge pull request #105 from SOPT-all/feat/#104/generate-schema
5c5aa48 
[Feat/#73] openapi Typescript Schema 생성 세팅
@ocahs9
deploy: main fork yml 작성
9764b0c
@ocahs9
chore: pat 테스트
af00215
@ocahs9
deploy: fork Deploy,fork Main 각각 작성
9f2ed60
@ocahs9
Merge pull request #114 from SOPT-all/feat/#11/vercelDeploy
76e6a5a 
[Feat/#11] 버셀 배포 (fork 액션 추가)
@ocahs9
Merge pull request #115 from SOPT-all/feat/#11/vercelDeploy
99f4e9d 
Feat/#11/vercel deploy
@ocahs9
fix: 로컬 액션 조건문 추가
21dd353
@ocahs9
Merge pull request #116 from SOPT-all/feat/#11/vercelDeploy
f1409f0 
fix: 로컬 액션 조건문 추가
@ocahs9 ocahs9 self-assigned this Jan 18, 2025
@ocahs9 ocahs9 merged commit 8430100 into main Jan 18, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Leeyoonji23 Leeyoonji23 Awaiting requested review from Leeyoonji23

@minjeoong minjeoong Awaiting requested review from minjeoong

@yarimu yarimu Awaiting requested review from yarimu

Assignees

@ocahs9 ocahs9

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ocahs9 @yarimu @Leeyoonji23 @minjeoong