From 465c76c6912acb825dd95afed71c1e33b15eebc8 Mon Sep 17 00:00:00 2001 From: hyobin Date: Thu, 24 Aug 2023 15:03:58 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[Fix]=20[GGFE-193]=20=EC=83=81=EC=A0=90?= =?UTF-8?q?=20=EB=A7=A4=EB=89=B4=EC=96=BC=20=EB=82=B4=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/modal/store/StoreManualModal.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/components/modal/store/StoreManualModal.tsx b/components/modal/store/StoreManualModal.tsx index 64bcb3103..e7fe0e13d 100644 --- a/components/modal/store/StoreManualModal.tsx +++ b/components/modal/store/StoreManualModal.tsx @@ -44,7 +44,7 @@ const modalContents: contentsType = { tag: '', content: [ '상점 페이지 구매 탭에서 판매 중인 아이템을 살펴보세요', - '보유한 코인을 한도로 원하는 아이템 구매가 가능합니다', + '보유한 코인으로 원하는 아이템 구매가 가능합니다', ], }, ], @@ -60,7 +60,7 @@ const modalContents: contentsType = { { tag: '', content: [ - '상점 페이지에 보유 코인을 눌러보세요', + '상점 페이지에서 코인을 눌러보세요', '코인 획득 및 사용 내역을 확인할 수 있습니다', ], }, @@ -74,7 +74,7 @@ const modalContents: contentsType = { { tag: '', content: [ - '상점 페이지 구매 탭에서 원하는 아이템의 구매하기 버튼 누르기', + '구매 탭에서 원하는 아이템의 구매하기 버튼 누르기', '아이템과 가격, 주의사항을 확인하고 확인 버튼을 누르면 구매 완료!', ], }, @@ -88,7 +88,7 @@ const modalContents: contentsType = { { tag: '', content: [ - '상점 페이지 구매 탭에서 원하는 아이템의 선물하기 버튼 누르기', + '구매 탭에서 원하는 아이템의 선물하기 버튼 누르기', '선물하고 싶은 유저 선택', '아이템과 가격, 선물 받을 유저의 아이디, 주의사항을 확인하고 보내기 버튼을 누르면 선물 완료!', ], @@ -106,9 +106,8 @@ const modalContents: contentsType = { { tag: '', content: [ - '메인 페이지에 선물 도착 알림을 받으면 상점 페이지 보관함 탭으로 이동', - '선물 받은 아이템엔 선물 상자가 표시됨', - '선물 상자를 누르면 선물을 보낸 유저 확인 가능', + '알림 탭에서 선물 도착 알림을 받으면 상점 페이지 보관함 탭으로 이동', + '새롭게 추가된 아이템의 선물 상자 표시를 꾹 누르면 선물을 보낸 유저 확인 가능', ], }, ], From 4d1183ab7db567dc1e2786375baf6dd6464710db Mon Sep 17 00:00:00 2001 From: hyobin Date: Thu, 24 Aug 2023 15:55:03 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[Feat]=20[GGFE-193]=20=EC=BD=94=EC=9D=B8?= =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/modal/store/UserCoinHistoryModal.tsx | 11 ++--------- components/mode/modeWraps/StoreModeWrap.tsx | 4 ++-- components/store/CoinImage.tsx | 17 +++++++++++++++++ styles/store/CoinImage.module.scss | 9 +++++++++ 4 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 components/store/CoinImage.tsx create mode 100644 styles/store/CoinImage.module.scss diff --git a/components/modal/store/UserCoinHistoryModal.tsx b/components/modal/store/UserCoinHistoryModal.tsx index 6da329657..6f8e16b70 100644 --- a/components/modal/store/UserCoinHistoryModal.tsx +++ b/components/modal/store/UserCoinHistoryModal.tsx @@ -11,6 +11,7 @@ import { } from 'components/modal/ModalButton'; import CoinHistoryContainer from 'components/modal/store/CoinHistoryContainer'; import PageNation from 'components/Pagination'; +import CoinImage from 'components/store/CoinImage'; import styles from 'styles/modal/store/UserCoinHistoryModal.module.scss'; export default function UserCoinHistoryModal({ coin }: ICoin) { @@ -54,15 +55,7 @@ export default function UserCoinHistoryModal({ coin }: ICoin) {
GG코인 내역
현재 코인
-
- {'coin'} - {coin}   -
+
diff --git a/components/mode/modeWraps/StoreModeWrap.tsx b/components/mode/modeWraps/StoreModeWrap.tsx index 366852485..c5347dc87 100644 --- a/components/mode/modeWraps/StoreModeWrap.tsx +++ b/components/mode/modeWraps/StoreModeWrap.tsx @@ -6,6 +6,7 @@ import { StoreMode } from 'types/storeTypes'; import { ICoin } from 'types/userTypes'; import { modalState } from 'utils/recoil/modal'; import StoreModeRadioBox from 'components/mode/modeItems/StoreModeRadioBox'; +import CoinImage from 'components/store/CoinImage'; import styles from 'styles/mode/StoreModeWrap.module.scss'; type StoreModeWrapProps = { @@ -44,8 +45,7 @@ export function StoreModeWrap({ 매뉴얼
- coin - {coin.coin.toLocaleString()} +
+ coin + {amount.toLocaleString()} + + ); +} diff --git a/styles/store/CoinImage.module.scss b/styles/store/CoinImage.module.scss new file mode 100644 index 000000000..c84539567 --- /dev/null +++ b/styles/store/CoinImage.module.scss @@ -0,0 +1,9 @@ +@import 'styles/common.scss'; + +.ggCoin { + color: $coin-yellow; + img { + margin-right: 0.2rem; + transform: translateY(0.2rem); + } +} From 122cdcc26c892ef9b95a2c922ee2d54311c32c60 Mon Sep 17 00:00:00 2001 From: hyobin Date: Fri, 25 Aug 2023 10:43:00 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[Style]=20[GGFE-193]=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=ED=85=9C=EC=B9=B4=EB=93=9C=20CSS=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/store/purchase/ItemCard.tsx | 63 +++---- pages/api/pingpong/items/store.ts | 15 +- .../store/UserCoinHistoryModal.module.scss | 3 - styles/store/ItemCard.module.scss | 174 ++++++++---------- types/itemTypes.ts | 3 +- 5 files changed, 118 insertions(+), 140 deletions(-) diff --git a/components/store/purchase/ItemCard.tsx b/components/store/purchase/ItemCard.tsx index c773ee573..48446ea65 100644 --- a/components/store/purchase/ItemCard.tsx +++ b/components/store/purchase/ItemCard.tsx @@ -38,49 +38,42 @@ export default function ItemCard({ item, coin }: { item: Item; coin: number }) { return (
+ {item.discount !== 0 && ( +
{item.discount}%
+ )} +
{item.imageUri && ( - {item.itemName} + {item.itemName} )}
- {item.discount &&
{item.discount}%
}
-
-
-

{item.itemName}

-
-
- {item.discount ? ( -
{item.originalPrice}
- ) : ( -
- {'coin'} - {item.originalPrice} -
- )} - {item.discount !== 0 && ( -
- {'coin'} - {item.salePrice} -
- )} -
-
-
-

{item.content}

+
{item.itemName}
+
+ {'coin'} + 0 ? styles.onDiscount : styles.salePrice} + > + {item.originalPrice} + + {item.discount > 0 && ( + {item.salePrice} + )}
+
{item.mainContent}
+
{item.subContent}
- -
+
{item.itemName}
+
+ {'coin'} + 0 ? styles.onDiscount : styles.salePrice} + > + {item.originalPrice} + + {item.discount > 0 && ( + {item.salePrice} + )} +
+
{item.mainContent}
+
{item.subContent}
+
+ +
); diff --git a/pages/api/pingpong/items/store.ts b/pages/api/pingpong/items/store.ts index 8ed1fda8b..b632658a8 100644 --- a/pages/api/pingpong/items/store.ts +++ b/pages/api/pingpong/items/store.ts @@ -4,9 +4,9 @@ import type { NextApiRequest, NextApiResponse } from 'next'; const itemList: Item[] = [ { itemId: 1, - itemName: '프로필 사진 변경권', + itemName: '이미지 변경권', mainContent: '프사 바꿔', - subContent: '42gg 프로필 사진을 변경할 수 있는 아이템', + subContent: '프로필 이미지를 원하는 이미지로 변경할 수 있는 아이템입니다.', itemType: 'PROFILE_IMAGE', imageUri: '/image/fallBackSrc.jpeg', originalPrice: 100, @@ -16,8 +16,9 @@ const itemList: Item[] = [ { itemId: 2, itemName: '확성기', - mainContent: '확성기다', - subContent: '확성기 설명', + mainContent: '오늘 하루 42GG는 내가 접수한다📢😎', + subContent: + '24시간 동안 모든 페이지 상단에 메시지를 띄울 수 있는 아이템입니다. 사용 다음날 적용됩니다.', itemType: 'MEGAPHONE', imageUri: '/image/fallBackSrc.jpeg', originalPrice: 20, @@ -26,9 +27,10 @@ const itemList: Item[] = [ }, { itemId: 3, - itemName: '프로필 배경색', - mainContent: '배경 바꿔', - subContent: '프로필 배경색 설명', + itemName: '배경 뽑기', + mainContent: '난 “Background”부터가 달라', + subContent: + '랜덤으로 내 프로필 페이지의 배경을 변경할 수 있는 아이템입니다.', itemType: 'PROFILE_BACKGROUND', imageUri: '/image/fallBackSrc.jpeg', originalPrice: 300, @@ -37,9 +39,9 @@ const itemList: Item[] = [ }, { itemId: 4, - itemName: '프로필 이미지띠', - mainContent: '엣지', - subContent: '프로필 이미지띠 설명', + itemName: 'Edge 뽑기', + mainContent: '난 “Edge”로 말해..', + subContent: '랜덤으로 프로필 테두리 색상을 변경할 수 있는 아이템입니다.', itemType: 'PROFILE_BAND', imageUri: '/image/fallBackSrc.jpeg', originalPrice: 50, @@ -48,9 +50,10 @@ const itemList: Item[] = [ }, { itemId: 5, - itemName: '이름 색 변경', - mainContent: '이름색 바꿔', - subContent: '설명', + itemName: 'ID 색깔 변경권', + mainContent: '남들과는 다르게! ID 색깔을 바꿔보세요!', + subContent: + '색상코드를 직접 입력하여 랭킹 페이지의 ID 색상을 바꿀 수 있는 아이템입니다.', itemType: 'TEXT_COLOR', imageUri: '/image/fallBackSrc.jpeg', originalPrice: 200, diff --git a/styles/store/ItemCard.module.scss b/styles/store/ItemCard.module.scss index b095a2038..af6de2977 100644 --- a/styles/store/ItemCard.module.scss +++ b/styles/store/ItemCard.module.scss @@ -1,96 +1,109 @@ @import 'styles/common.scss'; .itemCard { - position: relative; display: grid; - grid-template-areas: - 'image haeder ribbon' - 'image . .' - 'image price price' - 'image mainContent mainContent' - 'image subContent subContent' - 'image footer footer'; - gap: 0.5rem; width: 100%; - height: 10rem; + height: 12.5rem; + padding: 0.2rem 0 0.2rem 0.2rem; margin-bottom: 0.7rem; - overflow: hidden; font-family: 'NanumSquare_acR', sans-serif; background: #ffffff5f; border-radius: 0.3rem; + grid-template-columns: 1fr 3fr; + grid-template-rows: repeat(6, auto); + grid-template-areas: + 'image header header ribbon' + 'image price price price' + 'image mainContent mainContent mainContent' + 'image subContent subContent subContent' + 'image subContent subContent subContent' + 'image footer footer footer'; + column-gap: 0.5rem; - .badge { - grid-area: ribbon; - // position: absolute; - top: 6%; - right: 0; - width: 3rem; - height: 1.5rem; - color: #fff; - text-align: center; - background-color: #c03434; - border-radius: 1.25rem 0 0 1.25rem; - } .preview { grid-area: image; + position: relative; + width: 10rem; + height: 10rem; + margin: 0.8rem 0; .img { - // position: relative; - width: 100%; - height: 100%; - overflow: hidden; + object-fit: cover; } } .title { - font-size: 1.1rem; + margin-top: 1rem; + font-size: 0.9rem; font-weight: bold; color: black; grid-area: header; } - .priceTag { - font-size: 1rem; - color: $coin-yellow; grid-area: price; + font-size: 0.8rem; + color: $coin-yellow; @include ggCoin; .salePrice { font-weight: bold; } .onDiscount { margin-right: 0.2rem; - text-decoration: line-through 0.1rem solid #ff4040; + text-decoration: line-through 0.1rem solid #c03434; } } - .mainContent { - grid-area: mainContent; + padding-right: 0.3rem; + font-size: 0.85rem; + font-style: italic; color: #282828; + grid-area: mainContent; } .subContent { - font-size: 0.8rem; + padding-right: 0.5rem; + overflow: scroll; + font-size: 0.7rem; color: #343434; grid-area: subContent; } - .gift { - grid-area: footer; - width: 4.5rem; - height: 1.5rem; - color: white; - background: linear-gradient( - 180deg, - #ea80ea 0%, - rgba(211, 36, 182, 0.72) 100% - ); - border-style: none; - border-radius: 0.3rem; - } - .buy { + .buttons { grid-area: footer; - width: 4.5rem; - height: 1.5rem; - color: white; - background: $btn-purple; - border-style: none; - border-radius: 0.3rem; + display: flex; + justify-content: space-evenly; + .gift { + width: auto; + min-width: 4rem; + height: 1.5rem; + font-family: 'NanumSquare_acR', sans-serif; + color: white; + background: linear-gradient( + 180deg, + #ea80ea 0%, + rgba(211, 36, 182, 0.72) 100% + ); + border-style: none; + border-radius: 0.3rem; + } + .buy { + width: auto; + min-width: 4rem; + height: 1.5rem; + font-family: 'NanumSquare_acR', sans-serif; + color: white; + background: $btn-purple; + border-style: none; + border-radius: 0.3rem; + } } } + +.badge { + width: 3rem; + height: 1.5rem; + padding-top: 0.25rem; + margin-top: 0.5rem; + color: #fff; + text-align: center; + background-color: #c03434; + border-radius: 1.25rem 0 0 1.25rem; + grid-area: ribbon; +} From 9a5302f8ff31860695ca90ad1cc8f569c465d6b5 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Mon, 28 Aug 2023 16:22:16 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[Chore]=20[GGFE-208]=20Fork-sync=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-deploy.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/test-deploy.yml diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml new file mode 100644 index 000000000..6107a6fd2 --- /dev/null +++ b/.github/workflows/test-deploy.yml @@ -0,0 +1,27 @@ +name: Test Deploy to Vercel + +# 실행에 앞서 vercel과 연동되어 있는 fork된 repository가 필요합니다. + +# 실행에 필요한 secret을 설정해야 합니다. +# - TEST_DEPLOY_REPO_OWNER : fork-sync로 동기화할 repo의 owner + +# Parameters +# - owner : fork-sync로 동기화할 repo의 owner +# - base, head : 동기화할 브랜치 (from head to base) + +on: + push: + branches: + # - test-deploy + - GGFE-208-test-deploy-브랜치-설정 + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Fork-sync + uses: tgymnich/fork-sync@v1.9 + with: + owner: ${{ secrets.TEST_DEPLOY_REPO_OWNER }} + base: GGFE-208-test-deploy-브랜치-설정 + head: test-test-deploy From 8f628dc4da255c0642f089f35d12cf490d4438c5 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Mon, 28 Aug 2023 16:31:07 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[Chore]=20[GGFE-208]=20token=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 6107a6fd2..4ce3c19ff 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -4,6 +4,7 @@ name: Test Deploy to Vercel # 실행에 필요한 secret을 설정해야 합니다. # - TEST_DEPLOY_REPO_OWNER : fork-sync로 동기화할 repo의 owner +# - TEST_DEPLOY_REPO_OWNER_TOKEN : fork-sync로 동기화할 repo의 owner의 token (read and write permission 필요) # Parameters # - owner : fork-sync로 동기화할 repo의 owner @@ -22,6 +23,7 @@ jobs: - name: Fork-sync uses: tgymnich/fork-sync@v1.9 with: + token: ${{ secrets.TEST_DEPLOY_REPO_OWNER_TOKEN }} owner: ${{ secrets.TEST_DEPLOY_REPO_OWNER }} base: GGFE-208-test-deploy-브랜치-설정 head: test-test-deploy From 359445354171cf1717b60fb80b84446c9c533181 Mon Sep 17 00:00:00 2001 From: hyobin Date: Tue, 29 Aug 2023 16:53:16 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[Style]=20[GGFE-193]=20=EA=B8=80=EC=9E=90?= =?UTF-8?q?=20=ED=81=AC=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/api/pingpong/items/store.ts | 2 +- styles/store/ItemCard.module.scss | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pages/api/pingpong/items/store.ts b/pages/api/pingpong/items/store.ts index b632658a8..3afce0b65 100644 --- a/pages/api/pingpong/items/store.ts +++ b/pages/api/pingpong/items/store.ts @@ -16,7 +16,7 @@ const itemList: Item[] = [ { itemId: 2, itemName: '확성기', - mainContent: '오늘 하루 42GG는 내가 접수한다📢😎', + mainContent: '오늘 42GG는 내가 접수한다📢😎', subContent: '24시간 동안 모든 페이지 상단에 메시지를 띄울 수 있는 아이템입니다. 사용 다음날 적용됩니다.', itemType: 'MEGAPHONE', diff --git a/styles/store/ItemCard.module.scss b/styles/store/ItemCard.module.scss index af6de2977..0633811b3 100644 --- a/styles/store/ItemCard.module.scss +++ b/styles/store/ItemCard.module.scss @@ -23,8 +23,8 @@ .preview { grid-area: image; position: relative; - width: 10rem; - height: 10rem; + width: 9.5rem; + height: 9.5rem; margin: 0.8rem 0; .img { object-fit: cover; @@ -33,14 +33,14 @@ .title { margin-top: 1rem; - font-size: 0.9rem; + font-size: 1.1rem; font-weight: bold; color: black; grid-area: header; } .priceTag { grid-area: price; - font-size: 0.8rem; + font-size: 0.9rem; color: $coin-yellow; @include ggCoin; .salePrice { @@ -53,7 +53,7 @@ } .mainContent { padding-right: 0.3rem; - font-size: 0.85rem; + font-size: 0.9rem; font-style: italic; color: #282828; grid-area: mainContent; @@ -61,7 +61,7 @@ .subContent { padding-right: 0.5rem; overflow: scroll; - font-size: 0.7rem; + font-size: 0.8rem; color: #343434; grid-area: subContent; } @@ -97,10 +97,11 @@ } .badge { - width: 3rem; - height: 1.5rem; - padding-top: 0.25rem; + width: 2.5rem; + height: 1rem; + padding-top: 0.1rem; margin-top: 0.5rem; + font-size: 0.8rem; color: #fff; text-align: center; background-color: #c03434; From 437d5c6b1671a9a6ef90e0a2aa322df8fe6084d7 Mon Sep 17 00:00:00 2001 From: hyobin Date: Tue, 29 Aug 2023 17:00:29 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[Style]=20[GGFE-193]=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20margin=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/store/ItemCard.module.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/store/ItemCard.module.scss b/styles/store/ItemCard.module.scss index 0633811b3..a8dfa595b 100644 --- a/styles/store/ItemCard.module.scss +++ b/styles/store/ItemCard.module.scss @@ -25,7 +25,7 @@ position: relative; width: 9.5rem; height: 9.5rem; - margin: 0.8rem 0; + margin: 1.25rem 0; .img { object-fit: cover; } From 4c343836ac252e522faaa08530a5ca26c05f308e Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Tue, 29 Aug 2023 17:38:33 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[Feat]=20[GGFE-208]=20actions=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-deploy.yml | 39 ++++++++++++++++++------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 4ce3c19ff..3e17e1ebc 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -1,15 +1,5 @@ name: Test Deploy to Vercel -# 실행에 앞서 vercel과 연동되어 있는 fork된 repository가 필요합니다. - -# 실행에 필요한 secret을 설정해야 합니다. -# - TEST_DEPLOY_REPO_OWNER : fork-sync로 동기화할 repo의 owner -# - TEST_DEPLOY_REPO_OWNER_TOKEN : fork-sync로 동기화할 repo의 owner의 token (read and write permission 필요) - -# Parameters -# - owner : fork-sync로 동기화할 repo의 owner -# - base, head : 동기화할 브랜치 (from head to base) - on: push: branches: @@ -19,11 +9,28 @@ on: jobs: sync: runs-on: ubuntu-latest + steps: - - name: Fork-sync - uses: tgymnich/fork-sync@v1.9 + - uses: actions/checkout@v2 + - name: create build.sh + run: | + touch build.sh + echo "#!/bin/sh" >> build.sh + echo "cd ../" >> build.sh + echo "mkdir output" >> build.sh + echo "cp -R ./42gg.client/* ./output" >> build.sh + echo "cp -R ./output ./42gg.client/" >> build.sh + chmod +x build.sh + + - name: run build.sh + run: sh ./build.sh + + - name: Pushes to another repository + uses: cpina/github-action-push-to-another-repository@main + env: + API_TOKEN_GITHUB: ${{ secrets.TEST_DEPLOY_REPO_OWNER_TOKEN }} with: - token: ${{ secrets.TEST_DEPLOY_REPO_OWNER_TOKEN }} - owner: ${{ secrets.TEST_DEPLOY_REPO_OWNER }} - base: GGFE-208-test-deploy-브랜치-설정 - head: test-test-deploy + source-directory: 'output' + destination-github-username: ${{ secrets.TEST_DEPLOY_REPO_OWNER }} + destination-repository-name: '42gg.client' + target-branch: 'test-test-deploy' From e6fcb71b1840a566bf4e4c8a8a0369fa571c0645 Mon Sep 17 00:00:00 2001 From: hyobin Date: Tue, 29 Aug 2023 17:49:38 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[Fix]=20[GGFE-193]=20admin=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=82=B4=EC=9A=A9=20=EB=AA=A8=EB=8B=AC=20?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=EC=98=A4=EB=A5=98=20=EC=9E=84=EC=8B=9C?= =?UTF-8?q?=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 --- components/admin/store/ItemList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/admin/store/ItemList.tsx b/components/admin/store/ItemList.tsx index 80ce51012..4a397e924 100644 --- a/components/admin/store/ItemList.tsx +++ b/components/admin/store/ItemList.tsx @@ -85,7 +85,7 @@ function ItemList() { setModal({ modalName: 'ADMIN-DETAIL_CONTENT', detailTitle: item.itemName, - detailContent: item.content, + detailContent: item.mainContent, }); }; From 8edbb8b7c1db74a43b5bb73f689883032be885dc Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Tue, 29 Aug 2023 18:52:32 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[Chore]=20[GGFE-208]=20trigger=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test-deploy.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 3e17e1ebc..2ef3ee076 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -1,10 +1,13 @@ name: Test Deploy to Vercel +# action을 돌리기 전에 secret을 설정해야 한다. +# - TEST_DEPLOY_REPO_OWNER : vercel과 연결된 repository의 owner +# - TEST_DEPLOY_REPO_OWNER_TOKEN : vercel과 연결된 repository의 owner의 token (repo 권한 필요) + on: push: branches: - # - test-deploy - - GGFE-208-test-deploy-브랜치-설정 + - test-deploy jobs: sync: @@ -33,4 +36,5 @@ jobs: source-directory: 'output' destination-github-username: ${{ secrets.TEST_DEPLOY_REPO_OWNER }} destination-repository-name: '42gg.client' - target-branch: 'test-test-deploy' + target-branch: 'test-deploy' + commit-message: '[Test-Deploy] Update from 42gg.client' From 4767bad90fce0db6e8dfdbfbe6f84b0c073e4e18 Mon Sep 17 00:00:00 2001 From: yoouyeon Date: Tue, 29 Aug 2023 20:21:34 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[Fix]=20[GGFE-193]=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/modal/admin/AdminDeleteItem.tsx | 4 ++-- components/modal/admin/AdminEditItem.tsx | 4 ++-- stories/admin/AdminEditItem.stories.tsx | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/modal/admin/AdminDeleteItem.tsx b/components/modal/admin/AdminDeleteItem.tsx index bb06a27ca..2bf49c915 100644 --- a/components/modal/admin/AdminDeleteItem.tsx +++ b/components/modal/admin/AdminDeleteItem.tsx @@ -7,7 +7,7 @@ import { toastState } from 'utils/recoil/toast'; import styles from 'styles/admin/modal/AdminDeleteItem.module.scss'; export default function AdminDeleteItemModal(props: Item) { - const { itemId, itemName, content } = props; + const { itemId, itemName, mainContent } = props; const setModal = useSetRecoilState(modalState); const setSnackBar = useSetRecoilState(toastState); const user = useRecoilValue(userState).intraId; @@ -52,7 +52,7 @@ export default function AdminDeleteItemModal(props: Item) {
설명 :