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

Fixed makeUnPushable/unDroppable bug #229

Merged
merged 8 commits into from
Jun 16, 2019

Conversation

jSwanson99
Copy link
Contributor

… and added a loading screen/overlay while waiting for view to mount

… and added a loading screen/overlay while waiting for view to mount
@jSwanson99 jSwanson99 requested a review from a team June 13, 2019 17:42
Copy link
Member

@jasondkiesling jasondkiesling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments.

package.json Show resolved Hide resolved
src/components/Header.js Outdated Show resolved Hide resolved
@@ -180,6 +182,10 @@ class Header extends Component {
if (this.state.lastMsgTime !== this.props.message.time && this.props.message.text !== "") {
this.setState({ snackOpen: true, lastMsgTime: this.props.message.time });
}
if(shouldRender) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look like it is really the way that we should be doing this. Something is weird.

src/components/View.js Outdated Show resolved Hide resolved
src/components/View.js Outdated Show resolved Hide resolved
src/components/View.js Outdated Show resolved Hide resolved
src/components/layouts/Ide.js Outdated Show resolved Hide resolved
src/myr/Myr.js Outdated Show resolved Hide resolved
src/myr/Myr.js Outdated Show resolved Hide resolved
yarn.lock Show resolved Hide resolved
@jSwanson99
Copy link
Contributor Author

I removed the loading screen because I couldn't get it to work through the components state, so I want to take more time to figure out a fix for that. Also any white space that was added/remove in this commit was due to the auto formatter

@jasondkiesling
Copy link
Member

The way that render is working now isn't really the way we should be doing it. More investigation is needed. If you want to remove that part for now we can push the makeUnDrop/Pushable part.

@jasondkiesling
Copy link
Member

You also have some merge conflicts that need to be resolved.

@jSwanson99 jSwanson99 changed the title Fixed makeUnPushable/unDroppable bug, fixed animation bugs on render,… Fixed makeUnPushable/unDroppable bug Jun 14, 2019
Copy link
Member

@jasondkiesling jasondkiesling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me test this locally, but it looks fine.

@jasondkiesling jasondkiesling merged commit 42d5999 into engaging-computing:dev Jun 16, 2019
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.

2 participants