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

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

Browse Source
This commit is contained in:
Vivianne Pham 2018-12-05 14:43:13 +01:00
commit c6c8435684
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/home.js
View File

@ -1,5 +1,5 @@
const ('Home', { Vue.component('Home', {
template: ` <div id="message-list" v-for="(msg, index) in messages" :key="msg.id" :subject="msg.subject" :message="msg.message" :tag="msg.tag" :user="msg.user"> template: `<div id="message-list">
<div class="om-card card"> <div class="om-card card">
<h6 class="msg-head"> <h6 class="msg-head">
<b>{{ subject }}</b> <b>{{ subject }}</b>
@ -10,7 +10,7 @@ const ('Home', {
<div class="om-user-line"> <div class="om-user-line">
<i class="material-icons">account_circle</i> <i class="material-icons">account_circle</i>
Erstellt von {{ user }} Erstellt von {{ user }}
</div></div>`, </div></div></div>`,
props: ['subject', 'message', 'tag', 'user'] props: ['subject', 'message', 'tag', 'user']
}) })

48
public/index.html
View File

@ -30,20 +30,18 @@
<body> <body>
<div id="app"> <div id="app">
<div class="om-header-container"> <div class="om-header-container">
<div class="om-header"> <div class="om-header">
<a href="index.html"><img src="th_nbg_ohmicon_amp.png" width=55px height=55px></a> <a href="index.html"><img src="th_nbg_ohmicon_amp.png" width=55px height=55px></a>
<form class="om-searchbar"> <form class="om-searchbar">
<input type="search" placeholder="Search..."> <input type="search" placeholder="Search...">
</form> </form>
</div> </div>
</div> </div>
<router-view class="om-content"> <div class="om-content">
<Home></Home>
<!--
<div id="message-list"> <div id="message-list">
<Home <Home
v-for="(msg, index) in messages" v-for="(msg, index) in messages"
@ -54,21 +52,20 @@
:user="msg.user" :user="msg.user"
></Home> ></Home>
</div> </div>
--> </div>
</router-view> <nav class="nav nav-tabs nav-justified om-nav ">
<router-link to="/home" class="nav-item nav-link"><i class="material-icons">home</i></router-link>
<nav class="nav nav-tabs nav-justified om-nav "> <router-link to="/files" class="nav-item nav-link"><i class="material-icons">folder</i></router-link>
<router-link to="/home" class="nav-item nav-link"><i class="material-icons">home</i></router-link> <router-link to="/createMessage" class="nav-item nav-link outlined"><i class="material-icons">add_circle</i></router-link>
<router-link to="/files" class="nav-item nav-link"><i class="material-icons">folder</i></router-link> <router-link to="/bookmark" class="nav-item nav-link"><i class="material-icons">bookmark</i></router-link>
<router-link to="/createMessage" class="nav-item nav-link outlined"><i class="material-icons">add_circle</i></router-link> <router-link to="/profil" class="nav-item nav-link"><i class="material-icons">person</i></router-link>
<router-link to="/bookmark" class="nav-item nav-link"><i class="material-icons">bookmark</i></router-link> </nav>
<router-link to="/profil" class="nav-item nav-link"><i class="material-icons">person</i></router-link> </div>
</nav> <!--<router-view></router-view> -->
<!--
</div>
<script> <script>
const routes = [ const routes = [
{ path: "/home", component: Home }, { path: "/home", component: Home },
{ path: "/files", component: Files }, { path: "/files", component: Files },
@ -83,8 +80,9 @@
router, router,
el: '#app' el: '#app'
}); });
</script>
</script>
-->
<!-- NOTE: JavaScript Libs & Files --> <!-- NOTE: JavaScript Libs & Files -->
<!-- NOTE: Call Vue Components --> <!-- NOTE: Call Vue Components -->
<script src="home.js"></script> <script src="home.js"></script>