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

Fix choose file option and insert step functionality #712

Merged
merged 3 commits into from
Feb 5, 2019

Conversation

Mridul97
Copy link

Fixes #711

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with npm test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers and @publiclab/is-reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@Mridul97
Copy link
Author

@jywarren @publiclab/is-reviewers Please review!

file2

Copy link
Member

@harshkhandeparkar harshkhandeparkar left a comment

Choose a reason for hiding this comment

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

Looks good!

@aashna27
Copy link

This was happening with me also yesterday but then i retried by building again and in another browser so it worked correctly.

@harshkhandeparkar
Copy link
Member

Insert step was not working for me. @Mridul97 can you please see if that's working

@Mridul97
Copy link
Author

@harshkhandeparkar yes, insert step is not working for me as well

@harshkhandeparkar
Copy link
Member

@Mridul97 does this PR fix it?

@Mridul97
Copy link
Author

@harshkhandeparkar not yet, but will make the changes to do that!

@aashna27
Copy link

Can i work on insert step? If you don't mind? @Mridul97

@harshkhandeparkar
Copy link
Member

Please change the name of the PR to maybe "fix interMediateStepUi.js". Also you can change the issue to say that none of those functions imported from that file work.

@Mridul97
Copy link
Author

Can i work on insert step? If you don't mind? @Mridul97

Actually it has an easy fix, and I think opening another pr for it maybe an overkill! Thanks!

@aashna27
Copy link

Ohh okay! Go ahead.

@Mridul97 Mridul97 changed the title Fix choose file option Fix choose file option and insert step functionality Jan 24, 2019
@Mridul97
Copy link
Author

@aashna27 @harshkhandeparkar Please have a look!

insert

Copy link
Member

@harshkhandeparkar harshkhandeparkar left a comment

Choose a reason for hiding this comment

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

✔️

@aashna27
Copy link

aashna27 commented Jan 25, 2019

great work !!

@Mridul97
Copy link
Author

@jywarren Please review this!

@Mridul97 Mridul97 requested a review from jywarren January 30, 2019 15:00
Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

Looks great, ready to merge after rebase!

@Mridul97
Copy link
Author

Mridul97 commented Feb 2, 2019

@jywarren I have rebased the branch! :)

@jywarren jywarren merged commit 6b305a0 into publiclab:main Feb 5, 2019
@jywarren
Copy link
Member

jywarren commented Feb 5, 2019

Great!!!

@jywarren jywarren mentioned this pull request Feb 9, 2019
4 tasks
jywarren pushed a commit that referenced this pull request Mar 17, 2019
* update dist

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

dist update

Revert "dist update"

This reverts commit 9ee2a98.

* fix insert step button

* add icon

* add dist

* use normal functions

* use normal functions

* add new function

* add dist

* remove console logs

* changes

* refactor

* add dist

* Bump looks-same from 5.0.2 to 6.0.0 (#729)

Bumps [looks-same](https://github.com/gemini-testing/looks-same) from 5.0.2 to 6.0.0.
- [Release notes](https://github.com/gemini-testing/looks-same/releases)
- [Changelog](https://github.com/gemini-testing/looks-same/blob/master/CHANGELOG.md)
- [Commits](gemini-testing/looks-same@v5.0.2...v6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Setup UI testing (#720)

* default sequencer ui test

* default step ui test suite

* intermediate step ui test

* preview ui test suite

* url methods test suite

* add set url params method test suite

* argument call tests

* test directory refactor

* travis fix

* CLI code refactor (#665)

* CLI refactor

* es6 rollback

* Travis fix

* syntax fix

* clustered require statements

* travis debug

* travis debug

* Added line that selects the "More modules..." after adding a step. (#713)

* Added line making module selection correct after adding a step

* Added line with appropriate module selection

* Add: Module tests (#748)

* WIP

* module testing harness

* adjustments

* Fix choose file option and insert step functionality (#712)

* Fix choose file option

* changes

* Parse info.json to set module defaults (#650)

* changes

* changes

* changes

* changes

* changes

* changes

* Update package-lock.json

* Bump jsqr from 1.1.1 to 1.2.0 (#749)

Bumps [jsqr](https://github.com/cozmo/jsQR) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/cozmo/jsQR/releases)
- [Commits](https://github.com/cozmo/jsQR/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump jsqr from 1.1.1 to 1.2.0 (#749)

Bumps [jsqr](https://github.com/cozmo/jsQR) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/cozmo/jsQR/releases)
- [Commits](https://github.com/cozmo/jsQR/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* dist

* changes

* working

* final touches

* revert mapTypes

* proper revert

* Fix arctangent

* working hysteresis

* hysteresis optional
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants