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 ( -