Redesigned Facility Home Page #3819

GokulramGHV · 2022-10-24T12:55:04Z

fixes #3757
fixes #3804
fixes #4007
fixes #3713

Proposed Changes

Redesigned Facility Home Page

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

Add specs that demonstrate bug / test a new feature.
Update product documentation.
Ensure that UI text is kept in I18n files.
Prep screenshot or demo video for changelog entry, and attach it to issue.
Request for Peer Reviews
Completion of QA

netlify · 2022-10-24T12:56:54Z

✅ Deploy Preview for care-egov-staging ready!

Name	Link
🔨 Latest commit	`51ac8b9`
🔍 Latest deploy log	https://app.netlify.com/sites/care-egov-staging/deploys/637629b6723509000965a5aa
😎 Deploy Preview	https://deploy-preview-3819--care-egov-staging.netlify.app/
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

github-actions · 2022-10-26T06:07:13Z

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

vercel · 2022-10-27T09:31:43Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
care-storybook	✅ Ready (Inspect)	Visit Preview	Nov 17, 2022 at 0:33AM (UTC)

nihal467 · 2022-11-02T09:59:17Z

@GokulramGHV

triage is not responsive in mobile view

in the oxygen table is not responsive

rithviknishad · 2022-11-03T07:38:43Z

src/style/index.css

+.btn-secondary {
+  @apply px-4 py-3 border bg-white border-primary-500 rounded font-medium text-sm text-primary-500 flex justify-center items-center gap-2 hover:bg-primary-500 hover:text-white transition duration-300 ease-in-out
+}
+


@GokulramGHV revert this, and use the new ButtonV2 with type/style="secondary" instead of adjusting classes.

rithviknishad · 2022-11-03T07:41:40Z

src/Components/Common/components/Menu.tsx

+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >


Replace this with already implemented DropdownTransition since we need consistent dropdown animation for all types of dropdowns, which is already a wrapper around headlessui's transition.

rithviknishad · 2022-11-03T07:47:07Z

src/Components/Facility/DoctorsCountCard.tsx

+            <svg
+              className="w-5 h-5"
+              viewBox="0 0 14 16"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M7 8C9.20938 8 11 6.20937 11 4C11 1.79063 9.20938 0 7 0C4.79063 0 3 1.79063 3 4C3 6.20937 4.79063 8 7 8ZM4 9.725C1.6875 10.4031 0 12.5406 0 15.0719C0 15.5844 0.415625 16 0.928125 16H13.0719C13.5844 16 14 15.5844 14 15.0719C14 12.5406 12.3125 10.4031 10 9.725V11.3125C10.8625 11.5344 11.5 12.3188 11.5 13.25V14.5C11.5 14.775 11.275 15 11 15H10.5C10.225 15 10 14.775 10 14.5C10 14.225 10.225 14 10.5 14V13.25C10.5 12.6969 10.0531 12.25 9.5 12.25C8.94687 12.25 8.5 12.6969 8.5 13.25V14C8.775 14 9 14.225 9 14.5C9 14.775 8.775 15 8.5 15H8C7.725 15 7.5 14.775 7.5 14.5V13.25C7.5 12.3188 8.1375 11.5344 9 11.3125V9.52812C8.8125 9.50937 8.62188 9.5 8.42813 9.5H5.57188C5.37813 9.5 5.1875 9.50937 5 9.52812V11.5719C5.72188 11.7875 6.25 12.4563 6.25 13.25C6.25 14.2156 5.46562 15 4.5 15C3.53437 15 2.75 14.2156 2.75 13.25C2.75 12.4563 3.27813 11.7875 4 11.5719V9.725ZM4.5 14C4.91563 14 5.25 13.6656 5.25 13.25C5.25 12.8344 4.91563 12.5 4.5 12.5C4.08437 12.5 3.75 12.8344 3.75 13.25C3.75 13.6656 4.08437 14 4.5 14Z"
+                fill="white"
+              />
+            </svg>


use unicons or move svg's to constants and make it tailwind compatible instead of hardcoding the colors.

src/Components/Facility/DoctorsCountCard.tsx

nihal467 · 2022-11-15T11:44:51Z

@GokulramGHV PR looks good to me. Marking it as "Team discussion required" for final approval

github-actions · 2022-11-16T12:31:37Z

👋 Hi, @GokulramGHV,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

nihal467 · 2022-11-16T15:11:11Z

PR final design approved, @khavinshankar it is good to merge

khavinshankar

@GokulramGHV some minor changes

khavinshankar · 2022-11-17T04:14:00Z

src/Components/Facility/BedTypeCard.tsx

+  useEffect(() => {
+    setTimeout(() => {
+      if (props.current_capacity && props.total_capacity)
+        setPercentage((props.current_capacity * 100) / props.total_capacity);
+    }, 1000);
+  }, [isVisible, percentage, props.current_capacity, props.total_capacity]);
+


can't we calculate the percentage directly without the useEffect, and why timeout?

src/Components/Facility/FacilityHome.tsx

src/Components/Facility/HospitalList.tsx

sonarcloud · 2022-11-17T12:33:18Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
10 Code Smells

No Coverage information
0.0% Duplication

* added table and dropdown menu * added doctorCountCard and Triage Table * changed few icons * changed facility feature type icons * used ButtonV2 for add patient button * fixed table component and refactored code * made the menu button customizable * Revert "made the menu button customizable" This reverts commit 402cffe. * ButtonV2: border for ghost variants * authorized for ButtonV2 access control * deprecate `RoleButton` * fix contextual colors * improve tailwind component: DropDownItem * improve how component authorization is defined * remove console.log * hide dropdown item if not authorized * added ContactLink component * Update src/Components/Common/components/ContactLink.tsx Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com> * Fixed bedTypeCard animation & refactored some code Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>

GokulramGHV added 2 commits October 24, 2022 14:52

added table and dropdown menu

09b5043

added doctorCountCard and Triage Table

4ff7712

GokulramGHV requested a review from a team October 24, 2022 12:55

GokulramGHV requested a review from a team as a code owner October 24, 2022 12:55

GokulramGHV requested a review from mathew-alex October 24, 2022 12:55

GokulramGHV added the work-in-progress label Oct 24, 2022

GokulramGHV added the redesign label Oct 24, 2022

github-actions bot added the merge conflict pull requests with merge conflict label Oct 26, 2022

Merge branch 'develop' into fix-issue-3757

0843cc5

vercel bot temporarily deployed to Preview October 27, 2022 09:33 Inactive

GokulramGHV removed the merge conflict pull requests with merge conflict label Oct 27, 2022

Merge branch 'develop' into fix-issue-3757

48d923e

vercel bot temporarily deployed to Preview October 31, 2022 16:30 Inactive

GokulramGHV added 2 commits November 1, 2022 18:52

changed few icons

f8f9e09

changed facility feature type icons

b424449

GokulramGHV added needs testing and removed work-in-progress labels Nov 2, 2022

vercel bot temporarily deployed to Preview November 2, 2022 07:57 Inactive

nihal467 added Team Discuss Required test failed and removed needs testing Team Discuss Required labels Nov 2, 2022

rithviknishad reviewed Nov 3, 2022

View reviewed changes

src/Components/Facility/DoctorsCountCard.tsx Outdated Show resolved Hide resolved

vercel bot temporarily deployed to Preview November 11, 2022 13:40 Inactive

GokulramGHV added the needs testing label Nov 12, 2022

rithviknishad added the Major Code Change This Tag represent PR, which will be causing major Code change in the platform label Nov 14, 2022

nihal467 mentioned this pull request Nov 14, 2022

Blue color of phone number makes the facility page UI less uniform #3713

Closed

nihal467 added tested Team Discuss Required and removed needs testing labels Nov 15, 2022

github-actions bot added the merge conflict pull requests with merge conflict label Nov 16, 2022

Merge branch 'develop' into fix-issue-3757

fc5d461

rithviknishad removed the merge conflict pull requests with merge conflict label Nov 16, 2022

vercel bot temporarily deployed to Preview November 16, 2022 12:38 Inactive

nihal467 removed the Team Discuss Required label Nov 16, 2022

khavinshankar requested changes Nov 17, 2022

View reviewed changes

khavinshankar added question Further information is requested changes required labels Nov 17, 2022

GokulramGHV added 2 commits November 17, 2022 12:29

Fixed bedTypeCard animation & refactored some code

6837a33

Merge branch 'develop' into fix-issue-3757

51ac8b9

GokulramGHV requested a review from khavinshankar November 17, 2022 12:30

GokulramGHV added made_changes and removed question Further information is requested changes required labels Nov 17, 2022

vercel bot temporarily deployed to Preview November 17, 2022 12:31 Inactive

vercel bot temporarily deployed to Preview November 17, 2022 12:33 Inactive

khavinshankar approved these changes Nov 17, 2022

View reviewed changes

khavinshankar merged commit 4f8c363 into ohcnetwork:develop Nov 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Redesigned Facility Home Page #3819

Redesigned Facility Home Page #3819

GokulramGHV commented Oct 24, 2022 •

edited by rithviknishad

Loading

netlify bot commented Oct 24, 2022 •

edited

Loading

github-actions bot commented Oct 26, 2022

vercel bot commented Oct 27, 2022 •

edited

Loading

nihal467 commented Nov 2, 2022

rithviknishad Nov 3, 2022 •

edited

Loading

rithviknishad Nov 3, 2022 •

edited

Loading

rithviknishad Nov 3, 2022

nihal467 commented Nov 15, 2022

github-actions bot commented Nov 16, 2022

nihal467 commented Nov 16, 2022

khavinshankar left a comment

khavinshankar Nov 17, 2022

sonarcloud bot commented Nov 17, 2022

Redesigned Facility Home Page #3819

Redesigned Facility Home Page #3819

Conversation

GokulramGHV commented Oct 24, 2022 • edited by rithviknishad Loading

Proposed Changes

Merge Checklist

netlify bot commented Oct 24, 2022 • edited Loading

✅ Deploy Preview for care-egov-staging ready!

github-actions bot commented Oct 26, 2022

vercel bot commented Oct 27, 2022 • edited Loading

nihal467 commented Nov 2, 2022

rithviknishad Nov 3, 2022 • edited Loading

Choose a reason for hiding this comment

rithviknishad Nov 3, 2022 • edited Loading

Choose a reason for hiding this comment

rithviknishad Nov 3, 2022

Choose a reason for hiding this comment

nihal467 commented Nov 15, 2022

github-actions bot commented Nov 16, 2022

nihal467 commented Nov 16, 2022

khavinshankar left a comment

Choose a reason for hiding this comment

khavinshankar Nov 17, 2022

Choose a reason for hiding this comment

sonarcloud bot commented Nov 17, 2022

GokulramGHV commented Oct 24, 2022 •

edited by rithviknishad

Loading

netlify bot commented Oct 24, 2022 •

edited

Loading

vercel bot commented Oct 27, 2022 •

edited

Loading

rithviknishad Nov 3, 2022 •

edited

Loading

rithviknishad Nov 3, 2022 •

edited

Loading