updated forgotpassword screen

egovernments · Oct 16, 2024 · 18e4c67 · 18e4c67
1 parent 51f8e4d
commit 18e4c67
Show file tree

Hide file tree

Showing 19 changed files with 51 additions and 50 deletions.
diff --git a/micro-ui/web/core/inter-package.json b/micro-ui/web/core/inter-package.json
@@ -67,7 +67,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/core/package.json b/micro-ui/web/core/package.json
@@ -15,10 +15,10 @@
   ],
   "homepage": "/core-ui",
   "dependencies": {
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.21",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",

diff --git a/micro-ui/web/micro-ui-internals/example/package.json b/micro-ui/web/micro-ui-internals/example/package.json
@@ -13,13 +13,13 @@
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-dss": "1.8.1",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.21",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
     "@egovernments/digit-ui-module-common": "1.8.0",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-engagement": "1.5.20",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@egovernments/digit-ui-module-sandbox": "0.0.1",
     "http-proxy-middleware": "^1.0.5",

diff --git a/micro-ui/web/micro-ui-internals/example/public/index.html b/micro-ui/web/micro-ui-internals/example/public/index.html
@@ -14,7 +14,7 @@
 
   <!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css/dist/index.css"/> -->
   <!-- <script src="https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigs.js"></script> -->
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.37/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css" />
   <script src="%REACT_APP_GLOBAL%"></script>
 
 </head>

diff --git a/micro-ui/web/micro-ui-internals/package.json b/micro-ui/web/micro-ui-internals/package.json
@@ -72,7 +72,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/package.json b/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-css",
-  "version": "1.8.2-beta.41",
+  "version": "1.8.2-beta.42",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <jagan.kumar@egov.org.in>",

diff --git a/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/login.scss b/micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/login.scss
@@ -39,12 +39,6 @@
   border-left: none;
 }
 
-.employeeForgotPassword {
-  .digit-dropdown-select {
-    margin-bottom: 1.5rem;
-  }
-}
-
 .employeeForgotPassword .field-container {
   margin: 10px 0;
 }
@@ -338,3 +332,20 @@
   margin-bottom: "0.5rem";
   padding-left: "1rem";
 }
+
+
+.loginCardClassName{
+  .digit-dropdown-employee-select-wrap {
+    .digit-dropdown-options-card{
+      max-height: 10vmax;
+    }
+  }
+}
+
+.employeeForgotPassword{
+  .digit-dropdown-employee-select-wrap {
+    .digit-dropdown-options-card{
+      max-height: 10vmax;
+    }
+  }
+}
diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/package.json b/micro-ui/web/micro-ui-internals/packages/modules/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@egovernments/digit-ui-module-core",
-  "version": "1.8.2-beta.21",
+  "version": "1.8.2-beta.22",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",
@@ -14,7 +14,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/.../web/micro-ui-internals/packages/modules/core/src/pages/employee/ForgotPassword/config.js b/.../web/micro-ui-internals/packages/modules/core/src/pages/employee/ForgotPassword/config.js
@@ -8,13 +8,13 @@ export const loginConfig = [
     inputs: [
       {
         label: "CORE_COMMON_MOBILE_NUMBER",
-        type: "text",
+        type: "mobileNumber",
         name: "mobileNumber",
         error: "ERR_HRMS_INVALID_MOBILE_NUMBER",
       },
       {
         label: "CORE_COMMON_CITY",
-        type: "custom",
+        type: "dropdown",
         name: "city",
         error: "ERR_HRMS_INVALID_CITY",
       },

diff --git a/...ro-ui-internals/packages/modules/core/src/pages/employee/ForgotPassword/forgotPassword.js b/...ro-ui-internals/packages/modules/core/src/pages/employee/ForgotPassword/forgotPassword.js
@@ -1,5 +1,5 @@
-import { FormComposer } from "@egovernments/digit-ui-react-components";
-import { BackLink, Dropdown, Loader,Toast } from "@egovernments/digit-ui-components";
+// import { FormComposer } from "@egovernments/digit-ui-react-components";
+import { BackLink, Dropdown, Loader,Toast,FormComposerV2 } from "@egovernments/digit-ui-components";
 import PropTypes from "prop-types";
 import React, { useEffect, useState } from "react";
 import { useHistory } from "react-router-dom";
@@ -63,7 +63,6 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
           type: userId.type,
           populators: {
             name: userId.name,
-            componentInFront: "+91",
           },
           isMandatory: true,
         },
@@ -72,19 +71,9 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
           type: city.type,
           populators: {
             name: city.name,
-            customProps: {},
-            component: (props, customProps) => (
-              <Dropdown
-                option={cities}
-                optionKey="name"
-                id={city.name}
-                className="login-city-dd"
-                select={(d) => {
-                  props.onChange(d);
-                }}
-                {...customProps}
-              />
-            ),
+            optionsKey: "name",
+            required: true,
+            options: cities,
           },
           isMandatory: true,
         },
@@ -101,7 +90,7 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
       <div className="employeeBackbuttonAlign">
       <BackLink onClick={() => window.history.back()}/>
       </div>
-      <FormComposer
+      <FormComposerV2
         onSubmit={onForgotPassword}
         noBoxShadow
         inline
@@ -112,12 +101,13 @@ const ForgotPassword = ({ config: propsConfig, t }) => {
         onSecondayActionClick={navigateToLogin}
         heading={propsConfig.texts.header}
         description={propsConfig.texts.description}
-        headingStyle={{ textAlign: "center" }}
+        headingStyle={{ textAlign: "center",fontWeight:"bold",color:"#363636" }}
+        descriptionStyles={{color:"#787878",textAlign: "center"}}
         cardStyle={{ maxWidth: "408px", margin: "auto" }}
         className="employeeForgotPassword"
       >
         <Header />
-      </FormComposer>
+      </FormComposerV2>
       {showToast && <Toast type={"error"} label={t(showToast)} onClose={closeToast} />}
       <div className="EmployeeLoginFooter">
         <img

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json b/micro-ui/web/micro-ui-internals/packages/modules/sandbox/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "react": "17.0.2",
     "react-date-range": "^1.4.0",
     "react-dom": "17.0.2",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json b/micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@cyntler/react-doc-viewer": "1.10.3",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "axios": "^1.7.2",
     "react": "17.0.2",

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json b/micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
@@ -18,7 +18,7 @@
     "react-router-dom": "5.3.0"
   },
   "dependencies": {
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "@rjsf/core": "5.10.0",
     "@rjsf/utils": "5.10.0",

diff --git a/micro-ui/web/package.json b/micro-ui/web/package.json
@@ -16,13 +16,13 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.21",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-module-open-payment":"0.0.1",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-module-dss": "1.8.1",
     "@egovernments/digit-ui-module-common": "1.8.0",
     "@egovernments/digit-ui-module-engagement": "1.5.20",

diff --git a/micro-ui/web/public/index.html b/micro-ui/web/public/index.html
@@ -7,8 +7,8 @@
   <link
     href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;500;700&family=Roboto:wght@400;500;700&display=swap"
     rel="stylesheet" type="text/css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.41/dist/index.css" />
-  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.37/dist/index.css"/>
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-css@1.8.2-beta.42/dist/index.css" />
+  <link rel="stylesheet" href="https://unpkg.com/@egovernments/digit-ui-components-css@0.0.2-beta.39/dist/index.css"/>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#00bcd1" />
   <title>DIGIT</title>

diff --git a/micro-ui/web/sandbox/inter-package.json b/micro-ui/web/sandbox/inter-package.json
@@ -73,7 +73,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.9",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/sandbox/package.json b/micro-ui/web/sandbox/package.json
@@ -22,9 +22,9 @@
     "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
     "@egovernments/digit-ui-module-sandbox": "0.0.1",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "@egovernments/digit-ui-module-dss": "1.8.1",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.21",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
     "@egovernments/digit-ui-module-hrms": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-pgr": "1.8.1-beta.1",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",

diff --git a/micro-ui/web/workbench/inter-package.json b/micro-ui/web/workbench/inter-package.json
@@ -63,7 +63,7 @@
     "lodash": "4.17.21",
     "microbundle-crl": "0.13.11",
     "@egovernments/digit-ui-react-components": "1.8.1-beta.9",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-hook-form": "6.15.8",

diff --git a/micro-ui/web/workbench/package.json b/micro-ui/web/workbench/package.json
@@ -16,8 +16,8 @@
   "dependencies": {
     "@egovernments/digit-ui-libraries": "1.8.2-beta.7",
     "@egovernments/digit-ui-module-workbench": "1.0.2-beta.8",
-    "@egovernments/digit-ui-components": "0.0.2-beta.44",
-    "@egovernments/digit-ui-module-core": "1.8.2-beta.21",
+    "@egovernments/digit-ui-components": "0.0.2-beta.48",
+    "@egovernments/digit-ui-module-core": "1.8.2-beta.22",
     "@egovernments/digit-ui-module-utilities": "1.0.1-beta.39",
     "@egovernments/digit-ui-react-components": "1.8.2-beta.13",
     "babel-loader": "8.1.0",