Skip to content

Commit

Permalink
v3.18.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jemu75 committed May 8, 2021
1 parent 9ef28f0 commit edc0a5d
Show file tree
Hide file tree
Showing 48 changed files with 2,081 additions and 1,791 deletions.
3,621 changes: 1,880 additions & 1,741 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fhemapp",
"version": "3.18.1",
"version": "3.18.2",
"private": true,
"author": "jemu75",
"scripts": {
Expand All @@ -11,25 +11,25 @@
},
"dependencies": {
"apexcharts": "^3.26.1",
"core-js": "^3.10.1",
"core-js": "^3.12.0",
"typeface-roboto": "^1.1.13",
"vue": "^2.6.11",
"vue-apexcharts": "^1.6.1",
"vue-i18n": "^8.22.3",
"vue-json-pretty": "^1.7.1",
"vue-i18n": "^8.24.4",
"vue-json-pretty": "^1.8.0",
"vue-router": "^3.5.1",
"vuetify": "^2.4.9"
"vuetify": "^2.4.11"
},
"devDependencies": {
"@mdi/font": "^5.9.55",
"@vue/cli-plugin-babel": "^4.5.12",
"@vue/cli-plugin-eslint": "^4.5.12",
"@vue/cli-plugin-router": "^4.5.12",
"@vue/cli-service": "^4.5.12",
"@vue/cli-plugin-babel": "^4.5.13",
"@vue/cli-plugin-eslint": "^4.5.13",
"@vue/cli-plugin-router": "^4.5.13",
"@vue/cli-service": "^4.5.13",
"babel-eslint": "^10.1.0",
"eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2",
"sass": "^1.32.8",
"sass": "^1.32.12",
"sass-loader": "^8.0.0",
"vue-cli-plugin-i18n": "~2.1.0",
"vue-cli-plugin-vuetify": "~2.0.9",
Expand Down
6 changes: 2 additions & 4 deletions public/cfg/templ_watersensor.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
},
"main": [
{
"text": ["liter::%n Liter"]
},
{
"text": ["level::%n %"]
"text": ["liter::%n Liter"],
"text2": ["level::%n %"]
}
],
"info": {
Expand Down
151 changes: 151 additions & 0 deletions src/components/TemplCam.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
<template>
<v-col :class="size">
<v-card
:dark="this.$vuetify.theme.dark"
color="secondary"
>
<v-progress-linear
height="7"
:value="item.Options.status.level || status.level"
:color="item.Options.status.color || status.color"
background-color="secondary darken-1"
/>

<v-card-title class="text-truncate">
{{ item.Options.name }}

<v-spacer />
<v-btn
small
icon
@click="expandBtn()"
>
<v-icon small>
{{ expandIcon }}
</v-icon>
</v-btn>

<jsonList
v-if="app.options.debugMode"
:item="item"
/>
</v-card-title>
<v-divider />

<div v-if="!item.Options.status.isActive">
<v-card-text>
<v-row align="center">
<v-col align="center">
<div class="headline font-weight-bold">
{{ item.Options.status.error }}
</div>
</v-col>
</v-row>
</v-card-text>
<v-divider />
</div>

<div v-if="item.Options.status.isActive">
<v-card-text class="pa-0">
<video src="">
Your browser does not support the VIDEO tag and/or RTP streams.
</video>
</v-card-text>
</div>

<v-system-bar color="secondary darken-1">
<v-icon class="ml-0">
{{ item.Options.info.left1Icon || camIcon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.left1Text }}
</div>
<v-icon class="ml-2">
{{ item.Options.info.left2Icon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.left2Text }}
</div>
<v-spacer />
<v-icon>
{{ item.Options.info.mid1Icon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.mid1Text }}
</div>
<v-icon class="ml-2">
{{ item.Options.info.mid2Icon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.mid2Text }}
</div>
<v-spacer />
<v-icon>
{{ item.Options.info.right1Icon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.right1Text }}
</div>
<v-icon class="ml-2 mr-0">
{{ item.Options.info.right2Icon }}
</v-icon><div class="text-truncate">
{{ item.Options.info.right2Text }}
</div>
</v-system-bar>
</v-card>
</v-col>
</template>

<script>
import jsonList from '@/components/Jsonlist.vue'
export default {
components: {
jsonList
},
props: {
item: {
type: Object,
default: () => { return { name: 'cam' } }
}
},
data: () => ({
name: 'cam',
size: '',
camIcon: 'mdi-cctv',
expandIcon: 'mdi-arrow-expand',
maxSize: false,
status: {
color: 'success',
level: 0
},
app: {
options: {
debugMode: false
}
},
}),
created() {
this.app.options = this.$fhem.app.options;
this.size = this.$fhem.getEl(this.item, 'Options', 'setup', 'size') || 'col-12 col-sm-12 col-md-6 col-lg-4';
if(this.$route.params.filter && this.$route.params.filter.match('&size=max')) {
this.maxSize = true;
this.size = 'col-12';
this.expandIcon = 'mdi-arrow-collapse';
}
},
methods: {
expandBtn() {
if(this.maxSize) {
this.maxSize = false;
this.size = this.$fhem.getEl(this.item, 'Options', 'setup', 'size') || 'col-12 col-sm-12 col-md-6 col-lg-4';
this.expandIcon = 'mdi-arrow-expand';
} else {
this.maxSize = true;
this.size = 'col-12';
this.expandIcon = 'mdi-arrow-collapse';
}
}
}
}
</script>
2 changes: 1 addition & 1 deletion src/components/TemplPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
size: 'col-12 col-sm-6 col-md-6 col-lg-6',
status: {
color: 'success',
level: 100
level: 0
},
app: {
options: {
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/fhem.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ class Fhem extends EventEmitter {
{ name: 'sysmon', component: 'templ_sysmon' },
{ name: 'hmlan', component: 'templ_hmlan' },
{ name: 'sonos', component: 'templ_sonos' },
{ name: 'scenes', component: 'templ_scenes' }
{ name: 'scenes', component: 'templ_scenes' },
{ name: 'cam', component: 'templ_cam' }
],
data: {
roomList: [],
Expand Down Expand Up @@ -221,6 +222,7 @@ class Fhem extends EventEmitter {
if(result.room === 'hidden') result.room = '';
if(result.group === 'hidden') result.group = '';
if(!result.sortby) result.sortby = 'zzz';
if(!result.setup) result.setup = {};
result.status = {
level: null,
color: null,
Expand Down
3 changes: 2 additions & 1 deletion src/views/Devices.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ export default {
templ_scenes: () => import('@/components/TemplScenes.vue'),
templ_sonos: () => import('@/components/TemplSonos.vue'),
templ_sysmon: () => import('@/components/TemplSysmon.vue'),
templ_hmlan: () => import('@/components/TemplHmLan.vue')
templ_hmlan: () => import('@/components/TemplHmLan.vue'),
templ_cam: () => import('@/components/TemplCam.vue')
},
data: () => ({
app: {
Expand Down
6 changes: 2 additions & 4 deletions www/fhemapp/cfg/templ_watersensor.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
},
"main": [
{
"text": ["liter::%n Liter"]
},
{
"text": ["level::%n %"]
"text": ["liter::%n Liter"],
"text2": ["level::%n %"]
}
],
"info": {
Expand Down
1 change: 1 addition & 0 deletions www/fhemapp/css/chunk-00f750ae.8853dffa.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions www/fhemapp/css/chunk-0c34425c.11195de6.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion www/fhemapp/css/chunk-0c5af406.081c6f8a.css

This file was deleted.

File renamed without changes.
Loading

0 comments on commit edc0a5d

Please sign in to comment.