Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit e594543

Browse files
committed
Update with dev
2 parents f6d14e1 + 64a97be commit e594543

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/view/components/clue/ClueSimulator.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import {
44
// DEVICE_LIST_KEY,
55
CONSTANTS,
66
WEBVIEW_MESSAGES,
7+
<<<<<<< HEAD
78
DEFAULT_IMG_CLUE,
9+
=======
10+
>>>>>>> origin/dev
811
} from "../../constants";
912
import PlayLogo from "../../svgs/play_svg";
1013
import StopLogo from "../../svgs/stop_svg";
@@ -14,7 +17,11 @@ import { BUTTONS_KEYS, ClueImage } from "./ClueImage";
1417

1518
const DEFAULT_CLUE_STATE: IClueState = {
1619
buttons: { button_a: false, button_b: false },
20+
<<<<<<< HEAD
1721
displayMessage: DEFAULT_IMG_CLUE,
22+
=======
23+
displayMessage: "",
24+
>>>>>>> origin/dev
1825
};
1926

2027
interface IState {
@@ -67,10 +74,13 @@ export class ClueSimulator extends React.Component<any, IState> {
6774
this.setState({
6875
play_button: !this.state.play_button,
6976
running_file: newRunningFile,
77+
<<<<<<< HEAD
7078
clue: {
7179
...this.state.clue,
7280
displayMessage: DEFAULT_IMG_CLUE,
7381
},
82+
=======
83+
>>>>>>> origin/dev
7484
});
7585
break;
7686
case "visible-editors":

src/view/components/clue/Clue_svg.tsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class ClueSvg extends React.Component<IProps, {}> {
4343
<div className="microbit-svg">
4444
<svg
4545
xmlns="http://www.w3.org/2000/svg"
46-
viewBox="0 0 330 250.98"
46+
viewBox="0 0 304.89 250.98"
4747
ref={this.svgRef}
4848
x="0px"
4949
y="0px"
@@ -938,14 +938,6 @@ export class ClueSvg extends React.Component<IProps, {}> {
938938
rx="18.28"
939939
/>
940940
</g>
941-
<g id="g2144" transform="translate(320 51.193)">
942-
<circle
943-
y={200}
944-
x={320}
945-
id="CLUE_NEOPIXEL"
946-
fill="#c8c8c8"
947-
/>
948-
</g>
949941
</svg>
950942
</div>
951943
);
@@ -956,9 +948,6 @@ export class ClueSvg extends React.Component<IProps, {}> {
956948
"href",
957949
`data:image/png;base64,${this.props.displayImage}`
958950
);
959-
console.log(
960-
`newDisplay ${this.props.displayImage.substring(0, 100)}`
961-
);
962951
}
963952
}
964953
}

0 commit comments

Comments
 (0)