Skip to content

Commit 0e838ca

Browse files
committed
Fixes for message
1 parent c1bf45f commit 0e838ca

File tree

5 files changed

+85
-12
lines changed

5 files changed

+85
-12
lines changed

client/out/app.js

+41-6
Original file line numberDiff line numberDiff line change
@@ -33849,7 +33849,7 @@ ${JSON.stringify(newTargetLocation, null, 2)}
3384933849
},
3385033850
actions: {
3385133851
login(context, { server: server2, username, password }) {
33852-
console.log("LIGIN ", server2, context.state);
33852+
console.log("LOGIN ", server2, context.state);
3385333853
context.commit("setLoading", true);
3385433854
context.commit("setServer", server2);
3385533855
localStorage.setItem("server", server2);
@@ -34088,11 +34088,45 @@ ${JSON.stringify(newTargetLocation, null, 2)}
3408834088
},
3408934089
template: `
3409034090

34091-
<ul>
34092-
<li v-for='message in messages' :key="message.id">
34093-
{{ message }}
34094-
</li>
34095-
</ul>
34091+
<table class='table'>
34092+
<thead>
34093+
<tr>
34094+
<th>ID</th>
34095+
<th>Protocol</th>
34096+
<th>Message</th>
34097+
</tr>
34098+
</thead>
34099+
<tbody>
34100+
<tr v-for='message in messages' :key="message.mesage_id">
34101+
<td><router-link class="btn btn-sm btn-primary" :to="'/message/' + message.message_id ">{{ message.message_id }}</router-link></td>
34102+
<td>
34103+
<span v-if="message.message.protocol">
34104+
{{ message.message.protocol }} / {{ message.message.protocol_year }}
34105+
</span>
34106+
<span v-else>
34107+
Draft message
34108+
</span>
34109+
</td>
34110+
<td>{{ message }}</td>
34111+
</tr>
34112+
</tbody>
34113+
</table>
34114+
`
34115+
};
34116+
34117+
// src/components/Message.js
34118+
var Message_default = {
34119+
computed: mapState([
34120+
"messages",
34121+
"loading"
34122+
]),
34123+
created() {
34124+
if (this.messages == void 0) {
34125+
this.$store.dispatch("fetchMessages");
34126+
}
34127+
},
34128+
template: `
34129+
<div>Message {{ $route.params.id }}</div>
3409634130
`
3409734131
};
3409834132

@@ -34104,6 +34138,7 @@ ${JSON.stringify(newTargetLocation, null, 2)}
3410434138
{ path: "/", component: Home_default },
3410534139
{ path: "/login", component: Login_default },
3410634140
{ path: "/messages", component: Messages_default },
34141+
{ path: "/message/:id/", component: Message_default },
3410734142
{ path: "/help", component: Help },
3410834143
{ path: "/public_key_list", component: PublicKeyList },
3410934144
{ path: "/privatekey_load", component: PrivateKeyLoad }

client/src/Store.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const Store = createStore({
3434
},
3535
actions: {
3636
login (context, {server, username, password}) {
37-
console.log("LIGIN ", server, context.state)
37+
console.log("LOGIN ", server, context.state)
3838
context.commit('setLoading', true)
3939
context.commit('setServer', server)
4040
localStorage.setItem('server', server)

client/src/app.js

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Home from './components/Home';
99
import Nav from './components/Nav';
1010
import Login from './components/Login';
1111
import Messages from './components/Messages';
12+
import Message from './components/Message';
1213

1314
const Help = { template: '<div>Help</div>' }
1415
const PublicKeyList = { template: '<div>PublicKeyList</div>' }
@@ -18,6 +19,7 @@ const routes = [
1819
{ path: '/', component: Home },
1920
{ path: '/login', component: Login },
2021
{ path: '/messages', component: Messages },
22+
{ path: '/message/:id/', component: Message },
2123
{ path: '/help', component: Help },
2224
{ path: '/public_key_list', component: PublicKeyList },
2325
{ path: '/privatekey_load', component: PrivateKeyLoad },

client/src/components/Message.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { mapState } from 'vuex'
2+
3+
export default {
4+
computed: mapState([
5+
'messages', 'loading'
6+
]),
7+
created() {
8+
9+
if(this.messages== undefined) {
10+
this.$store.dispatch('fetchMessages')
11+
}
12+
13+
},
14+
template: `
15+
<div>Message {{ $route.params.id }}</div>
16+
`
17+
}
18+

client/src/components/Messages.js

+23-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,29 @@ export default {
1313
},
1414
template: `
1515
16-
<ul>
17-
<li v-for='message in messages' :key="message.id">
18-
{{ message }}
19-
</li>
20-
</ul>
16+
<table class='table'>
17+
<thead>
18+
<tr>
19+
<th>ID</th>
20+
<th>Protocol</th>
21+
<th>Message</th>
22+
</tr>
23+
</thead>
24+
<tbody>
25+
<tr v-for='message in messages' :key="message.mesage_id">
26+
<td><router-link class="btn btn-sm btn-primary" :to="'/message/' + message.message_id ">{{ message.message_id }}</router-link></td>
27+
<td>
28+
<span v-if="message.message.protocol">
29+
{{ message.message.protocol }} / {{ message.message.protocol_year }}
30+
</span>
31+
<span v-else>
32+
Draft message
33+
</span>
34+
</td>
35+
<td>{{ message }}</td>
36+
</tr>
37+
</tbody>
38+
</table>
2139
`
2240
}
2341

0 commit comments

Comments
 (0)