Skip to content

[DEPLOY] prod 배포 #189

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.

Sign up for GitHub

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

Merged
jaeml06 merged 2 commits into from
Mar 17, 2025
Merged

[DEPLOY] prod 배포 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e02930
[FIX] Discord 스크립트 오류 수정 (#174)
i-meant-to-be Mar 17, 2025
3481178
[FIX] 초기 speakerNumber를 상황에 맞게 초기화 (#186)
jaeml06 Mar 17, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/Issue_Noti.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
TITLE: ${{ github.event.issue.title }}
run: |
echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV
echo "COMMENT_BODY=${{ github.event.issue.body }}" >> $GITHUB_ENV
echo "COMMENT_BODY=$(echo "${{ github.event.issue.body }}" | base64)" >> $GITHUB_ENV
echo "USERNAME=망곰" >> $GITHUB_ENV
echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV

Expand All @@ -30,8 +30,9 @@ jobs:
WEB_HOOK: ${{ env.WEB_HOOK }}
run: |
if [ -n "$WEB_HOOK" ]; then
DECODED_COMMENT_BODY=$(echo "$COMMENT_BODY" | base64 --decode)
JSON_PAYLOAD=$(jq -n \
--arg comment_body "$COMMENT_BODY" \
--arg comment_body "$(echo "$DECODED_COMMENT_BODY" | jq -R @json)" \
--arg username "$USERNAME" \
--arg avatar_url "$AVATAR_URL" \
--arg issue_title "$ISSUE_TITLE" \
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/PR_Comment_Noti.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set Environment Variables
run: |
echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV
echo "COMMENT_BODY=$(echo '${{ github.event.comment.body }}' | jq -Rs .)" >> $GITHUB_ENV
echo "COMMENT_BODY=$(echo '${{ github.event.comment.body }}' | base64)" >> $GITHUB_ENV
echo "USERNAME=망곰" >> $GITHUB_ENV
echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV

Expand All @@ -29,8 +29,9 @@ jobs:
WEB_HOOK: ${{ env.WEB_HOOK }}
run: |
if [ -n "$WEB_HOOK" ]; then
DECODED_COMMENT_BODY=$(echo "$COMMENT_BODY" | base64 --decode)
JSON_PAYLOAD=$(jq -n \
--arg comment_body "$COMMENT_BODY" \
--arg comment_body "$(echo "$DECODED_COMMENT_BODY" | jq -R @json)" \
--arg username "$USERNAME" \
--arg avatar_url "$AVATAR_URL" \
--arg pr_title "$PR_TITLE" \
Expand Down
12 changes: 9 additions & 3 deletions src/page/TableComposition/components/TimerCreationContent/TimerCreationContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,15 @@ export default function TimerCreationContent({
const [minutes, setMinutes] = useState(initMinutes);
const [seconds, setSeconds] = useState(initSeconds);
const [speakerNumber, setSpeakerNumber] = useState<number | null>(
(beforeData?.speakerNumber ?? initData?.stance === 'NEUTRAL')
? null
: (initData?.speakerNumber ?? 1),
beforeData?.speakerNumber
? beforeData.speakerNumber
: initData
? initData.stance === 'NEUTRAL'
? null
: initData.speakerNumber
? initData.speakerNumber
: null
: 1,
);

const handleSubmit = () => {
Expand Down
Loading