Resolve PR confilicts #93
Conversation
nov redirects to home page
I had to use react-helmet-async. I was getting error while using with react-helmet. I have no idea if this is the right approach.
* CSS(pages)(styles)(Markdown): add span data-term * Fix: #41 Phone ("tel:" schema) links should not have target="_blank" attribute * Fix #52 All external links should open in new tab * FIX(pages)(Faq): missing target="_blank" * REFACTOR: use spinner and minor changes * FIX: partially #57, icon check should be green * FIX(pages)(Faq): wrong check icon also remove title from tooltip child * REFACTOR(comp...)(DoctorCard): minor improvements * lint fix * lint fixes * Fix eslint warnings and errors Co-authored-by: Stefan Baebler <stefan.baebler@gmail.com> (cherry picked from commit 4a5f259)
introduce Section component
(cherry picked from commit e2f2835)
change textarea rows as user is typing (cherry picked from commit 771db12)
(cherry picked from commit 8bc8857)
... as "accepts" field values in doctors.csv. See: sledilnik/zdravniki-data (cherry picked from commit 03ebbcb)
(cherry picked from commit 2c115f5)
(cherry picked from commit f7f4543)
(cherry picked from commit 0b82bb7)
(cherry picked from commit 6162f2d)
(cherry picked from commit 3cf9cb1)
(cherry picked from commit 0e469dd)
use filterBySearchValueInMapBounds() (cherry picked from commit 9b4c8a9)
(cherry picked from commit 1ddf3d9)
(cherry picked from commit d729b4c)
(cherry picked from commit cda5e69)
(cherry picked from commit 340bf03)
(cherry picked from commit c009dc2)
(cherry picked from commit 4ae21b8)
(cherry picked from commit 216a494)
|
Hey! The prop types PR is not ready to be merged. I haven't had any time last week to work on it, unfortunately. Also, I would consider it non-blocking so go ahead and deploy without it. The prop-types I would almost consider a nice to have but not crucial for any of the functionalities. Let me know if think different. I can only say I will try to finish it by the end of this week. |
|
Quick test report: In general I think we could merge changes/PRs faster and rebase WIP PR more often to reduce need to resolve conflicts on bigger merges. |
|
@jalezi I suspect it is a merge bug that SPREJEMA stays red? Should be green, right? |
before: availability text "SPREJEMA" is red after: availability text "SPREJEMA" is green This bug was most likely produced during conflicts resolving.
I agree with @lukarenko. Smaller PRs, easier and faster review. I would include your PR @mihaerzen (basically it's one commit). You can slowly fix warnings and maybe even I can give you a hand if I recognize something that is easy to fix (I have plenty of time). Also with each prop-type fix I would add appropriate test, which are desperately needed. As you say prop-types are not essential for functionality and I guess we can take time to fix. Also I am pretty sure that there is still some useless code that I would like to refactor after we implement new design. |
|
@bananica I have also created develop-blue-design branch, where I've (hopefully correct) resolved conflicts with this PR. There are some linting errors ATM (I left them on purpose) in some empty styled components that need your attention. |
Yesterday @stefanb and I had short discussion about possible PR conflicts. We haven't made any decision.
This is just attempt to solve possible conflicts.
This PR includes: #67, #92, #81, #83
What I did:
I’m not sure if it was right decision to include #81 while is still marked as draft, but #83 is based on it.
I skipped #88 while it solves issue #86 only partially and I guess it will be fixed with new design (#89).
Assuming I did everything right, the next step would be prepare PR with new design (#89).
Any thoughts? Especially @mihaerzen, I don't know how far are you with prop-types.