misc minor bug fixes

pull/1144/head
gabrielburnworth 2019-04-09 22:44:58 -07:00
parent d0ea0d9e86
commit 22d54c1c44
4 changed files with 25 additions and 15 deletions

View File

@ -20,6 +20,7 @@
}
&.is-saved,
&.is-saving {
color: $off_white !important;
background: $medium_gray !important;
box-shadow: 0 2px 0px 0px $dark_gray !important;
pointer-events: none;

View File

@ -221,7 +221,7 @@
margin-left: 0;
margin-right: 0;
}
padding: 10rem 3rem;
padding: 0 3rem;
padding-right: 0;
padding-left: 0;
.fb-button {
@ -268,6 +268,9 @@
input {
background: $white;
}
.is-saved {
margin: 1rem;
}
}
.add-farm-event-panel button.red,

View File

@ -235,4 +235,7 @@
select {
width: 100%;
}
.expandable-header {
font-size: 1.6rem;
}
}

View File

@ -10,20 +10,23 @@ import { ColWidth } from "../farmbot_os_settings";
import { Feature } from "../../interfaces";
import { t } from "../../../i18next_wrapper";
const CAMERA_CHOICES = [
const CAMERA_CHOICES = () => ([
{ label: t("USB Camera"), value: "USB" },
{ label: t("Raspberry Pi Camera"), value: "RPI" }
];
]);
const CAMERA_CHOICES_DDI = {
[CAMERA_CHOICES[0].value]: {
label: CAMERA_CHOICES[0].label,
value: CAMERA_CHOICES[0].value
},
[CAMERA_CHOICES[1].value]: {
label: CAMERA_CHOICES[1].label,
value: CAMERA_CHOICES[1].value
}
const CAMERA_CHOICES_DDI = () => {
const CHOICES = CAMERA_CHOICES();
return {
[CHOICES[0].value]: {
label: CHOICES[0].label,
value: CHOICES[0].value
},
[CHOICES[1].value]: {
label: CHOICES[1].label,
value: CHOICES[1].value
}
};
};
export class CameraSelection
@ -36,8 +39,8 @@ export class CameraSelection
selectedCamera(): DropDownItem {
const camera = this.props.env["camera"];
return camera
? CAMERA_CHOICES_DDI[JSON.parse(camera)]
: CAMERA_CHOICES_DDI["USB"];
? CAMERA_CHOICES_DDI()[JSON.parse(camera)]
: CAMERA_CHOICES_DDI()["USB"];
}
sendOffConfig = (selectedCamera: DropDownItem) => {
@ -64,7 +67,7 @@ export class CameraSelection
<div>
<FBSelect
allowEmpty={false}
list={CAMERA_CHOICES}
list={CAMERA_CHOICES()}
selectedItem={this.selectedCamera()}
placeholder="Select a camera..."
onChange={this.sendOffConfig}