Global refactor
This commit is contained in:
@@ -152,7 +152,7 @@ Vue.component('login-panel', {
|
||||
function successful_login(res) {
|
||||
console.info("Re-Auth: Correct credentials");
|
||||
this.closeLoginPanel;
|
||||
vueForceRender();
|
||||
vueForceRender('key');
|
||||
|
||||
//console.log(res);
|
||||
router.push('/home')
|
||||
|
||||
@@ -4,10 +4,11 @@ const CreateMsgRouter = {
|
||||
<div class="column pull-right-sm is-four-fifths-desktop">
|
||||
<div id="mobile" class="om-card card">
|
||||
<h4>Neue Nachricht erstellen</h4>
|
||||
<b-field>
|
||||
<b-input placeholder="User" id="user"></b-input>
|
||||
</b-field>
|
||||
<!--<b-field>
|
||||
<b-input placeholder="User" id="user"></b-input>
|
||||
</b-field>-->
|
||||
|
||||
<label class="label">{{ userName }}</label>
|
||||
<b-field>
|
||||
<b-input placeholder="Betreff" id="subject"></b-input>
|
||||
</b-field>
|
||||
@@ -38,6 +39,7 @@ const CreateMsgRouter = {
|
||||
|
||||
data: function () {
|
||||
return {
|
||||
auth: auth,
|
||||
isDisabled: false,
|
||||
selected: [],
|
||||
searchtext : "",
|
||||
@@ -45,13 +47,16 @@ const CreateMsgRouter = {
|
||||
};
|
||||
},
|
||||
computed:{
|
||||
filteredDataArray() {
|
||||
filteredDataArray: function() {
|
||||
return this.taglist.filter((option) => {
|
||||
return option
|
||||
.toString()
|
||||
.toLowerCase()
|
||||
.indexOf(this.searchtext.toLowerCase()) >= 0
|
||||
})
|
||||
},
|
||||
userName: function() {
|
||||
return 'User: '+auth.name;
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -62,8 +67,19 @@ const CreateMsgRouter = {
|
||||
createMsg: function () {
|
||||
var _subject = $("#subject").val();
|
||||
var _message = $("#message").val();
|
||||
var _tag = tagArray;
|
||||
var _user = auth.name != '' ? auth.name : $("#user").val();
|
||||
var tmpArr = [];
|
||||
tagArray.forEach(function(tag) {
|
||||
console.info(tag);
|
||||
tmpArr.push(tag.replace(/#/g, ''));
|
||||
});
|
||||
tagArray = tmpArr;
|
||||
var _tag = tagArray;
|
||||
var _user = auth.name.split(' ');
|
||||
if (_user.length < 2) {
|
||||
_user = _user[0];
|
||||
} else {
|
||||
_user = _user[1] + ', ' + _user[0];
|
||||
}
|
||||
//console.log("Message Created: " + _tag + " " + _message + " " + _user);
|
||||
$.ajax({
|
||||
url: "api/msg",
|
||||
@@ -95,38 +111,26 @@ const CreateMsgRouter = {
|
||||
})
|
||||
},
|
||||
list_tags: function () {
|
||||
$.ajax({url: "api/tag/ids",method: "GET"})
|
||||
.done(jd => {
|
||||
// NICHT SO wg. Vue: _messagelist = jd;
|
||||
console.log("DATA: "+data);
|
||||
if(data == ""){
|
||||
_taglist.splice(0, _taglist.length);
|
||||
_taglist.push.apply(_taglist, jd);
|
||||
console.log("tag: jd: " + jd);
|
||||
for (var e in jd) {
|
||||
if (!_tags[jd[e]]) {
|
||||
get_insert_tag(jd[e]);
|
||||
}
|
||||
$.ajax({url: "api/tag/ids",method: "GET"})
|
||||
.done(jd => {
|
||||
// NICHT SO wg. Vue: _messagelist = jd;
|
||||
console.log("DATA: "+data);
|
||||
if(data == ""){
|
||||
_taglist.splice(0, _taglist.length);
|
||||
_taglist.push.apply(_taglist, jd);
|
||||
console.log("tag: jd: " + jd);
|
||||
for (var e in jd) {
|
||||
if (!_tags[jd[e]]) {
|
||||
get_insert_tag(jd[e]);
|
||||
}
|
||||
}
|
||||
}).fail(function (e, f, g) {
|
||||
console.log("err: " + e + f + g);
|
||||
});
|
||||
}
|
||||
}
|
||||
}).fail(function (e, f, g) {
|
||||
console.log("err: " + e + f + g);
|
||||
});
|
||||
},
|
||||
},
|
||||
mounted: function () {
|
||||
var userField = $('#user');
|
||||
if (auth != null && auth.mail != '') {
|
||||
// userField.prop('placeholder',auth.name);
|
||||
var authorName = auth.name.split(' ');
|
||||
authorName = authorName[1] + ', ' + authorName[0];
|
||||
userField.val(authorName);
|
||||
userField.prop('disabled',true);
|
||||
} else {
|
||||
userField.prop('placeholder','User');
|
||||
userField.prop('disabled',false);
|
||||
}
|
||||
|
||||
//this.list_tags();
|
||||
if ($(this).bootstrapMaterialDesign)
|
||||
$(this).bootstrapMaterialDesign();
|
||||
|
||||
+48
-21
@@ -1,16 +1,26 @@
|
||||
const HomeRouter = {
|
||||
template: `
|
||||
<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><br><br>
|
||||
<MsgCard
|
||||
v-for="id in messagelist.slice().reverse()"
|
||||
:key="id"
|
||||
:msg="messages[id] || {}"
|
||||
:isBookmark="bookmarkArray[id]"
|
||||
></MsgCard>
|
||||
</div>
|
||||
<div id="om-msg-cards" class="column pull-right-sm is-four-fifths-desktop">
|
||||
<b-button id="escape-search-link"
|
||||
v-if="_isSearchActiv"
|
||||
@click="goBackToDashboard"
|
||||
icon-left="arrow-left"
|
||||
type="is-primary"
|
||||
@toggle-escape-search-link="toggleEscapeSearchLink"
|
||||
outlined>
|
||||
zurück zu allen Einträgen
|
||||
</b-button>
|
||||
<!--<b-button id="subscribe-btn" type="is-primary" v-if="_isSubscripeButtonActiv" @update-home-abo-button="updateHomeAboButton" @click="changeSubscribtion">
|
||||
{{ subscripeTagName }}
|
||||
</b-button>--><br><br>
|
||||
<MsgCard
|
||||
v-for="id in messagelist.slice().reverse()"
|
||||
:key="id"
|
||||
:msg="messages[id] || {}"
|
||||
:isBookmark="bookmarkArray[id]">
|
||||
</MsgCard>
|
||||
</div>
|
||||
</div>`,
|
||||
data: function () {
|
||||
return {
|
||||
@@ -18,34 +28,51 @@ const HomeRouter = {
|
||||
messages: _messages,
|
||||
isSearchActiv: _isSearchActiv,
|
||||
isSubscripeButtonActiv: _isSubscripeButtonActiv,
|
||||
isSubscriped: false,
|
||||
subscripeTagName: '',
|
||||
bookmarkArray: auth.bookmarks,
|
||||
vueRender: vueRender,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
updateHomeAboButton: function(content) {
|
||||
this.subscripeTagName = content;
|
||||
console.info( this.subscripeTagName);
|
||||
vueForceRender('key');
|
||||
},
|
||||
toggleEscapeSearchLink: function() {
|
||||
console.info('got called');
|
||||
this.isSearchActive = !this.isSearchActive;
|
||||
vueForceRender('key');
|
||||
console.info( this.isSearchActive);
|
||||
},
|
||||
list_messages: function() {
|
||||
messages();
|
||||
},
|
||||
goBackToDashboard: function() {
|
||||
vueForceRender();
|
||||
$("#escape-search-link").css("visibility", "hidden");
|
||||
$("#subscribe-btn").css("visibility", "hidden");
|
||||
_isSearchActiv = false;
|
||||
this.$emit('reset-searchtext','');
|
||||
// $("#escape-search-link").css("visibility", "hidden");
|
||||
// $("#subscribe-btn").css("visibility", "hidden");
|
||||
_isSubscripeButtonActiv = false;
|
||||
vueForceRender('key');
|
||||
vueForceRender('search');
|
||||
},
|
||||
changeSubscribtion: function(){
|
||||
var btnString = $("#btn-text").text();
|
||||
console.log(btnString);
|
||||
|
||||
if($("#btn-text").hasClass("subscribed")){
|
||||
$("#btn-text").removeClass("subscribed");
|
||||
var newBtnString = btnString.replace(/deabonnieren/g, '') + "abonnieren";
|
||||
if(this.isSubscriped){
|
||||
this.subscripeTagName.replace(/deabonnieren/g, '') + "abonnieren";
|
||||
//console.log(btnString);
|
||||
$("#btn-text").text(newBtnString);
|
||||
// $("#btn-text").text(newBtnString);
|
||||
}else{
|
||||
$("#btn-text").addClass("subscribed");
|
||||
var newBtnString = btnString.replace(/abonnieren/g, '') + "deabonnieren";
|
||||
this.subscripeTagName.replace(/abonnieren/g, '') + "deabonnieren";
|
||||
//console.log(newBtnString);
|
||||
$("#btn-text").text(newBtnString);
|
||||
|
||||
// $("#btn-text").text(newBtnString);
|
||||
}
|
||||
this.isSubscriped = !this.isSubscriped;
|
||||
vueForceRender('key');
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// Global Variables
|
||||
// User
|
||||
var auth = {},
|
||||
majorList = [],
|
||||
|
||||
// Message
|
||||
_messagelist = [],
|
||||
@@ -14,19 +13,82 @@ var auth = {},
|
||||
|
||||
// Search
|
||||
_isSearchActiv = false,
|
||||
_isSubscripeButtonActiv = true,
|
||||
_isSubscripeButtonActiv = false,
|
||||
data = [],
|
||||
search_data = [],
|
||||
|
||||
// Vue Rerender Key
|
||||
vueRender = { key:0 };
|
||||
vueRender = {
|
||||
key: 0,
|
||||
search: 0,
|
||||
};
|
||||
|
||||
const authorRole = 'author';
|
||||
const authorRole = 'author',
|
||||
majorList = [
|
||||
{id:'B-AC',name:'Bachelor Angewandte Chemie'},
|
||||
{id:'B-AMP',name:'Bachelor Angewandte Mathematik und Physik'},
|
||||
{id:'B-TJ',name:'Bachelor Technikjournalismus/Technik-PR'},
|
||||
{id:'B-AR',name:'Bachelor Architektur'},
|
||||
{id:'B-BI',name:'Bachelor Bauingenieurwesen'},
|
||||
{id:'B-BW',name:'Bachelor Betriebswirtschaft'},
|
||||
{id:'B-BIO',name:'Bachelor Management in der Biobranche'},
|
||||
{id:'B-IB',name:'Bachelor International Business'},
|
||||
{id:'B-IBT',name:'Bachelor International Business and Technology'},
|
||||
{id:'B-DE',name:'Bachelor Design'},
|
||||
{id:'B-EI',name:'Bachelor Elektrotechnik und Informationstechnik'},
|
||||
{id:'B-MED',name:'Bachelor Medizintechnik'},
|
||||
{id:'B-MF',name:'Bachelor Mechatronik/Feinwerktechnik'},
|
||||
{id:'B-ME',name:'Bachelor Media Engineering'},
|
||||
{id:'B-IN',name:'Bachelor Informatik'},
|
||||
{id:'B-MIN',name:'Bachelor Medieninformatik'},
|
||||
{id:'B-WIN',name:'Bachelor Wirtschaftsinformatik'},
|
||||
{id:'B-MB',name:'Bachelor Maschinenbau'},
|
||||
{id:'B-EGT',name:'Bachelor Energie- und Gebäudetechnik'},
|
||||
{id:'B-EBL',name:'Bachelor Soziale Arbeit: Erziehung und Bildung im Lebenslauf'},
|
||||
{id:'B-SA',name:'Bachelor Soziale Arbeit'},
|
||||
{id:'B-EPT',name:'Bachelor Energieprozesstechnik'},
|
||||
{id:'B-VT',name:'Bachelor Verfahrenstechnik'},
|
||||
{id:'B-WT',name:'Bachelor Werkstofftechnik'},
|
||||
{id:'M-AMP',name:'Master Angewandte Mathematik und Physik'},
|
||||
{id:'M-AR',name:'Master Architektur'},
|
||||
{id:'M-BI',name:'Master Internationales Bauwesen'},
|
||||
{id:'M-URB',name:'Master Urbane Mobilität (Verkehrsingenieurwesen)'},
|
||||
{id:'M-BW',name:'Master Betriebswirtschaft'},
|
||||
{id:'M-TAX',name:'Master Steuerberatung'},
|
||||
{id:'M-WR',name:'Master Wirtschaftsrecht'},
|
||||
{id:'M-IFE',name:'Master International Finance and Economics'},
|
||||
{id:'M-IMA',name:'Master International Marketing'},
|
||||
{id:'M-APR',name:'Master Applied Research in Engineering Sciences'},
|
||||
{id:'M-SY',name:'Master Elektronische und Mechatronische Systeme'},
|
||||
{id:'M-IN',name:'Master Informatik'},
|
||||
{id:'M-MIN',name:'Master Medieninformatik'},
|
||||
{id:'M-WIN',name:'Master Wirtschaftsinformatik'},
|
||||
{id:'M-MB',name:'Master Maschinenbau'},
|
||||
{id:'M-EE',name:'Master Energiemanagement und Energietechnik'},
|
||||
{id:'M-GT',name:'Master Gebäudetechnik'},
|
||||
{id:'M-SA',name:'Master Soziale Arbeit'},
|
||||
{id:'M-VT',name:'Master Chemieingenieurwesen und Verfahrenstechnik'},
|
||||
{id:'M-WT',name:'Master Werkstofftechnik'},
|
||||
],
|
||||
facultyList = [
|
||||
{id:'AC',name:'Angewandte Chemie'},
|
||||
{id:'AMP',name:'Angewandte Mathematik, Physik und Allgemeinwissenschaften'},
|
||||
{id:'AR',name:'Architektur'},
|
||||
{id:'BI',name:'Bauingeneurwesen'},
|
||||
{id:'BW',name:'Betriebswirtschaft'},
|
||||
{id:'D',name:'Design'},
|
||||
{id:'EFI',name:'Elektrotechnik Feinwerktechnik Informationstechnik'},
|
||||
{id:'IN',name:'Informatik'},
|
||||
{id:'MB-VS',name:'Maschinenbau und Versorgungstechnik'},
|
||||
{id:'SW',name:'Sozialwissenschaften'},
|
||||
{id:'VT',name:'Verfahrenstechnik'},
|
||||
{id:'WT',name:'Werkstofftechnik'},
|
||||
];
|
||||
|
||||
// Global Functions
|
||||
function vueForceRender() {
|
||||
if (vueRender.key >= 10) {
|
||||
vueRender.key = 0;
|
||||
function vueForceRender(keyName) {
|
||||
if (vueRender[keyName] >= 10) {
|
||||
vueRender[keyName] = 0;
|
||||
}
|
||||
vueRender.key++;
|
||||
vueRender[keyName]++;
|
||||
}
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
majorList = [
|
||||
{id:'B-AC',name:'Bachelor Angewandte Chemie'},
|
||||
{id:'B-AMP',name:'Bachelor Angewandte Mathematik und Physik'},
|
||||
{id:'B-TJ',name:'Bachelor Technikjournalismus/Technik-PR'},
|
||||
{id:'B-AR',name:'Bachelor Architektur'},
|
||||
{id:'B-BI',name:'Bachelor Bauingenieurwesen'},
|
||||
{id:'B-BW',name:'Bachelor Betriebswirtschaft'},
|
||||
{id:'B-BIO',name:'Bachelor Management in der Biobranche'},
|
||||
{id:'B-IB',name:'Bachelor International Business'},
|
||||
{id:'B-IBT',name:'Bachelor International Business and Technology'},
|
||||
{id:'B-DE',name:'Bachelor Design'},
|
||||
{id:'B-EI',name:'Bachelor Elektrotechnik und Informationstechnik'},
|
||||
{id:'B-MED',name:'Bachelor Medizintechnik'},
|
||||
{id:'B-MF',name:'Bachelor Mechatronik/Feinwerktechnik'},
|
||||
{id:'B-ME',name:'Bachelor Media Engineering'},
|
||||
{id:'B-IN',name:'Bachelor Informatik'},
|
||||
{id:'B-MIN',name:'Bachelor Medieninformatik'},
|
||||
{id:'B-WIN',name:'Bachelor Wirtschaftsinformatik'},
|
||||
{id:'B-MB',name:'Bachelor Maschinenbau'},
|
||||
{id:'B-EGT',name:'Bachelor Energie- und Gebäudetechnik'},
|
||||
{id:'B-EBL',name:'Bachelor Soziale Arbeit: Erziehung und Bildung im Lebenslauf'},
|
||||
{id:'B-SA',name:'Bachelor Soziale Arbeit'},
|
||||
{id:'B-EPT',name:'Bachelor Energieprozesstechnik'},
|
||||
{id:'B-VT',name:'Bachelor Verfahrenstechnik'},
|
||||
{id:'B-WT',name:'Bachelor Werkstofftechnik'},
|
||||
{id:'M-AMP',name:'Master Angewandte Mathematik und Physik'},
|
||||
{id:'M-AR',name:'Master Architektur'},
|
||||
{id:'M-BI',name:'Master Internationales Bauwesen'},
|
||||
{id:'M-URB',name:'Master Urbane Mobilität (Verkehrsingenieurwesen)'},
|
||||
{id:'M-BW',name:'Master Betriebswirtschaft'},
|
||||
{id:'M-TAX',name:'Master Steuerberatung'},
|
||||
{id:'M-WR',name:'Master Wirtschaftsrecht'},
|
||||
{id:'M-IFE',name:'Master International Finance and Economics'},
|
||||
{id:'M-IMA',name:'Master International Marketing'},
|
||||
{id:'M-APR',name:'Master Applied Research in Engineering Sciences'},
|
||||
{id:'M-SY',name:'Master Elektronische und Mechatronische Systeme'},
|
||||
{id:'M-IN',name:'Master Informatik'},
|
||||
{id:'M-MIN',name:'Master Medieninformatik'},
|
||||
{id:'M-WIN',name:'Master Wirtschaftsinformatik'},
|
||||
{id:'M-MB',name:'Master Maschinenbau'},
|
||||
{id:'M-EE',name:'Master Energiemanagement und Energietechnik'},
|
||||
{id:'M-GT',name:'Master Gebäudetechnik'},
|
||||
{id:'M-SA',name:'Master Soziale Arbeit'},
|
||||
{id:'M-VT',name:'Master Chemieingenieurwesen und Verfahrenstechnik'},
|
||||
{id:'M-WT',name:'Master Werkstofftechnik'},
|
||||
];
|
||||
@@ -11,7 +11,7 @@ Vue.component('nav-router', {
|
||||
<i class="material-icons">search</i>
|
||||
</router-link>
|
||||
|
||||
<router-link v-if="isAuthor" to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
|
||||
<router-link v-if="auth.roles.author" to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
|
||||
<i class="material-icons">add_circle</i>
|
||||
</router-link>
|
||||
|
||||
@@ -37,7 +37,7 @@ Vue.component('nav-router', {
|
||||
<i class="material-icons">search</i> Search
|
||||
</router-link></li>
|
||||
|
||||
<li><router-link v-if="isAuthor" to="/createMessage">
|
||||
<li><router-link v-if="auth.roles.author" to="/createMessage">
|
||||
<i class="material-icons">add_circle</i> Create Message
|
||||
</router-link></li>
|
||||
|
||||
@@ -55,18 +55,9 @@ Vue.component('nav-router', {
|
||||
</div>`,
|
||||
data: function() {
|
||||
return {
|
||||
isAuthor: this.isAuthorCheck(),
|
||||
auth: auth,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
isAuthorCheck: function() {
|
||||
console.info(auth.roles.author === authorRole);
|
||||
return (auth.roles.author === authorRole);
|
||||
},
|
||||
},
|
||||
updated: function() {
|
||||
this.isAuthorChecked();
|
||||
}
|
||||
});
|
||||
|
||||
const routes = [
|
||||
|
||||
+35
-13
@@ -11,7 +11,9 @@ Vue.component('profil-card', {
|
||||
|
||||
<div class="profil-text">
|
||||
<span style="font-size:120%; display:inline-block; margin: 0.8rem 0 0 0;"><b>{{ auth.name }}</b></span><br><br>
|
||||
<span style="font-size:90%; display:inline-block; margin: 0 0 0.8rem 0;"><b>{{ major }}</b></span>
|
||||
<span style="font-size:100%; display:inline-block; margin: 0 0 0.8rem 0;"><b>{{ labelMajorOrFaculty }}</b></span>
|
||||
<br>
|
||||
<span style="font-size:90%; display:inline-block; margin: 0 0 0.8rem 0;"><b>{{ majorOrFaculty }}</b></span>
|
||||
<br><br>
|
||||
</div>
|
||||
|
||||
@@ -57,25 +59,45 @@ Vue.component('profil-card', {
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
major: function() {
|
||||
majorOrFaculty: function() {
|
||||
// e.g. ST@B-ME;ST@EFI;
|
||||
var majorID = auth.type.split(';')[0].split('@')[1];
|
||||
//console.info(majorID);
|
||||
//console.info(majorList);
|
||||
var majorName = 'Studiengang Unbekannt';
|
||||
majorList.forEach(function(major) {
|
||||
if (major.id == majorID) {
|
||||
majorName = major.name;
|
||||
}
|
||||
});
|
||||
return majorName;
|
||||
if (auth.roles.author) {
|
||||
var facultyID = auth.type.split(';');
|
||||
console.info(facultyID[facultyID.length-2]);
|
||||
facultyID = facultyID[facultyID.length-2].split('@')[1];
|
||||
var facultyName = '';
|
||||
facultyList.forEach(function(faculty) {
|
||||
if (faculty.id == facultyID) {
|
||||
facultyName = faculty.name;
|
||||
}
|
||||
});
|
||||
return facultyName;
|
||||
} else {
|
||||
var majorID = auth.type.split(';')[0].split('@')[1];
|
||||
//console.info(majorID);
|
||||
//console.info(majorList);
|
||||
var majorName = 'Studiengang Unbekannt';
|
||||
majorList.forEach(function(major) {
|
||||
if (major.id == majorID) {
|
||||
majorName = major.name;
|
||||
}
|
||||
});
|
||||
return majorName;
|
||||
}
|
||||
},
|
||||
labelMajorOrFaculty: function() {
|
||||
if (auth.roles.author) {
|
||||
return 'Fakultät:'
|
||||
} else {
|
||||
return 'Studiengang:'
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
logout: function() {
|
||||
clearAuthState();
|
||||
$.ajax({ url: "api/logout", method: "POST" });
|
||||
vueForceRender();
|
||||
vueForceRender('key');
|
||||
router.push('/profil');
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user