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

Fixed User Default View in Resource and Shifting #9306

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Fixed User Default View in Resource and Shifting #9306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11ee192
Fixed User Default View in Resource and Shifting
nithish1018 Dec 5, 2024
73f98db
Added bot suggestions
nithish1018 Dec 5, 2024
5dc8cac
changed ButtonV2 to shadcn button
nithish1018 Dec 5, 2024
9302534
switched to button default size
nithish1018 Dec 5, 2024
7ab9adf
Added margin to icons
nithish1018 Dec 5, 2024
a27c6cf
Merge branch 'develop' into issues/9304/fixuserdefaultview
nithish1018 Dec 6, 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
11 changes: 8 additions & 3 deletions src/components/Resource/ResourceBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { useTranslation } from "react-i18next";
import CareIcon from "@/CAREUI/icons/CareIcon";
import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";

import ButtonV2 from "@/components/Common/ButtonV2";
import { Button } from "@/components/ui/button";

import { ExportButton } from "@/components/Common/Export";
import Loading from "@/components/Common/Loading";
import PageTitle from "@/components/Common/PageTitle";
Expand Down Expand Up @@ -92,10 +93,14 @@ export default function BoardView() {
currentTab={boardFilter !== ACTIVE ? 1 : 0}
/>
<div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
<ButtonV2 className="py-[11px]" onClick={onListViewBtnClick}>
<Button
className="h-[45px]"
variant={"primary"}
onClick={onListViewBtnClick}
>
nithish1018 marked this conversation as resolved.
Show resolved Hide resolved
<CareIcon icon="l-list-ul" />
{t("list_view")}
</ButtonV2>
</Button>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
Expand Down
11 changes: 8 additions & 3 deletions src/components/Resource/ResourceList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import Chip from "@/CAREUI/display/Chip";
import CareIcon from "@/CAREUI/icons/CareIcon";
import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";

import ButtonV2 from "@/components/Common/ButtonV2";
import { Button } from "@/components/ui/button";

import { ExportButton } from "@/components/Common/Export";
import Loading from "@/components/Common/Loading";
import Page from "@/components/Common/Page";
Expand Down Expand Up @@ -218,10 +219,14 @@ export default function ListView() {
</div>

<div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
<ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
<Button
className="h-[45px]"
variant={"primary"}
onClick={onBoardViewBtnClick}
>
<CareIcon icon="l-list-ul" className="rotate-90" />
nithish1018 marked this conversation as resolved.
Show resolved Hide resolved
{t("board_view")}
</ButtonV2>
</Button>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
Expand Down
13 changes: 9 additions & 4 deletions src/components/Shifting/ShiftingBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { useTranslation } from "react-i18next";
import CareIcon from "@/CAREUI/icons/CareIcon";
import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";

import ButtonV2 from "@/components/Common/ButtonV2";
import { Button } from "@/components/ui/button";

import ConfirmDialog from "@/components/Common/ConfirmDialog";
import { ExportButton } from "@/components/Common/Export";
import Loading from "@/components/Common/Loading";
Expand Down Expand Up @@ -123,10 +124,14 @@ export default function BoardView() {
/>

<div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
<ButtonV2 className="py-[11px]" onClick={onListViewBtnClick}>
<CareIcon icon="l-list-ul" />
<Button
variant={"primary"}
onClick={onListViewBtnClick}
className="h-[45px]"
>
<CareIcon icon="l-list-ul" className="mr-2" />
{t("list_view")}
</ButtonV2>
</Button>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
Expand Down
13 changes: 9 additions & 4 deletions src/components/Shifting/ShiftingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { useTranslation } from "react-i18next";
import CareIcon from "@/CAREUI/icons/CareIcon";
import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";

import ButtonV2 from "@/components/Common/ButtonV2";
import { Button } from "@/components/ui/button";

import { ExportButton } from "@/components/Common/Export";
import Loading from "@/components/Common/Loading";
import Page from "@/components/Common/Page";
Expand Down Expand Up @@ -77,10 +78,14 @@ export default function ListView() {
</div>

<div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
<ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
<CareIcon icon="l-list-ul" className="rotate-90" />
<Button
className="h-[45px]"
variant={"primary"}
onClick={onBoardViewBtnClick}
>
<CareIcon icon="l-list-ul" className="rotate-90 mr-2" />
{t("board_view")}
</ButtonV2>
</Button>
<AdvancedFilterButton
onClick={() => advancedFilter.setShow(true)}
/>
Expand Down
Loading