Skip to content

develop 브랜치의 작업 내용 main으로 병합 #89

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

Merged
mgYang53 merged 19 commits into from
Feb 22, 2026
Merged

develop 브랜치의 작업 내용 main으로 병합 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c5234b4
refactor: develop 브랜치 기반 워크플로우 전환 (#54) (#55)
mgYang53 Feb 3, 2026
f920275
feat: 모임 목록 페이지 구현 (#39) (#56)
mgYang53 Feb 4, 2026
bd82478
[feat] 주제 조회 UI 및 기능 개발 (#61)
haruyam15 Feb 7, 2026
7b897fd
[feat] 내 책장 페이지 구현 (#60)
choiyoungae Feb 7, 2026
9a99981
feat: 모임 상세 페이지 구현 (#50) (#58)
mgYang53 Feb 8, 2026
953a6aa
[feat] 사전의견 조회 페이지 구현 (#64)
choiyoungae Feb 8, 2026
5c5f43a
[feat] 주제 제안 UI 및 기능 구현 (#68)
haruyam15 Feb 9, 2026
ef9d570
[feat] 모임 설정 페이지 구현 (#69)
mgYang53 Feb 11, 2026
788f1fc
[feat] 주제 확정 UI 및 기능 구현 (#65)
haruyam15 Feb 11, 2026
a662f31
[feat] 약속관련 추가 기능 구현 (#71)
haruyam15 Feb 12, 2026
6c8d94a
[feat] 랜딩페이지 구현 (#73)
haruyam15 Feb 12, 2026
b17aa47
[feat] 로딩(Spinner) 컴포넌트 개발 및 적용 (#75)
haruyam15 Feb 12, 2026
1fff012
[fix] 약속/주제 확정 관련 버그 수정 및 기능 연결 (#79)
haruyam15 Feb 16, 2026
11c2efd
[feat]카카오맵 feature 모듈 분리 및 장소 선택 모달 디자인 변경 (#77)
haruyam15 Feb 19, 2026
cd652c4
feat: 토스트(Sonner) 컴포넌트 개발 및 프로젝트 전반 적용 (#81) (#82)
mgYang53 Feb 19, 2026
24d8476
feat: 약속 회고 AI 요약 결과 UI 구현 (#85)
mgYang53 Feb 19, 2026
58197ce
feat: 메인페이지 구현 (#70) (#80)
mgYang53 Feb 19, 2026
e958fb9
[feat] 사전의견 작성 페이지 구현 (#86)
choiyoungae Feb 19, 2026
364c84d
refactor: 레이아웃 리팩토링 (#88)
mgYang53 Feb 19, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
pull_request:
branches: [main, dev]
branches: [main, develop]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy Frontend

on:
pull_request:
branches: [main, dev]
branches: [main]
types: [closed]

jobs:
Expand Down Expand Up @@ -32,6 +32,7 @@ jobs:
env:
VITE_API_URL: ${{ secrets.VITE_API_URL }}
VITE_APP_URL: ${{ secrets.VITE_APP_URL }}
VITE_KAKAO_MAP_KEY: ${{ secrets.VITE_KAKAO_MAP_KEY }}

- name: Deploy to EC2
uses: appleboy/scp-action@v0.1.7
Expand Down
7 changes: 7 additions & 0 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ export default defineConfig([
{
selector: 'variable',
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
leadingUnderscore: 'allow',
},
// 매개변수: camelCase, 언더스코어로 시작 가능 (unused params)
{
selector: 'parameter',
format: ['camelCase'],
leadingUnderscore: 'allow',
},
// 함수: camelCase, PascalCase (컴포넌트)
{
Expand Down
4 changes: 0 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>독크독크</title>
<script
type="text/javascript"
src="//dapi.kakao.com/v2/maps/sdk.js?appkey=%VITE_KAKAO_MAP_KEY%&libraries=services"
></script>
</head>
<body>
<div id="root"></div>
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"globals": "^16.5.0",
"lefthook": "^2.0.15",
"prettier": "^3.7.4",
"shadcn": "^3.8.4",
"tw-animate-css": "^1.4.0",
"typescript": "~5.9.3",
"typescript-eslint": "^8.46.4",
Expand All @@ -49,18 +50,21 @@
"@radix-ui/react-tabs": "^1.1.13",
"@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-toggle-group": "^1.1.11",
"@radix-ui/react-tooltip": "^1.2.8",
"@tailwindcss/vite": "^4.1.18",
"@tanstack/react-query": "^5.90.16",
"axios": "^1.13.2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"date-fns": "^4.1.0",
"lucide-react": "^0.562.0",
"next-themes": "^0.4.6",
"pretendard": "^1.3.9",
"react": "18.2.0",
"react-day-picker": "^9.13.0",
"react-dom": "18.2.0",
"react-router-dom": "^6.30.3",
"sonner": "^2.0.7",
"tailwind-merge": "^3.4.0",
"tailwindcss": "^4.1.18",
"zustand": "^5.0.10"
Expand Down
Loading
Loading