From 645a5629c2533d179ab677995d9ca6dabcb46bba Mon Sep 17 00:00:00 2001 From: gurramkarthiknetha Date: Tue, 19 Nov 2024 20:11:14 +0530 Subject: [PATCH 1/6] fixed responsiveness of the website with small changes fixed responsiveness of the website with small changes --- package-lock.json | 6 +++--- src/CAREUI/interactive/FiltersSlideover.tsx | 2 +- src/components/Common/ButtonV2.tsx | 2 +- src/components/Common/Menu.tsx | 2 +- src/components/Facility/FacilityCard.tsx | 4 ++-- src/components/Kanban/Board.tsx | 4 ++-- src/components/Patient/ManagePatients.tsx | 2 +- src/components/Patient/PatientConsentRecords.tsx | 2 +- src/style/index.css | 11 +++++++++++ 9 files changed, 23 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5edb998e4e..6ce89b1db1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7247,9 +7247,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", diff --git a/src/CAREUI/interactive/FiltersSlideover.tsx b/src/CAREUI/interactive/FiltersSlideover.tsx index 959fd0621e8..6e35cc9de94 100644 --- a/src/CAREUI/interactive/FiltersSlideover.tsx +++ b/src/CAREUI/interactive/FiltersSlideover.tsx @@ -61,7 +61,7 @@ export const AdvancedFilterButton = ({ onClick }: { onClick: () => void }) => { diff --git a/src/components/Common/ButtonV2.tsx b/src/components/Common/ButtonV2.tsx index 11b6aa95d20..a4dab66a4e7 100644 --- a/src/components/Common/ButtonV2.tsx +++ b/src/components/Common/ButtonV2.tsx @@ -101,7 +101,7 @@ export const buttonStyles = ({ shadow = !ghost, }: ButtonStyleProps) => { return classNames( - "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500", + "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre mt-2 font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500", `button-size-${size}`, `button-shape-${circle ? "circle" : "square"}`, ghost ? `button-${variant}-ghost` : `button-${variant}-default`, diff --git a/src/components/Common/Menu.tsx b/src/components/Common/Menu.tsx index 035b6f2f342..932e108fbe2 100644 --- a/src/components/Common/Menu.tsx +++ b/src/components/Common/Menu.tsx @@ -36,7 +36,7 @@ export default function DropdownMenu({
)}
@@ -220,7 +220,7 @@ export const FacilityCard = (props: {
-
+
{["DistrictAdmin", "StateAdmin"].includes(userType) && ( (
-
+
{props.sections.map((section, i) => ( key={i} @@ -146,7 +146,7 @@ export function KanbanSection(
diff --git a/src/components/Patient/ManagePatients.tsx b/src/components/Patient/ManagePatients.tsx index 0664532b0a1..9610516bec7 100644 --- a/src/components/Patient/ManagePatients.tsx +++ b/src/components/Patient/ManagePatients.tsx @@ -841,7 +841,7 @@ export const PatientManager = () => {

-
+
-
+
{props.sections.map((section, i) => ( key={i} @@ -146,7 +146,7 @@ export function KanbanSection(
diff --git a/src/components/Patient/ManagePatients.tsx b/src/components/Patient/ManagePatients.tsx index 0664532b0a1..e61b75a4d58 100644 --- a/src/components/Patient/ManagePatients.tsx +++ b/src/components/Patient/ManagePatients.tsx @@ -914,7 +914,7 @@ export const PatientManager = () => { }); }, 500); }} - className="mr-5 w-full lg:w-fit" + className="mr-5 w-full lg:w-fit mt-2" > Export diff --git a/src/style/index.css b/src/style/index.css index e80d1b2733f..8b89d979cb9 100644 --- a/src/style/index.css +++ b/src/style/index.css @@ -1314,4 +1314,4 @@ input[type="number"] { :root { --radius: 0.5rem; } -} +} \ No newline at end of file From 88e5236e6936fb8293189979da4128c567f1ef5f Mon Sep 17 00:00:00 2001 From: gurramkarthiknetha Date: Fri, 22 Nov 2024 00:29:11 +0530 Subject: [PATCH 4/6] fixed responsive ness fixed responsive ness --- src/components/Common/ButtonV2.tsx | 2 +- src/style/index.css | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/components/Common/ButtonV2.tsx b/src/components/Common/ButtonV2.tsx index 96fde7b8703..6c902271ae5 100644 --- a/src/components/Common/ButtonV2.tsx +++ b/src/components/Common/ButtonV2.tsx @@ -101,7 +101,7 @@ export const buttonStyles = ({ shadow = !ghost, }: ButtonStyleProps) => { return classNames( - "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500 mtrequired", + "inline-flex h-min cursor-pointer mt-2 items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500 mtrequired", `button-size-${size}`, `button-shape-${circle ? "circle" : "square"}`, ghost ? `button-${variant}-ghost` : `button-${variant}-default`, diff --git a/src/style/index.css b/src/style/index.css index 25150f11f7e..e80d1b2733f 100644 --- a/src/style/index.css +++ b/src/style/index.css @@ -1315,16 +1315,3 @@ input[type="number"] { --radius: 0.5rem; } } -@media screen and (max-width:915px){ - .containerss{ - flex-wrap: wrap; - gap: 5px; - margin-bottom: 5px; - } - .bshadow{ - border:solid rgb(168, 168, 168); - } - .mtrequired{ - margin-top: 0.5rem; - } -} \ No newline at end of file From 1ab58f52766f40d0a7e39f06e0aea2793ec05923 Mon Sep 17 00:00:00 2001 From: gurramkarthiknetha Date: Sat, 23 Nov 2024 00:10:03 +0530 Subject: [PATCH 5/6] final change final change --- package-lock.json | 4 +--- src/components/Common/ButtonV2.tsx | 2 +- src/components/Kanban/Board.tsx | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index a52713d6cb6..713e24bf350 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7620,9 +7620,7 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", diff --git a/src/components/Common/ButtonV2.tsx b/src/components/Common/ButtonV2.tsx index 6c902271ae5..25da5692658 100644 --- a/src/components/Common/ButtonV2.tsx +++ b/src/components/Common/ButtonV2.tsx @@ -101,7 +101,7 @@ export const buttonStyles = ({ shadow = !ghost, }: ButtonStyleProps) => { return classNames( - "inline-flex h-min cursor-pointer mt-2 items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500 mtrequired", + "inline-flex h-min cursor-pointer mt-2 items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500", `button-size-${size}`, `button-shape-${circle ? "circle" : "square"}`, ghost ? `button-${variant}-ghost` : `button-${variant}-default`, diff --git a/src/components/Kanban/Board.tsx b/src/components/Kanban/Board.tsx index a46460fe0cc..5109599c840 100644 --- a/src/components/Kanban/Board.tsx +++ b/src/components/Kanban/Board.tsx @@ -58,7 +58,7 @@ export default function KanbanBoard(
-
+
{props.sections.map((section, i) => ( key={i} @@ -146,7 +146,7 @@ export function KanbanSection(
From 87e627af91b4b4d72c45f7241878a5e13318c006 Mon Sep 17 00:00:00 2001 From: gurramkarthiknetha Date: Wed, 4 Dec 2024 16:21:03 +0530 Subject: [PATCH 6/6] removed the mt-2 --- src/components/Common/ButtonV2.tsx | 2 +- src/components/Common/Menu.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Common/ButtonV2.tsx b/src/components/Common/ButtonV2.tsx index 25da5692658..11b6aa95d20 100644 --- a/src/components/Common/ButtonV2.tsx +++ b/src/components/Common/ButtonV2.tsx @@ -101,7 +101,7 @@ export const buttonStyles = ({ shadow = !ghost, }: ButtonStyleProps) => { return classNames( - "inline-flex h-min cursor-pointer mt-2 items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500", + "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500", `button-size-${size}`, `button-shape-${circle ? "circle" : "square"}`, ghost ? `button-${variant}-ghost` : `button-${variant}-default`, diff --git a/src/components/Common/Menu.tsx b/src/components/Common/Menu.tsx index 932e108fbe2..035b6f2f342 100644 --- a/src/components/Common/Menu.tsx +++ b/src/components/Common/Menu.tsx @@ -36,7 +36,7 @@ export default function DropdownMenu({