public/routes/home.js

@@ -1,17 +1,17 @@
 const HomeRouter = {
     template: `
-<div>
+        <div>
-<div id="om-msg-cards" class="column pull-right-sm is-four-fifths-desktop">
+            <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>
+                <a v-if="isSearchActiv" @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 class="subscribe-btn" v-if="isSubscripeButtonActiv" type="is-primary" @click="">#IPSUM ABONNIEREN</b-button>
-    <MsgCard
+                <MsgCard
-        v-for="id in messagelist.slice().reverse()"
+                    v-for="id in messagelist.slice().reverse()"
-        :key="id"
+                    :key="id"
-        :msg="messages[id] || {}"
+                    :msg="messages[id] || {}"
-		:isBookmark="bookmarkArray[id]"
+                    :isBookmark="bookmarkArray[id]">
-    ></MsgCard>
+                </MsgCard>
-</div>
+            </div>
-</div>`,
+        </div>`,
     data: function () {
         return {
             messagelist: _messagelist,
@@ -28,27 +28,8 @@ const HomeRouter = {
 		goBackToDashboard: function() {
 			//Home neu rendern ...
 			//windows.history.go();
-			router.push('/files')
-			router.push('/home')
-			$("#escape-search-link").css("visibility", "hidden");
-			$("#subscribe-btn").css("visibility", "hidden");
-		},
-		changeSubscribtion: function(){
-			var btnString = $("#btn-text").text();
-			//console.log(btnString);
 
-			if($("#btn-text").hasClass("subscribed")){
+			_isSearchActiv = false;
-				$("#btn-text").removeClass("subscribed");
-				var newBtnString = "#" + $("#btn-text").text(/deabonnieren/g, '') + "abonnieren";
-				//console.log(btnString);
-				$("#btn-text").text(newBtnString);
-			}else{
-				$("#btn-text").addClass("subscribed");
-				var newBtnString = "#" + $("#btn-text").text(/abonnieren/g, '') + "deabonnieren";
-				//console.log(newBtnString);
-				$("#btn-text").text(newBtnString);
-
-			}
 		}
 
     },

public/routes/initGlobals.js

@@ -14,7 +14,7 @@ var auth = {},
 
     // Search
     _isSearchActiv = false,
-	_isSubscripeButtonActiv = true,
+	_isSubscripeButtonActiv = false,
     data = [],
     search_data = [],
 

public/search.js

@@ -69,15 +69,9 @@ Vue.component('search',{
                 });
         },
         clear: function() {
-            //_isSearchActiv = false;
+            _isSearchActiv = false;
-			this.searchtext = "";
+            this.searchtext = "";
             this.list_messages();
-			//router.push('/files')
-			//router.push('/home')
-			$("#escape-search-link").css("visibility", "hidden");
-			$("#subscribe-btn").css("visibility", "hidden");
-
-
         },
     },
     mounted: function() {
@@ -100,16 +94,7 @@ function get_insert_tag(id) {
 
 function searching(searchtext) {
     _isSearchActiv = true;
-	$("#escape-search-link").css("visibility", "visible");
+    console.log("Searchtext: " + searchtext.replace(/#/g, ''));
-	if(_taglist.indexOf(searchtext.replace(/#/g, '')) > -1){
-		var btnString = "#" + searchtext.replace(/#/g, '') + " abonnieren";
-		$("#btn-text").text(btnString);
-		$("#subscribe-btn").css("visibility", "visible");
-	}else{
-		$("#subscribe-btn").css("visibility", "hidden");
-	}
-
-
     $.ajax({
         url: "api/msg/search/" + searchtext.replace(/#/g, ''),
         method: "GET"
@@ -127,6 +112,8 @@ function searching(searchtext) {
         console.log("searching: err: " + e + f + g);
     })
 
+	_isSubscripeButtonActiv = (_taglist.indexOf(searchtext.replace(/#/g, '')) > -1);
+	console.log("isSubscripeButtonActiv: " + _isSubscripeButtonActiv);
 }
 
 function messages() {

public/style/style.css

@@ -241,15 +241,6 @@ button.clearButton {
     float: right;
   }
 }
-<<<<<<< HEAD
-#subscribe-btn {
-  float: right;
-  visibility: hidden;
-}
-#escape-search-link {
-  visibility: hidden;
-=======
 #bockmark-not-active {
   visibility: visible;
->>>>>>> origin/developer
 }

public/style/style.less

@@ -285,13 +285,6 @@ button.clearButton{
     }
 }
 
-#subscribe-btn{
-	float: right;
-	visibility: hidden;
-}
-#escape-search-link{
-	visibility: hidden;
-
 #bockmark-not-active{
     visibility: visible;
 }