From 2c2f488740656e7bb0896711bae90b6c2e06a456 Mon Sep 17 00:00:00 2001 From: jisu-kim Date: Wed, 13 Nov 2024 09:18:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=8A=AC=EB=9E=99=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-slack-notify.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-slack-notify.yml b/.github/workflows/pr-slack-notify.yml index 618e309f..9e67691e 100644 --- a/.github/workflows/pr-slack-notify.yml +++ b/.github/workflows/pr-slack-notify.yml @@ -12,12 +12,18 @@ jobs: id: set-reviewers run: | REPO_NAME="${{ github.repository }}" - if [[ $REPO_NAME == */dev-fe ]]; then + if [[ $REPO_NAME == *"dev-fe"* ]]; then echo "team=FE" >> $GITHUB_OUTPUT echo "reviewers=<@U07GSBHPCPR> <@U07H6QLFPBM> <@U07H9CTPC9J>" >> $GITHUB_OUTPUT - elif [[ $REPO_NAME == */dev-be ]]; then + echo "reviewer_names=김지수, 고민지, 홍창현" >> $GITHUB_OUTPUT + elif [[ $REPO_NAME == *"dev-be"* ]]; then echo "team=BE" >> $GITHUB_OUTPUT echo "reviewers=<@U07GSBPT9ST> <@U07H0978N14>" >> $GITHUB_OUTPUT + echo "reviewer_names=김영길, 김준서" >> $GITHUB_OUTPUT + else + echo "team=Team" >> $GITHUB_OUTPUT + echo "reviewers=@here" >> $GITHUB_OUTPUT + echo "reviewer_names=전체" >> $GITHUB_OUTPUT fi - name: Send Slack notification @@ -67,6 +73,15 @@ jobs: "type": "mrkdwn", "text": "👉 ${{ steps.set-reviewers.outputs.reviewers }} 리뷰 부탁드립니다!" } + }, + { + "type": "context", + "elements": [ + { + "type": "mrkdwn", + "text": "✨ 리뷰어: ${{ steps.set-reviewers.outputs.reviewer_names }}" + } + ] } ] } From bc18830f6f0ecad0d3d3f94c7f12b2300eea5eb6 Mon Sep 17 00:00:00 2001 From: jisu-kim Date: Wed, 13 Nov 2024 09:22:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=8A=AC=EB=9E=99=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20JSON=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pr-slack-notify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-slack-notify.yml b/.github/workflows/pr-slack-notify.yml index 9e67691e..889ab132 100644 --- a/.github/workflows/pr-slack-notify.yml +++ b/.github/workflows/pr-slack-notify.yml @@ -30,7 +30,7 @@ jobs: uses: 8398a7/action-slack@v3 with: status: custom - custom_payload: | + custom_payload: > { "blocks": [ { @@ -57,14 +57,14 @@ jobs: "type": "section", "text": { "type": "mrkdwn", - "text": "*PR 제목:*\n<${{ github.event.pull_request.html_url }}|${{ github.event.pull_request.title }}>" + "text": "*PR 제목:*\n<${{ github.event.pull_request.html_url }}|${{ toJSON(github.event.pull_request.title) }}>" } }, { "type": "section", "text": { "type": "mrkdwn", - "text": "*PR 설명:*\n${{ github.event.pull_request.body }}" + "text": "*PR 설명:*\n${{ toJSON(github.event.pull_request.body) }}" } }, { @@ -86,4 +86,4 @@ jobs: ] } env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From b258ac6ba728f60c8d51ca072542b2858350cc51 Mon Sep 17 00:00:00 2001 From: Changhyun-Hong Date: Thu, 14 Nov 2024 16:38:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20space=EB=B0=94=EB=A1=9C=20=EC=9E=AC?= =?UTF-8?q?=EC=83=9D,=20=EC=A0=95=EC=A7=80=20=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/{ => icons}/custom_play_icon.svg | 0 frontend/src/assets/icons/live_pause_icon.svg | 12 +++++++ frontend/src/assets/icons/pause_icon.svg | 32 ++++--------------- frontend/src/assets/icons/play_icon.svg | 22 +++---------- frontend/src/components/client/Player.tsx | 29 +++++++++++++++-- 5 files changed, 49 insertions(+), 46 deletions(-) rename frontend/src/assets/{ => icons}/custom_play_icon.svg (100%) create mode 100644 frontend/src/assets/icons/live_pause_icon.svg diff --git a/frontend/src/assets/custom_play_icon.svg b/frontend/src/assets/icons/custom_play_icon.svg similarity index 100% rename from frontend/src/assets/custom_play_icon.svg rename to frontend/src/assets/icons/custom_play_icon.svg diff --git a/frontend/src/assets/icons/live_pause_icon.svg b/frontend/src/assets/icons/live_pause_icon.svg new file mode 100644 index 00000000..1a2d1b0d --- /dev/null +++ b/frontend/src/assets/icons/live_pause_icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/frontend/src/assets/icons/pause_icon.svg b/frontend/src/assets/icons/pause_icon.svg index 7269d367..c1f14183 100644 --- a/frontend/src/assets/icons/pause_icon.svg +++ b/frontend/src/assets/icons/pause_icon.svg @@ -1,26 +1,6 @@ - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/icons/play_icon.svg b/frontend/src/assets/icons/play_icon.svg index 9c7a2da9..ebeda792 100644 --- a/frontend/src/assets/icons/play_icon.svg +++ b/frontend/src/assets/icons/play_icon.svg @@ -1,18 +1,6 @@ - - - - - - - + + + + + diff --git a/frontend/src/components/client/Player.tsx b/frontend/src/components/client/Player.tsx index a0c6082f..62094fb9 100644 --- a/frontend/src/components/client/Player.tsx +++ b/frontend/src/components/client/Player.tsx @@ -3,7 +3,7 @@ import Hls from 'hls.js'; import styled from 'styled-components'; import playerLoading from '@assets/player_loading.gif'; -import CustomPlayIcon from '@assets/custom_play_icon.svg'; +import CustomPlayIcon from '@assets/icons/custom_play_icon.svg'; import PauseIcon from '@assets/icons/pause_icon.svg'; import PlayIcon from '@assets/icons/play_icon.svg'; @@ -58,14 +58,37 @@ const Player = ({ videoUrl }: { videoUrl: string }) => { } }; + useEffect(() => { + const handleKeyDown = (e: KeyboardEvent) => { + if (e.code === 'Space') { + e.preventDefault(); + handlePlayPause(); + } + }; + + const videoElement = videoRef.current; + videoElement?.addEventListener('keydown', handleKeyDown); + + return () => { + videoElement?.removeEventListener('keydown', handleKeyDown); + }; + }, []); + return ( {onHLSReady ? ( <> - + {showIcon && ( - {isPaused ? : } + + {isPaused ? : } + )} ) : (