-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
10 changed files
with
177 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| MIT License | ||
|
|
||
| Copyright (c) [2017] [Alessandro Dionisi] | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
Submodule smarthome-server
updated
10 files
| +21 −0 | LICENSE.txt | |
| +2 −0 | config/dev.yaml | |
| +6 −4 | config/prod.yaml | |
| +72 −0 | controller/alarm.go | |
| +32 −0 | controller/camera.go | |
| +27 −16 | controller/raspsonar.go | |
| +2 −2 | main.go | |
| +55 −0 | service/alarm.go | |
| +17 −0 | service/camera.go | |
| +12 −5 | service/raspsonar.go |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
smarthome-ui/src/components/Dashboard/Views/Overview/Alarm.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <template> | ||
| <stats-card> | ||
| <div class="icon-big icon-success" slot="header"> | ||
| Alarm | ||
| </div> | ||
| <div class="numbers" slot="content"> | ||
| <button class="btn btn-default btn-md" v-bind:class="{ active: isActive }" v-on:click="toggleAlarm"> | ||
| {{ status }} | ||
| </button> | ||
| </div> | ||
| <div class="stats" slot="footer"> | ||
| <i v-if="messages" class="ti-info"></i> {{messages}} | ||
| </div> | ||
| </stats-card> | ||
| </template> | ||
| <script> | ||
| import StatsCard from 'components/UIComponents/Cards/StatsCard.vue' | ||
| import * as alarmService from 'src/services/alarmService.js' | ||
| export default { | ||
| components: { | ||
| StatsCard | ||
| }, | ||
| data () { | ||
| return { | ||
| messages: '', | ||
| isActive: false | ||
| } | ||
| }, | ||
| computed: { | ||
| status: function () { | ||
| return this.isActive ? 'On' : 'Off' | ||
| } | ||
| }, | ||
| methods: { | ||
| toggleAlarm: function () { | ||
| var that = this | ||
| alarmService.toggleAlarm(!this.isActive).then((data) => { | ||
| that.isActive = !that.isActive | ||
| that.messages = that.getMessage(that.isActive, data.cameras) | ||
| }) | ||
| .catch((err) => { | ||
| that.messages = err.message | ||
| }) | ||
| }, | ||
| getMessage: function (enabled, cameras) { | ||
| var message = '' | ||
| if (enabled && cameras.length) { | ||
| message = 'Enabled on ' + cameras | ||
| } | ||
| if (enabled && !cameras.length) { | ||
| message = 'Enabled but no camera enabled' | ||
| } | ||
| return message | ||
| } | ||
| }, | ||
| created () { | ||
| var that = this | ||
| alarmService.getAlarmStatus().then((data) => { | ||
| that.isActive = data.alarmEnabled | ||
| that.messages = that.getMessage(data.alarmEnabled, data.cameras) | ||
| }) | ||
| .catch((err) => { | ||
| that.messages = err.message | ||
| that.isActive = false | ||
| }) | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import axios from 'axios' | ||
| import * as authService from './authService.js' | ||
|
|
||
| function toggleAlarm (status) { | ||
| var user = authService.getCurrentUser() | ||
| var configurationId = user.configurationId | ||
| return new Promise(function (resolve, reject) { | ||
| axios.put(process.env.API_ENDPOINT + '/configurations/' + configurationId + '/alarm/', null, {params: {status: status ? 1 : 0}, headers: { Authorization: `Bearer ${user.token}` }}) | ||
| .then(function (res) { | ||
| resolve(res.data) | ||
| }) | ||
| .catch(function (err) { | ||
| reject(err) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| function getAlarmStatus () { | ||
| var user = authService.getCurrentUser() | ||
| var configurationId = user.configurationId | ||
| return new Promise(function (resolve, reject) { | ||
| axios.get(process.env.API_ENDPOINT + '/configurations/' + configurationId + '/alarm/', {headers: { Authorization: `Bearer ${user.token}` }}) | ||
| .then(function (res) { | ||
| resolve(res.data) | ||
| }) | ||
| .catch(function (err) { | ||
| reject(err) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| export {toggleAlarm, getAlarmStatus} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters