From 933a8fa03bf975381c467f8e670c50e4bc5f81c7 Mon Sep 17 00:00:00 2001
From: Bakary Potter <akad@live.be>
Date: Thu, 27 Jul 2017 12:48:59 +0000
Subject: [PATCH] Add link to Youtube Video

---
 frontend/src/components/results/WaterfallDisplay.vue | 11 +----------
 frontend/src/components/results/YoutubeFeed.vue      |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/results/WaterfallDisplay.vue b/frontend/src/components/results/WaterfallDisplay.vue
index 55c6c93..2e2b434 100644
--- a/frontend/src/components/results/WaterfallDisplay.vue
+++ b/frontend/src/components/results/WaterfallDisplay.vue
@@ -54,22 +54,13 @@
 
 		<div class="empty-state empty-state-feed" v-show="entitiesIsEmpty">
 			<h2>Visualise what your colleagues, friends, companies and competitors are talking about.</h2>
-<<<<<<< HEAD
 			<ol>
 				<li>Add the name of your first company or person you want to follow. We call this a member.</li>
 				<li>Click on the member and add all social media channels for this member.</li>
 				<li>All done!</li>
 			</ol>
 			</div>
-=======
-			<ul>
-				<li>Add the name of your first company or person you want to follow. We call this a member.</li>
-				<li>Click on the member and add all social media channels for this member.</li>
-				<li>All done!</li>
-			</ul>
-					
-		</div>
->>>>>>> 5e492662b63242982e86bdf5f677ec09ea50f7c2
+
 
 		<div class="tweets wf-container" id="wf-container">
 			<template v-for="item in items">
diff --git a/frontend/src/components/results/YoutubeFeed.vue b/frontend/src/components/results/YoutubeFeed.vue
index 2ec14ac..40a9fad 100644
--- a/frontend/src/components/results/YoutubeFeed.vue
+++ b/frontend/src/components/results/YoutubeFeed.vue
@@ -13,7 +13,7 @@
   <!-- THUMBNAIL -->
   <div style="position: relative;margin-bottom:16px;">
     <img v-bind:src="feed.thumbnail" alt="" class="media">
-    <a href="" class="play-button">
+    <a v-bind:href="'https://www.youtube.com/watch?v='+feed.id" target="_blank" class="play-button">
       <i class="fa fa-youtube-play"></i>
     </a>
   </div>
@@ -25,7 +25,7 @@
 
   <!-- METADATA - likes/comments/views -->
   <div class="metadata_1">
-    <a v-bind:href="'https://www.youtube.com/v/'+feed.id" target="_blank"><i class="fa fa-external-link"></i></a>
+    <a v-bind:href="'https://www.youtube.com/watch?v='+feed.id" target="_blank"><i class="fa fa-external-link"></i></a>
   </div>
   <div class="metadata_2">
     <div class="name">{{feed.channel}}</div>