Skip to content

Commit 35c4aba

Browse files
authored
Merge pull request #164 from GulSam00/develop
Merge : 자동완성 개선. 크롤링 API 수정
2 parents 64a79c9 + f927cc4 commit 35c4aba

41 files changed

Lines changed: 360 additions & 725 deletions

Some content is hidden

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

.github/workflows/update_ky_youtube.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
run: |
3838
echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> .env
3939
echo "SUPABASE_KEY=${{ secrets.SUPABASE_KEY }}" >> .env
40+
echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> .env
4041
4142
- name: run update script - packages/crawling/crawlYoutube.ts
4243
working-directory: packages/crawling
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Verify ky by Youtube
2+
3+
on:
4+
workflow_dispatch:
5+
6+
permissions:
7+
contents: write # push 권한을 위해 필요
8+
9+
jobs:
10+
run-npm-task:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout branch
15+
uses: actions/checkout@v4
16+
17+
- name: Use Node.js 20
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version: "20"
21+
22+
- name: Install pnpm
23+
uses: pnpm/action-setup@v2
24+
with:
25+
version: 9
26+
run_install: false
27+
28+
- name: Install dependencies
29+
working-directory: packages/crawling
30+
run: pnpm install
31+
32+
- name: Create .env file
33+
working-directory: packages/crawling
34+
run: |
35+
echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> .env
36+
echo "SUPABASE_KEY=${{ secrets.SUPABASE_KEY }}" >> .env
37+
echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> .env
38+
39+
- name: run verify script - packages/crawling
40+
working-directory: packages/crawling
41+
run: pnpm run ky-verify

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@ yarn-error.log*
4545
.cursorrules
4646
.gitmessage.txt
4747

48+
# Claude Code local settings (contains secrets)
49+
.claude/*
50+
4851
temp/
4952
.vscode

CLAUDE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@ See [apps/web/CLAUDE.md](apps/web/CLAUDE.md) for full detail. Key points:
5858
- **Tailwind CSS v4** + **shadcn/ui** in `src/components/ui/` (do not modify directly)
5959
- Path alias `@/``src/`
6060

61+
## Git Workflows
62+
63+
### "branch 정리해줘"
64+
65+
원격에서 merge 후 삭제된 브랜치를 로컬에서도 동기화한다.
66+
67+
```bash
68+
# 1. 원격 삭제된 브랜치 참조 정리
69+
git fetch --prune
70+
71+
# 2. 원격에 없는 로컬 브랜치 목록 확인
72+
git branch -vv | grep ': gone]'
73+
74+
# 3. 삭제 대상 브랜치 제거 (main, develop, 현재 브랜치 제외)
75+
git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -r git branch -d
76+
```
77+
78+
- `-d` 플래그 사용 (merge되지 않은 브랜치는 삭제 안 됨, 안전)
79+
- 삭제 전 목록을 사용자에게 보여주고 확인 후 진행
80+
6181
## Git Conventions
6282

6383
Branch format: `<type>/<camelCaseName>` — flow: `feat/*``develop``main`

apps/web/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"@radix-ui/react-tabs": "^1.1.3",
3232
"@radix-ui/react-tooltip": "^1.2.6",
3333
"@repo/open-api": "workspace:*",
34-
"@repo/query": "workspace:*",
3534
"@supabase/ssr": "^0.6.1",
3635
"@supabase/supabase-js": "^2.49.1",
3736
"@tanstack/react-query": "^5.68.0",

apps/web/src/app/info/like/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function LikePage() {
4545

4646
<Separator className="mb-4" />
4747

48-
<ScrollArea className="h-[calc(100vh-16rem)]">
48+
<ScrollArea className="h-[calc(100vh-20rem)]">
4949
{likedSongs.map(song => (
5050
<SongItem
5151
key={song.song_id}

apps/web/src/app/popular/PopularRankingList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function PopularRankingList() {
2727
/>
2828
</CardHeader>
2929

30-
<ScrollArea className="h-[calc(100vh-20rem)]">
30+
<ScrollArea className="h-[calc(100vh-22rem)]">
3131
<CardContent className="pt-0">
3232
<div className="space-y-0">
3333
{data && data.length > 0 ? (

apps/web/src/constants/artistAlias.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const artistAlias = {
1616
'Creepy Nuts': ['크리피 너츠'],
1717

1818
// [Gemini 추천 아티스트 추가] 한국 인기 최상위
19-
Ado: ['아도', '우세와'],
19+
Ado: ['아도', '우세와', '신시대'],
2020
imase: ['이마세', '나이트댄서'],
2121
'ONE OK ROCK': ['원오크락', '원오크', '원옥'],
2222
'X JAPAN': ['엑스재팬', '엑스제팬'],
@@ -25,16 +25,18 @@ export const artistAlias = {
2525
"L'Arc~en~Ciel": ['라르크', '라르크 앙 시엘'],
2626
松田聖子: ['마츠다 세이코'],
2727
椎名林檎: ['시이나 링고'],
28+
Eve: ['eve', '이브'],
29+
美波: ['미나미', 'minami', '373'],
30+
'ASIAN KUNG-FU GENERATION': ['아시안 쿵푸 제너레이션', '아지캉', '아쿵제'],
2831

2932
// 기존 데이터
3033
: ['아라시'],
31-
東方神起: ['동방신기'],
3234
あいみょん: ['아이묭'],
3335
米津玄師: ['요네즈 켄시'],
3436
浜崎あゆみ: ['하마사키 아유미'],
3537
水樹奈々: ['미즈키 나나'],
3638
'モーニング娘。': ['모닝구 무스메'],
37-
Official髭男dism: ['오피셜히게단디즘', '히게단'],
39+
Official髭男dism: ['오피셜히게단디즘', '히게단', '프리텐더'],
3840
ヨルシカ: ['요루시카'],
3941
中島美嘉: ['나카시마 미카'],
4042
宇多田ヒカル: ['우타다 히카루'],
@@ -50,14 +52,11 @@ export const artistAlias = {
5052
坂本真綾: ['사카모토 마아야'],
5153
結束バンド: ['결속 밴드'],
5254
乃木坂46: ['노기자카46'],
53-
防弾少年団: ['방탄소년단'],
54-
少女時代: ['소녀시대'],
5555
林原めぐみ: ['하야시바라 메구미'],
5656
ポルノグラフィティ: ['포르노그라피티'],
5757
初音ミク: ['하츠네 미쿠'],
58-
'DECO*27(Feat.初音ミク)': ['DECO27', '데코니나'],
58+
'DECO*27': ['DECO27', '데코니나'],
5959
松浦亜弥: ['마츠우라 아야'],
60-
ユンナ: ['윤하'],
6160
堀江由衣: ['호리에 유이'],
6261
コブクロ: ['코부쿠로'],
6362
きゃりーぱみゅぱみゅ: ['캬리 파뮤파뮤'],

apps/web/src/constants/krToJpnArtist.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ export const krToJpnArtistSort = {
22
// A-Z
33
Ado: 'Ado',
44
Aimer: 'Aimer',
5+
'ASIAN KUNG-FU GENERATION': '아시안 쿵푸 제너레이션',
6+
57
DECO27: 'DECO*27',
8+
Eve: 'Eve',
69
HoneyWorks: 'HoneyWorks',
710

811
imase: 'imase',
@@ -22,6 +25,7 @@ export const krToJpnArtistSort = {
2225

2326
// 마
2427
'미세스 그린 애플': 'Mrs. GREEN APPLE',
28+
미나미: '美波',
2529

2630
// 바
2731
바운디: 'Vaundy',

apps/web/src/hooks/useSearchSong.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ export default function useSearchSong() {
6060
let parsedSearch = trimSearch;
6161

6262
if (autoCompleteList.length === 1) {
63-
// 자동완성 리스트가 하나(정확히 일치하면) 해당 alias의 value로 자동 치환
64-
parsedSearch = autoCompleteList[0].value;
63+
if (autoCompleteList[0].label === trimSearch) {
64+
// 자동완성 리스트가 하나(정확히 일치하면)고 label도 일치하면 해당 alias의 value로 자동 치환
65+
parsedSearch = autoCompleteList[0].value;
66+
}
6567
} else {
6668
// 한글이 있다면 공백 제거
6769
const hasKorean = /[---]/.test(trimSearch);

0 commit comments

Comments
 (0)