From 7b14706b41dde18c8be91572ff82541c244abb50 Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Tue, 16 Jul 2024 22:06:42 +0530 Subject: [PATCH 1/5] Fix usages of gray shade that had spelling mistake with grey --- src/Components/Facility/Consultations/Mews.tsx | 2 +- src/Components/Facility/CoverImageEditModal.tsx | 2 +- src/Components/Facility/HospitalList.tsx | 2 +- src/Components/Patient/FileUpload.tsx | 16 ++++++++++------ src/Utils/useFileManager.tsx | 8 +++++--- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Components/Facility/Consultations/Mews.tsx b/src/Components/Facility/Consultations/Mews.tsx index 9773e9ce7a..b3960e171c 100644 --- a/src/Components/Facility/Consultations/Mews.tsx +++ b/src/Components/Facility/Consultations/Mews.tsx @@ -73,7 +73,7 @@ export const Mews = ({ dailyRound }: { dailyRound: DailyRoundsModel }) => { return ( <>
-
+
-
diff --git a/src/Components/Facility/CoverImageEditModal.tsx b/src/Components/Facility/CoverImageEditModal.tsx index cbf976aafe..319ae60fd1 100644 --- a/src/Components/Facility/CoverImageEditModal.tsx +++ b/src/Components/Facility/CoverImageEditModal.tsx @@ -390,7 +390,7 @@ const CoverImageEditModal = ({ setIsCameraOpen(false); webRef.current.stopCamera(); }} - className="border-grey-200 my-2 w-full border-2" + className="my-2 w-full" > {t("close")} diff --git a/src/Components/Facility/HospitalList.tsx b/src/Components/Facility/HospitalList.tsx index 63a76e5998..b59a1a2c5d 100644 --- a/src/Components/Facility/HospitalList.tsx +++ b/src/Components/Facility/HospitalList.tsx @@ -137,7 +137,7 @@ export const HospitalList = () => { ) : (
navigate("/facility/create")} > diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx index d8f865d3fe..41fa0ccb4a 100644 --- a/src/Components/Patient/FileUpload.tsx +++ b/src/Components/Patient/FileUpload.tsx @@ -1397,10 +1397,12 @@ export const FileUpload = (props: FileUploadProps) => { className="text-lg text-danger-500" />
-
+

Archive File

- This action is irreversible. Once a file is archived it cannot be - unarchived. + + This action is irreversible. Once a file is archived it cannot + be unarchived. +
} @@ -1447,10 +1449,12 @@ export const FileUpload = (props: FileUploadProps) => { className="text-lg text-primary-500" />
-
+

File Details

- This file is archived. Once a file is archived it cannot be - unarchived. + + This file is archived. Once a file is archived it cannot be + unarchived. +
} diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx index 145c63800a..3713d689a1 100644 --- a/src/Utils/useFileManager.tsx +++ b/src/Utils/useFileManager.tsx @@ -224,10 +224,12 @@ export default function useFileManager( className="text-lg text-danger-500" />
-
+

Archive File

- This action is irreversible. Once a file is archived it cannot be - unarchived. + + This action is irreversible. Once a file is archived it cannot + be unarchived. +
} From d50aa7bbb11aaf2f9a7a0a641927a5272785addb Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Wed, 17 Jul 2024 14:32:22 +0530 Subject: [PATCH 2/5] fix colors --- src/Components/Patient/FileUpload.tsx | 4 ++-- src/Utils/useFileManager.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx index 41fa0ccb4a..7a2b92ad54 100644 --- a/src/Components/Patient/FileUpload.tsx +++ b/src/Components/Patient/FileUpload.tsx @@ -1399,7 +1399,7 @@ export const FileUpload = (props: FileUploadProps) => {

Archive File

- + This action is irreversible. Once a file is archived it cannot be unarchived. @@ -1451,7 +1451,7 @@ export const FileUpload = (props: FileUploadProps) => {

File Details

- + This file is archived. Once a file is archived it cannot be unarchived. diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx index 3713d689a1..76eeb07849 100644 --- a/src/Utils/useFileManager.tsx +++ b/src/Utils/useFileManager.tsx @@ -226,7 +226,7 @@ export default function useFileManager(

Archive File

- + This action is irreversible. Once a file is archived it cannot be unarchived. From 2f816293bbbff7c8d451647e7268d00934ec1abe Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Wed, 17 Jul 2024 16:52:38 +0530 Subject: [PATCH 3/5] fix colors --- src/Components/Patient/FileUpload.tsx | 8 ++++---- src/Utils/useFileManager.tsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx index 7a2b92ad54..cfef384afe 100644 --- a/src/Components/Patient/FileUpload.tsx +++ b/src/Components/Patient/FileUpload.tsx @@ -1397,9 +1397,9 @@ export const FileUpload = (props: FileUploadProps) => { className="text-lg text-danger-500" />
-
+

Archive File

- + This action is irreversible. Once a file is archived it cannot be unarchived. @@ -1449,9 +1449,9 @@ export const FileUpload = (props: FileUploadProps) => { className="text-lg text-primary-500" />
-
+

File Details

- + This file is archived. Once a file is archived it cannot be unarchived. diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx index 76eeb07849..6d73710d2b 100644 --- a/src/Utils/useFileManager.tsx +++ b/src/Utils/useFileManager.tsx @@ -224,9 +224,9 @@ export default function useFileManager( className="text-lg text-danger-500" />
-
+

Archive File

- + This action is irreversible. Once a file is archived it cannot be unarchived. From d0079e120e6323930b73fb8ba221d327137f7494 Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Wed, 17 Jul 2024 19:08:00 +0530 Subject: [PATCH 4/5] fixes 8169; adds missing gray color --- tailwind.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tailwind.config.js b/tailwind.config.js index 43e2412b93..a40c805621 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,6 +3,7 @@ const colors = require("tailwindcss/colors"); const defaultTheme = require("tailwindcss/defaultTheme"); const gray = { + 50: "#F9FAFB", 100: "#FBFAFC", 200: "#F7F5FA", 300: "#F1EDF7", From 3b677f36b2563022e12ffd334c2659df5959547d Mon Sep 17 00:00:00 2001 From: rithviknishad Date: Wed, 17 Jul 2024 21:23:46 +0530 Subject: [PATCH 5/5] disable prettier on eslint --- .eslintrc.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index a2f7b66785..0fc2f64dda 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,7 +12,6 @@ "extends": [ "eslint:recommended", "plugin:react-hooks/recommended", - "plugin:prettier/recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended", "plugin:i18next/recommended",