Skip to content

Commit 95c19f7

Browse files
committed
Merge branch 'issues/10' of github.com:mpaarating/electric-io into issues/10
2 parents 5f9f5a8 + 66ef425 commit 95c19f7

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.data/dashboard.json.sim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "dashboard": {"blockSize":[250,200],"bgColor":"papayawhip","bgImageRepeat":"true","tiles":[{"title":"MXChip sending ","type":"button","buttonText":"stop","deviceId":"AZ3166","deviceMethod":"stop","position":[54,466],"size":[0.8,0.7],"id":"2471d5ab-0d73-42a3-ba4f-f694574feb6b"},{"title":"","type":"sticker","url":"https://upload.wikimedia.org/wikipedia/commons/3/3a/Cat03.jpg","position":[1120,102],"size":[1,1],"id":"84de1d0d-d1ae-4daa-9540-179e9dd4155c"},{"title":"Study Temperature","type":"lineChart","lineColor":"#FF6384","deviceId":"AZ3166","property":"temperature","position":[53,108],"size":[2,1.5],"id":"1048bae5-e1ac-4617-ad96-9a08a3d1aa48"},{"title":"Jenn's Coolness Factor 😎","type":"lineChart","lineColor":"#6b66ff","deviceId":"Jenn","property":"coolness","position":[585,106],"size":[2,1.5],"id":"055fa281-4fc3-4060-a47f-d3c03430afce"},{"title":"Humidity 😰","type":"number","deviceId":"AZ3166","textColor":"#ff0000","property":"humidity","position":[296,465],"size":[1,1],"id":"101ca6cb-ba75-4e5c-9db6-d29ba7ab9f51"},{"title":"Noise 🙉","type":"lineChart","lineColor":"#60dd4d","deviceId":"Tessel2","property":"sound","position":[901,470],"size":[2,1.5],"id":"d8444332-7b07-4cfc-b251-641a906f7c6b"},{"title":"","type":"sticker","url":"https://media.giphy.com/media/1wXeLxuTVBZe0Ht7Zu/giphy.gif","position":[601,471],"size":[1,1],"id":"88e12934-c628-48cb-8b84-b16c2e311105"}]} }

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ coverage
55
.DS_Store
66
.cache
77
.env
8-
public/js/dist
8+
public/js/dist/

public/js/components/form.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
// focus management mixin
2+
import {focus} from '../vendor/vue-focus.js';
23
import FormFields from './formFields';
3-
import { focus } from '../vendor/vue-focus.js';
4-
54
const template = `
65
<div class="cardForm">
76
<h2>Settings</h2>
87
98
<form v-on:submit.prevent="onSubmit">
10-
<input name="id" type="hidden" :value="tile.id"/>
9+
<input name="id" type="hidden" v-bind:value="tile.id"/>
1110
1211
<label>Title
13-
<input v-focus="editing" type="text" name="title" :value="tile.title"/>
12+
<input v-focus="editing" type="text" name="title" v-bind:value="tile.title"/>
1413
</label>
1514
1615
<form-fields :tile="tile" :deviceList="deviceList" />
@@ -21,10 +20,10 @@ const template = `
2120
`;
2221

2322
export default Vue.component('card-form', {
24-
directives: { focus },
25-
components: { FormFields },
23+
directives: {focus},
24+
components: {FormFields},
2625
template,
27-
props: ['tile', 'deviceList', 'editing'],
26+
props: ["tile", "deviceList", "editing"],
2827
methods: {
2928
onSubmit: function(event) {
3029
let eventData = {};
@@ -34,5 +33,6 @@ export default Vue.component('card-form', {
3433
});
3534
this.$emit('save-settings', eventData);
3635
}
37-
}
36+
},
3837
});
38+

public/js/components/formFields.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export default Vue.component('form-fields', {
44
this.$options.template = this.$options.propsData.tile.template;
55
}
66
});
7+

0 commit comments

Comments
 (0)