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

Use shadcn Tooltip Components across FacilityCard #9317

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4989af2
add tooltip for small screen
rajku-dev Dec 1, 2024
5e0c835
Merge branch 'ohcnetwork:develop' into tooltip-facility
rajku-dev Dec 6, 2024
72b3bff
edit en.json
rajku-dev Dec 6, 2024
a796de0
switch to Button
rajku-dev Dec 7, 2024
abcdbf9
edit outline
rajku-dev Dec 7, 2024
9eed329
fix breakpoint
rajku-dev Dec 7, 2024
27c9a40
remove ButtonV2 import
rajku-dev Dec 7, 2024
6033772
fixed the lint
nihal467 Dec 10, 2024
458de15
wrap Link with button
rajku-dev Dec 13, 2024
ac3d465
fix button
rajku-dev Dec 13, 2024
39deb1f
use shadcn tooltip
rajku-dev Dec 14, 2024
adcd8d4
increase tootltip font size and decrease delayDuration
rajku-dev Dec 14, 2024
a1780a1
format with prettier
rajku-dev Dec 16, 2024
7d949cb
correct facility spelling
rajku-dev Dec 16, 2024
bc220c9
Merge branch 'develop' into issue/9315/facilitycard-tooltip
rajku-dev Dec 17, 2024
6d34778
use TooltipComponent throughout
rajku-dev Dec 18, 2024
367c512
Merge branch 'develop' into issue/9315/facilitycard-tooltip
nihal467 Dec 18, 2024
65f9a29
Merge branch 'develop' into issue/9315/facilitycard-tooltip
rajku-dev Dec 19, 2024
2e716d5
Merge branch 'develop' into issue/9315/facilitycard-tooltip
nihal467 Dec 19, 2024
1ef0c1b
Merge branch 'develop' into issue/9315/facilitycard-tooltip
nihal467 Dec 20, 2024
1e16c1b
Merge branch 'develop' into issue/9315/facilitycard-tooltip
rajku-dev Dec 21, 2024
8c8684c
Merge branch 'develop' into issue/9315/facilitycard-tooltip
rajku-dev Dec 21, 2024
263dda9
Merge branch 'develop' into issue/9315/facilitycard-tooltip
nihal467 Dec 23, 2024
5c7d36f
Merge branch 'develop' into issue/9315/facilitycard-tooltip
nihal467 Dec 23, 2024
8123404
revert the view cns button id
nihal467 Dec 23, 2024
827b1ca
fixed the icon and text gap
nihal467 Dec 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@
"notification_cancelled": "Notification cancelled",
"notification_permission_denied": "Notification permission denied",
"notification_permission_granted": "Notification permission granted",
"notify": "Notify",
"number_of_aged_dependents": "Number of Aged Dependents (Above 60)",
"number_of_beds": "Number of beds",
"number_of_beds_out_of_range_error": "Number of beds cannot be greater than 100",
Expand Down
14 changes: 10 additions & 4 deletions src/components/Facility/FacilityCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,28 @@ export const FacilityCard = (props: {
id="facility-notify"
ghost
border
className="h-[38px]"
className="h-[38px] tooltip"
onClick={(_) => setNotifyModalFor(facility.id)}
>
<CareIcon icon="l-megaphone" className="text-lg" />
<span className="hidden md:block">Notify</span>
<span className="hidden md:block">{t("notify")}</span>
<span className="tooltip-text tooltip-top md:hidden">
{t("notify")}
</span>
</ButtonV2>
)}
<ButtonV2
href={`/facility/${facility.id}`}
id="facility-details"
border
ghost
className="h-[38px]"
className="tooltip h-[38px]"
>
<CareIcon icon="l-hospital" className="text-lg" />
<span className="hidden md:inline">
<span className="hidden sm:inline">
{t("view_faciliy")}
</span>
<span className="tooltip-text tooltip-top sm:hidden">
{t("view_faciliy")}
rajku-dev marked this conversation as resolved.
Show resolved Hide resolved
rajku-dev marked this conversation as resolved.
Show resolved Hide resolved
</span>
</ButtonV2>
Expand Down
Loading