hopfma/om
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into developer

Browse Source 
# Conflicts:
#	public/index.html
#	public/routes/navRoutes.js
This commit is contained in:
gruenzingerxe68435
2019-07-19 15:34:10 +02:00
parent a4da6243f5 35b5748af9
commit a56ab9cadd
7 changed files with 270 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.html
+3 -77
View File
@@ -103,26 +103,9 @@
<b-autocomplete rounded v-model="searchtext" @keydown.native.enter="search" :data="filteredDataArray" placeholder="suche..." icon="magnify" @select="option => selected = option">
</b-autocomplete>
<!--<b-input
type="search"
v-model="searchtext"
icon="magnify"
placeholder="Suche...">
</b-input>-->
<!--<b-taginput
id="search-text"
type="search"
v-model="selected"
:data=taglist
autocomplete
allow-new:true
icon="magnify"
placeholder="Suche.."
@typing="getFilteredTags"
@input="saveTagsToArray">
</b-taginput>-->
<b-button type="is-light" @click="clear">x</b-button>
</b-field>
<button @click="clear">x</button>
</b-field>
</form>
</div>
</div>
@@ -134,51 +117,6 @@
</div>
</div>
<!--<b-tabs type="is-toggle" expanded>
<b-tab-item><router-link to="/home" >
<b-icon
pack="fas"
icon="home"
size="is-small">
</b-icon>
</router-link></b-tab-item>
<b-tab-item icon="magnify"></b-tab-item>
<b-tab-item icon="plus-circle"></b-tab-item>
<b-tab-item icon="bookmark"></b-tab-item>
<b-tab-item icon="account"></b-tab-item>
</b-tabs>-->
<!--
<nav class="navbar is-fixed-bottom is-expanded is-light is-hoverable" role="navigation" aria-label="main navigation">
<div class="navbar-brand is-expanded">
<router-link to="/home" class="navbar-item is-expanded has-text-centered is-active">
<i class="material-icons">home</i>
</router-link>
<router-link to="/files" class="navbar-item is-expanded">
<i class="material-icons">language</i>
</router-link>
<router-link to="/createMessage" class="navbar-item is-expanded">
<i class="material-icons">add_circle</i>
</router-link>
<router-link to="/bookmark" class="navbar-item is-expanded">
<i class="material-icons">bookmark</i>
</router-link>
<router-link to="/profil" class="navbar-item is-expanded">
<i class="material-icons">person</i>
</router-link>
</div>
</nav>
<nav class="nav nav-tabs nav-justified om-nav" v-if="$route.path !=='/createMessage' ">
<router-link to="/home" class="navbar-item has-text-centered"><i class="material-icons">home</i></router-link>
<router-link to="/files" class="navbar-item has-text-centered"><i class="material-icons">language</i></router-link>
<router-link to="/createMessage" class="navbar-item has-text-centered outlined"><i class="material-icons">add_circle</i></router-link>
<router-link to="/bookmark" class="navbar-item has-text-centered"><i class="material-icons">bookmark</i></router-link>
<router-link to="/profil" class="navbar-item has-text-centered"><i class="material-icons">person</i></router-link>
</nav>
</div>
-->
<script>
var isSearchActive = false;
var tagArray = ["lorem"];
@@ -190,18 +128,6 @@
</script>
<!-- const routes = [
{ path: "/", component: HomeRouter },
{ path: "/home", component: HomeRouter },
{ path: "/files", component: FileRouter },
{ path: "/createMessage", component: CreateMsgRouter },
{ path: "/bookmark", component: BookmarkRouter },
{ path: "/profil", component: ProfilRouter },
];
const router = new VueRouter({
routes
}); -->
<script>
var app = new Vue({
router,