Skip to content

Commit

Permalink
Release/v0.8 (#263)
Browse files Browse the repository at this point in the history
* fix: student view top menu scaling

* unit next btn module

* unit&lesson module updates

* console initial code && filter serial port to show only adrino uno && updated react dependency

* minor change to console view

* TextDecoderStream not working

* finished reader functionality

* initial working console view

* new interactions

* able to select baud rate

* able to select baud rate

* added newLine, fixed string being chunk, added input initial code

* input working. Trying to add scroll bar for console

* console scroll bar, modified baud rate display

* remove page scroll bar for better UX

* added event listener for device disconnection.

* updated UI

* fix: filter unable to process unit number > 9

* feat: allow console to slide up on to canvas;
added scrollbar to content creator toolbox

* added disable choose baud rate

* added device status message

* student login auth

* edit error message

* fix bug where mentor/cc not able to upload code to arduino

* added pop-up message

* fixed LS_name in day

* fixed Change button not showing on Classroom when there's no LS

* added confirm button for unsave CC workspace

* added serial connection auto open, edited connection message

* updated button style

* fixed update unix for cc. Not able to update grade

* added message

* ui updates

* sorted file structure

* updated Add Day functionality

* fix: content creator toolbox prefilled with student options

* feat: toggle select all now expand/contract toolbox

* merge develop into pre_demo_fix

* take out add day after add a lesson temporarily

* added z-index to btn-container

* fix merge bug && ant-table wrapper

* fixed cc unit grade bug

* Created Test workflow

* clean up

* comments and prop

* content creator rewrite

* fix add ls bug

* fix bug where student always go to Pedro's classroom

* fix bug where student always go to Pedro's classroom

* clean up

* Added token for checking out action

* Deleted version release on path

* putting ref back in

It seems like it requires the workflow format to include the ref

* updated new ref release

* Changed label name to be github_token for warning error

* sorted blockly category in the backend

* sorted blockly category in the backend

* clean up db dump file and added meaningful data

* modify avrgirl to get rid of connection error on heroku

* edited avrgirl serial connection, added hover for save, edited go back warming

* added error message

Co-authored-by: chensation <[email protected]>
Co-authored-by: chensation <[email protected]>
Co-authored-by: Anna Le <[email protected]>
Co-authored-by: lilyh14 <[email protected]>
Co-authored-by: Michael Pascuzzi <[email protected]>
Co-authored-by: Lily Hinkeldey <[email protected]>
  • Loading branch information
7 people authored Aug 11, 2021
1 parent d703ecc commit e181bf4
Show file tree
Hide file tree
Showing 35 changed files with 12,691 additions and 18,226 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Test App
on:
pull_request:
branches: [ develop ]
types: [ opened, reopened ]
jobs:
run:
runs-on: ubuntu-latest
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Test App
uses: STEM-C/auto/[email protected]
with:
github_token: "${{ secrets.GITHUB_TOKEN }}"
11 changes: 6 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@
"@craco/craco": "^5.6.4",
"@material-ui/core": "^4.10.2",
"@material-ui/icons": "^4.9.1",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.0.0",
"@testing-library/user-event": "^7.1.2",
"antd": "^4.3.5",
"axios": "^0.21.1",
"craco-less": "^1.17.0",
"cross-env": "^7.0.2",
"emoji-picker-react": "^3.2.1",
"http-server": "^0.12.3",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-papaparse": "^3.7.0",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"react-scripts": "^4.0.3",
"util": "^0.12.4",
"yarn": "^1.22.10"
},
"scripts": {
Expand Down
43 changes: 17 additions & 26 deletions client/public/lib/avrgirl-arduino.global.js
Original file line number Diff line number Diff line change
Expand Up @@ -13121,8 +13121,6 @@ THE SOFTWARE.
this.writer = null;
this.reader = null;
this.baudRate = this.options.baudRate;
this.requestOptions = this.options.requestOptions || {};

if (this.options.autoOpen) this.open();
}

Expand All @@ -13132,32 +13130,25 @@ THE SOFTWARE.
.catch((error) => {if (callback) {return callback(error)}});
}

open(callback) {
window.navigator.serial.requestPort(this.requestOptions)
.then(serialPort => {
this.port = serialPort;
if (this.isOpen) return;
return this.port.open({ baudRate: this.baudRate || 57600 });
})
.then(() => this.writer = this.port.writable.getWriter())
.then(() => this.reader = this.port.readable.getReader())
.then(async () => {
this.emit('open');
this.isOpen = true;
callback(null);
while (this.port.readable.locked) {
try {
const { value, done } = await this.reader.read();
if (done) {
break;
}
this.emit('data', Buffer.from(value));
} catch (e) {
console.error(e);
async open(callback) {
this.port = window['port']
await this.port.open({ baudRate: this.baudRate || 57600 })
this.writer = this.port.writable.getWriter()
this.reader = this.port.readable.getReader()
this.emit('open');
this.isOpen = true;
callback(null);
while (this.port.readable.locked) {
try {
const { value, done } = await this.reader.read();
if (done) {
break;
}
this.emit('data', Buffer.from(value));
} catch (e) {
console.error(e);
}
})
.catch(error => {callback(error)});
}
}

async close(callback) {
Expand Down
Loading

0 comments on commit e181bf4

Please sign in to comment.