Merge branch 'feat/Video' into 'develop'

Feat/video See merge request !7

Merge branch 'feat/Video' into 'develop'
Feat/video See merge request !7
이승윤
Commit 2faf482b311204bd546ad136f97493616a5d67ca 2faf482b 2 parents 6da8af16 0f29049d
Showing 5 changed files with 67 additions and 35 deletions
routes/Videos.js
routes/categori.js
views/category/productsDetail.ejs
views/home.ejs
views/includes/header.ejs
--- a/routes/Videos.js
View file @2faf482
+++ b/routes/Videos.js
View file @2faf482
@@ -16,7 +16,7 @@ router.get('/', function (req, res) {
         }
         if (videos.length != 0) {
           // 빈 배열 체크
-          console.log(videos);
+          //console.log(videos);
           var items = {
             category: category[i],
             videos: videos,
--- a/routes/categori.js
View file @2faf482
+++ b/routes/categori.js
View file @2faf482
@@ -54,6 +54,22 @@ router.get('/products/detail/:id', function (req, res) {
     var video = [];
     //제품정보를 받고 그안에서 댓글을 받아온다.
     CategoriModel.find({ product_id: req.params.id }, function (err, comments) {
+      VideoModel.find(function (err, myVideo) {
+        var mitem = []; // 카테고리별 비디오 목록을 담아두는 배열
+        var videos = []; // 비디오 목록을 담는 임시 배열
+        for (var j in myVideo) {
+          if (product.title == myVideo[j].categori) {
+            videos.push(myVideo[j].title);
+          }
+        }
+        if (videos.length != 0) {
+          // 빈 배열 체크
+          //console.log(videos);
+          var items = videos;
+          mitem.push(items);
+        }
+        //console.log(item[2].category.title);
+        //console.log(item[2].videos);
         if (word != null) {
           var count = 0;
           youtube.addParam('order', 'rating'); // 평점 순으로 정렬
@@ -61,7 +77,7 @@ router.get('/products/detail/:id', function (req, res) {
           youtube.addParam('videoLicense', 'creativeCommon'); // 크리에이티브 커먼즈 아이템만 불러옴
           youtube.search(word, limit, function (err, result) {
             // 검색 실행
-          console.log(word);
+            //console.log(word);
             if (err) {
               console.log(err);
             } // 에러일 경우 에러공지하고 빠져나감
@@ -92,17 +108,21 @@ router.get('/products/detail/:id', function (req, res) {
               product: product,
               comments: comments,
               videos: video,
+              items: mitem,
             });
           });
         } else {
+          //console.log(item[0]);
           res.render('category/productsDetail', {
             product: product,
             comments: comments,
             videos: video,
+            items: mitem,
           });
         }
       });
     });
+  });
 });
 router.post('/products/detail/:id', loginRequired, function (req, res) {
--- a/views/category/productsDetail.ejs
View file @2faf482
+++ b/views/category/productsDetail.ejs
View file @2faf482
@@ -3,6 +3,24 @@
         <div class="panel-heading">
             <%=product.title%>
         </div>
+        <div style="padding-bottom: 10px">
+            작성일 :
+            <%=product.getDate.year%> -
+                <%=product.getDate.month%> -
+                    <%=product.getDate.day%>
+        </div>
+        <div>
+            <% var count=0; %>
+                보유중인 영상
+                <% for (var i in items[0]) { %>
+                    <div>
+                        <%=items[0][i]%>
+                    </div>
+                    <%count++;};%>
+        </div>
+        <div>
+            설명 : <%=product.description%>
+        </div>
         <form method="get" action="">
             <div class="input-group">
                 <input type="text" class="form-control" placeholder="검색 키워드를 입력하세요!" name="keyword" autocomplete='off'>
@@ -30,18 +48,6 @@
                 <button class="btn btn-primary" style="margin-top: 10px; margin-left: 15px;" >영상담기</button>
         </form>
         <div class="panel-body">
-            <div style="padding-bottom: 10px">
-                작성일 : 
-                <%=product.getDate.year%> - 
-                <%=product.getDate.month%> - 
-                <%=product.getDate.day%>
-            </div>
-            <% if(product.thumbnail){%>
-                <p>
-                    <img src="/uploads/<%=product.thumbnail%>" style="max-width: 100%"/>
-                </p>
-            <% } %>
-            <%=product.description%>
             <!-- 댓글영역  -->
             <div>
                 댓글작성하기
--- a/views/home.ejs
View file @2faf482
+++ b/views/home.ejs
View file @2faf482
 <% include ./includes/header.ejs %>
     <div id="masonry_container">
-        한식
+        <% var count = 0; %>
-        <% for (var i in videos) { %>
+        <% for (var i in video) { %>
-            <div id="<%=videos[i].id%>" vid="<%=videos[i].video_id%>">
+            <div>
+                <%=video[i].category.title%>
             </div>
-        <%};%>
+            <% for (var j in video[i].videos) { %>
+            <div id="<%=count%>" vid="<%=video[i].videos[j].video_id%>">
+            </div>
+            <%count++;};};%>
     </div>
-<style type="text/css">
+    <style type="text/css">
-.masonry-grid img { max-width: 260px; }
+        .masonry-grid img {
-</style>
+            max-width: 260px;
-<script src="https://unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
+        }
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.imagesloaded/4.1.1/imagesloaded.pkgd.min.js"></script>
+    </style>
-<script type="text/javascript">
+    <script src="https://unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
+    <script type="text/javascript"
+        src="https://cdnjs.cloudflare.com/ajax/libs/jquery.imagesloaded/4.1.1/imagesloaded.pkgd.min.js"></script>
+    <script type="text/javascript">
         var $masonry_container = $('#masonry_container');
-    $masonry_container.imagesLoaded(function(){
+        $masonry_container.imagesLoaded(function () {
             $masonry_container.masonry({
-        itemSelector : '.masonry-grid',
+                itemSelector: '.masonry-grid',
-        columnWidth : 270
+                columnWidth: 270
             });
         });
-</script>
+    </script>
-<script>
+    <script>
         var tag = document.createElement('script');
         tag.src = "https://www.youtube.com/iframe_api";
         var firstScriptTag = document.getElementsByTagName('script')[0];
         firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
-
         var player;
         var players = [];
         var videoIds = [];
-    for (var i = 0;i<10;i++) {
+        for (var i = 0; i < 30; i++) {
             players.push(String(i));
-        videoIds.push($('#'+i).attr('vid'));
+            videoIds.push($('#' + players[i]).attr('vid'));
         }
         function onYouTubeIframeAPIReady() {
@@ -56,5 +62,5 @@
     //   }
     //   function stopVideo() {
     //   }
-</script>
-<% include ./includes/footer.ejs %>
\ No newline at end of file
+    </script>
+    <% include ./includes/footer.ejs %>
\ No newline at end of file
--- a/views/includes/header.ejs
View file @2faf482
+++ b/views/includes/header.ejs
View file @2faf482
@@ -30,7 +30,7 @@
                 </div> 
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-9">
                     <ul class="nav navbar-nav">
-                        <li class="active">
+                        <li>
                             <a href="/">Home</a>
                         </li>
                         <li><a href="/categori/products">Categori</a></li>