diff --git a/.github/workflows/deploy_develop.yml b/.github/workflows/deploy_develop.yml deleted file mode 100644 index 9bdb4d08..00000000 --- a/.github/workflows/deploy_develop.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Trigger Sync - develop - -on: - repository_dispatch: - types: [develop_updated] - -jobs: - trigger-sync-develop: - if: github.repository == 'yulrang/Team-1-Codeit-youl' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Git user - run: | - git config --global user.email "2yulrang@gmail.com" - git config --global user.name "yulrang" - - name: Sync fork - run: | - git remote add upstream https://github.com/CodeitFESI4-Team1/Team-1-Codeit.git - git fetch upstream - git checkout develop - git merge -X theirs upstream/develop --allow-unrelated-histories || echo "Merge conflicts occurred" - git push origin develop diff --git a/.github/workflows/dispatch_develop.yml b/.github/workflows/dispatch_develop.yml deleted file mode 100644 index 5b9a109f..00000000 --- a/.github/workflows/dispatch_develop.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Trigger Fork Repo Action - develop -on: - push: - branches: - - develop -jobs: - trigger-fork-develop: - if: github.repository_owner == 'CodeitFESI4-Team1' - runs-on: ubuntu-latest - steps: - - name: Trigger repository_dispatch - develop - run: | - curl -X POST \ - -H "Authorization: token ${{ secrets.PAT }}" \ - -H "Accept: application/vnd.github.everest-preview+json" \ - "https://api.github.com/repos/yulrang/Team-1-Codeit-youl/dispatches" \ - -d '{"event_type": "develop_updated"}' diff --git a/src/app/(auth)/signup/_component/signup-form.tsx b/src/app/(auth)/signup/_component/signup-form.tsx index 56f537fa..aaee00c3 100644 --- a/src/app/(auth)/signup/_component/signup-form.tsx +++ b/src/app/(auth)/signup/_component/signup-form.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from 'react'; -import { UseFormReturn, useForm } from 'react-hook-form'; +import { UseFormReturn } from 'react-hook-form'; import { Button } from '@mantine/core'; import { useDebouncedCallback } from '@mantine/hooks'; import PasswordInput from '@/src/components/common/input/password-input'; diff --git a/src/app/(crew)/crew/_components/create-crew-form/index.tsx b/src/app/(crew)/crew/_components/create-crew-form/index.tsx index 8ba64351..bbd5f62b 100644 --- a/src/app/(crew)/crew/_components/create-crew-form/index.tsx +++ b/src/app/(crew)/crew/_components/create-crew-form/index.tsx @@ -6,7 +6,7 @@ import { useRouter } from 'next/navigation'; import { NumberInput } from '@mantine/core'; import categoryData from '@/src/data/category.json'; import regionData from '@/src/data/region.json'; -import Button from '@/src/components/common/button'; +import Button from '@/src/components/common/input/button'; import DropDown from '@/src/components/common/input/drop-down'; import FileInputWrap from '@/src/components/common/input/file-input-wrap'; import TextInput from '@/src/components/common/input/text-input'; diff --git a/src/app/(crew)/crew/_components/create-gathering-form/index.tsx b/src/app/(crew)/crew/_components/create-gathering-form/index.tsx index 4321a0bc..ae0bc960 100644 --- a/src/app/(crew)/crew/_components/create-gathering-form/index.tsx +++ b/src/app/(crew)/crew/_components/create-gathering-form/index.tsx @@ -3,7 +3,7 @@ import { useState } from 'react'; import { useForm } from 'react-hook-form'; import { NumberInput } from '@mantine/core'; -import Button from '@/src/components/common/button'; +import Button from '@/src/components/common/input/button'; import DateTimePicker from '@/src/components/common/input/date-time-picker'; import FileInputWrap from '@/src/components/common/input/file-input-wrap'; import TextInput from '@/src/components/common/input/text-input'; diff --git a/src/components/gathering-detail-modal/container.tsx b/src/app/(crew)/crew/_components/gathering-detail-modal/container.tsx similarity index 89% rename from src/components/gathering-detail-modal/container.tsx rename to src/app/(crew)/crew/_components/gathering-detail-modal/container.tsx index e701686b..e67dd8bc 100644 --- a/src/components/gathering-detail-modal/container.tsx +++ b/src/app/(crew)/crew/_components/gathering-detail-modal/container.tsx @@ -1,7 +1,7 @@ 'use client'; -import GatheringDetailModalPresenter from '@/src/components/gathering-detail-modal/presenter'; import { GatheringDetailType } from '@/src/types/gathering-data'; +import GatheringDetailModalPresenter from './presenter'; export interface GatheringDetailModalContainerProps { opened: boolean; diff --git a/src/components/gathering-detail-modal/gathering-detail-modal.stories.tsx b/src/app/(crew)/crew/_components/gathering-detail-modal/gathering-detail-modal.stories.tsx similarity index 100% rename from src/components/gathering-detail-modal/gathering-detail-modal.stories.tsx rename to src/app/(crew)/crew/_components/gathering-detail-modal/gathering-detail-modal.stories.tsx diff --git a/src/components/gathering-detail-modal/presenter.tsx b/src/app/(crew)/crew/_components/gathering-detail-modal/presenter.tsx similarity index 98% rename from src/components/gathering-detail-modal/presenter.tsx rename to src/app/(crew)/crew/_components/gathering-detail-modal/presenter.tsx index 5f5cd7ea..d2643e5e 100644 --- a/src/components/gathering-detail-modal/presenter.tsx +++ b/src/app/(crew)/crew/_components/gathering-detail-modal/presenter.tsx @@ -2,7 +2,7 @@ import Image from 'next/image'; import { Modal, ScrollArea } from '@mantine/core'; import { formatDate } from '@/src/utils/format-date'; import isToday from '@/src/utils/is-today'; -import Button from '@/src/components/common/button'; +import Button from '@/src/components/common/input/button'; import { Profile } from '@/src/components/common/profile'; import { GatheringDetailType } from '@/src/types/gathering-data'; import IcoClock from '@/public/assets/icons/ic-clock.svg'; diff --git a/src/app/(crew)/crew/create/page.tsx b/src/app/(crew)/crew/create/page.tsx index d35dda0d..e2ae9ddc 100644 --- a/src/app/(crew)/crew/create/page.tsx +++ b/src/app/(crew)/crew/create/page.tsx @@ -21,7 +21,7 @@ export default function CreateCrewPage() { }; return ( -
+
+
API 연결 - const initialValue: CreateCrewRequestTypes = { - title: '', - mainCategory: '', - subCategory: '', - imageUrl: null, - mainLocation: '', - subLocation: '', - totalCount: 0, - }; - - const handleEdit = () => { - // TODO : PATCH API 연결 - }; - - return ( -
-
-
-
- -
-

크루 수정하기

-
- -
-
- ); -} diff --git a/src/app/(crew)/layout.tsx b/src/app/(crew)/layout.tsx index 345f236f..372ffe84 100644 --- a/src/app/(crew)/layout.tsx +++ b/src/app/(crew)/layout.tsx @@ -11,7 +11,9 @@ export default function RootLayout({ <>
-
{children}
+
+ {children} +
); diff --git a/src/app/(crew)/my-crew/.gitkeep b/src/app/(crew)/my-crew/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/(crew)/my-crew/page.tsx b/src/app/(crew)/my-crew/page.tsx new file mode 100644 index 00000000..3c065137 --- /dev/null +++ b/src/app/(crew)/my-crew/page.tsx @@ -0,0 +1,48 @@ +'use client'; + +import { useState } from 'react'; +import { useInfiniteScroll } from '@/src/hooks/useInfiniteScroll'; +import { fetchCrewData } from '@/src/app/api/mock-api/crew'; +import CrewCardList from '@/src/components/common/crew-list/crew-card-list'; +import Tabs from '@/src/components/common/tab'; +import { CrewCardInformResponse } from '@/src/types/crew-card'; + +export default function MyCrePage() { + const myPageTabs = [ + { label: '내가 참여한 크루', id: 'joined-crew' }, + { label: '내가 만든 크루', id: 'made-crew' }, + ]; + const [currentTab, setCurrentTab] = useState(myPageTabs[0].id); + + // TODO: fetchCrewData 함수를 사용하여 데이터를 불러오기 : 파라미터 수정 필요 + const { data, ref, isFetchingNextPage } = useInfiniteScroll({ + queryKey: ['crew'], + queryFn: ({ pageParam = 0 }) => { + return fetchCrewData(pageParam, 3); + }, + getNextPageParam: (lastPage, allPages) => + lastPage.hasNextPage ? allPages.length + 1 : undefined, + }); + return ( +
+
+ { + setCurrentTab(id); + }} + /> +
+
+ +
+
+ ); +} diff --git a/src/components/my-page/profile-card/container.tsx b/src/app/(crew)/mypage/_components/profile-card/container.tsx similarity index 100% rename from src/components/my-page/profile-card/container.tsx rename to src/app/(crew)/mypage/_components/profile-card/container.tsx diff --git a/src/components/my-page/profile-card/presenter.tsx b/src/app/(crew)/mypage/_components/profile-card/presenter.tsx similarity index 100% rename from src/components/my-page/profile-card/presenter.tsx rename to src/app/(crew)/mypage/_components/profile-card/presenter.tsx diff --git a/src/app/(crew)/mypage/page.tsx b/src/app/(crew)/mypage/page.tsx index 3d922dae..f1632c24 100644 --- a/src/app/(crew)/mypage/page.tsx +++ b/src/app/(crew)/mypage/page.tsx @@ -3,9 +3,9 @@ import { useState } from 'react'; import { Divider } from '@mantine/core'; import { useInfiniteScroll } from '@/src/hooks/useInfiniteScroll'; +import ProfileCardContainer from '@/src/app/(crew)/mypage/_components/profile-card/container'; import ReviewCardList from '@/src/components/common/review-list/review-card-list'; import Tabs from '@/src/components/common/tab'; -import ProfileCardContainer from '@/src/components/my-page/profile-card/container'; import { ReviewInformResponse } from '@/src/types/review'; import { fetchMyReviewData } from '../../api/mock-api/review'; diff --git a/src/app/(crew)/page.tsx b/src/app/(crew)/page.tsx index 78e078d0..31d5f055 100644 --- a/src/app/(crew)/page.tsx +++ b/src/app/(crew)/page.tsx @@ -5,21 +5,15 @@ import Image from 'next/image'; import { Divider } from '@mantine/core'; import regionData from '@/src/data/region.json'; import { useInfiniteScroll } from '@/src/hooks/useInfiniteScroll'; +import CategoryContainer from '@/src/app/_components/category/category-container'; +import HeroCrew from '@/src/app/_components/hero/hero-crew'; import { fetchCrewData } from '@/src/app/api/mock-api/crew'; -import CategoryContainer from '@/src/components/common/category/category-container'; import CrewCardList from '@/src/components/common/crew-list/crew-card-list'; -import HeroCrew from '@/src/components/common/hero/hero-crew'; import DropDown from '@/src/components/common/input/drop-down'; import TextInput from '@/src/components/common/input/text-input'; import { CrewCardInformResponse } from '@/src/types/crew-card'; import IcoSearch from '@/public/assets/icons/ic-search.svg'; -export interface ValuesType { - region: string; - date: Date; - sort: string; -} - export default function Home() { const [mainCategory, setMainCategory] = useState('cardio_strength'); const [subCategory, setSubCategory] = useState('running'); @@ -37,7 +31,7 @@ export default function Home() { }); return ( - <> +
- +
); } diff --git a/src/components/common/category/category-container/index.tsx b/src/app/_components/category/category-container/index.tsx similarity index 88% rename from src/components/common/category/category-container/index.tsx rename to src/app/_components/category/category-container/index.tsx index 1ce8d1d2..5c31d3f9 100644 --- a/src/components/common/category/category-container/index.tsx +++ b/src/app/_components/category/category-container/index.tsx @@ -2,8 +2,8 @@ import { useEffect, useState } from 'react'; import category from '@/src/data/category.json'; -import InternalCategory from '@/src/components/common/category/internal-category'; -import MainCategory from '@/src/components/common/category/main-category'; +import InternalCategory from '@/src/app/_components/category/internal-category'; +import MainCategory from '@/src/app/_components/category/main-category'; export interface CategoryContainerProps { mainCategory: string; diff --git a/src/components/common/category/internal-category/index.tsx b/src/app/_components/category/internal-category/index.tsx similarity index 96% rename from src/components/common/category/internal-category/index.tsx rename to src/app/_components/category/internal-category/index.tsx index 39c652af..501f8fbf 100644 --- a/src/components/common/category/internal-category/index.tsx +++ b/src/app/_components/category/internal-category/index.tsx @@ -2,7 +2,7 @@ import { usePathname } from 'next/navigation'; import { useSlider } from '@/src/hooks/useSlider'; -import Button from '@/src/components/common/button'; +import Button from '@/src/components/common/input/button'; import { CategoryItem } from '@/src/types/category'; export interface InternalCategoryProps { diff --git a/src/components/common/category/internal-category/internal-category.stories.tsx b/src/app/_components/category/internal-category/internal-category.stories.tsx similarity index 100% rename from src/components/common/category/internal-category/internal-category.stories.tsx rename to src/app/_components/category/internal-category/internal-category.stories.tsx diff --git a/src/components/common/category/main-category/index.tsx b/src/app/_components/category/main-category/index.tsx similarity index 97% rename from src/components/common/category/main-category/index.tsx rename to src/app/_components/category/main-category/index.tsx index 86c4ce0e..50063dad 100644 --- a/src/components/common/category/main-category/index.tsx +++ b/src/app/_components/category/main-category/index.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { usePathname } from 'next/navigation'; -import Button from '@/src/components/common/button'; +import Button from '@/src/components/common/input/button'; import { MainCategoryItem } from '@/src/types/category'; export interface MainCategoryProps { diff --git a/src/components/common/hero/hero-crew.tsx b/src/app/_components/hero/hero-crew.tsx similarity index 100% rename from src/components/common/hero/hero-crew.tsx rename to src/app/_components/hero/hero-crew.tsx diff --git a/src/components/common/crew-list/crew-card.tsx b/src/components/common/crew-list/crew-card.tsx index 1d9f1b7f..f561a0f2 100644 --- a/src/components/common/crew-list/crew-card.tsx +++ b/src/components/common/crew-list/crew-card.tsx @@ -7,6 +7,7 @@ import ProgressBar from '@/src/components/common/progress-bar/index'; import { CrewMemberList } from '@/src/types/crew-card'; import Check from '@/public/assets/icons/ic-check.svg'; import UserIco from '@/public/assets/icons/ic-user.svg'; +import Profiles from './profiles'; interface CrewCardProps { id: number; @@ -18,8 +19,8 @@ interface CrewCardProps { isConfirmed: boolean; thumbnail: string; gatheringCount: number; - inWhere?: 'my-crew'; crewMember?: CrewMemberList[]; + inWhere?: 'my-crew'; } export default function CrewCard({ @@ -57,7 +58,7 @@ export default function CrewCard({ className="relative mx-auto flex h-[430px] w-full animate-fade cursor-pointer flex-col overflow-hidden rounded-[14px] bg-white shadow-bg md:h-[203px] md:flex-row" > {/* 썸네일 */} -
+
{name}
@@ -83,6 +84,11 @@ export default function CrewCard({ {participantCount}/{capacity} + {inWhere === 'my-crew' && ( + + + + )}
{isConfirmed && ( diff --git a/src/components/common/crew-list/profiles.tsx b/src/components/common/crew-list/profiles.tsx index c697cbbe..4d5ac54a 100644 --- a/src/components/common/crew-list/profiles.tsx +++ b/src/components/common/crew-list/profiles.tsx @@ -7,7 +7,7 @@ interface ProfilesProps { } export default function Profiles({ size = 'small', profiles }: ProfilesProps) { - const shows = 4; + const shows = 4; // 최대 표시할 프로필 수를 고정값으로 설정 const visibleProfiles = profiles.slice(0, shows); const extraCount = profiles.length - shows; diff --git a/src/components/common/gathering-card/container.tsx b/src/components/common/gathering-card/container.tsx index 5141d288..95c5eac1 100644 --- a/src/components/common/gathering-card/container.tsx +++ b/src/components/common/gathering-card/container.tsx @@ -2,8 +2,8 @@ import { useState } from 'react'; import { useDisclosure } from '@mantine/hooks'; +import GatheringDetailModalContainer from '@/src/app/(crew)/crew/_components/gathering-detail-modal/container'; import { GatheringDetailType } from '@/src/types/gathering-data'; -import GatheringDetailModalContainer from '../../gathering-detail-modal/container'; import GatheringCardPresenter from './presenter'; interface GatheringCardContainerProps { diff --git a/src/components/common/gathering-card/presenter.tsx b/src/components/common/gathering-card/presenter.tsx index 629af398..1fab527e 100644 --- a/src/components/common/gathering-card/presenter.tsx +++ b/src/components/common/gathering-card/presenter.tsx @@ -3,8 +3,8 @@ import Image from 'next/image'; import { Badge } from '@mantine/core'; import { cn } from '@/src/hooks/cn'; import { formatDate } from '@/src/utils/format-date'; -import Button from '@/src/components/common/button'; -import LikeBtn from '@/src/components/common/button/like-btn'; +import Button from '@/src/components/common/input/button'; +import LikeBtn from '@/src/components/common/input/button/like-btn'; import IcoPerson from '@/public/assets/icons/person.svg'; import IcoTimer from '@/public/assets/icons/timer.svg'; diff --git a/src/components/common/gathering-card/scheduled-gathering-card/presenter.tsx b/src/components/common/gathering-card/scheduled-gathering-card/presenter.tsx index 4169d8ea..5e20cbb3 100644 --- a/src/components/common/gathering-card/scheduled-gathering-card/presenter.tsx +++ b/src/components/common/gathering-card/scheduled-gathering-card/presenter.tsx @@ -1,7 +1,7 @@ import Image from 'next/image'; import { Badge } from '@mantine/core'; import { formatDate } from '@/src/utils/format-date'; -import LikeBtn from '@/src/components/common/button/like-btn'; +import LikeBtn from '@/src/components/common/input/button/like-btn'; import IcoPerson from '@/public/assets/icons/person.svg'; interface ScheduledGatheringCardPresenterProps { diff --git a/src/components/common/header/container.tsx b/src/components/common/header/container.tsx index ac7f2fa8..501919a0 100644 --- a/src/components/common/header/container.tsx +++ b/src/components/common/header/container.tsx @@ -1,6 +1,5 @@ 'use client'; -import { useState } from 'react'; import { useRouter } from 'next/navigation'; import { useAuthStore } from '@/src/store/use-auth-store'; import HeaderPresenter from '@/src/components/common/header/presenter'; diff --git a/src/components/common/button/button.stories.tsx b/src/components/common/input/button/button.stories.tsx similarity index 100% rename from src/components/common/button/button.stories.tsx rename to src/components/common/input/button/button.stories.tsx diff --git a/src/components/common/button/floating-btn.stories.tsx b/src/components/common/input/button/floating-btn.stories.tsx similarity index 100% rename from src/components/common/button/floating-btn.stories.tsx rename to src/components/common/input/button/floating-btn.stories.tsx diff --git a/src/components/common/button/floating-btn.tsx b/src/components/common/input/button/floating-btn.tsx similarity index 100% rename from src/components/common/button/floating-btn.tsx rename to src/components/common/input/button/floating-btn.tsx diff --git a/src/components/common/button/index.tsx b/src/components/common/input/button/index.tsx similarity index 100% rename from src/components/common/button/index.tsx rename to src/components/common/input/button/index.tsx diff --git a/src/components/common/button/like-btn.stories.tsx b/src/components/common/input/button/like-btn.stories.tsx similarity index 100% rename from src/components/common/button/like-btn.stories.tsx rename to src/components/common/input/button/like-btn.stories.tsx diff --git a/src/components/common/button/like-btn.tsx b/src/components/common/input/button/like-btn.tsx similarity index 100% rename from src/components/common/button/like-btn.tsx rename to src/components/common/input/button/like-btn.tsx diff --git a/src/components/common/modal/confirm-cancel-modal.tsx b/src/components/common/modal/confirm-cancel-modal.tsx index 825dafd9..a6f8a274 100644 --- a/src/components/common/modal/confirm-cancel-modal.tsx +++ b/src/components/common/modal/confirm-cancel-modal.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import { Modal } from '@mantine/core'; -import Button from '@/src/components/common/button/index'; +import Button from '@/src/components/common/input/button/index'; interface ConfirmCancelModalProps { children: ReactNode; diff --git a/src/components/common/modal/confirm-modal.tsx b/src/components/common/modal/confirm-modal.tsx index 5dbc5372..f5a4ace6 100644 --- a/src/components/common/modal/confirm-modal.tsx +++ b/src/components/common/modal/confirm-modal.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import { Modal } from '@mantine/core'; -import Button from '@/src/components/common/button/index'; +import Button from '@/src/components/common/input/button/index'; interface ConfirmModalProps { children: ReactNode; diff --git a/src/components/common/profile/index.tsx b/src/components/common/profile/index.tsx index 7ff64c73..df1a6e69 100644 --- a/src/components/common/profile/index.tsx +++ b/src/components/common/profile/index.tsx @@ -47,9 +47,7 @@ export function Profile({ className={`relative ${sizeClasses[finalSize]} overflow-hidden rounded-full`} onClick={onClick} > -
+
프로필 이미지 ({ id: participant.id, nickname: participant.nickname, - imageUrl: participant.imageUrl, + profileImageUrl: participant.imageUrl, })); return ( diff --git a/src/components/gathering-list/gathering-list.tsx b/src/components/gathering-list/gathering-list.tsx index b07df59d..de3daefe 100644 --- a/src/components/gathering-list/gathering-list.tsx +++ b/src/components/gathering-list/gathering-list.tsx @@ -3,8 +3,8 @@ import { useState } from 'react'; import { Pagination } from '@mantine/core'; import { useMediaQuery } from '@mantine/hooks'; +import GatheringCard from '@/src/components/common/gathering-card/container'; import { GatheringType } from '@/src/types/gathering-data'; -import GatheringCard from '../common/gathering-card/container'; /* eslint-disable react/no-array-index-key */ diff --git a/src/mock/gathering-data.ts b/src/mock/gathering-data.ts index dc4bdcda..fd3aae52 100644 --- a/src/mock/gathering-data.ts +++ b/src/mock/gathering-data.ts @@ -14,27 +14,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -52,12 +57,14 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, ], }, @@ -87,27 +94,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -136,27 +148,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -174,7 +191,8 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, ], }, @@ -192,12 +210,14 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, ], }, @@ -215,27 +235,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -264,27 +289,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -324,27 +354,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -362,27 +397,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, @@ -400,27 +440,32 @@ export const gatheringData = { { id: 1, nickname: 'User1', - imageUrl: 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/25/bb/e225bb492dc7a20a549f3c0abec28eb8.jpg', }, { id: 2, nickname: 'User2', - imageUrl: 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/9d/b8/86/9db886bb5475cc35a7f450831f4125bc.jpg', }, { id: 3, nickname: 'User3', - imageUrl: 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/41/56/d8/4156d8253b6d76e5455d28b44bd1a1e0.jpg', }, { id: 4, nickname: 'User4', - imageUrl: 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/e2/e6/47/e2e64732424094c4e9e2643aaaf4389e.jpg', }, { id: 5, nickname: 'User5', - imageUrl: 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', + profileImageUrl: + 'https://i.pinimg.com/564x/17/06/45/170645a5f7b8a76f04c15b226b22cf90.jpg', }, ], }, diff --git a/src/mock/writable-gathering-data.ts b/src/mock/writable-gathering-data.ts index 6cb15272..44b70ba9 100644 --- a/src/mock/writable-gathering-data.ts +++ b/src/mock/writable-gathering-data.ts @@ -1,4 +1,4 @@ -import { ParticipantType, WritableGatheringCardInform } from '../types/writable-gathering-card'; +import { ParticipantType, WritableGatheringCardInform } from '@/src/types/writable-gathering-card'; export const Participants: ParticipantType[] = [ { diff --git a/src/types/gathering-data.d.ts b/src/types/gathering-data.d.ts index a093de6a..8589da2e 100644 --- a/src/types/gathering-data.d.ts +++ b/src/types/gathering-data.d.ts @@ -17,7 +17,7 @@ export interface GatheringDetailType extends GatheringType { participants: UserType[]; } export interface GatheringData { - data: Gathering[]; + data: GatheringDetailType[]; pagination: { totalCount: number; page: number;