Merge pull request #303 from SWM-FIRE/dev

revert s3 domain to static domain
SWM-FIRE · Nov 29, 2022 · c6c5cdd · c6c5cdd
2 parents a0095cd + f6d8ab1
commit c6c5cdd
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 35 deletions.
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://s3.modocode.com/svg/dummyAvatar.svg';
+    this.img.src = 'https://static.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://s3.modocode.com/fire.mp3';
+      myTheme = 'https://static.modocode.com/fire.mp3';
       break;
     case 'ocean':
-      myTheme = 'https://s3.modocode.com/ocean.mp3';
+      myTheme = 'https://static.modocode.com/ocean.mp3';
       break;
     case 'camping':
-      myTheme = 'https://s3.modocode.com/camping.mp3';
+      myTheme = 'https://static.modocode.com/camping.mp3';
       break;
     case 'cosmos':
-      myTheme = 'https://s3.modocode.com/cosmos.mp3';
+      myTheme = 'https://static.modocode.com/cosmos.mp3';
       break;
     case 'travel':
-      myTheme = 'https://s3.modocode.com/travel.mp3';
+      myTheme = 'https://static.modocode.com/travel.mp3';
       break;
     default:
-      myTheme = 'https://s3.modocode.com/fire.mp3';
+      myTheme = 'https://static.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://s3.modocode.com/newUserAlarm.mp3';
+  const newUserAlarm = 'https://static.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://s3.modocode.com/chattingAlarm.mp3';
+  const chattingAlarm = 'https://static.modocode.com/chattingAlarm.mp3';
   useEffect(() => {
     // console.log(isAlarmToggle);
     volumeRef.current.play();

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