From 9f9d3c1480d8cae3439be82252dc8c9d91d32599 Mon Sep 17 00:00:00 2001
From: senta_mandutz <mandutzse68104@th-nuernberg.de>
Date: Tue, 23 Jul 2019 21:41:27 +0200
Subject: [PATCH] bookmars

---
 public/routes/bookmark.js    |  9 ++++++++-
 public/routes/home.js        |  2 +-
 public/routes/initGlobals.js |  2 +-
 public/routes/msgCard.js     | 12 ++++++++----
 public/search.js             |  5 ++++-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/public/routes/bookmark.js b/public/routes/bookmark.js
index c627af4..3efcc66 100644
--- a/public/routes/bookmark.js
+++ b/public/routes/bookmark.js
@@ -6,6 +6,7 @@ const BookmarkRouter = {
             v-for="id in msgDisplay"
             :key="id"
             :msg="messages[id] || {}"
+            :isBookmark="bookmarkArray[id]"
         ></MsgCard>
     </div>
 
@@ -21,6 +22,7 @@ const BookmarkRouter = {
             messages: _messages,
             isActive: true,
             messageId: '',
+            bookmarkArray: auth.bookmarks,
         }
     },
     computed:{
@@ -50,6 +52,7 @@ const BookmarkRouter = {
 
 
 
+
             /*var _usrid = auth.user;
             $.ajax({
                 url: "api/usr/id/" + _usrid,
@@ -75,8 +78,12 @@ const BookmarkRouter = {
 				console.log(err);
 			}*/
         }
+    },
+    beforeMount: function(){
+
     },
     mounted: function (){
         this.getMessages();
-    }
+    },
+
 };
diff --git a/public/routes/home.js b/public/routes/home.js
index aabe37e..209cd20 100644
--- a/public/routes/home.js
+++ b/public/routes/home.js
@@ -3,7 +3,7 @@ const HomeRouter = {
 <div>
 <div id="om-msg-cards" class="column pull-right-sm is-four-fifths-desktop">
 	<a id="escape-search-link"  @click="goBackToDashboard">< zurück zu allen Einträgen</a>
-	<b-button id="subscribe-btn"  type="is-primary" @click="changeSubscribtion"><div id="btn-text"></div></b-button>
+	<b-button id="subscribe-btn"  type="is-primary" @click="changeSubscribtion"><div id="btn-text"></div></b-button><br><br>
     <MsgCard
         v-for="id in messagelist.slice().reverse()"
         :key="id"
diff --git a/public/routes/initGlobals.js b/public/routes/initGlobals.js
index 5fa5d48..89425ab 100644
--- a/public/routes/initGlobals.js
+++ b/public/routes/initGlobals.js
@@ -8,7 +8,7 @@ var auth = {},
     _messages = {},
 
     // Tag
-    _taglist = ["efi","wichtig"],
+    _taglist = [],
     _tags = [],
     tagArray = [],
 
diff --git a/public/routes/msgCard.js b/public/routes/msgCard.js
index b093abf..1584831 100644
--- a/public/routes/msgCard.js
+++ b/public/routes/msgCard.js
@@ -14,8 +14,8 @@ Vue.component('MsgCard', {
                     <i class="material-icons">account_circle</i>
                     Erstellt von {{ msg.user }}
                 </div>
-                <i id="bockmark-not-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
-                <i id="bockmark-active" class="material-icons" :key="isActive" @click="myFilter(msg._id)" v-else>bookmark</i>
+                <i id="bockmark-not-active" class="material-icons" :key="vueRender.key" @click="myFilter(msg._id)" v-if="!isActive">bookmark_border</i>
+                <i id="bockmark-active" class="material-icons" :key="vueRender.key" @click="myFilter(msg._id)" v-else>bookmark</i>
             </div>
         </div>`,
     props: ['msg', 'isBookmark'],
@@ -23,9 +23,9 @@ Vue.component('MsgCard', {
     data: function () {
         return {
             isActive: this.isBookmark,
-            isActive_: 0,
             msgid: this.msg._id,
             bookmarkArray: auth.bookmarks,
+            vueRender: vueRender,
         };
     },
 
@@ -68,8 +68,12 @@ Vue.component('MsgCard', {
             }*/
         },
         filterForTag: function (tag) {
-            console.log("link: " + tag);
+
+            //console.log("link: " + tag);
             searching(tag);
+            var btnString = "#" + tag + " abonnieren";
+			$("#btn-text").text(btnString);
+			$("#subscribe-btn").css("visibility", "visible");
         },
         isBookmarkActive: function (msgid) {
             //console.log("isBookmarkActive(): " + msgid);
diff --git a/public/search.js b/public/search.js
index 871619b..c18f95f 100644
--- a/public/search.js
+++ b/public/search.js
@@ -99,7 +99,10 @@ function get_insert_tag(id) {
 function searching(searchtext) {
     _isSearchActiv = true;
 	$("#escape-search-link").css("visibility", "visible");
-	if(_taglist.indexOf(searchtext.replace(/#/g, '')) > -1){
+    //console.log(_tags);
+    console.log(data);
+
+	if(data.indexOf(searchtext) > -1){
 		var btnString = "#" + searchtext.replace(/#/g, '') + " abonnieren";
 		$("#btn-text").text(btnString);
 		$("#subscribe-btn").css("visibility", "visible");