Merge remote-tracking branch 'origin/developer' into developer
# Conflicts: # public/index.html # public/routes/navRoutes.js
This commit is contained in:
+95
-32
@@ -1,48 +1,111 @@
|
||||
const BookmarkRouter = {
|
||||
template: `
|
||||
<div>
|
||||
<div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<div class="content">
|
||||
<div class="is-hidden-desktop">
|
||||
<div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a></p>
|
||||
<div class="om-card-footer"> <div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 1</div>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 1
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div></div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
</div>
|
||||
</div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br>
|
||||
<a href="#">#beispiel #tag</a></p>
|
||||
<div class="om-card-footer"> <div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 2</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 2
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div></div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
</div>
|
||||
</div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a></p>
|
||||
<div class="om-card-footer"> <div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 3</div>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 3
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div></div>
|
||||
</div>
|
||||
</div>`,
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
|
||||
<div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 1
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 2
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="om-card card">
|
||||
<h6 class="msg-head">
|
||||
<b>Betreff</b>
|
||||
<img src="favicon.ico" width=20px height=20px>
|
||||
</h6>
|
||||
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
|
||||
<a href="#">#beispiel #tag</a>
|
||||
<div class="om-card-footer">
|
||||
<div class="om-user-line">
|
||||
<i class="material-icons">account_circle</i>
|
||||
Erstellt von User 3
|
||||
</div>
|
||||
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
|
||||
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>`,
|
||||
|
||||
data: function () {
|
||||
return {
|
||||
messages: _messages,
|
||||
|
||||
@@ -6,40 +6,76 @@ const data=[
|
||||
];
|
||||
const CreateMsgRouter = {
|
||||
template: `
|
||||
<div class="content card om-card">
|
||||
<h4>Neue Nachricht erstellen</h4>
|
||||
<div class="content">
|
||||
<div class="is-hidden-desktop">
|
||||
<div class="content card om-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>
|
||||
<b-field>
|
||||
<b-input placeholder="Betreff" id="subject"></b-input>
|
||||
</b-field>
|
||||
|
||||
<b-field>
|
||||
<b-input placeholder="Betreff" id="subject"></b-input>
|
||||
</b-field>
|
||||
<b-field label="Tags">
|
||||
<b-taginput
|
||||
id="tag"
|
||||
v-model="selected"
|
||||
:data=taglist
|
||||
autocomplete
|
||||
allow-new:false
|
||||
icon="label"
|
||||
placeholder="#"
|
||||
@typing="getFilteredTags"
|
||||
@input="saveTagsToArray">
|
||||
</b-taginput>
|
||||
</b-field>
|
||||
|
||||
<b-field label="Tags">
|
||||
<b-taginput
|
||||
id="tag"
|
||||
v-model="selected"
|
||||
:data=taglist
|
||||
autocomplete
|
||||
allow-new:false
|
||||
icon="label"
|
||||
placeholder="#"
|
||||
@typing="getFilteredTags"
|
||||
@input="saveTagsToArray">
|
||||
</b-taginput>
|
||||
</b-field>
|
||||
<b-field>
|
||||
<b-input placeholder="Nachricht" id="message" type="textarea"></b-input>
|
||||
</b-field>
|
||||
|
||||
<b-field>
|
||||
<b-input placeholder="Nachricht" id="message" type="textarea"></b-input>
|
||||
</b-field>
|
||||
<b-button @click="$router.go(-1)">ABBRECHEN</b-button>
|
||||
<b-button type="is-primary" @click="createMsg">SENDEN</b-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<b-button @click="$router.go(-1)">ABBRECHEN</b-button>
|
||||
<b-button type="is-primary" @click="createMsg">SENDEN</b-button>
|
||||
<div class=" column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
|
||||
<div class="content card om-card">
|
||||
<h4>Neue Nachricht erstellen</h4>
|
||||
<b-field>
|
||||
<b-input placeholder="User" id="user"></b-input>
|
||||
</b-field>
|
||||
|
||||
<b-field>
|
||||
<b-input placeholder="Betreff" id="subject"></b-input>
|
||||
</b-field>
|
||||
|
||||
<b-field label="Tags">
|
||||
<b-taginput
|
||||
id="tag"
|
||||
v-model="selected"
|
||||
:data=taglist
|
||||
autocomplete
|
||||
allow-new:false
|
||||
icon="label"
|
||||
placeholder="#"
|
||||
@typing="getFilteredTags"
|
||||
@input="saveTagsToArray">
|
||||
</b-taginput>
|
||||
</b-field>
|
||||
|
||||
<b-field>
|
||||
<b-input placeholder="Nachricht" id="message" type="textarea"></b-input>
|
||||
</b-field>
|
||||
|
||||
<b-button @click="$router.go(-1)">ABBRECHEN</b-button>
|
||||
<b-button type="is-primary" @click="createMsg">SENDEN</b-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>`,
|
||||
|
||||
</div>
|
||||
`,
|
||||
data: function () {
|
||||
return {
|
||||
selected: [],
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
Vue.component('nav-router', {
|
||||
template: `
|
||||
<div>
|
||||
<nav class="navbar is-fixed-bottom is-expanded is-primary" role="navigation" aria-label="main navigation">
|
||||
<nav class="navbar is-fixed-bottom is-expanded is-primary is-hidden-desktop" role="navigation" aria-label="main navigation">
|
||||
<div class="navbar-brand is-expanded is-light">
|
||||
<router-link to="/home" class="navbar-item is-primary is-expanded has-text-centered">
|
||||
<router-link to="/home" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop">
|
||||
<i class="material-icons">home</i>
|
||||
</router-link>
|
||||
|
||||
@@ -11,19 +11,47 @@ Vue.component('nav-router', {
|
||||
<i class="material-icons">search</i>
|
||||
</router-link>
|
||||
|
||||
<router-link to="/createMessage" class="navbar-item is-primary is-expanded">
|
||||
<router-link to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
|
||||
<i class="material-icons">add_circle</i>
|
||||
</router-link>
|
||||
|
||||
<router-link to="/bookmark" class="navbar-item is-primary is-expanded">
|
||||
<router-link to="/bookmark" class="navbar-item is-primary is-expanded is-hidden-desktop">
|
||||
<i class="material-icons">bookmark</i>
|
||||
</router-link>
|
||||
|
||||
<router-link to="/profil" class="navbar-item is-primary is-expanded">
|
||||
<router-link to="/profil" class="navbar-item is-primary is-expanded is-hidden-desktop">
|
||||
<i class="material-icons">person</i>
|
||||
</router-link>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="is-fullheight">
|
||||
<div class="column is-sidebar-menu is-hidden-touch">
|
||||
<aside class="menu is-medium">
|
||||
<ul class="menu-list">
|
||||
<li><router-link to="/home" class="is-hidden-touch">
|
||||
<i class="material-icons">home</i> Home
|
||||
</router-link></li>
|
||||
|
||||
<li><router-link to="/files" class="is-hidden-touch">
|
||||
<i class="material-icons">language</i> Language
|
||||
</router-link></li>
|
||||
|
||||
<li><router-link to="/createMessage" class="is-hidden-touch">
|
||||
<i class="material-icons">add_circle</i> Create Message
|
||||
</router-link></li>
|
||||
|
||||
<li><router-link to="/bookmark" class="is-hidden-touch">
|
||||
<i class="material-icons">bookmark</i> Bookmark
|
||||
</router-link></li>
|
||||
|
||||
<li><router-link to="/profil" class="is-hidden-touch">
|
||||
<i class="material-icons">person</i> Profil
|
||||
</router-link></li>
|
||||
</ul>
|
||||
</aside>
|
||||
</div>
|
||||
</div>
|
||||
</div>`,
|
||||
|
||||
});
|
||||
@@ -41,3 +69,27 @@ const router = new VueRouter({
|
||||
routes,
|
||||
linkActiveClass: 'is-active'
|
||||
});
|
||||
|
||||
/*
|
||||
<div class="nav-right nav-menu is-hidden-desktop-only">
|
||||
<router-link to="/home" class="nav-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
|
||||
<i class="material-icons">home</i> Home
|
||||
</router-link>
|
||||
|
||||
<router-link to="/files" class="nav-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
|
||||
<i class="material-icons">language</i> Language
|
||||
</router-link>
|
||||
|
||||
<router-link to="/createMessage" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
|
||||
<i class="material-icons">add_circle</i> Create Message
|
||||
</router-link>
|
||||
|
||||
<router-link to="/bookmark" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
|
||||
<i class="material-icons">bookmark</i> Bookmark
|
||||
</router-link>
|
||||
|
||||
<router-link to="/profil" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
|
||||
<i class="material-icons">person</i> Profil
|
||||
</router-link>
|
||||
</div>
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user