diff --git a/.github/workflows/gpt-review.yml b/.github/workflows/gpt-review.yml index b0a731c..8f924cd 100644 --- a/.github/workflows/gpt-review.yml +++ b/.github/workflows/gpt-review.yml @@ -22,6 +22,7 @@ jobs: LANGUAGE: Korean max_tokens: 10000 MAX_PATCH_LENGTH: 10000 + ACTIONS_STEP_DEBUG: true IGNORE_PATTERNS: /dist, /node_modules,*.md # Regex pattern to ignore files, separated by comma - INCLUDE_PATTERNS: '*.js, *.ts, *.jsx, *.tsx' # glob pattern or regex pattern to include files, separated by comma + # INCLUDE_PATTERNS: '*.js, *.ts, *.jsx, *.tsx' # glob pattern or regex pattern to include files, separated by comma diff --git a/apps/web/app/ErrorWrapper.tsx b/apps/web/app/ErrorWrapper.tsx new file mode 100644 index 0000000..ddd1228 --- /dev/null +++ b/apps/web/app/ErrorWrapper.tsx @@ -0,0 +1,19 @@ +'use client'; + +import { Suspense } from 'react'; + +import ErrorContent from '@/components/ErrorContnet'; + +export default function ErrorWrapper({ children }: { children: React.ReactNode }) { + return ( + +

로딩 중...

+ + } + > + {children} + + ); +} diff --git a/apps/web/app/footer.tsx b/apps/web/app/Footer.tsx similarity index 100% rename from apps/web/app/footer.tsx rename to apps/web/app/Footer.tsx diff --git a/apps/web/app/SideBar.tsx b/apps/web/app/Sidebar.tsx similarity index 99% rename from apps/web/app/SideBar.tsx rename to apps/web/app/Sidebar.tsx index 26219ed..265a079 100644 --- a/apps/web/app/SideBar.tsx +++ b/apps/web/app/Sidebar.tsx @@ -72,7 +72,7 @@ export default function Sidebar() {
- ? + {user?.nickname.slice(0, 3)}
diff --git a/apps/web/app/api/open_songs/[type]/[param]/route.ts b/apps/web/app/api/open_songs/[type]/[param]/route.ts index e16b1fb..e6c92f1 100644 --- a/apps/web/app/api/open_songs/[type]/[param]/route.ts +++ b/apps/web/app/api/open_songs/[type]/[param]/route.ts @@ -13,12 +13,12 @@ import { getSong, } from '@repo/open-api'; -export async function GET( - request: NextRequest, - { params }: { params: { type: string; param: string } }, -) { +export async function GET(request: NextRequest) { try { - const { type, param } = params; + const segments = request.nextUrl.pathname.split('/'); + const type = segments[segments.length - 2]; + const param = segments[segments.length - 1]; + const searchParams = request.nextUrl.searchParams; const brand = searchParams.get('brand') as Brand | undefined; diff --git a/apps/web/app/api/search/route.ts b/apps/web/app/api/search/route.ts index 0a160a6..6453a70 100644 --- a/apps/web/app/api/search/route.ts +++ b/apps/web/app/api/search/route.ts @@ -4,11 +4,11 @@ import createClient from '@/lib/supabase/server'; import { SearchSong, Song } from '@/types/song'; import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser'; -interface ApiResponse { - success: boolean; - data?: T; - error?: string; -} +// interface ApiResponse { +// success: boolean; +// data?: T; +// error?: string; +// } interface DBSong extends Song { like_activities: { @@ -18,8 +18,8 @@ interface DBSong extends Song { user_id: string; }[]; } - -export async function GET(request: Request): Promise>> { +// export async function GET(request: Request): Promise>> { +export async function GET(request: Request) { // API KEY 노출을 막기 위해 미들웨어 역할을 할 API ROUTE 활용 try { const { searchParams } = new URL(request.url); @@ -90,7 +90,7 @@ export async function GET(request: Request): Promise ({ + id: item.user_id + item.song_id, + user_id: item.user_id, + song_id: item.songs.id, + created_at: item.created_at, + title: item.songs.title, + artist: item.songs.artist, + num_tj: item.songs.num_tj, + num_ky: item.songs.num_ky, + })); + // 가져온 song_id 목록을 사용하여 songs 테이블에서 정보를 가져옴 const songIds = likedSongs.map(item => item.song_id); @@ -30,14 +52,11 @@ export async function GET() { if (tosingError) throw tosingError; const tosingSongIds = new Set(tosingSongs.map(item => item.song_id)); - const { data, error } = await supabase.from('songs').select('*').in('id', songIds); - - if (error) throw error; // tosingSongIds에 포함된 song_id를 가진 노래에 isInToSingList: true 추가 - const processedData = data.map(song => ({ + const processedData = likedSongs.map(song => ({ ...song, - isInToSingList: tosingSongIds.has(song.id), + isInToSingList: tosingSongIds.has(song.song_id), })); return NextResponse.json({ success: true, data: processedData }); diff --git a/apps/web/app/api/songs/recent/route.tsx b/apps/web/app/api/songs/recent/route.tsx index 8a7102a..03c5345 100644 --- a/apps/web/app/api/songs/recent/route.tsx +++ b/apps/web/app/api/songs/recent/route.tsx @@ -1,7 +1,7 @@ import { NextResponse } from 'next/server'; import createClient from '@/lib/supabase/server'; -import { SingLog } from '@/types/sing_log'; +import { SingLog } from '@/types/singLog'; import { Song } from '@/types/song'; import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser'; diff --git a/apps/web/app/api/songs/tosing/array/route.ts b/apps/web/app/api/songs/tosing/arr/route.ts similarity index 100% rename from apps/web/app/api/songs/tosing/array/route.ts rename to apps/web/app/api/songs/tosing/arr/route.ts diff --git a/apps/web/app/api/songs/total_stats/route.ts b/apps/web/app/api/total_stats/route.ts similarity index 99% rename from apps/web/app/api/songs/total_stats/route.ts rename to apps/web/app/api/total_stats/route.ts index dbb104a..852b223 100644 --- a/apps/web/app/api/songs/total_stats/route.ts +++ b/apps/web/app/api/total_stats/route.ts @@ -4,6 +4,7 @@ import createClient from '@/lib/supabase/server'; // 유효한 카운트 타입 정의 type CountType = 'sing_count' | 'like_count' | 'saved_count'; + export async function POST(request: Request) { try { const supabase = await createClient(); diff --git a/apps/web/app/api/songs/user_stats/route.ts b/apps/web/app/api/user_stats/route.ts similarity index 72% rename from apps/web/app/api/songs/user_stats/route.ts rename to apps/web/app/api/user_stats/route.ts index 6fb4cd0..6014711 100644 --- a/apps/web/app/api/songs/user_stats/route.ts +++ b/apps/web/app/api/user_stats/route.ts @@ -3,6 +3,30 @@ import { NextResponse } from 'next/server'; import createClient from '@/lib/supabase/server'; import { getAuthenticatedUser } from '@/utils/getAuthenticatedUser'; +export async function GET() { + const supabase = await createClient(); + const userId = await getAuthenticatedUser(supabase); + + const { data, error } = await supabase + .from('user_stats') + .select(`*, songs(*)`) + .eq('user_id', userId) + .order('sing_count', { ascending: false }); + + if (error) throw error; + + const parsedData = data?.map(item => ({ + userId: item.user_id, + songId: item.song_id, + singCount: item.sing_count, + lastSingAt: item.last_sing_at, + title: item.songs.title, + artist: item.songs.artist, + })); + + return NextResponse.json({ success: true, data: parsedData }); +} + export async function POST(request: Request) { try { const supabase = await createClient(); // Supabase 클라이언트 생성 diff --git a/apps/web/app/errorWrapper.tsx b/apps/web/app/components/ErrorContnet.tsx similarity index 77% rename from apps/web/app/errorWrapper.tsx rename to apps/web/app/components/ErrorContnet.tsx index 1507d08..0cd1b86 100644 --- a/apps/web/app/errorWrapper.tsx +++ b/apps/web/app/components/ErrorContnet.tsx @@ -3,24 +3,21 @@ import { useSearchParams } from 'next/navigation'; import { useEffect } from 'react'; -export default function ErrorWrapper({ children }: { children: React.ReactNode }) { +export default function ErrorContent({ children }: { children: React.ReactNode }) { const searchParams = useSearchParams(); useEffect(() => { - // 에러 파라미터 확인 const error = searchParams.get('error'); const errorCode = searchParams.get('error_code'); const errorDescription = searchParams.get('error_description'); if (error) { - // 에러 정보를 구조화 const errorMessage = { code: errorCode || 'unknown', message: errorDescription?.replace(/\+/g, ' ') || '인증 오류가 발생했습니다.', type: error, }; - // 에러를 throw하여 Error Boundary 트리거 throw new Error(JSON.stringify(errorMessage)); } }, [searchParams]); diff --git a/apps/web/app/popular/RankingList.tsx b/apps/web/app/components/RankingList.tsx similarity index 65% rename from apps/web/app/popular/RankingList.tsx rename to apps/web/app/components/RankingList.tsx index 295e204..6b22c30 100644 --- a/apps/web/app/popular/RankingList.tsx +++ b/apps/web/app/components/RankingList.tsx @@ -1,15 +1,13 @@ import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; +import { UserSongStat } from '@/types/userStat'; import { cn } from '@/utils/cn'; -interface RankingItemProps { +interface RankingItemProps extends UserSongStat { rank: number; - title: string; - artist: string; - className?: string; } -export function RankingItem({ rank, title, artist, className }: RankingItemProps) { +export function RankingItem({ rank, title, artist, singCount, className }: RankingItemProps) { // 등수에 따른 색상 및 스타일 결정 const getRankStyle = (rank: number) => { switch (rank) { @@ -34,9 +32,14 @@ export function RankingItem({ rank, title, artist, className }: RankingItemProps > {rank}
-
-

{title}

-

{artist}

+
+
+

{title}

+

{artist}

+
+
+

{singCount}회

+
); @@ -44,20 +47,20 @@ export function RankingItem({ rank, title, artist, className }: RankingItemProps interface RankingListProps { title: string; - items: Array>; + items: UserSongStat[]; className?: string; } export default function RankingList({ title, items, className }: RankingListProps) { return ( - + {title}
{items.map((item, index) => ( - + ))}
diff --git a/apps/web/app/home/AddListModal.tsx b/apps/web/app/home/AddListModal.tsx index d1b297e..52e7d6c 100644 --- a/apps/web/app/home/AddListModal.tsx +++ b/apps/web/app/home/AddListModal.tsx @@ -25,14 +25,14 @@ export default function AddListModal({ isOpen, onClose }: AddListModalProps) { setActiveTab, songSelected, handleToggleSelect, - handleConfirm, + handleConfirmAdd, totalSelectedCount, } = useAddListModal(); const { likedSongs, recentSongs } = useSongStore(); const handleClickConfirm = () => { - handleConfirm(); + handleConfirmAdd(); onClose(); }; diff --git a/apps/web/app/hooks/useAddSongList.ts b/apps/web/app/hooks/useAddSongList.ts index 6861798..34383b3 100644 --- a/apps/web/app/hooks/useAddSongList.ts +++ b/apps/web/app/hooks/useAddSongList.ts @@ -45,7 +45,7 @@ export default function useAddSongList() { ); }; - const handleConfirm = async () => { + const handleConfirmAdd = async () => { await handleApiCall(async () => { await postToSingSongs(songSelected); setSongSelected([]); @@ -65,7 +65,7 @@ export default function useAddSongList() { setActiveTab, songSelected, handleToggleSelect, - handleConfirm, + handleConfirmAdd, totalSelectedCount, }; } diff --git a/apps/web/app/hooks/useSearch.ts b/apps/web/app/hooks/useSearch.ts index c0bf6ec..609c871 100644 --- a/apps/web/app/hooks/useSearch.ts +++ b/apps/web/app/hooks/useSearch.ts @@ -1,5 +1,9 @@ import { useEffect, useState } from 'react'; +import { deleteLikedSongs, postLikedSongs } from '@/lib/api/like_activites'; +import { getSearch } from '@/lib/api/search'; +import { deleteToSingSongs, postToSingSongs } from '@/lib/api/tosings'; +import { postTotalStats } from '@/lib/api/total_stats'; import useLoadingStore from '@/stores/useLoadingStore'; import { Method } from '@/types/common'; import { SearchSong } from '@/types/song'; @@ -37,15 +41,13 @@ export default function useSearch() { await handleApiCall( async () => { - const response = await fetch(`api/search?q=${search}&type=${searchType}`); - const data = await response.json(); - - if (data.success) { - setSearchResults(data.songs); + const { success, data } = await getSearch(search, searchType); + if (success) { + setSearchResults(data); } else { setSearchResults([]); } - return data.success; + return success; }, () => { setSearchResults([]); @@ -55,13 +57,14 @@ export default function useSearch() { const handleToggleToSing = async (songId: string, method: Method) => { await handleApiCall(async () => { - const response = await fetch('/api/songs/tosing', { - method, - body: JSON.stringify({ songId }), - headers: { 'Content-Type': 'application/json' }, - }); + let response; + if (method === 'POST') { + response = await postToSingSongs({ songId }); + } else { + response = await deleteToSingSongs({ songId }); + } - const { success } = await response.json(); + const { success } = response; if (success) { const newResults = searchResults.map(song => { if (song.id === songId) { @@ -79,23 +82,20 @@ export default function useSearch() { const handleToggleLike = async (songId: string, method: Method) => { await handleApiCall(async () => { - await fetch('/api/songs/total_stats', { - method: 'POST', - body: JSON.stringify({ - songId, - countType: 'like_count', - isMinus: method === 'DELETE', - }), - headers: { 'Content-Type': 'application/json' }, + await postTotalStats({ + songId, + countType: 'like_count', + isMinus: method === 'DELETE', }); - const response = await fetch(`/api/songs/like`, { - method, - body: JSON.stringify({ songId }), - headers: { 'Content-Type': 'application/json' }, - }); + let response; + if (method === 'POST') { + response = await postLikedSongs({ songId }); + } else { + response = await deleteLikedSongs({ songId }); + } - const { success } = await response.json(); + const { success } = response; const newResults = searchResults.map(song => { if (song.id === songId) { return { ...song, isLiked: !song.isLiked }; diff --git a/apps/web/app/hooks/useSong.ts b/apps/web/app/hooks/useSong.ts index c77cb9e..004c92e 100644 --- a/apps/web/app/hooks/useSong.ts +++ b/apps/web/app/hooks/useSong.ts @@ -3,6 +3,10 @@ import { DragEndEvent } from '@dnd-kit/core'; import { arrayMove } from '@dnd-kit/sortable'; import { useEffect } from 'react'; +import { postSingLog } from '@/lib/api/sing_logs'; +import { patchToSingSongs } from '@/lib/api/tosings'; +import { postTotalStats } from '@/lib/api/total_stats'; +import { postUserStats } from '@/lib/api/user_stats'; import useAuthStore from '@/stores/useAuthStore'; import useLoadingStore from '@/stores/useLoadingStore'; import useSongStore from '@/stores/useSongStore'; @@ -10,8 +14,7 @@ import useSongStore from '@/stores/useSongStore'; export default function useSong() { const { startLoading, stopLoading, initialLoading } = useLoadingStore(); const { isAuthenticated } = useAuthStore(); - const { toSings, swapToSings, refreshToSings, refreshLikedSongs, refreshRecentSongs } = - useSongStore(); + const { toSings, swapToSings, refreshToSings, deleteToSingSong } = useSongStore(); const handleApiCall = async (apiCall: () => Promise, onError?: () => void) => { startLoading(); @@ -61,13 +64,9 @@ export default function useSong() { newWeight = (prevItem.order_weight + nextItem.order_weight) / 2; } - const response = await fetch(`/api/songs/tosing`, { - method: 'PATCH', - body: JSON.stringify({ - songId: active.id, - newWeight, - }), - headers: { 'Content-Type': 'application/json' }, + const response = await patchToSingSongs({ + songId: active.id as string, + newWeight, }); const { success } = await response.json(); @@ -78,15 +77,17 @@ export default function useSong() { const handleDelete = async (songId: string) => { await handleApiCall(async () => { - await fetch('/api/songs/tosing', { - method: 'DELETE', - body: JSON.stringify({ songId }), - headers: { 'Content-Type': 'application/json' }, - }); + await deleteToSingSong(songId); swapToSings(toSings.filter(item => item.songs.id !== songId)); - refreshLikedSongs(); - refreshRecentSongs(); - }, handleSearch); + // await fetch('/api/songs/tosing/arr', { + // method: 'DELETE', + // body: JSON.stringify({ songIds }), + // headers: { 'Content-Type': 'application/json' }, + // }); + // swapToSings(toSings.filter(item => !songIds.includes(item.songs.id))); + // refreshLikedSongs(); + // refreshRecentSongs(); + }); }; const handleMoveToTop = async (songId: string, oldIndex: number) => { @@ -96,10 +97,9 @@ export default function useSong() { const newItems = arrayMove(toSings, oldIndex, 0); const newWeight = toSings[0].order_weight - 1; - const response = await fetch('/api/songs/tosing', { - method: 'PATCH', - body: JSON.stringify({ songId, newWeight }), - headers: { 'Content-Type': 'application/json' }, + const response = await patchToSingSongs({ + songId: songId, + newWeight, }); const { success } = await response.json(); swapToSings(newItems); @@ -115,10 +115,9 @@ export default function useSong() { const newItems = arrayMove(toSings, oldIndex, lastIndex); const newWeight = toSings[lastIndex].order_weight + 1; - const response = await fetch('/api/songs/tosing', { - method: 'PATCH', - body: JSON.stringify({ songId, newWeight }), - headers: { 'Content-Type': 'application/json' }, + const response = await patchToSingSongs({ + songId: songId, + newWeight, }); const { success } = await response.json(); swapToSings(newItems); @@ -134,21 +133,9 @@ export default function useSong() { // 통계 업데이트 await Promise.all([ - fetch('/api/songs/total_stats', { - method: 'POST', - body: JSON.stringify({ songId, countType: 'sing_count' }), - headers: { 'Content-Type': 'application/json' }, - }), - fetch('/api/songs/user_stats', { - method: 'POST', - body: JSON.stringify({ songId }), - headers: { 'Content-Type': 'application/json' }, - }), - fetch('/api/sing_logs', { - method: 'POST', - body: JSON.stringify({ songId }), - headers: { 'Content-Type': 'application/json' }, - }), + postTotalStats({ songId, countType: 'sing', isMinus: false }), + postUserStats(songId), + postSingLog(songId), handleDelete(songId), ]); }, handleSearch); diff --git a/apps/web/app/hooks/useSongInfo.ts b/apps/web/app/hooks/useSongInfo.ts new file mode 100644 index 0000000..23f2acb --- /dev/null +++ b/apps/web/app/hooks/useSongInfo.ts @@ -0,0 +1,67 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import useLoadingStore from '@/stores/useLoadingStore'; +import useSongStore from '@/stores/useSongStore'; + +export default function useAddSongList() { + const [deleteLikeSelected, setDeleteLikeSelected] = useState([]); + const { startLoading, stopLoading, initialLoading } = useLoadingStore(); + + const { refreshLikedSongs, refreshRecentSongs, deleteLikedSongs } = useSongStore(); + + const handleApiCall = async (apiCall: () => Promise, onError?: () => void) => { + startLoading(); + try { + const result = await apiCall(); + return result; + } catch (error) { + console.error('API 호출 실패:', error); + if (onError) onError(); + return null; + } finally { + stopLoading(); + } + }; + + const getLikedSongs = async () => { + await handleApiCall(async () => { + refreshLikedSongs(); + }); + }; + + const getRecentSongs = async () => { + await handleApiCall(async () => { + refreshRecentSongs(); + }); + }; + + const handleToggleSelect = (songId: string) => { + setDeleteLikeSelected(prev => + prev.includes(songId) ? prev.filter(id => id !== songId) : [...prev, songId], + ); + }; + + const handleDelete = async () => { + await handleApiCall(async () => { + await deleteLikedSongs(deleteLikeSelected); + setDeleteLikeSelected([]); + }); + }; + + const totalSelectedCount = deleteLikeSelected.length; + + useEffect(() => { + getLikedSongs(); + getRecentSongs(); + initialLoading(); + }, []); + + return { + deleteLikeSelected, + totalSelectedCount, + handleToggleSelect, + handleDelete, + }; +} diff --git a/apps/web/app/hooks/useUserStat.ts b/apps/web/app/hooks/useUserStat.ts new file mode 100644 index 0000000..56d334a --- /dev/null +++ b/apps/web/app/hooks/useUserStat.ts @@ -0,0 +1,23 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +import { getUserStats } from '@/lib/api/user_stats'; +import { UserSongStat } from '@/types/userStat'; + +export default function useUserStat() { + const [userStat, setUserStat] = useState([]); + + const getUserStat = async () => { + const { success, data } = await getUserStats(); + if (success) { + setUserStat(data); + } + }; + + useEffect(() => { + getUserStat(); + }, []); + + return { userStat, getUserStat }; +} diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx index e2ca111..06d2b3c 100644 --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -1,3 +1,5 @@ +import { Analytics } from '@vercel/analytics/react'; +import { SpeedInsights } from '@vercel/speed-insights/next'; import type { Metadata } from 'next'; import { Toaster } from 'sonner'; @@ -45,6 +47,8 @@ export default function RootLayout({ + + diff --git a/apps/web/app/lib/api/like_activites.ts b/apps/web/app/lib/api/like_activites.ts new file mode 100644 index 0000000..ab99f72 --- /dev/null +++ b/apps/web/app/lib/api/like_activites.ts @@ -0,0 +1,42 @@ +export async function getLikedSongs() { + const response = await fetch('/api/songs/like'); + if (!response.ok) { + throw new Error('Failed to fetch liked songs'); + } + return response.json(); +} +export async function postLikedSongs(body: { songId: string }) { + const response = await fetch('/api/songs/like', { + method: 'POST', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post liked songs'); + } + return response.json(); +} + +export async function deleteLikedSongs(body: { songId: string }) { + const response = await fetch('/api/songs/like', { + method: 'DELETE', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to delete liked songs'); + } + return response.json(); +} + +export async function deleteLikedSongsArray(body: { songIds: string[] }) { + const response = await fetch('/api/songs/like/arr', { + method: 'DELETE', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to delete liked songs array'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/search.ts b/apps/web/app/lib/api/search.ts new file mode 100644 index 0000000..936a7c9 --- /dev/null +++ b/apps/web/app/lib/api/search.ts @@ -0,0 +1,7 @@ +export async function getSearch(search: string, searchType: string) { + const response = await fetch(`/api/search?q=${search}&type=${searchType}`); + if (!response.ok) { + throw new Error('Failed to search songs'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/sing_logs.ts b/apps/web/app/lib/api/sing_logs.ts new file mode 100644 index 0000000..39fd03d --- /dev/null +++ b/apps/web/app/lib/api/sing_logs.ts @@ -0,0 +1,11 @@ +export async function postSingLog(songId: string) { + const response = await fetch(`/api/songs/sing_logs`, { + method: 'POST', + body: JSON.stringify({ songId }), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post sing log'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/songs.ts b/apps/web/app/lib/api/songs.ts new file mode 100644 index 0000000..52ae7ba --- /dev/null +++ b/apps/web/app/lib/api/songs.ts @@ -0,0 +1,7 @@ +export async function getRecentSongs() { + const response = await fetch('/api/songs/recent'); + if (!response.ok) { + throw new Error('Failed to fetch recent songs'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/tosings.ts b/apps/web/app/lib/api/tosings.ts new file mode 100644 index 0000000..d96ce18 --- /dev/null +++ b/apps/web/app/lib/api/tosings.ts @@ -0,0 +1,67 @@ +export async function getToSingSongs() { + const response = await fetch(`/api/songs/tosing`); + if (!response.ok) { + throw new Error('Failed to fetch tosing songs'); + } + return response.json(); +} + +export async function patchToSingSongs(body: { songId: string; newWeight: number }) { + const response = await fetch(`/api/songs/tosing`, { + method: 'PATCH', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to patch tosing songs'); + } + return response.json(); +} + +export async function postToSingSongs(body: { songId: string }) { + const response = await fetch(`/api/songs/tosing`, { + method: 'POST', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post tosing songs'); + } + return response.json(); +} + +export async function postToSingSongsArray(body: { songIds: string[] }) { + const response = await fetch(`/api/songs/tosing/array`, { + method: 'POST', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post tosing songs array'); + } + return response.json(); +} + +export async function deleteToSingSongs(body: { songId: string }) { + const response = await fetch(`/api/songs/tosing`, { + method: 'DELETE', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to delete tosing songs'); + } + return response.json(); +} + +export async function deleteToSingSongsArray(body: { songIds: string[] }) { + const response = await fetch(`/api/songs/tosing/arr`, { + method: 'DELETE', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to delete tosing songs array'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/total_stats.ts b/apps/web/app/lib/api/total_stats.ts new file mode 100644 index 0000000..5db68e7 --- /dev/null +++ b/apps/web/app/lib/api/total_stats.ts @@ -0,0 +1,15 @@ +export async function postTotalStats(body: { + songId: string; + countType: string; + isMinus: boolean; +}) { + const response = await fetch(`/api/total_stats`, { + method: 'POST', + body: JSON.stringify(body), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post total stats'); + } + return response.json(); +} diff --git a/apps/web/app/lib/api/user_stats.ts b/apps/web/app/lib/api/user_stats.ts new file mode 100644 index 0000000..acd0032 --- /dev/null +++ b/apps/web/app/lib/api/user_stats.ts @@ -0,0 +1,19 @@ +export async function getUserStats() { + const response = await fetch(`/api/user_stats`); + if (!response.ok) { + throw new Error('Failed to get user stats'); + } + return response.json(); +} + +export async function postUserStats(songId: string) { + const response = await fetch(`/api/user_stats`, { + method: 'POST', + body: JSON.stringify({ songId }), + headers: { 'Content-Type': 'application/json' }, + }); + if (!response.ok) { + throw new Error('Failed to post user stats'); + } + return response.json(); +} diff --git a/apps/web/app/lib/supabase/api.ts b/apps/web/app/lib/supabase/api.ts index 10bd9b0..0d7dd71 100644 --- a/apps/web/app/lib/supabase/api.ts +++ b/apps/web/app/lib/supabase/api.ts @@ -4,28 +4,24 @@ import { type NextApiRequest, type NextApiResponse } from 'next'; // API client export default function createClient(req: NextApiRequest, res: NextApiResponse) { - const supabase = createServerClient( - process.env.NEXT_PUBLIC_SUPABASE_URL!, - process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!, - { - cookies: { - getAll() { - return Object.keys(req.cookies).map(name => ({ - name, - value: req.cookies[name] || '', - })); - }, - setAll(cookiesToSet) { - res.setHeader( - 'Set-Cookie', - cookiesToSet.map(({ name, value, options }) => - serializeCookieHeader(name, value, options), - ), - ); - }, + const supabase = createServerClient(process.env.SUPABASE_URL!, process.env.SUPABASE_ANON_KEY!, { + cookies: { + getAll() { + return Object.keys(req.cookies).map(name => ({ + name, + value: req.cookies[name] || '', + })); + }, + setAll(cookiesToSet) { + res.setHeader( + 'Set-Cookie', + cookiesToSet.map(({ name, value, options }) => + serializeCookieHeader(name, value, options), + ), + ); }, }, - ); + }); return supabase; } diff --git a/apps/web/app/lib/supabase/middleware.ts b/apps/web/app/lib/supabase/middleware.ts index 7b4dee2..d298cdd 100644 --- a/apps/web/app/lib/supabase/middleware.ts +++ b/apps/web/app/lib/supabase/middleware.ts @@ -12,7 +12,7 @@ export async function updateSession(request: NextRequest) { return request.cookies.getAll(); }, setAll(cookiesToSet) { - cookiesToSet.forEach(({ name, value, options }) => request.cookies.set(name, value)); + cookiesToSet.forEach(({ name, value }) => request.cookies.set(name, value)); supabaseResponse = NextResponse.next({ request, }); diff --git a/apps/web/app/library/liked/page.tsx b/apps/web/app/library/liked/page.tsx index 2267c01..0019929 100644 --- a/apps/web/app/library/liked/page.tsx +++ b/apps/web/app/library/liked/page.tsx @@ -6,7 +6,7 @@ import { useRouter } from 'next/navigation'; import { Button } from '@/components/ui/button'; import { ScrollArea } from '@/components/ui/scroll-area'; import { Separator } from '@/components/ui/separator'; -import useAddSongList from '@/hooks/useAddSongList'; +import useSongInfo from '@/hooks/useSongInfo'; import useSongStore from '@/stores/useSongStore'; import SongItem from './SongItem'; @@ -14,7 +14,7 @@ import SongItem from './SongItem'; export default function LikedPage() { const router = useRouter(); const { likedSongs } = useSongStore(); - const { songSelected, handleToggleSelect, deleteLikedSongs } = useAddSongList(); + const { deleteLikeSelected, handleToggleSelect, handleDelete } = useSongInfo(); return (
@@ -27,12 +27,12 @@ export default function LikedPage() {

- {songSelected.length > 0 - ? `${songSelected.length}곡 선택됨` + {deleteLikeSelected.length > 0 + ? `${deleteLikeSelected.length}곡 선택됨` : `총 ${likedSongs.length}곡`}

- {songSelected.length > 0 && ( - )} @@ -45,7 +45,7 @@ export default function LikedPage() { ))} diff --git a/apps/web/app/library/stats/page.tsx b/apps/web/app/library/stats/page.tsx index da9a0e6..6a1ff55 100644 --- a/apps/web/app/library/stats/page.tsx +++ b/apps/web/app/library/stats/page.tsx @@ -3,15 +3,20 @@ import { ArrowLeft } from 'lucide-react'; import { useRouter } from 'next/navigation'; +import RankingList from '@/components/RankingList'; import { Button } from '@/components/ui/button'; -import { Card, CardContent } from '@/components/ui/card'; import { ScrollArea } from '@/components/ui/scroll-area'; +import useUserStat from '@/hooks/useUserStat'; export default function StatsPage() { const router = useRouter(); + const { userStat } = useUserStat(); + + console.log('userStat', userStat); + return ( -
+
- - - -
-

- 노래방 통계 콘텐츠가 여기에 표시됩니다 -

-
- - + +
); diff --git a/apps/web/app/popular/page.tsx b/apps/web/app/popular/page.tsx index 1e63896..6b5e755 100644 --- a/apps/web/app/popular/page.tsx +++ b/apps/web/app/popular/page.tsx @@ -1,67 +1,27 @@ -import RankingList from './RankingList'; +import { Construction } from 'lucide-react'; -// 샘플 데이터 -const WEEKLY_HOT_SONGS = [ - { rank: 1, title: 'Love Lee', artist: 'AKMU', num_tj: '97531', num_ky: '84612' }, - { rank: 2, title: 'Perfect Night', artist: '르세라핌', num_tj: '97485', num_ky: '84599' }, - { rank: 3, title: 'Drama', artist: 'aespa', num_tj: '97462', num_ky: '84587' }, - { rank: 4, title: 'Smoke', artist: '다이나믹 듀오', num_tj: '97421', num_ky: '84563' }, - { rank: 5, title: 'Seven (feat. Latto)', artist: '정국', num_tj: '97380', num_ky: '84542' }, - { rank: 6, title: 'Super Shy', artist: 'NewJeans', num_tj: '97325', num_ky: '84521' }, - { rank: 7, title: '헤어지자 말해요', artist: '박재정', num_tj: '97289', num_ky: '84503' }, - { rank: 8, title: 'ETA', artist: 'NewJeans', num_tj: '97245', num_ky: '84487' }, - { rank: 9, title: 'Hype Boy', artist: 'NewJeans', num_tj: '97201', num_ky: '84462' }, - { rank: 10, title: '사랑은 늘 도망가', artist: '임영웅', num_tj: '97156', num_ky: '84441' }, -]; - -const MONTHLY_HOT_SONGS = [ - { rank: 1, title: '사랑은 늘 도망가', artist: '임영웅', num_tj: '97156', num_ky: '84441' }, - { rank: 2, title: '모든 날, 모든 순간', artist: '폴킴', num_tj: '96842', num_ky: '84321' }, - { rank: 3, title: '다시 만날 수 있을까', artist: '임영웅', num_tj: '96789', num_ky: '84298' }, - { rank: 4, title: "That's Hilarious", artist: 'Charlie Puth', num_tj: '96745', num_ky: '84276' }, - { rank: 5, title: 'LOVE DIVE', artist: 'IVE', num_tj: '96701', num_ky: '84254' }, - { rank: 6, title: '취중고백', artist: '김민석', num_tj: '96654', num_ky: '84231' }, - { - rank: 7, - title: 'That That', - artist: '싸이 (Prod. & Feat. SUGA of BTS)', - num_tj: '96612', - num_ky: '84209', - }, - { rank: 8, title: 'TOMBOY', artist: '(여자)아이들', num_tj: '96578', num_ky: '84187' }, - { rank: 9, title: '사랑인가 봐', artist: '멜로망스', num_tj: '96534', num_ky: '84165' }, - { - rank: 10, - title: 'GANADARA', - artist: '박재범 (Feat. 아이유)', - num_tj: '96498', - num_ky: '84143', - }, -]; - -const TROT_HOT_SONGS = [ - { rank: 1, title: '이제 나만 믿어요', artist: '임영웅', num_tj: '96321', num_ky: '84098' }, - { rank: 2, title: '별빛 같은 나의 사랑아', artist: '임영웅', num_tj: '96287', num_ky: '84076' }, - { rank: 3, title: '보금자리', artist: '임영웅', num_tj: '96254', num_ky: '84054' }, - { rank: 4, title: '사랑은 늘 도망가', artist: '임영웅', num_tj: '97156', num_ky: '84441' }, - { rank: 5, title: '찐이야', artist: '영탁', num_tj: '96187', num_ky: '84032' }, - { rank: 6, title: '다시 만날 수 있을까', artist: '임영웅', num_tj: '96789', num_ky: '84298' }, - { rank: 7, title: '막걸리 한잔', artist: '임영웅', num_tj: '96121', num_ky: '84010' }, - { rank: 8, title: '당신이 좋은 이유', artist: '설운도', num_tj: '96087', num_ky: '83988' }, - { rank: 9, title: '진또배기', artist: '홍진영', num_tj: '96054', num_ky: '83966' }, - { rank: 10, title: '찐이야', artist: '홍진영', num_tj: '96021', num_ky: '83944' }, -]; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; export default function PopularPage() { return ( -
-

인기 노래

+
+ + + 서비스 준비 중 + + 더 나은 서비스를 위해 준비 중입니다 + + -
- - - -
+ + +

+ 곧 새로운 기능으로 찾아뵙겠습니다 +
+ 조금만 기다려주세요 +

+ +
); } diff --git a/apps/web/app/stores/useSongStore.ts b/apps/web/app/stores/useSongStore.ts index 1a3ed4b..8ac6b47 100644 --- a/apps/web/app/stores/useSongStore.ts +++ b/apps/web/app/stores/useSongStore.ts @@ -1,5 +1,8 @@ import { create } from 'zustand'; +import { deleteLikedSongsArray, getLikedSongs } from '@/lib/api/like_activites'; +import { getRecentSongs } from '@/lib/api/songs'; +import { deleteToSingSongs, getToSingSongs, postToSingSongsArray } from '@/lib/api/tosings'; import { AddListModalSong, ToSing } from '@/types/song'; interface SongStore { @@ -11,6 +14,7 @@ interface SongStore { refreshLikedSongs: () => Promise; refreshRecentSongs: () => Promise; postToSingSongs: (songIds: string[]) => Promise; + deleteToSingSong: (songId: string) => Promise; deleteLikedSongs: (songIds: string[]) => Promise; } @@ -24,46 +28,45 @@ const useSongStore = create((set, get) => ({ }, refreshToSings: async () => { - const response = await fetch('/api/songs/tosing'); - const { success, data } = await response.json(); + const { success, data } = await getToSingSongs(); if (success) { set({ toSings: data }); } }, refreshLikedSongs: async () => { - const response = await fetch('/api/songs/like'); - const { success, data } = await response.json(); + const { success, data } = await getLikedSongs(); if (success) { set({ likedSongs: data }); } }, refreshRecentSongs: async () => { - const response = await fetch('/api/songs/recent'); - const { success, data } = await response.json(); + const { success, data } = await getRecentSongs(); if (success) { set({ recentSongs: data }); } }, postToSingSongs: async (songIds: string[]) => { - const response = await fetch('/api/songs/tosing/array', { - method: 'POST', - body: JSON.stringify({ songIds }), - }); - const { success } = await response.json(); + const { success } = await postToSingSongsArray({ songIds }); if (success) { get().refreshToSings(); get().refreshLikedSongs(); get().refreshRecentSongs(); } }, + + deleteToSingSong: async (songId: string) => { + const { success } = await deleteToSingSongs({ songId }); + if (success) { + get().refreshToSings(); + get().refreshLikedSongs(); + get().refreshRecentSongs(); + } + }, + deleteLikedSongs: async (songIds: string[]) => { - const response = await fetch('/api/songs/like/arr', { - method: 'DELETE', - body: JSON.stringify({ songIds }), - }); - const { success } = await response.json(); + const { success } = await deleteLikedSongsArray({ songIds }); if (success) { get().refreshLikedSongs(); } diff --git a/apps/web/app/types/likeLog.ts b/apps/web/app/types/likeLog.ts new file mode 100644 index 0000000..1e2ae30 --- /dev/null +++ b/apps/web/app/types/likeLog.ts @@ -0,0 +1,5 @@ +export interface LikeLog { + song_id: string; + user_id: string; + created_at: string; +} diff --git a/apps/web/app/types/sing_log.ts b/apps/web/app/types/singLog.ts similarity index 100% rename from apps/web/app/types/sing_log.ts rename to apps/web/app/types/singLog.ts diff --git a/apps/web/app/types/userStat.ts b/apps/web/app/types/userStat.ts new file mode 100644 index 0000000..22647cf --- /dev/null +++ b/apps/web/app/types/userStat.ts @@ -0,0 +1,8 @@ +export interface UserSongStat { + userId: string; + songId: string; + singCount: number; + lastSingAt: string; + title: string; + artist: string; +} diff --git a/apps/web/app/update-password/page.tsx b/apps/web/app/update-password/page.tsx index fa29e3c..89b0d7f 100644 --- a/apps/web/app/update-password/page.tsx +++ b/apps/web/app/update-password/page.tsx @@ -60,7 +60,7 @@ export default function UpdatePasswordPage() { useEffect(() => { const supabase = createClient(); - supabase.auth.onAuthStateChange(async (event, session) => { + supabase.auth.onAuthStateChange(async event => { if (event == 'PASSWORD_RECOVERY') { setStep('reset'); // 비밀번호 재설정 단계로 이동 } diff --git a/apps/web/package.json b/apps/web/package.json index fd4ad58..cc83b5f 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -29,6 +29,8 @@ "@supabase/supabase-js": "^2.49.1", "@tanstack/react-query": "^5.68.0", "@tanstack/react-query-devtools": "^5.68.0", + "@vercel/analytics": "^1.5.0", + "@vercel/speed-insights": "^1.2.0", "axios": "^1.5.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", diff --git a/packages/open-api/src/test.ts b/packages/open-api/src/test.ts index 8916e65..1eba272 100644 --- a/packages/open-api/src/test.ts +++ b/packages/open-api/src/test.ts @@ -36,7 +36,7 @@ console.log('get song test'); // console.log('get release test'); -let year = 2010; +let year = 2025; let month = 1; const parseMonth = (month: number) => { @@ -54,9 +54,7 @@ while (year <= 2025) { // console.log('response9', `${year}${parseMonth(month)}`, response9?.length); response9?.forEach((item: any) => { const { title, singer, composer, lyricist } = item; - if (singer === 'ヨルシカ') { - console.log('item', item); - } + console.log('item', item); }); month++; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4a85292..aa91e17 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -181,6 +181,12 @@ importers: '@tanstack/react-query-devtools': specifier: ^5.68.0 version: 5.68.0(@tanstack/react-query@5.68.0(react@19.0.0))(react@19.0.0) + '@vercel/analytics': + specifier: ^1.5.0 + version: 1.5.0(next@15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0) + '@vercel/speed-insights': + specifier: ^1.2.0 + version: 1.2.0(next@15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0) axios: specifier: ^1.5.0 version: 1.8.3 @@ -2779,6 +2785,55 @@ packages: peerDependencies: '@urql/core': ^5.0.0 + '@vercel/analytics@1.5.0': + resolution: {integrity: sha512-MYsBzfPki4gthY5HnYN7jgInhAZ7Ac1cYDoRWFomwGHWEX7odTEzbtg9kf/QSo7XEsEAqlQugA6gJ2WS2DEa3g==} + peerDependencies: + '@remix-run/react': ^2 + '@sveltejs/kit': ^1 || ^2 + next: '>= 13' + react: ^18 || ^19 || ^19.0.0-rc + svelte: '>= 4' + vue: ^3 + vue-router: ^4 + peerDependenciesMeta: + '@remix-run/react': + optional: true + '@sveltejs/kit': + optional: true + next: + optional: true + react: + optional: true + svelte: + optional: true + vue: + optional: true + vue-router: + optional: true + + '@vercel/speed-insights@1.2.0': + resolution: {integrity: sha512-y9GVzrUJ2xmgtQlzFP2KhVRoCglwfRQgjyfY607aU0hh0Un6d0OUyrJkjuAlsV18qR4zfoFPs/BiIj9YDS6Wzw==} + peerDependencies: + '@sveltejs/kit': ^1 || ^2 + next: '>= 13' + react: ^18 || ^19 || ^19.0.0-rc + svelte: '>= 4' + vue: ^3 + vue-router: ^4 + peerDependenciesMeta: + '@sveltejs/kit': + optional: true + next: + optional: true + react: + optional: true + svelte: + optional: true + vue: + optional: true + vue-router: + optional: true + '@webassemblyjs/ast@1.14.1': resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} @@ -10261,6 +10316,16 @@ snapshots: '@urql/core': 5.1.1 wonka: 6.3.5 + '@vercel/analytics@1.5.0(next@15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)': + optionalDependencies: + next: 15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + + '@vercel/speed-insights@1.2.0(next@15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)': + optionalDependencies: + next: 15.2.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + '@webassemblyjs/ast@1.14.1': dependencies: '@webassemblyjs/helper-numbers': 1.13.2