Merge pull request #117 from AkshataKatwal16/admin

Issue 1317 feat: UI changes
tekdi · Aug 10, 2024 · a79547a · a79547a
2 parents 35d6c58 + 67937e3
commit a79547a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -276,6 +276,10 @@
     "MIN_LENGTH_DIGITS_ERROR": "Minimum {{minLength}} Digits required",
     "MAX_LENGTH_DIGITS_ERROR": "Maximum {{maxLength}} Digits allowed",
      "MIN_LENGTH_CHARACTERS_ERROR": "Minimum {{minLength}} characters required",
+     "MAX_LENGTH_DIGITS_ERROR_AGE": "Age should be less than or equal to {{maxLength}}",
+     "MIN_LENGTH_DIGITS_ERROR_AGE": "Age should be greater than or equal to {{minLength}}",
+
+
     "MAX_LENGTH_CHARACTERS_ERROR": "Maximum {{maxLength}} characters allowed",
     "NUMBER_AND_SPECIAL_CHARACTERS_NOT_ALLOWED": "Numbers and special characters are not allowed",
     "CHARACTERS_AND_SPECIAL_CHARACTERS_NOT_ALLOWED": "Characters and special characters are not allowed",

diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
@@ -124,9 +124,11 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
           const property = error.property.substring(1);
 
           if (schema.properties?.[property]?.validation?.includes("numeric")) {
-            error.message = t("FORM_ERROR_MESSAGES.MAX_LENGTH_DIGITS_ERROR", {
-              maxLength: schema.properties?.[property]?.maxLength
-            });
+
+            if (property === 'age') {
+              error.message = t("FORM_ERROR_MESSAGES.MAX_LENGTH_DIGITS_ERROR_AGE", {
+                maxLength: schema.properties?.[property]?.maxLength
+              });            }
           }
           break;
         }
@@ -136,6 +138,13 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
             error.message = t("FORM_ERROR_MESSAGES.MIN_LENGTH_DIGITS_ERROR", {
               minLength: schema.properties?.[property]?.minLength
             });
+
+            if (property === 'age') {
+              error.message = t("FORM_ERROR_MESSAGES.MIN_LENGTH_DIGITS_ERROR_AGE", {
+                minLength: schema.properties?.[property]?.minLength
+              });
+            //  error.message = `Age should be greater than or equal to ${error?.params?.limit}`
+            }
           }
           break;
         }

diff --git a/src/components/layouts/sidebar/Sidebar.tsx b/src/components/layouts/sidebar/Sidebar.tsx
@@ -84,7 +84,7 @@ const Sidebar = ({
 
 </ListItemIcon>
       <ListItemText>
-                    <Typography variant="h2" sx={{ fontWeight: "bold" }}>
+                    <Typography variant="h2" sx={{ fontWeight: "700px" }}>
                       {t(item.title)}
                     </Typography>
                   </ListItemText>

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -57,6 +57,10 @@ input[type="number"]::-webkit-outer-spin-button {
   display: none !important;
 }
 
+/* To show legend in black or inherited color instead of primary color */
 legend.Mui-focused {
   color: inherit !important;
 }
+
+
+