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

Hot fix: resolved merge conflicts, updated UI breaking and updated props docs(rectified redundant code). #87

Closed
wants to merge 3 commits into from

Conversation

Uyadav207
Copy link
Contributor

@Uyadav207 Uyadav207 commented Mar 20, 2021

What kind of change does this PR introduce?

Did you add tests for your changes?

  • Not required...

Summary

  • After the merge of feat: Remote docs #15.... there was some conflict occurred resolved that conflict in this PR.

ERROR RESOLVED IS SHOWN BELOW

Does this PR introduce a breaking change?

  • No breaking changes are involved.

Other information

  • Also removed UI breaking.

before

After (Fixes #75 )

@netlify
Copy link

netlify bot commented Mar 20, 2021

Deploy preview for rne-playground ready!

Built with commit 84d8e04

https://deploy-preview-87--rne-playground.netlify.app

@Uyadav207 Uyadav207 changed the title Hot fix Hot fix: resolved merge conflicts, updated UI breaking and updated props docs(rectified redundant code). Mar 20, 2021
@Uyadav207
Copy link
Contributor Author

Uyadav207 commented Mar 20, 2021

@pranshuchittora, The checks are failing because....

when tried to update the Props folder... it is not pushing....then after looking at this issue... I found that you have pushed the Props folder in .gitignore, That is why ... the checks are not passing as there is no prop folder found.

  • What to do now?
  • may I remove it from .gitignore?
  • This is also causing compilation error on development in the local host....

DO we really need to push the props folder

  • Yes, as if not pushed... on the development side... compiler will throw an error NO Such directory found /Props/props.mdx.

@Uyadav207 Uyadav207 mentioned this pull request Mar 20, 2021
@pranshuchittora
Copy link
Member

@Uyadav207 this is not required as #15 introduces remote docs for always up-to-dated docs.

@Uyadav207
Copy link
Contributor Author

ok Got it... @pranshuchittora ... Also The UI for error render is quite buggy may, I give the PR for that instead.

@Uyadav207
Copy link
Contributor Author

As that changes were included ... in this PR also but no worries

@pranshuchittora
Copy link
Member

Sure, Feel free to open a new PR if this can't be updated.

@Uyadav207
Copy link
Contributor Author

Uyadav207 commented Mar 26, 2021

Screenshot from 2021-03-26 23-58-19

@pranshuchittora, pls help me how can I resolve this??

@Uyadav207
Copy link
Contributor Author

Uyadav207 commented Mar 26, 2021

@pranshuchittora, please have a look...

Screenshot from 2021-03-27 00-14-24

  • after running npm prepare... i.e injecting props... The error is still there... Might be the Case the directory is not found.
  • current import STATEMENT
    Screenshot from 2021-03-27 00-16-00

@jugshaurya
Copy link
Contributor

jugshaurya commented Mar 26, 2021

@pranshuchittora, please have a look...

Screenshot from 2021-03-27 00-14-24

  • after running npm prepare... i.e injecting props... The error is still there... Might be the Case the directory is not found.
  • current import STATEMENT
    Screenshot from 2021-03-27 00-16-00

@Uyadav207 , problem is solvable when you run npm i, npm i is running injectProps.js, which is adding Props folder to the appropritate folder. So wait for the #97 to be merged and then run npm i once more to get folder into the codebase/workspace

@Uyadav207
Copy link
Contributor Author

@pranshuchittora, please have a look...
Screenshot from 2021-03-27 00-14-24

  • after running npm prepare... i.e injecting props... The error is still there... Might be the Case the directory is not found.
  • current import STATEMENT
    Screenshot from 2021-03-27 00-16-00

@Uyadav207 , problem is solvable when you run npm i, npm i is running injectProps.js, which is adding Props folder to the appropritate folder. So wait for the #97 to be merged and then run npm i once more to get folder into the codebase/workspace

Resolved.. The folder was injected ... but in wrong sub folder

@Uyadav207 Uyadav207 closed this Mar 26, 2021
@Uyadav207 Uyadav207 deleted the Hot-fix branch March 26, 2021 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants