Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README.md #84

Open
wants to merge 107 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
9322b43
Adding client app
eyak Dec 9, 2018
0c0e011
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Dec 11, 2018
17c3554
update
Robohad Dec 17, 2018
e840fad
update data
Robohad Dec 17, 2018
b2b21ba
Made it work
roboAmir Dec 17, 2018
9dccc46
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
roboAmir Dec 17, 2018
f6230ac
chnage coder structure
Robohad Dec 19, 2018
599797a
Heyz
roboAmir Dec 19, 2018
a2e6720
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
roboAmir Dec 19, 2018
3c5dbe2
update
Robohad Dec 23, 2018
fceddb4
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Dec 23, 2018
022ba07
New forms
eyak Dec 24, 2018
8aef9c7
Remove unnecessary packages
eyak Dec 25, 2018
c9260c1
Fix packages.json
eyak Dec 25, 2018
53ccd0b
update after compilation tests
Robohad Dec 25, 2018
3df8db0
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Dec 25, 2018
c27f199
update meta data
Robohad Dec 25, 2018
e13e380
ddd
roboAmir Dec 25, 2018
9a6e958
commit
roboAmir Dec 25, 2018
8d36431
update interface
eyak Dec 25, 2018
eb8767b
merge with new interface
eyak Dec 25, 2018
6882885
Update README.md
eyak Dec 26, 2018
3991f56
Separate upload and preview routes
eyak Dec 26, 2018
c56f713
added illustration
eyak Dec 26, 2018
d4b7a81
update illustration
eyak Dec 26, 2018
58a7282
add new componentns
Robohad Dec 26, 2018
28fc020
add speaker 3w
Robohad Dec 26, 2018
7a3f872
SVG Creator
eyak Dec 26, 2018
9998ed7
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Dec 26, 2018
3a95efd
Add uploader to home screen
eyak Dec 26, 2018
e2eba36
fix image uploader
eyak Dec 26, 2018
e552d11
add supported controllers Attiny and Teensy + script
Robohad Dec 26, 2018
4505fcc
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Dec 26, 2018
d1a7699
add pintypes to svgcreator
eyak Dec 26, 2018
3bdee33
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Dec 26, 2018
f0e7a8e
fix cloudinary url
eyak Dec 26, 2018
636a60b
fixes
Dec 26, 2018
cf3185e
update ATTIny85
Robohad Dec 31, 2018
4638839
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Dec 31, 2018
b1bc9be
update
Robohad Dec 31, 2018
b201eea
add circuitmerge script
Robohad Dec 31, 2018
bbe47d6
update
Robohad Dec 31, 2018
86c1397
update
Robohad Dec 31, 2018
1ffe6be
update
Robohad Dec 31, 2018
a0bc5af
update
Robohad Dec 31, 2018
aa3f4b7
update script
Robohad Dec 31, 2018
b088e9e
update script
Robohad Dec 31, 2018
689a763
update script
Robohad Dec 31, 2018
07157b1
update script
Robohad Dec 31, 2018
047025f
merged circuits
Robohad Dec 31, 2018
6b0b18f
Reorder form. Add ArrayField
eyak Jan 1, 2019
d49c14b
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Jan 1, 2019
18f23eb
update
Robohad Jan 1, 2019
1db1354
change urls to https
Robohad Jan 1, 2019
71abf88
fix NMOS
Robohad Jan 1, 2019
adf7e18
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Jan 1, 2019
4d37289
Merge branch 'circuitMerge'
Robohad Jan 1, 2019
093be8c
add pwoer to powerConnectors
Robohad Jan 1, 2019
161ada2
tmp controller
eyak Jan 1, 2019
430886c
working controller
eyak Jan 1, 2019
21d7543
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Jan 1, 2019
3a07e87
ziv
Jan 2, 2019
f71ed4c
ziv
Jan 2, 2019
d73c038
stable forms
eyak Jan 2, 2019
9c830d5
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Jan 2, 2019
69263ca
heroku fix
eyak Jan 2, 2019
ad52c52
heroku fix
eyak Jan 2, 2019
6ed6dca
All object conneted, with notifications
eyak Jan 2, 2019
2eb6bb4
clear home
eyak Jan 2, 2019
1f240d8
ziv teensy addition
Jan 2, 2019
30d4fdc
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Jan 2, 2019
845d902
bug fixes, unify save-uploadm, publish placeholder
eyak Jan 6, 2019
682532a
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Jan 6, 2019
2c2f3e6
Updated circuit schema
eyak Jan 6, 2019
05fa95e
update
Robohad Jan 6, 2019
2d08c5e
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Jan 6, 2019
029c8f8
change 'circuit' to 'circuits'
Robohad Jan 6, 2019
1b8c8ae
merge
Robohad Jan 6, 2019
98a0d5f
change circuit names 6/1
Robohad Jan 6, 2019
6898ce0
update
Robohad Jan 6, 2019
7731e0c
change requires and prvoides to object
Robohad Jan 6, 2019
04eb5af
update
Robohad Jan 6, 2019
2941702
change requires to requiredBlocks
Robohad Jan 6, 2019
71a924b
Rename src folder. Unite circuit in block object
eyak Jan 6, 2019
8050de8
add required fields to schemas
eyak Jan 6, 2019
ce7ebd6
minor typos
eyak Jan 6, 2019
8b424d0
added favicon
eyak Jan 7, 2019
a9a6242
gitignore package-lock
eyak Jan 7, 2019
ee86321
add vscode config files
eyak Jan 7, 2019
04b47d0
Schema improvements
eyak Jan 7, 2019
9144178
part and coder field bug
eyak Jan 7, 2019
dde8f14
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
Robohad Jan 7, 2019
bd44a76
change to boolean flags
Robohad Jan 7, 2019
20a5f87
Support two columns in forms
eyak Jan 7, 2019
19f415e
Merge branch 'master' of https://github.com/Roboplan/ComponentsBank-MESS
eyak Jan 7, 2019
2b4a3cc
schema updates
eyak Jan 7, 2019
97c8062
Improved schemas
eyak Jan 7, 2019
680294f
Make server system proof (Windows support)
eyak Jan 7, 2019
c366c10
Merge branch 'master' into master-sub
Robohad Feb 25, 2019
828820b
Merge branch 'master' of https://github.com/Circuito-io/ComponentEditor
eyak Feb 25, 2019
e032c89
prevent white space in new block name
eyak Feb 25, 2019
0af797e
build
eyak Feb 25, 2019
5074f1a
Corrected description (#12)
bernhard-hofmann Feb 26, 2019
23273d1
pull request video
eyak Feb 28, 2019
d21c5d4
build
eyak Feb 28, 2019
b0652fe
Update README.md
eyak Mar 8, 2019
a08a2d6
Update README.md
eyak Aug 15, 2023
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
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
## Video Tutorial
[![Intro Video](https://res.cloudinary.com/circuito/image/upload/w_300,b_white/v1550053341/circuito_youtube_help_title.png)](https://www.youtube.com/watch?v=i3CpeFhRLI4)

## Using GitPod
## Using GitPod - Recommended
[Edit using GitPod](http://gitpod.io/#https://github.com/Circuito-io/ComponentEditor)

## Creating a Local Development Environment
1. Make sure you have [Node.js](https://nodejs.org/en/download/)
2. Clone this repository
2. Clone this repository and cd into it
```bash
git clone https://github.com/Circuito-io/ComponentsEditor.git
git clone https://github.com/Circuito-io/ComponentEditor.git
cd ComponentEditor
```
3. Init and update submodule
```bash
Expand All @@ -19,14 +20,12 @@ git submodule update
```
3. Run npm install
```bash
cd ComponentEditor
npm install
npm install --legacy-peer-deps
```
4. Run the dev web server
```bash
npm run dev
```
5. Connect to the web server - http://localhost:8080
6. Edit your files locally - components are in the ```components``` subfloder
7. When ready - click the 'save&upload' button to sync local files with our server
8. Click the 'preview' button to open your **private** circuito.io preview window
7. When ready - click the 'Preview' button to sync local files with our server and open your **private** circuito.io preview window
4 changes: 2 additions & 2 deletions components/Blocks/NodeMCU1.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"verified": false,
"solder": false
},
"desc": "<p>NodeMCU is an Arduino compatible ESP8266 based micro controller with on-board WiFi. It is great from internet of things projects or just as an Arduino replacement.</p>",
"desc": "<p>NodeMCU is an Arduino compatible ESP8266 based micro controller with on-board WiFi. It is great for Internet of Things (IoT) projects or just as an Arduino replacement.</p>",
"visible": true
},
"circuits": [
Expand Down Expand Up @@ -1245,4 +1245,4 @@
"cost": 2
}
]
}
}
40 changes: 20 additions & 20 deletions public/bundle.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions src/client/blocks-list.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Typeahead } from "react-bootstrap-typeahead";
import { toast } from "react-toastify";
import { ListGroup, Button } from "react-bootstrap";
import { Button } from "react-bootstrap";
import { update_a_block, update_a_coder } from "./controller.js";
import { createNewCoder } from "./form/coderfield.js";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
Expand All @@ -18,7 +18,7 @@ function createNewBlockData(blockName) {
name: blockName,
blockId: blockId.toString(),
app: {
appName: blockName,
appName: blockName.replace("_", " "),
visible: true,
indicators: {
solder: false
Expand Down Expand Up @@ -102,7 +102,7 @@ export class BlocksList extends React.Component {
actions: [
Dialog.CancelAction(),
Dialog.OKAction(dialog => {
const newBlockName = dialog.value;
const newBlockName = dialog.value.replace(" ", "_");

analytics.track("Block Created", { name: newBlockName });
analytics.track("Block Opened", { name: newBlockName });
Expand Down 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
19 changes: 11 additions & 8 deletions src/client/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,14 @@ export class Publish extends React.Component {
<Modal.Title>How to publish your work</Modal.Title>
</Modal.Header>
<Modal.Body>
<h4>Video comming soon.</h4>
After you fork the repo and commit your changes using the git panel
on the left, create a pull request using the pull-request panel on
the right, or directly in github in your fork.
{/*
After you <b>fork</b> the repo and <b>commit</b> your changes using the git panel
on the left, create a <b>pull request</b> using the pull-request panel on
the right, or create the pull request directly in your github.
<ReactPlayer
url="https://www.youtube.com/watch?v=i3CpeFhRLI4"
url="https://www.youtube.com/watch?v=1EkRuXEPBO4"
width="90%"
controls={true}
/> */}
/>
</Modal.Body>
<Modal.Footer>
<Button variant="secondary" onClick={this.handleClose}>
Expand All @@ -46,7 +44,12 @@ export class Publish extends React.Component {
</Modal.Footer>
</Modal>

<Button variant="secondary" id="btn-publish" onClick={this.handleShow} style={{margin: "0px 2px"}}>
<Button
variant="secondary"
id="btn-publish"
onClick={this.handleShow}
style={{ margin: "0px 2px" }}
>
Publish
</Button>
</React.Fragment>
Expand Down