Skip to content

Commit 4c5a050

Browse files
da-inda-in
authored
Merge pull request #147 from yangjaecheon-otter-guardians/da-in/flatten-structure
Flatten repository structure by removing frontend directory
2 parents b2c698d + cb3b189 commit 4c5a050

69 files changed

Lines changed: 111 additions & 67 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cursor/rules/git-conventions.mdc‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
description: Git 커밋 메시지 및 브랜치 네이밍 컨벤션
3+
globs:
4+
alwaysApply: true
5+
---
6+
7+
# Git 컨벤션
8+
9+
## 커밋 메시지
10+
11+
Conventional Commit 형식을 사용하며, 본문은 한글로 작성합니다.
12+
13+
### 형식
14+
15+
```
16+
<type>: <subject>
17+
18+
<body (선택)>
19+
```
20+
21+
### Type
22+
23+
- `feat`: 새로운 기능 추가
24+
- `fix`: 버그 수정
25+
- `refactor`: 코드 리팩토링 (기능 변경 없음)
26+
- `style`: 코드 포맷팅, 세미콜론 누락 등 (기능 변경 없음)
27+
- `docs`: 문서 수정
28+
- `test`: 테스트 코드 추가/수정
29+
- `chore`: 빌드 설정, 패키지 매니저 설정 등
30+
31+
### 예시
32+
33+
```
34+
feat: 텍스트 레이아웃 선택 기능 추가
35+
fix: 헤더 로고 변경 및 README 링크 업데이트
36+
refactor: frontend 폴더 구조 평탄화
37+
```
38+
39+
## 브랜치 네이밍
40+
41+
### 주요 브랜치
42+
43+
- `main`: 프로덕션 배포 브랜치
44+
- `develop`: 개발 통합 브랜치
45+
46+
### 피처 브랜치
47+
48+
```
49+
<author>/<description>
50+
```
51+
52+
- 작성자 이름과 간단한 설명을 슬래시로 구분
53+
- 설명은 kebab-case 사용
54+
55+
### 예시
56+
57+
```
58+
da-in/flatten-structure
59+
anveloper/add-color-picker
60+
```

frontend/.eslintrc.js renamed to .eslintrc.js

File renamed without changes.

‎.github/workflows/gh-pages.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ permissions:
88
jobs:
99
deploy:
1010
runs-on: ubuntu-latest
11-
defaults:
12-
run:
13-
working-directory: ./frontend
1411

1512
steps:
1613
- uses: actions/checkout@v4
@@ -20,7 +17,7 @@ jobs:
2017
with:
2118
node-version: 20
2219
cache: 'npm'
23-
cache-dependency-path: ./frontend/package-lock.json
20+
cache-dependency-path: ./package-lock.json
2421

2522
- name: Install dependencies
2623
run: npm ci
@@ -32,4 +29,4 @@ jobs:
3229
uses: peaceiris/actions-gh-pages@v3
3330
with:
3431
github_token: ${{ secrets.GITHUB_TOKEN }}
35-
publish_dir: ./frontend/build
32+
publish_dir: ./build

‎.github/workflows/on-pr.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
jobs:
99
build:
1010
runs-on: ubuntu-latest
11-
env:
12-
working-directory: ./frontend
1311

1412
strategy:
1513
matrix:
@@ -26,4 +24,3 @@ jobs:
2624
run: |
2725
npm install
2826
CI="false" npm run lint
29-
working-directory: ${{ env.working-directory }}

frontend/.gitignore renamed to .gitignore

File renamed without changes.

frontend/.prettierrc renamed to .prettierrc

File renamed without changes.

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ npm start
8181
- react-helmet-async
8282
- HTML의 head 태그를 관리하기 위한 라이브러리입니다.
8383

84-
[package.json 바로가기](https://github.com/yangjaecheon-otter-guardians/simple-thumbnail/blob/main/frontend/package.json)
84+
[package.json 바로가기](https://github.com/yangjaecheon-otter-guardians/simple-thumbnail/blob/main/package.json)
8585

8686
<br />
8787

8888
## 📌 File Structure
8989

90-
```
91-
📦frontend
90+
```text
91+
📦simple-thumbnail
92+
┣ 📂.github # GitHub Actions 워크플로우 및 템플릿
9293
┣ 📂public
9394
┣ 📂src
9495
┃ ┣ 📂assets # 번들링 되어야하는 자산을 모아둔 폴더입니다.

‎frontend/README.md‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)