[#20] 배포 테스트

boostcampwm-2021 · Sep 24, 2021 · 9ad0c2b · 9ad0c2b
1 parent 90a9de3
commit 9ad0c2b
Show file tree

Hide file tree

Showing 21 changed files with 275 additions and 3,722 deletions.
diff --git a/backend/app.js b/backend/app.js
@@ -8,14 +8,19 @@ const fs = require('fs');
 
 const apiRouter = require('./routes/api');
 
+const corsOptions = {
+    origin : 'http://everywhere.o-r.kr',
+    credentials : true
+}
+
 const app = express();
 
 app.use(logger('dev'));
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use('/videos', express.static('videos'))
-app.use(cors());
+app.use(cors(corsOptions));
 
 app.use('/api', apiRouter);
 

diff --git a/backend/controllers/randomChoice.js b/backend/controllers/randomChoice.js
@@ -23,4 +23,4 @@ const getRandomIndex = async function(req, res) {
     }
 }
 
-module.exports = getRandomIndex;
+module.exports = getRandomIndex;
diff --git a/backend/nohup.out b/backend/nohup.out
diff --git a/backend/videos/1632452143104.mp4 b/backend/videos/1632452143104.mp4
diff --git a/backend/videos/1632452594493.mp4 b/backend/videos/1632452594493.mp4
diff --git a/backend/videos/1632452639710.mp4 b/backend/videos/1632452639710.mp4
diff --git a/public/html/main.html b/public/html/main.html
@@ -1,58 +1 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>I'm everywhere</title>
-    <link rel="icon" href="/image/favicon.png">
-    <link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap" rel="stylesheet">
-  <script defer src="././javascripts/main_bundle.js"></script></head>
-  <body>
-    <header>
-      <div id='main_logo'>I'm everywhere</div>
-      <div id='address'>
-        <img class='address_icon' src='/image/address_marker.svg' />
-        <p id='address_text'>example address</p>
-      </div>
-    </header>
-    <div class='main_contents_wrap'>
-      <button type='button' id='left_move'>
-        <img class='move_btn' src='/image/left_btn.svg' />
-      </button>
-      <div id='main_video'>
-        <iframe src="https://www.youtube.com/embed/S91wQbYYX3Q?autoplay=1&mute=1&autohide=1" frameborder="0" allowfullscreen allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture;"></iframe>
-        <div class="video_cover"></div>
-      </div>
-      <button type='button' id='right_move'>
-        <img class='move_btn' src='/image/right_btn.svg'  />
-      </button>
-    </div>
-    <footer>
-      <button type="button" class="btn share-btn"></button>
-      <div class="share-btn-list">
-          <button type="button" class="btn copy-btn"></button>
-          <button type="button" class="btn naver-btn"></button>
-          <button type="button" class="btn kakao-btn"></button>
-      </div>
-      <button type="button" class="write-btn">add the video</button>
-      <div class="volume-controller">
-          <button type="button" class="volumn-btn"></button>
-          <input name="volume" value="100" min="0" max="100" step="5" type="range">
-      </div>
-    </footer>
-    <div class="popup">
-      <div class="popup-container">
-          <button type="button" class="close-btn"></button>
-          <div class="popup-header">
-              <h4 class="title">Add your video</h4>
-              <span class="title-cont">Upload your video, enjoy together!</span>
-          </div>
-          <div class="popup-body">
-            <form id="form">
-              <div class="file-upload-btn">
-                  <span>Drag and drop or click your video</span>
-              </div>
-              <input type="file" id="video" accept="video/*">
-            </form>
-          </div>
-      </div>
-  </body>
-</html>
+<!doctype html><html><head><title>I'm everywhere</title><link rel="icon" href="/image/favicon.png"><link href="https://fonts.googleapis.com/css2?family=Ubuntu:wght@400;700&display=swap" rel="stylesheet"><script defer="defer" src="././javascripts/main_bundle.js"></script></head><body><header><div id="main_logo">I'm everywhere</div><div id="address"><img class="address_icon" src="/images/address_marker.svg"/><p id="address_text">example address</p></div></header><div class="main_contents_wrap"><button type="button" id="left_move"><img class="move_btn" src="/images/left_btn.svg"/></button><div id="main_video"><video autoplay loop src=""></video><div class="video_cover"></div></div><button type="button" id="right_move"><img class="move_btn" src="/images/right_btn.svg"/></button></div><footer><button type="button" class="btn share-btn"></button><div class="share-btn-list"><button type="button" class="btn copy-btn"></button> <button type="button" class="btn naver-btn"></button> <button type="button" class="btn kakao-btn"></button></div><button type="button" class="write-btn">add the video</button><div class="volume-controller"><button type="button" class="volumn-btn"></button> <input name="volume" value="100" min="0" max="100" step="5" type="range"></div></footer><div class="popup"><div class="popup-container"><button type="button" class="close-btn"></button><div class="popup-header"><h4 class="title">Add your video</h4><span class="title-cont">Upload your video, enjoy together!</span></div><div class="popup-body"><form id="form"><div class="file-upload-btn"><span>Drag and drop or click your video</span></div><input type="file" id="video" accept="video/*"></form></div></div></div></body></html>
diff --git a/public/image/address_marker.svg b/public/image/address_marker.svg
diff --git a/public/image/ic_cloud.svg b/public/image/ic_cloud.svg
diff --git a/public/image/ic_exit.svg b/public/image/ic_exit.svg
diff --git a/public/image/ic_kakao.svg b/public/image/ic_kakao.svg
diff --git a/public/image/ic_share.svg b/public/image/ic_share.svg
diff --git a/public/image/ic_volume.svg b/public/image/ic_volume.svg
diff --git a/public/image/ic_volume_off.svg b/public/image/ic_volume_off.svg
diff --git a/public/image/left_btn.svg b/public/image/left_btn.svg
diff --git a/public/image/right_btn.svg b/public/image/right_btn.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,4 @@ const getRandomIndex = async function(req, res) { @@
         }
     }
-    module.exports = getRandomIndex;
+    module.exports = getRandomIndex;