Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/Blocks/WemosD1Mini.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"image": "https://res.cloudinary.com/circuito/image/upload/client/WeMosD1Mini_lq2ptx",
"numericName": "",
"shortName": "Wemos D1 Mini",
"visible": true,
"visible": false,
"indicators": {
"verified": false,
"solder": false
Expand Down
2 changes: 1 addition & 1 deletion components/Parts/WemosD1Mini.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "WemosD1Mini",
"displayName": "Wemos D1 Mini",
"desc": "",
"symbol": "http://res.cloudinary.com/circuito/image/upload/o9lnywaajpzfexonvujf",
"symbol": "http://res.cloudinary.com/circuito/image/upload/wg3adm0uwtn6kawiw6nb",
"category": [
"controller"
],
Expand Down
1 change: 0 additions & 1 deletion src/client/blocks-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ export class BlocksList extends React.Component {
continuous
run={this.state.runHelp}
callback={data => {
console.log(data);
if (["stop", "skip", "close"].includes(data.action)) {
firstTimeHelp = false;
this.setState({ runHelp: false });
Expand Down
2 changes: 1 addition & 1 deletion src/client/form/imagewidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function ImageWidget(props) {
<FormControl
type="text"
disabled={true}
value={props.value}
value={props.value || ""}
required={props.required}
placeholder="https://"
onChange={event => props.onChange(event.target.value)}
Expand Down
4 changes: 2 additions & 2 deletions src/client/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ export class Preview extends React.Component {
</Modal.Header>
<Modal.Body
style={{
"max-height": "calc(100vh - 210px)",
"overflow-y": "auto"
"maxHeight": "calc(100vh - 210px)",
"overflowY": "auto"
}}
dangerouslySetInnerHTML={{ __html: this.state.modalMsg }}
/>
Expand Down
9 changes: 5 additions & 4 deletions src/server/api/controllers/uploadController.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ var partSchema = require("../../../../circuito-schema/part.json");
var blockSchema = require("../../../../circuito-schema/block.json");
var coderSchema = require("../../../../circuito-schema/coder.json");

var schema = { type: "number" };

function setDifference(setA, setB) {
var _difference = new Set(setA);
for (var elem of setB) {
Expand Down Expand Up @@ -61,7 +59,7 @@ const walkDirSync = (
// case json data file

var data = JSON.parse(dataraw);
data.path=`${type}/${basename}`; // add file path to data
data.path = `${type}/${basename}`; // add file path to data

if (type == "Coders" && data.name) {
// for coder, find files under the relevant folder and compare to files field
Expand Down Expand Up @@ -139,7 +137,10 @@ exports.upload = function(req, res) {
if (errorString) {
global.analytics.track({
userId: global.userid,
event: "Schema Failed"
event: "Schema Failed",
properties: {
error: errorString
}
});

console.log("Found schema errors, aborting");
Expand Down