Skip to content

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

Closed
iamutkarshy wants to merge 3 commits into
react-native-elements:masterfrom
iamutkarshy:Hot-fix
Closed

iamutkarshy wants to merge 3 commits into
react-native-elements:masterfrom
iamutkarshy:Hot-fix

Conversation

@iamutkarshy

@iamutkarshy iamutkarshy commented Mar 20, 2021 •

Copy link
Copy Markdown
Contributor

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

netlify Bot commented Mar 20, 2021 •

Copy link
Copy Markdown

Deploy preview for rne-playground ready!

Built with commit 84d8e04

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

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

iamutkarshy commented Mar 20, 2021 •

Copy link
Copy Markdown
Contributor Author

@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.

@pranshuchittora

Copy link
Copy Markdown
Member

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

@iamutkarshy

Copy link
Copy Markdown
Contributor Author

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

@iamutkarshy

Copy link
Copy Markdown
Contributor Author

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

@pranshuchittora

Copy link
Copy Markdown
Member

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

@iamutkarshy

iamutkarshy commented Mar 26, 2021 •

Copy link
Copy Markdown
Contributor Author

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

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

@iamutkarshy

iamutkarshy commented Mar 26, 2021 •

Copy link
Copy Markdown
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

@jugshaurya

jugshaurya commented Mar 26, 2021 •

Copy link
Copy Markdown
Contributor

@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

@iamutkarshy

Copy link
Copy Markdown
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

@iamutkarshy
iamutkarshy 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

Development

Successfully merging this pull request may close these issues.

🐛 Bug: Error log is unaligned and breaking the UI of playground. (Need to make a hot-fix) for all components.

4 participants