Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

오타 수정 (속성 > 타입 정정, cardedit > cardEdit path경로 정정) #125

Merged
merged 7 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: git push into another repo to deploy to vercel
on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -23,7 +22,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
Expand All @@ -34,7 +33,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
Expand All @@ -45,7 +44,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
2 changes: 1 addition & 1 deletion src/components/header/MobileNavMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const MobileNavMenu = () => {
도감
</div>
</Link>
<Link href="/cardedit" className={getClassName('/cardedit')}>
<Link href="/cardEdit" className={getClassName('/cardEdit')}>
<div className={styles.nav__item__mobile}>
<FiPlusSquare size={24} />
카드 제작
Expand Down
2 changes: 1 addition & 1 deletion src/components/mypage/MobileMypageAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const MobileMypageAlert = ({ isOpen }: { isOpen: boolean }) => {
const router = useRouter();

const onMovetoMakecard = () => {
router.push('/cardedit');
router.push('/cardEdit');
};
return (
<>
Expand Down
2 changes: 1 addition & 1 deletion src/components/mypage/Mycard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/plate/FilterPlates.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const FilterPlates = () => {
>
<div className={styles.inner}>
<motion.span className={styles.description}>
*속성을 선택해주세요. (중복 선택 가능)
*타입을 선택해주세요. (중복 선택 가능)
</motion.span>
<motion.div className={styles.type_plates}>
{renderTypes(koreanTypes)}
Expand Down
Loading