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.

Sign up for GitHub

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

Fix: Resource filters in mobile view #10402

Merged
merged 6 commits into from
Feb 12, 2025
+5 −5
Merged

Fix: Resource filters in mobile view #10402

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
75832b7
resource filters in mobile view
Rishith25 Feb 5, 2025
50bcb8d
Trigger Build
Rishith25 Feb 5, 2025
aff54a4
Merge branch 'develop' into resource-filter
Rishith25 Feb 6, 2025
c816ee9
resource filters mobile view
Rishith25 Feb 6, 2025
c48621c
Merge branch 'develop' into resource-filter
Rishith25 Feb 10, 2025
38177bf
correct classNames
Rishith25 Feb 10, 2025
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
16 changes: 8 additions & 8 deletions src/components/Resource/ResourceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function EmptyState() {
<CareIcon icon="l-folder-open" className="h-6 w-6 text-primary" />
</div>
<h3 className="text-lg font-semibold mb-1">{t("no_resources_found")}</h3>
<p className="text-sm text-gray-500 mb-4">
<p className="text-sm text-muted-foreground mb-4">
{t("adjust_resource_filters")}
</p>
</Card>
Expand Down Expand Up @@ -158,12 +158,12 @@ export default function ResourceList({ facilityId }: { facilityId: string }) {
</div>
</PopoverContent>
</Popover>
<div className="hidden md:flex items-center">
<div className="flex flex-wrap items-center gap-2">
<Tabs
value={outgoing ? "outgoing" : "incoming"}
className="w-full"
>
<TabsList className="bg-transparent p-0 h-8">
<TabsList className="bg-transparent p-0 h-8 flex justify-around">
<TabsTrigger
value="outgoing"
className="data-[state=active]:bg-primary/10 data-[state=active]:text-primary"
Expand Down Expand Up @@ -193,12 +193,12 @@ export default function ResourceList({ facilityId }: { facilityId: string }) {
</div>
</div>

<div className="hidden md:flex items-center">
<div className="lex flex-wrap items-center gap-2">
<Tabs
value={isActive ? "active" : "completed"}
className="w-full"
>
<TabsList className="bg-transparent p-0 h-8">
<TabsList className="bg-transparent p-0 h-8 flex justify-around">
<TabsTrigger
value="active"
className="data-[state=active]:bg-primary/10 data-[state=active]:text-primary"
Expand Down Expand Up @@ -228,11 +228,11 @@ export default function ResourceList({ facilityId }: { facilityId: string }) {
</div>
</div>

<Separator className="hidden md:block" />
<Separator />

<div className="hidden md:block p-4">
<div className="p-4 h-auto overflow-hidden">
<Tabs value={currentStatus} className="w-full">
<TabsList className="bg-transparent p-0 h-8">
<TabsList className="bg-transparent p-0 h-auto flex-wrap justify-start gap-y-2 overflow-auto">
{currentStatuses.map((statusOption) => (
<TabsTrigger
key={statusOption}
Expand Down
Loading