From 7939c804bbb841f608b53db976a4ec1ececda268 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Wed, 15 May 2024 09:59:38 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Chore:=20=EC=86=8D=EC=84=B1=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=83=80=EC=9E=85=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/plate/FilterPlates.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/plate/FilterPlates.tsx b/src/components/plate/FilterPlates.tsx index bbe3cfc..93d7b22 100644 --- a/src/components/plate/FilterPlates.tsx +++ b/src/components/plate/FilterPlates.tsx @@ -61,7 +61,7 @@ const FilterPlates = () => { >
- *속성을 선택해주세요. (중복 선택 가능) + *타입을 선택해주세요. (중복 선택 가능) {renderTypes(koreanTypes)} From 64ec67fd9eef7ca551ba3b090bc6ee274594cf19 Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Wed, 15 May 2024 10:00:05 +0900 Subject: [PATCH 2/5] =?UTF-8?q?Fix=20:=20CD=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 46d9263..2e16615 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -23,7 +23,7 @@ jobs: destination-github-username: BearHumanS destination-repository-name: Team_side_project_pokemon user-email: ${{ secrets.HUN_EMAIL }} - commit-message: ${{ github.event.commits[0].message }} + commit-message: ${{ github.event.head_commit.message }} target-branch: main - name: Pushes to Pokehub uses: cpina/github-action-push-to-another-repository@main @@ -34,7 +34,7 @@ jobs: destination-github-username: cdm1263 destination-repository-name: Pokehub user-email: ${{ secrets.CDM_EMAIL }} - commit-message: ${{ github.event.commits[0].message }} + commit-message: ${{ github.event.head_commit.message }} target-branch: main - name: Pushes to Pokehub uses: cpina/github-action-push-to-another-repository@main @@ -45,7 +45,7 @@ jobs: destination-github-username: DICEPT destination-repository-name: Pokehub user-email: ${{ secrets.DICEPT_EMAIL }} - commit-message: ${{ github.event.commits[0].message }} + commit-message: ${{ github.event.head_commit.message }} target-branch: main - name: Test get variable exported by push-to-another-repository run: echo $DESTINATION_CLONED_DIRECTORY From a7815c277719a92ec37edc26b3120cf47ff1bf3b Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Wed, 15 May 2024 10:00:23 +0900 Subject: [PATCH 3/5] =?UTF-8?q?FIx=20:=20CD=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 2e16615..3dfe432 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -3,7 +3,6 @@ name: git push into another repo to deploy to vercel on: push: branches: [main] - jobs: build: runs-on: ubuntu-latest From 8fde28cbfd6ef163576717d91f31d4f0fbafb73a Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Wed, 15 May 2024 10:04:37 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20:=20=EC=B9=B4=EB=93=9C=EC=A0=9C?= =?UTF-8?q?=EC=9E=91=20path=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/MobileNavMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/header/MobileNavMenu.tsx b/src/components/header/MobileNavMenu.tsx index 2962602..4173acf 100644 --- a/src/components/header/MobileNavMenu.tsx +++ b/src/components/header/MobileNavMenu.tsx @@ -46,7 +46,7 @@ const MobileNavMenu = () => { 도감
- +
카드 제작 From 6bffea8851a4b28149b615d59be36c382644ab2e Mon Sep 17 00:00:00 2001 From: BearHumanS Date: Wed, 15 May 2024 10:21:58 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Fix=20:=20=EC=B9=B4=EB=93=9C=EC=A0=9C?= =?UTF-8?q?=EC=9E=91=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/mypage/MobileMypageAlert.tsx | 2 +- src/components/mypage/Mycard.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/mypage/MobileMypageAlert.tsx b/src/components/mypage/MobileMypageAlert.tsx index 938b0c1..cb26fe4 100644 --- a/src/components/mypage/MobileMypageAlert.tsx +++ b/src/components/mypage/MobileMypageAlert.tsx @@ -5,7 +5,7 @@ const MobileMypageAlert = ({ isOpen }: { isOpen: boolean }) => { const router = useRouter(); const onMovetoMakecard = () => { - router.push('/cardedit'); + router.push('/cardEdit'); }; return ( <> diff --git a/src/components/mypage/Mycard.tsx b/src/components/mypage/Mycard.tsx index 82f2fe6..9d32a84 100644 --- a/src/components/mypage/Mycard.tsx +++ b/src/components/mypage/Mycard.tsx @@ -86,7 +86,7 @@ const Mycard = () => { const onMoveMakeCard = () => { if (windowWidth <= 768) { setIsAlert((prev) => !prev); - } else router.push('/cardedit'); + } else router.push('/cardEdit'); }; const onModalToggle = (card?: Card) => {