spacecruft/Farmbot-Web-App
spacecruft/Farmbot-Web-App
1
0
Fork 0
Code Issues Pull requests Releases Activity

verbiage and bug fixes

Browse source
This commit is contained in:
gabrielburnworth 2018-04-27 23:54:52 -07:00
parent 9e09761add
commit 82bbcfd1d9
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webpack/controls/move.tsx
View file

@ -110,7 +110,7 @@ export class Move extends React.Component<MoveProps, {}> {
</fieldset>
<p>
{t("Swap jog buttons")}
{t("Swap jog buttons (and rotate map)")}
</p>
<fieldset>
<label>

1
webpack/css/farm_designer/farm_designer.scss
View file

@ -245,6 +245,7 @@
}
}
.virtual-bot-trail,
.virtual-peripherals {
pointer-events: none;
}

10
webpack/farm_designer/map/virtual_farmbot/__tests__/bot_trail_test.tsx
View file

@ -23,7 +23,7 @@ describe("<BotTrail/>", () => {
const p = fakeProps();
p.mapTransformProps.quadrant = 2;
const wrapper = shallow(<BotTrail {...p} />);
const lines = wrapper.find("#trail").find("line");
const lines = wrapper.find(".virtual-bot-trail").find("line");
expect(lines.length).toEqual(4);
expect(lines.first().props()).toEqual({
id: "trail-line-1",
@ -44,7 +44,7 @@ describe("<BotTrail/>", () => {
it("shows default length trail", () => {
sessionStorage[VirtualTrail.length] = undefined;
const wrapper = shallow(<BotTrail {...fakeProps()} />);
const lines = wrapper.find("#trail").find("line");
const lines = wrapper.find(".virtual-bot-trail").find("line");
expect(lines.length).toEqual(5);
});
@ -53,13 +53,13 @@ describe("<BotTrail/>", () => {
const p = fakeProps();
p.position = { x: 4, y: 4, z: 0 };
const wrapper = shallow(<BotTrail {...p} />);
const lines = wrapper.find("#trail").find("line");
const lines = wrapper.find(".virtual-bot-trail").find("line");
expect(lines.length).toEqual(4);
});
it("shows water", () => {
const wrapper = shallow(<BotTrail {...fakeProps()} />);
const circles = wrapper.find("#trail").find("circle");
const circles = wrapper.find(".virtual-bot-trail").find("circle");
expect(circles.length).toEqual(2);
});
@ -68,7 +68,7 @@ describe("<BotTrail/>", () => {
p.position = { x: 4, y: 4, z: 0 };
p.peripherals = [{ label: "water", value: true }];
const wrapper = shallow(<BotTrail {...p} />);
const water = wrapper.find("#trail").find("circle").last();
const water = wrapper.find(".virtual-bot-trail").find("circle").last();
expect(water.props().r).toEqual(21);
});

2
webpack/farm_designer/map/virtual_farmbot/bot_trail.tsx
View file

@ -48,7 +48,7 @@ export function BotTrail(props: BotTrailProps) {
const array = getNewTrailArray({ coord: { x, y }, water: 0 }, watering);
return <g id="trail">
return <g className="virtual-bot-trail">
{array.map((cur: TrailRecord, i: number) => {
const prev = (array[i - 1] || { coord: undefined }).coord; // prev coord
const opacity = _.round(Math.max(0.25, i / (array.length - 1)), 2);