merge upstream changes and fix conflict

freedomotic · Oct 25, 2018 · bc923bb · bc923bb
2 parents 5f6e4b3 + 4cd2576
commit bc923bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/store/getters.js b/src/store/getters.js
@@ -1,4 +1,4 @@
-export const authStatus = (state) => {
+export const authStatus = state => {
   state.status
 }
 
@@ -11,3 +11,11 @@ export const availableProtocols = state => {
   })
   return protocols
 }
+
+export const getHardwareTriggers = state => {
+  return state.triggersList.filter(trigger => {
+    if (trigger.hardwareLevel === true) {
+      return trigger
+    }
+  })
+}
diff --git a/src/store/index.js b/src/store/index.js
@@ -45,7 +45,7 @@ export default new Vuex.Store({
     roomsList: '',
     thingsList: [],
     thingTemplatesList: '',
-    triggersList: '',
+    triggersList: [],
     usersList: ''
   },
   actions,