Skip to content

Commit e76ca20

Browse files
authored
Revert "Merge changes from master onto Sound_Improvements (#543)"
This reverts commit c2e24d3.
1 parent a2b3950 commit e76ca20

File tree

84 files changed

+15814
-17887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+15814
-17887
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ terraform*
2222
.env.production.local
2323

2424
npm-debug.log*
25+
yarn-debug.log*
26+
yarn-error.log*

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
language: node_js
22
node_js:
33
- 9
4+
cache: yarn
45
branches:
56
except:
67
- /^no-ci.*$/
78
script:
8-
- npm run format:ci
9-
- npm run build
10-
- npm run tslint
11-
- npm run test-coveralls
9+
- yarn format:ci
10+
- yarn build-css
11+
- yarn tslint -p .
12+
- yarn test-coveralls

README.md

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,23 @@
55

66
## Development Setup
77

8-
1. Install a stable version of NodeJS (tested: Node 10.15.0).
9-
2. Run `npm install` to install dependencies.
8+
1. Install a stable version of Yarn and NodeJS (use node version 4-9 with nvm).
9+
2. Run `yarn` to install dependencies.
1010
3. Copy the `.env.example` file as `.env` and set the variable `REACT_APP_IVLE_KEY`
1111
to contain your IVLE Lapi key.
12-
4. Run `npm start` to start the server at `localhost:80`. Admin permissions may
12+
4. Run `yarn start` to start the server at `localhost:80`. Admin permissions may
1313
be required for your OS to serve at port 80.
14-
5. If running cadet without ngix, `npm run cors-proxy` to solve CORS problems.
1514

1615
## IVLE LAPI Key
1716
For NUS students, you can access your IVLE LAPI key [here](https://ivle.nus.edu.sg/LAPI/default.aspx).
1817

1918
## For Windows Users
2019

2120
### Running cadet-frontend
22-
Run `npm run win-start`
21+
In package.json, change line 19:\
22+
"start-js": "rm -r coverage; BROWSER=none PORT=80 react-scripts-ts start",\
23+
to:\
24+
"start-js": "set PORT=80 & react-scripts-ts start",\
2325

2426
### Dealing with hooks
2527
In package.json, change line 28:\
@@ -41,35 +43,18 @@ to toggle native (default is native enabled).
4143
### To run local copy of js-slang
4244

4345
1. Follow the instructions on the js-slang repository to transpile your own copy
44-
2. Edit line 41 of package.json in this project to link to the directory of your js-slang and then run `npm install`:
46+
2. Edit line 41 of package.json in this project to link to the directory of your js-slang and then run `yarn`:
4547

4648
`"js-slang": "file:path/to/js-slang",`
4749

4850
Note that this copies your files over, any future changes will not be reflected.
4951

5052
You may try [this](https://medium.com/@alexishevia/the-magic-behind-npm-link-d94dcb3a81af) for a smoother experience.
5153

52-
## Inspector
53-
This requires the use of the `debugger` branch of js-slang to work. Clone both the frontend and the `debugger` slang to the same directory. You would want to `yarn build` the slang you just obtained and then `yarn && sudo yarn start` in the frontend and it should just work. The merge over there is still ongoing. Meanwhile, please try to break this.
54-
55-
The mental model we are using is: A breakpoint means that the interpreter will stop right before it. Whatever is highlighted is going to be evaluated next. If you meet any inconsistencies with this, also please raise it up for discussion.
56-
57-
### What you can do
58-
- Set breakpoints by clicking on the gutter
59-
- `debugger;` just like ECMAScript
60-
- Inspect!
61-
- Run stuff in the context of the paused program!
62-
63-
### Usage
64-
Here's what happens: After you click run, if there the interpreter meets a breakpoint, the first thing you're going to notice is that the REPL feedbacks to you it hit a breakpoint, the line is highlighted, and one of the icons on the right pane is going to start blinking. If you click on the icon, it reveals the inspector. All the variables in every frame is exposed here. The REPL is also now in the context of where ever you are. So you can evaluate anything you would normally be able to in the REPL. It is all quite simple really.
65-
66-
### Note
67-
Because we use a local version of `js-slang`, the CI just breaks all the time.
68-
6954
## For Editing And Creating New Local XML Missions
7055

7156
1. Use the branch 'mission-editing' in cadet-frontend
72-
2. Run in browser with npm start
57+
2. Run in browser with yarn start
7358
2. Go to Incubator tab.
7459

7560
## Application Structure

README.md.orig

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)