Browse Source

verschiedenes

master
Xenia Gruenzinger 4 years ago
parent
commit
6529b1d937
5 changed files with 55 additions and 12 deletions
  1. 22
    3
      public/routes/home.js
  2. 1
    1
      public/routes/initGlobals.js
  3. 18
    5
      public/search.js
  4. 6
    3
      public/style/style.css
  5. 8
    0
      public/style/style.less

+ 22
- 3
public/routes/home.js View File

@@ -2,8 +2,8 @@ const HomeRouter = {
template: `
<div>
<div id="om-msg-cards" class="column pull-right-sm is-four-fifths-desktop">
<a v-if="isSearchActiv" @click="goBackToDashboard">< zurück zu allen Einträgen</a>
<b-button class="subscribe-btn" v-if="isSubscripeButtonActiv" type="is-primary" @click="">#IPSUM ABONNIEREN</b-button>
<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>
<MsgCard
v-for="id in messagelist.slice().reverse()"
:key="id"
@@ -26,8 +26,27 @@ 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);

_isSearchActiv = false;
if($("#btn-text").hasClass("subscribed")){
$("#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);

}
}
},
mounted: function () {

+ 1
- 1
public/routes/initGlobals.js View File

@@ -14,7 +14,7 @@ var auth = {},

// Search
_isSearchActiv = false,
_isSubscripeButtonActiv = false,
_isSubscripeButtonActiv = true,
data = [],
search_data = []


+ 18
- 5
public/search.js View File

@@ -69,9 +69,15 @@ Vue.component('search',{
});
},
clear: function() {
_isSearchActiv = false;
this.searchtext = "";
//_isSearchActiv = false;
this.searchtext = "";
this.list_messages();
//router.push('/files')
//router.push('/home')
$("#escape-search-link").css("visibility", "hidden");
$("#subscribe-btn").css("visibility", "hidden");


},
},
mounted: function() {
@@ -94,7 +100,16 @@ function get_insert_tag(id) {

function searching(searchtext) {
_isSearchActiv = true;
console.log("Searchtext: " + searchtext.replace(/#/g, ''));
$("#escape-search-link").css("visibility", "visible");
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"
@@ -112,8 +127,6 @@ function searching(searchtext) {
console.log("searching: err: " + e + f + g);
})

_isSubscripeButtonActiv = (_taglist.indexOf(searchtext.replace(/#/g, '')) > -1);
console.log("isSubscripeButtonActiv: " + _isSubscripeButtonActiv);
}

function messages() {

+ 6
- 3
public/style/style.css View File

@@ -241,7 +241,10 @@ button.clearButton {
float: right;
}
}

.subscribe-btn{
float:right;
#subscribe-btn {
float: right;
visibility: hidden;
}
#escape-search-link {
visibility: hidden;
}

+ 8
- 0
public/style/style.less View File

@@ -284,3 +284,11 @@ button.clearButton{
float: right;
}
}

#subscribe-btn{
float: right;
visibility: hidden;
}
#escape-search-link{
visibility: hidden;
}

Loading…
Cancel
Save