Merge pull request #302 from SWM-FIRE/dev

merge dev
SWM-FIRE · Nov 29, 2022 · a0095cd · a0095cd
2 parents 7791e13 + 591b793
commit a0095cd
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,12 @@
-# 모도코
-
+<div align="center">
 <img src="https://user-images.githubusercontent.com/66371206/184502359-9e21d760-282d-4d0e-a19b-d3814cbb9aa8.png" title="modoco"/>
 
+[![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FSWM-FIRE%2Fmodoco-frontend&count_bg=%2396CEB4&title_bg=%23555555&icon=codeigniter.svg&icon_color=%23F58A7D&title=modoco&edge_flat=false)](https://hits.seeyoufarm.com)
+
+</div>
+
+# 모도코
+
 > **모여서 도란도란 코딩👨‍💻👩‍💻** <br/> **개발기간: 2022.06 ~ 2022.11**
 
 ## 배포 주소
@@ -179,18 +184,22 @@ npx cypress open
 - 화면만으로 부족하다면, 음성을 키고 대화해보세요
 
 ### ⭐️ 채팅
+
 - 모각코 방에서 여러 사람들과 채팅을 할 수 있어요
 - 친구들과 1:1 채팅 또한 가능해요!
 
 ### ⭐️ 유튜브 플레이리스트 듣기
+
 - 나만의 플레이리스트로 커스텀하여 친구들과 노래를 들을 수 있어요
 - 원하지 않는 노래는 삭제도 가능해요
 
 ### ⭐️ 프로필 설정
+
 - 나의 깃허브와 개인 페이지 혹은 블로그 링크를 등록할 수 있어요
 - 간단한 한줄 소개로 자신을 표현해봐요!
 
 ### ⭐ 로비 입장
+
 - 현재 모도코에 있는 모든 사람들을 확인할 수 있어요
 - 전체 채팅을 통해 같이 모각코할 사람을 구해보세요!
 
@@ -206,14 +215,18 @@ npx cypress open
 
 ![WebRTC Sequence Diagram](https://user-images.githubusercontent.com/66371206/185143244-142999a6-9f58-4e56-90ef-598782d7f420.png)
 
-### Room UML Diagram
+### DM Flow
 
-![front-uml](https://user-images.githubusercontent.com/66371206/194737818-1ac02b91-7861-4983-8bc5-b00c2e55d7c8.jpeg)
+![direct_message_sequence_diagram](https://user-images.githubusercontent.com/66371206/201030305-c85815f3-5b42-4f10-9a1a-a3135aa3305a.png)
 
 ---
 
 ## 개발로그 ✏️
 
+[![halang's GitHub stats](https://velog-readme-stats.vercel.app/api?name=lhr4884&slug=모도코에서-코드-리뷰-하실분)](https://velog.io/@lhr4884/%EB%AA%A8%EB%8F%84%EC%BD%94%EC%97%90%EC%84%9C-%EC%BD%94%EB%93%9C-%EB%A6%AC%EB%B7%B0-%ED%95%98%EC%8B%A4%EB%B6%84)
+[![halang's GitHub stats](https://velog-readme-stats.vercel.app/api?name=lhr4884&slug=모여서-각자-코딩모각코할분-들어오세요-i9lbb30z)](https://velog.io/@lhr4884/%EB%AA%A8%EC%97%AC%EC%84%9C-%EA%B0%81%EC%9E%90-%EC%BD%94%EB%94%A9%EB%AA%A8%EA%B0%81%EC%BD%94%ED%95%A0%EB%B6%84-%EB%93%A4%EC%96%B4%EC%98%A4%EC%84%B8%EC%9A%94-i9lbb30z)
+[![071yoon's GitHub stats](https://velog-readme-stats.vercel.app/api?name=071yoon&slug=FIRE는-이렇게-협업했다)](https://velog.io/@071yoon/FIRE%EB%8A%94-%EC%9D%B4%EB%A0%87%EA%B2%8C-%ED%98%91%EC%97%85%ED%96%88%EB%8B%A4)
+
 <details>
 <summary>영기</summary>
 
@@ -259,3 +272,13 @@ npx cypress open
 [![halang's GitHub stats](https://velog-readme-stats.vercel.app/api?name=lhr4884&slug=React-Carousel-이용한-Carousel-만들기)](https://velog.io/@lhr4884/React-Carousel-%EC%9D%B4%EC%9A%A9%ED%95%9C-Carousel-%EB%A7%8C%EB%93%A4%EA%B8%B0)
 
 </details>
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/63354527/201853029-e92aa913-882f-47b7-be43-5878cb3af169.png" width="30%" >
+</p>
+
+<br/>
+
+<p align="center"><i>This Project is Sponsored by <b>Software Maestro</b></i></p>
+
+<p align="center">This work was supported by the Institute of Information & Communications Technology Planning & Evaluation(IITP) grant funded by the Ministry of Science and ICT(MSIT) (IITP-0000-SW Maestro training course).</p>
diff --git a/src/components/archive/myCharacter.ts b/src/components/archive/myCharacter.ts
@@ -18,7 +18,7 @@ export default class Character {
     uid: number,
     canvasRef: React.MutableRefObject<HTMLCanvasElement>,
   ) {
-    this.img.src = 'https://static.modocode.com/svg/dummyAvatar.svg';
+    this.img.src = 'https://s3.modocode.com/svg/dummyAvatar.svg';
     this.uid = uid;
     this.positionX = 0;
     this.positionY = 0;

diff --git a/src/components/room/header/ThemeSound.tsx b/src/components/room/header/ThemeSound.tsx
@@ -2,22 +2,22 @@ export default function ThemeSound({ theme, volumeRef }) {
   let myTheme: string;
   switch (theme) {
     case 'fire':
-      myTheme = 'https://static.modocode.com/fire.mp3';
+      myTheme = 'https://s3.modocode.com/fire.mp3';
       break;
     case 'ocean':
-      myTheme = 'https://static.modocode.com/ocean.mp3';
+      myTheme = 'https://s3.modocode.com/ocean.mp3';
       break;
     case 'camping':
-      myTheme = 'https://static.modocode.com/camping.mp3';
+      myTheme = 'https://s3.modocode.com/camping.mp3';
       break;
     case 'cosmos':
-      myTheme = 'https://static.modocode.com/cosmos.mp3';
+      myTheme = 'https://s3.modocode.com/cosmos.mp3';
       break;
     case 'travel':
-      myTheme = 'https://static.modocode.com/travel.mp3';
+      myTheme = 'https://s3.modocode.com/travel.mp3';
       break;
     default:
-      myTheme = 'https://static.modocode.com/fire.mp3';
+      myTheme = 'https://s3.modocode.com/fire.mp3';
       break;
   }
 

diff --git a/src/components/room/screenShare/NewUserAlarm.tsx b/src/components/room/screenShare/NewUserAlarm.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 
 export default function NewUserAlarm({ volumeRef }) {
-  const newUserAlarm = 'https://static.modocode.com/newUserAlarm.mp3';
+  const newUserAlarm = 'https://s3.modocode.com/newUserAlarm.mp3';
   useEffect(() => {
     volumeRef.current.play();
   }, []);

diff --git a/src/components/room/sideBar/ChattingAlarm.tsx b/src/components/room/sideBar/ChattingAlarm.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 
 export default function ChattingAlarm({ volumeRef, isAlarmToggle }) {
-  const chattingAlarm = 'https://static.modocode.com/chattingAlarm.mp3';
+  const chattingAlarm = 'https://s3.modocode.com/chattingAlarm.mp3';
   useEffect(() => {
     // console.log(isAlarmToggle);
     volumeRef.current.play();

diff --git a/src/fonts/font.css b/src/fonts/font.css
@@ -2,12 +2,10 @@
   font-family: GmarketSansBold;
   src: local('GmarketSansTTFBold'), local('GmarketSansTTFBold');
   font-style: normal;
-  src: url('https://static.modocode.com/assets/GmarketSansBold.woff2')
+  src: url('https://s3.modocode.com/assets/GmarketSansBold.woff2')
       format('woff2'),
-    url('https://static.modocode.com/assets/GmarketSansBold.woff')
-      format('woff'),
-    url('https://static.modocode.com/assets/GmarketSansBold.ttf')
-      format('truetype');
+    url('https://s3.modocode.com/assets/GmarketSansBold.woff') format('woff'),
+    url('https://s3.modocode.com/assets/GmarketSansBold.ttf') format('truetype');
 }
 @font-face {
   font-family: GmarketSansMedium;
@@ -17,62 +15,54 @@
       format('woff2'),
     url('https://cdn.jsdelivr.net/gh/webfontworld/gmarket/GmarketSansMedium.woff')
       format('woff'),
-    url('https://static.modocode.com/assets/GmarketSansMedium.ttf')
+    url('https://s3.modocode.com/assets/GmarketSansMedium.ttf')
       format('truetype');
 }
 @font-face {
   font-family: IBMPlexSansKRRegular;
   src: local('IBMPlexSansKRRegular'), local('IBMPlexSansKRRegular');
   font-style: normal;
-  src: url('https://static.modocode.com/assets/IBMPlexSansKR.woff2')
-      format('woff2'),
-    url('https://static.modocode.com/assets/IBMPlexSansKR.woff') format('woff'),
-    url('https://static.modocode.com/assets/IBMPlexSansKR.otf')
-      format('opentype'),
-    url('https://static.modocode.com/assets/IBMPlexSansKR.ttf')
-      format('truetype');
+  src: url('https://s3.modocode.com/assets/IBMPlexSansKR.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/IBMPlexSansKR.woff') format('woff'),
+    url('https://s3.modocode.com/assets/IBMPlexSansKR.otf') format('opentype'),
+    url('https://s3.modocode.com/assets/IBMPlexSansKR.ttf') format('truetype');
 }
 @font-face {
   font-family: IBMPlexMonoRegular;
   src: local('IBMPlexMonoRegular'), local('IBMPlexMonoRegular');
   font-style: normal;
-  src: url('https://static.modocode.com/assets/IBMPlexMono.woff2')
-      format('woff2'),
-    url('https://static.modocode.com/assets/IBMPlexMono.woff') format('woff'),
-    url('https://static.modocode.com/assets/IBMPlexMono.otf') format('opentype'),
-    url('https://static.modocode.com/assets/IBMPlexMono.ttf') format('truetype');
+  src: url('https://s3.modocode.com/assets/IBMPlexMono.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/IBMPlexMono.woff') format('woff'),
+    url('https://s3.modocode.com/assets/IBMPlexMono.otf') format('opentype'),
+    url('https://s3.modocode.com/assets/IBMPlexMono.ttf') format('truetype');
 }
 @font-face {
   font-family: JostRegular;
-  src: url('https://static.modocode.com/assets/jost.woff2') format('woff2'),
-    url('https://static.modocode.com/assets/jost.woff') format('woff'),
-    url('https://static.modocode.com/assets/jost.ttf') format('truetype');
+  src: url('https://s3.modocode.com/assets/jost.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/jost.woff') format('woff'),
+    url('https://s3.modocode.com/assets/jost.ttf') format('truetype');
 }
 @font-face {
   font-family: PoppinsRegular;
-  src: url('https://static.modocode.com/assets/poppins.woff2') format('woff2'),
-    url('https://static.modocode.com/assets/poppins.woff') format('woff'),
-    url('https://static.modocode.com/assets/poppins.ttf') format('truetype');
+  src: url('https://s3.modocode.com/assets/poppins.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/poppins.woff') format('woff'),
+    url('https://s3.modocode.com/assets/poppins.ttf') format('truetype');
 }
 @font-face {
   font-family: PretendardRegular;
   src: local('PretendardRegular'), local('PretendardRegular');
   font-style: normal;
-  src: url('https://static.modocode.com/assets/Pretendard.woff2')
-      format('woff2'),
-    url('https://static.modocode.com/assets/Pretendard.woff') format('woff'),
-    url('https://static.modocode.com/assets/Pretendard.otf') format('opentype'),
-    url('https://static.modocode.com/assets/Pretendard.ttf') format('truetype');
+  src: url('https://s3.modocode.com/assets/Pretendard.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/Pretendard.woff') format('woff'),
+    url('https://s3.modocode.com/assets/Pretendard.otf') format('opentype'),
+    url('https://s3.modocode.com/assets/Pretendard.ttf') format('truetype');
 }
 @font-face {
   font-family: SFProDisplayRegular;
   src: local('SFProDisplayRegular'), local('SFProDisplayRegular');
   font-style: normal;
-  src: url('https://static.modocode.com/assets/SFProDisplay.woff2')
-      format('woff2'),
-    url('https://static.modocode.com/assets/SFProDisplay.woff') format('woff'),
-    url('https://static.modocode.com/assets/SFProDisplay.otf')
-      format('opentype'),
-    url('https://static.modocode.com/assets/SFProDisplay.ttf')
-      format('truetype');
+  src: url('https://s3.modocode.com/assets/SFProDisplay.woff2') format('woff2'),
+    url('https://s3.modocode.com/assets/SFProDisplay.woff') format('woff'),
+    url('https://s3.modocode.com/assets/SFProDisplay.otf') format('opentype'),
+    url('https://s3.modocode.com/assets/SFProDisplay.ttf') format('truetype');
 }