From 5df76c57c213a92a1dd171751d431503962db14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=EC=A7=80=EC=9C=A4?= <70828192+cheonjiyun@users.noreply.github.com> Date: Sun, 15 Dec 2024 22:36:03 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20=EA=B8=80=EC=94=A8=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Night.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Night.tsx b/src/pages/Night.tsx index 7aa2c68..e033b59 100644 --- a/src/pages/Night.tsx +++ b/src/pages/Night.tsx @@ -39,7 +39,6 @@ export default function Night({ statusType, publishSkill, mafiaSkillPlayer }: Pr ) : (
- {myJob} <> {'MAFIA' === myJob && ( Date: Sun, 15 Dec 2024 22:36:22 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=EC=B1=84=ED=8C=85=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=A7=81=EC=97=85=20=EC=B0=BE=EC=95=84=EC=84=9C=20?= =?UTF-8?q?=EB=B3=B4=EC=97=AC=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/chat/ChatGroup.tsx | 7 ++++++- src/util/job.ts | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/util/job.ts diff --git a/src/components/chat/ChatGroup.tsx b/src/components/chat/ChatGroup.tsx index 47fc9e4..bdb21d7 100644 --- a/src/components/chat/ChatGroup.tsx +++ b/src/components/chat/ChatGroup.tsx @@ -1,9 +1,12 @@ /** @jsxImportSource @emotion/react */ import { css } from '@emotion/react'; import { forwardRef } from 'react'; +import { useRecoilState } from 'recoil'; +import { roomInfoState } from '../../recoil/roominfo/atom'; import { VariablesCSS } from '../../styles/VariablesCSS'; import { Chat } from '../../type'; +import { getPlayerJob } from '../../util/job'; import PlayerChat from '../player/PlayerChat'; import ChatMessage from './ChatMessage'; @@ -15,9 +18,11 @@ interface PropsType { export default forwardRef(function ChatGroup(props: PropsType, ref: any) { const { chats } = props; + const [roomInfo] = useRecoilState(roomInfoState); + return (
- +

{chats[0].name}

{chats.map((chat, idx) => ( diff --git a/src/util/job.ts b/src/util/job.ts new file mode 100644 index 0000000..4d24d35 --- /dev/null +++ b/src/util/job.ts @@ -0,0 +1,5 @@ +import { Job, Player } from '../type'; + +export const getPlayerJob = (players: Player[], name: string): Job => { + return players.find(el => el.name == name)?.job || null; +}; From 61a28cb3cbccd48d03784e3368887328319900bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=EC=A7=80=EC=9C=A4?= <70828192+cheonjiyun@users.noreply.github.com> Date: Sun, 22 Dec 2024 19:52:54 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=EC=B4=88=EB=8C=80=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=91=90=EB=B2=88=20?= =?UTF-8?q?=EB=93=A4=EC=96=B4=EA=B0=80=EB=8A=94=20=ED=98=95=EC=83=81=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/WaitingRoom.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/WaitingRoom.tsx b/src/pages/WaitingRoom.tsx index 7618db9..fa3c6fb 100644 --- a/src/pages/WaitingRoom.tsx +++ b/src/pages/WaitingRoom.tsx @@ -5,7 +5,6 @@ import { Toaster } from 'react-hot-toast'; import { useNavigate } from 'react-router-dom'; import { getRoomsCode, startGame } from '../axios/http'; -import { DOMAIN } from '../axios/instances'; import BigButton from '../components/button/BigButton'; import { Loading } from '../components/etc/Loading'; import AppContainerCSS from '../components/layout/AppContainerCSS'; @@ -71,7 +70,7 @@ export default function WaitingRoom({ waitingRoomInfoState }: PropsType) { const onShareLink = async () => { // 링크 공유s - const inviteLink = DOMAIN + '/#/participate?code=' + code; + const inviteLink = '/#/participate?code=' + code; const shareData = { url: inviteLink, }; From bbf9c5872dd3bab8dce6781f3b3418667907d214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=EC=A7=80=EC=9C=A4?= <70828192+cheonjiyun@users.noreply.github.com> Date: Sun, 22 Dec 2024 19:53:20 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=EC=9B=B9=EC=86=8C=EC=BC=93=20baseU?= =?UTF-8?q?RL=EC=97=90=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=A5=BC=20=ED=99=9C=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Game.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Game.tsx b/src/pages/Game.tsx index 71d4466..113e6b2 100644 --- a/src/pages/Game.tsx +++ b/src/pages/Game.tsx @@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from 'react'; import { useRecoilState, useSetRecoilState } from 'recoil'; import { getChats, getGamesInfo, getMyJob } from '../axios/http'; -import { BASE_URL } from '../axios/instances'; +import { BASE_URL, DOMAIN } from '../axios/instances'; import { gameRound, myJobState, roomInfoState } from '../recoil/roominfo/atom'; import { ChatArray, ChatResponse, GameStatus, SkillResponse, WaitingRoomInfo } from '../type'; import Day from './Day'; @@ -69,7 +69,7 @@ export default function Game() { // WebSocket const connect = () => { const socket = new StompJs.Client({ - brokerURL: `wss://dev.mafia-together.com/api/stomp`, + brokerURL: `wss://${DOMAIN}/api/stomp`, reconnectDelay: 10000, }); From cfb92cfe50f1f861b58da8e0a88a36ceffee68ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=EC=A7=80=EC=9C=A4?= <70828192+cheonjiyun@users.noreply.github.com> Date: Sun, 22 Dec 2024 19:57:30 +0900 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EC=83=81=EC=88=98=EB=A5=BC=20env=EB=A5=BC=20=ED=99=9C=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- src/axios/instances.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8834d89..d90a4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ dist-ssr *.sw? # env -.env.development \ No newline at end of file +.env +.env.development diff --git a/src/axios/instances.ts b/src/axios/instances.ts index 9d95997..d279280 100644 --- a/src/axios/instances.ts +++ b/src/axios/instances.ts @@ -1,6 +1,6 @@ import axios, { AxiosInstance, AxiosRequestConfig } from 'axios'; -export const DOMAIN = 'dev.mafia-together.com'; +export const DOMAIN = import.meta.env.VITE_DOMAIN; export const BASE_URL = `https://${DOMAIN}/api`; export const axiosInstance = axios.create({ From 4aa56adc57cf0b10024856406c5fca387bcdff0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B2=9C=EC=A7=80=EC=9C=A4?= <70828192+cheonjiyun@users.noreply.github.com> Date: Sun, 22 Dec 2024 20:01:26 +0900 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=EA=B9=83=ED=97=88=EB=B8=8C=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=EC=97=90=20env=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/frontend-dev-CICD.yml | 8 +++++--- .github/workflows/frontend-prod-CICD.yml | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/frontend-dev-CICD.yml b/.github/workflows/frontend-dev-CICD.yml index 4624d11..9e2c59e 100644 --- a/.github/workflows/frontend-dev-CICD.yml +++ b/.github/workflows/frontend-dev-CICD.yml @@ -2,7 +2,7 @@ name: Dev CI/CD on: push: - branches: [ dev ] + branches: [dev] permissions: contents: read @@ -11,7 +11,7 @@ jobs: build: runs-on: group: Default - labels: [ self-hosted, dev ] + labels: [self-hosted, dev] permissions: pull-requests: write @@ -29,6 +29,8 @@ jobs: - name: Run build run: npm run build + env: + VITE_DOMAIN: ${{ secrets.VITE_DOMAIN_DEV }} - name: 빌드 파일 - run: cp -rf ./dist ~/ \ No newline at end of file + run: cp -rf ./dist ~/ diff --git a/.github/workflows/frontend-prod-CICD.yml b/.github/workflows/frontend-prod-CICD.yml index 295e02d..b9f658f 100644 --- a/.github/workflows/frontend-prod-CICD.yml +++ b/.github/workflows/frontend-prod-CICD.yml @@ -2,7 +2,7 @@ name: Prod CI/CD on: push: - branches: [ prod ] + branches: [prod] permissions: contents: read @@ -11,7 +11,7 @@ jobs: build: runs-on: group: Default - labels: [ self-hosted, dev ] + labels: [self-hosted, dev] permissions: pull-requests: write @@ -29,6 +29,8 @@ jobs: - name: Run build run: npm run build + env: + VITE_DOMAIN: ${{ secrets.VITE_DOMAIN_PROD }} - name: Copy to Prod Server uses: appleboy/scp-action@master @@ -36,5 +38,5 @@ jobs: username: ${{ secrets.PROD_USER_NAME }} host: ${{ secrets.PROD_SERVER }} key: ${{ secrets.PROD_PEM_KEY }} - source: "./dist" - target: "~/" \ No newline at end of file + source: './dist' + target: '~/'