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

Redesign IDE #21

Merged
merged 203 commits into from
May 26, 2018
Merged

Redesign IDE #21

merged 203 commits into from
May 26, 2018

Conversation

remo5000
Copy link
Contributor

@remo5000 remo5000 commented May 21, 2018

These commits are children of branch interrupt-button. The PR for that branch (#27) probably needs to be reviewed before this.


Features

  • SCSS
  • Dark background
  • Buttons are grouped with their semantic counterparts

Issues fixed

ning-y and others added 30 commits May 14, 2018 10:48
Changes:
- Changed `Playground` component to a statefull one (extends `React.Component)
- add property `playgroundCode` to IApplicationState (bad practice,
change to a slice of the state instead)
- add interface `IPlaygroundProps` to denote the properties passed to
Playground
Once again, this is a WIP. Text typed into the playground editor will
stay in the playground (or rather, appear again) after leaving and
coming back.

Changes:
- added of action, actionCreator (updatePlaygroundCode)
- added a reducer under application's `reducer` function

Possible problems:
- Location of reducer
- Location of playgroundCode stored (as in previous commit)
Made a compromise by including an IPlaygroundState as part of IApplicationProps
This is a copy over of the current state of `./frontend/src/toolchain` at
source-academy/source-academy2 67d9184. It includes only source chapter 1, a new
specification (see [PR 6 at the
source-academy/source-academy2](source-academy/source-academy2#6)
repository).
The react types were added as a result of the `yarn add` command.
remo5000 added 2 commits May 24, 2018 17:00
Note that handleEditorChange has been modified to
handleEditorValueChange, to be clearer when comapring to
handleEditorWidthChange.
@remo5000 remo5000 changed the base branch from functioning-ide to master May 24, 2018 09:11
@remo5000 remo5000 added the blocked Something else needs pass review first label May 24, 2018
@remo5000
Copy link
Contributor Author

Blocked as it would be wise to include the "Interrupt" button (#27) when merging (as there are conflicts already anyways).

This would allow this PR to (hopefully) be the last "frontend" PR for this sprint.

@remo5000 remo5000 mentioned this pull request May 25, 2018
Note that this make the IDE/index component stateful, handling the
editor width.
@ning-y ning-y changed the base branch from master to interrupt-button May 25, 2018 03:41
@ning-y ning-y changed the base branch from interrupt-button to master May 25, 2018 03:47
@ning-y
Copy link
Member

ning-y commented May 25, 2018

Will fix the merge conflicts with master after #27 is merged into master.

remo5000 added 5 commits May 25, 2018 12:48
This means that the change in width (in pixels) would need to be
converted to a percentage change (in the component) and the string must
be converted, added to the percentage change, then parsed again. A
possble optimization is keeping the number as a float (which would
involve one parse when passing it as a prop). However, I find it
semantically cleaner to keep the `editorWidth` as a string that expresses
a percentage, as compared to an `editorWidthPercentage` that holds a
number.
Main conflict : usage of `pre` instead of `code`
This is set to be the same as the default minWidth, 10px.
@remo5000 remo5000 removed the blocked Something else needs pass review first label May 26, 2018
@ning-y ning-y merged commit f442140 into master May 26, 2018
@ning-y ning-y deleted the ide-ui branch May 26, 2018 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants