@egovernments/digit-ui-module-core 1.3.0 → 1.3.4

package/dist/index.js

@@ -215,9 +215,7 @@ var SelectOtp = function SelectOtp(_ref) {
       onResend = _ref.onResend,
       onSelect = _ref.onSelect,
       t = _ref.t,
-      error = _ref.error,
-      _ref$userType = _ref.userType,
-      userType = _ref$userType === void 0 ? "citizen" : _ref$userType;
+      error = _ref.error;
 
   var _useState = React.useState(30),
       timeLeft = _useState[0],
@@ -232,17 +230,6 @@ var SelectOtp = function SelectOtp(_ref) {
     setTimeLeft(2);
   };
 
-  if (userType === "employee") {
-    return /*#__PURE__*/React__default.createElement(React.Fragment, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.OTPInput, {
-      length: 6,
-      onChange: onOtpChange,
-      value: otp
-    }), timeLeft > 0 ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, t("CS_RESEND_ANOTHER_OTP") + " " + timeLeft + " " + t("CS_RESEND_SECONDS")) : /*#__PURE__*/React__default.createElement("p", {
-      className: "card-text-button",
-      onClick: handleResendOtp
-    }, t("CS_RESEND_OTP")), !error && /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelError, null, t("CS_INVALID_OTP")));
-  }
-
   return /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormStep, {
     onSelect: onSelect,
     config: config,
@@ -331,7 +318,6 @@ var Login = function Login(_ref) {
       }
 
       errorTimeout = setTimeout(function () {
-        console.log("clearing err");
         setError("");
       }, 5000);
       setErrorTO(errorTimeout);
@@ -521,9 +507,8 @@ var Login = function Login(_ref) {
             if (_temp2 && _temp2.then) return _temp2.then(function () {});
           }
         }();
-      }, function (err) {
+      }, function () {
         setIsOtpValid(false);
-        console.log(err);
       }));
     } catch (e) {
       return Promise.reject(e);
@@ -614,17 +599,17 @@ var Login = function Login(_ref) {
 
 var loginConfig = [{
   texts: {
-    header: "CORE_COMMON_LOGIN",
-    submitButtonLabel: "CORE_COMMON_CONTINUE",
-    secondaryButtonLabel: "CORE_COMMON_FORGOT_PASSWORD"
+    header: "CS_LOGIN",
+    submitButtonLabel: "CS_LOGIN",
+    secondaryButtonLabel: "CS_FORGOT_PASSWORD"
   },
   inputs: [{
-    label: "CORE_LOGIN_USERNAME",
+    label: "CORE_COMMON_USER_ID",
     type: "text",
     name: "username",
     error: "ERR_HRMS_INVALID_USER_ID"
   }, {
-    label: "CORE_LOGIN_PASSWORD",
+    label: "CORE_COMMON_PASSWORD",
     type: "password",
     name: "password",
     error: "ERR_HRMS_WRONG_PASSWORD"
@@ -1704,30 +1689,6 @@ var propTypes = createCommonjsModule(function (module) {
   }
 });
 
-var Background = function Background(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "banner"
-  }, children);
-};
-
-var Header = function Header() {
-  var _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-      storeData = _Digit$Hooks$useStore.data,
-      isLoading = _Digit$Hooks$useStore.isLoading;
-
-  var _ref = storeData || {},
-      stateInfo = _ref.stateInfo;
-
-  if (isLoading) return null;
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "bannerHeader"
-  }, /*#__PURE__*/React__default.createElement("img", {
-    className: "bannerLogo",
-    src: stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.logoUrl
-  }), /*#__PURE__*/React__default.createElement("p", null, stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.name));
-};
-
 var Login$1 = function Login(_ref) {
   var propsConfig = _ref.config,
       t = _ref.t;
@@ -1736,17 +1697,10 @@ var Login$1 = function Login(_ref) {
       cities = _Digit$Hooks$useTenan.data,
       isLoading = _Digit$Hooks$useTenan.isLoading;
 
-  var _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-      isStoreLoading = _Digit$Hooks$useStore.isLoading;
-
   var _useState = React.useState(null),
       user = _useState[0],
       setUser = _useState[1];
 
-  var _useState2 = React.useState(null),
-      showToast = _useState2[0],
-      setShowToast = _useState2[1];
-
   var history = reactRouterDom.useHistory();
 
   var getUserType = function getUserType() {
@@ -1780,9 +1734,9 @@ var Login$1 = function Login(_ref) {
       delete requestData.city;
 
       var _temp2 = _catch(function () {
-        return Promise.resolve(Digit.UserService.authenticate(requestData)).then(function (_ref3) {
-          var info = _ref3.UserRequest,
-              tokens = _objectWithoutPropertiesLoose(_ref3, ["UserRequest"]);
+        return Promise.resolve(Digit.UserService.authenticate(requestData)).then(function (_ref2) {
+          var info = _ref2.UserRequest,
+              tokens = _objectWithoutPropertiesLoose(_ref2, ["UserRequest"]);
 
           setUser(_extends({
             info: info
@@ -1791,8 +1745,7 @@ var Login$1 = function Login(_ref) {
       }, function (err) {
         var _err$response, _err$response$data;
 
-        setShowToast((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || "Invalid login credentials!");
-        setTimeout(closeToast, 5000);
+        alert((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || "Invalid login credentials!");
       });
 
       return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
@@ -1801,12 +1754,8 @@ var Login$1 = function Login(_ref) {
     }
   };
 
-  var closeToast = function closeToast() {
-    setShowToast(null);
-  };
-
   var onForgotPassword = function onForgotPassword() {
-    history.push("/digit-ui/employee/user/forgot-password");
+    history.push("/digit-ui/employee/forgot-password");
   };
 
   var _propsConfig$inputs = propsConfig.inputs,
@@ -1840,15 +1789,14 @@ var Login$1 = function Login(_ref) {
             optionKey: "i18nKey",
             select: function select(d) {
               props.onChange(d);
-            },
-            t: t
+            }
           }, customProps));
         }
       },
       isMandatory: true
     }]
   }];
-  return isLoading || isStoreLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(Background, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
+  return isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
     onSubmit: onLogin,
     noBoxShadow: true,
     inline: true,
@@ -1862,14 +1810,10 @@ var Login$1 = function Login(_ref) {
       textAlign: "center"
     },
     cardStyle: {
-      margin: "auto",
-      minWidth: "400px"
+      maxWidth: "400px",
+      margin: "auto"
     }
-  }, /*#__PURE__*/React__default.createElement(Header, null)), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
-    error: true,
-    label: t(showToast),
-    onClose: closeToast
-  }));
+  });
 };
 
 Login$1.propTypes = {
@@ -1899,13 +1843,13 @@ var EmployeeLogin = function EmployeeLogin() {
       });
     }, [loginConfig]);
   });
-  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.AppContainer, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: "" + path,
     exact: true
   }, /*#__PURE__*/React__default.createElement(Login$1, {
     config: loginParams[0],
     t: t
-  })));
+  }))));
 };
 
 var config = [{
@@ -1944,21 +1888,11 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
 
   var history = reactRouterDom.useHistory();
 
-  var _useState2 = React.useState(""),
-      otp = _useState2[0],
-      setOtp = _useState2[1];
-
-  var _useState3 = React.useState(true),
-      isOtpValid = _useState3[0];
-
-  var _useState4 = React.useState(null),
-      showToast = _useState4[0],
-      setShowToast = _useState4[1];
-
   var getUserType = function getUserType() {
     return Digit.UserService.getType();
   };
 
+  var otpReference = "";
   React.useEffect(function () {
     var _location$state;
 
@@ -1971,16 +1905,8 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
     history.replace(redirectPath);
   }, [user]);
 
-  var closeToast = function closeToast() {
-    setShowToast(null);
-  };
-
   var onResendOTP = function onResendOTP() {
     try {
-      var _temp3 = function _temp3() {
-        setTimeout(closeToast, 5000);
-      };
-
       var requestData = {
         otp: {
           mobileNumber: mobileNumber,
@@ -1990,17 +1916,17 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
         }
       };
 
-      var _temp4 = _catch(function () {
+      var _temp2 = _catch(function () {
         return Promise.resolve(Digit.UserService.sendOtp(requestData, tenantId)).then(function () {
-          setShowToast(t("ES_OTP_RESEND"));
+          alert("OTP resend successfull");
         });
       }, function (err) {
         var _err$response, _err$response$data;
 
-        setShowToast((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || t("ES_INVALID_LOGIN_CREDENTIALS"));
+        alert((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || "Invalid login credentials!");
       });
 
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -2010,32 +1936,32 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
     try {
       return Promise.resolve(_catch(function () {
         if (data.newPassword !== data.confirmPassword) {
-          return setShowToast(t("ERR_PASSWORD_DO_NOT_MATCH"));
+          return alert(t("ERR_PASSWORD_DO_NOT_MATCH"));
         }
 
         var requestData = _extends({}, data, {
-          otpReference: otp,
+          otpReference: otpReference,
           tenantId: tenantId,
           type: getUserType().toUpperCase()
         });
 
         return Promise.resolve(Digit.UserService.changePassword(requestData, tenantId)).then(function (response) {
-          console.log({
-            response: response
-          });
           navigateToLogin();
         });
       }, function (err) {
-        var _err$response2, _err$response2$data, _err$response2$data$e, _err$response2$data$e2, _err$response2$data$e3;
+        var _err$response2, _err$response2$data, _err$response2$data$E;
 
-        setShowToast((err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : (_err$response2$data$e = _err$response2$data.error) === null || _err$response2$data$e === void 0 ? void 0 : (_err$response2$data$e2 = _err$response2$data$e.fields) === null || _err$response2$data$e2 === void 0 ? void 0 : (_err$response2$data$e3 = _err$response2$data$e2[0]) === null || _err$response2$data$e3 === void 0 ? void 0 : _err$response2$data$e3.message) || t("ES_SOMETHING_WRONG"));
-        setTimeout(closeToast, 5000);
+        alert((err === null || err === void 0 ? void 0 : (_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : (_err$response2$data$E = _err$response2$data.Errors[0]) === null || _err$response2$data$E === void 0 ? void 0 : _err$response2$data$E.message) || "Something went wrong!");
       }));
     } catch (e) {
       return Promise.reject(e);
     }
   };
 
+  var updateOtp = function updateOtp(data) {
+    otpReference = data.target.value || "";
+  };
+
   var navigateToLogin = function navigateToLogin() {
     history.replace("/digit-ui/employee/login");
   };
@@ -2068,7 +1994,7 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
       isMandatory: true
     }]
   }];
-  return /*#__PURE__*/React__default.createElement(Background, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
+  return /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
     onSubmit: onChangePassword,
     noBoxShadow: true,
     inline: true,
@@ -2079,22 +2005,41 @@ var ChangePasswordComponent = function ChangePasswordComponent(_ref) {
       maxWidth: "400px",
       margin: "auto"
     }
-  }, /*#__PURE__*/React__default.createElement(Header, null), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
+  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardSubHeader, {
     style: {
       textAlign: "center"
     }
-  }, " ", propsConfig.texts.header, " "), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardText, null, t("CS_LOGIN_OTP_TEXT") + " " + mobileNumber), /*#__PURE__*/React__default.createElement(SelectOtp, {
-    t: t,
-    userType: "employee",
-    otp: otp,
-    onOtpChange: setOtp,
-    error: isOtpValid,
-    onResend: onResendOTP
-  })), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
-    error: true,
-    label: t(showToast),
-    onClose: closeToast
-  }));
+  }, " ", propsConfig.texts.header, " "), /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
+    style: {
+      marginBottom: "8px"
+    }
+  }, t("CORE_OTP_SENT_MESSAGE")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelDesc, {
+    style: {
+      marginBottom: "0px"
+    }
+  }, " ", mobileNumber, " "), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabelDesc, {
+    style: {
+      marginBottom: "8px"
+    }
+  }, " ", t("CORE_EMPLOYEE_OTP_CHECK_MESSAGE"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardLabel, {
+    style: {
+      marginBottom: "8px"
+    }
+  }, t("CORE_OTP_OTP"), " *"), /*#__PURE__*/React__default.createElement(digitUiReactComponents.TextInput, {
+    className: "field",
+    name: otpReference,
+    isRequired: true,
+    onChange: updateOtp,
+    type: "text",
+    style: {
+      marginBottom: "10px"
+    }
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "flex-right"
+  }, /*#__PURE__*/React__default.createElement("div", {
+    className: "primary-label-btn",
+    onClick: onResendOTP
+  }, t("CORE_OTP_RESEND"))));
 };
 
 ChangePasswordComponent.propTypes = {
@@ -2124,20 +2069,20 @@ var EmployeeChangePassword = function EmployeeChangePassword() {
       });
     }, [config]);
   });
-  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.AppContainer, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: "" + path,
     exact: true
   }, /*#__PURE__*/React__default.createElement(ChangePasswordComponent, {
     config: params[0],
     t: t
-  })));
+  }))));
 };
 
 var loginConfig$1 = [{
   texts: {
-    header: "ES_FORGOT_PASSWORD",
-    description: "ES_FORGOT_PASSWORD_DESC",
-    submitButtonLabel: "CORE_COMMON_CONTINUE"
+    header: "CS_FORGOT_PASSWORD",
+    submitButtonLabel: "CS_CONTINUE",
+    secondaryButtonLabel: "CS_BACK_TO_LOGIN"
   },
   inputs: [{
     label: "CORE_COMMON_MOBILE_NUMBER",
@@ -2155,20 +2100,13 @@ var loginConfig$1 = [{
 var ForgotPassword = function ForgotPassword(_ref) {
   var propsConfig = _ref.config,
       t = _ref.t;
-
-  var _Digit$Hooks$useTenan = Digit.Hooks.useTenants(),
-      cities = _Digit$Hooks$useTenan.data,
-      isLoading = _Digit$Hooks$useTenan.isLoading;
+  var cities = Digit.Hooks.fsm.useTenants();
 
   var _useState = React.useState(null),
       user = _useState[0];
 
   var history = reactRouterDom.useHistory();
 
-  var _useState2 = React.useState(null),
-      showToast = _useState2[0],
-      setShowToast = _useState2[1];
-
   var getUserType = function getUserType() {
     return Digit.UserService.getType();
   };
@@ -2185,10 +2123,6 @@ var ForgotPassword = function ForgotPassword(_ref) {
     history.replace(redirectPath);
   }, [user]);
 
-  var closeToast = function closeToast() {
-    setShowToast(null);
-  };
-
   var onForgotPassword = function onForgotPassword(data) {
     try {
       if (!data.city) {
@@ -2206,13 +2140,12 @@ var ForgotPassword = function ForgotPassword(_ref) {
 
       var _temp2 = _catch(function () {
         return Promise.resolve(Digit.UserService.sendOtp(requestData, data.city.code)).then(function () {
-          history.push("/digit-ui/employee/user/change-password?mobile_number=" + data.mobileNumber + "&tenantId=" + data.city.code);
+          history.push("/digit-ui/employee/change-password?mobile_number=" + data.mobileNumber + "&tenantId=" + data.city.code);
         });
       }, function (err) {
-        var _err$response, _err$response$data, _err$response$data$er, _err$response$data$er2, _err$response$data$er3;
+        var _err$response, _err$response$data;
 
-        setShowToast((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : (_err$response$data$er = _err$response$data.error) === null || _err$response$data$er === void 0 ? void 0 : (_err$response$data$er2 = _err$response$data$er.fields) === null || _err$response$data$er2 === void 0 ? void 0 : (_err$response$data$er3 = _err$response$data$er2[0]) === null || _err$response$data$er3 === void 0 ? void 0 : _err$response$data$er3.message) || "Invalid login credentials!");
-        setTimeout(closeToast, 5000);
+        alert((err === null || err === void 0 ? void 0 : (_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.error_description) || "Invalid login credentials!");
       });
 
       return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
@@ -2233,8 +2166,7 @@ var ForgotPassword = function ForgotPassword(_ref) {
       label: t(userId.label),
       type: userId.type,
       populators: {
-        name: userId.name,
-        componentInFront: "+91"
+        name: userId.name
       },
       isMandatory: true
     }, {
@@ -2257,12 +2189,7 @@ var ForgotPassword = function ForgotPassword(_ref) {
       isMandatory: true
     }]
   }];
-
-  if (isLoading) {
-    return /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null);
-  }
-
-  return /*#__PURE__*/React__default.createElement(Background, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
+  return /*#__PURE__*/React__default.createElement(digitUiReactComponents.FormComposer, {
     onSubmit: onForgotPassword,
     noBoxShadow: true,
     inline: true,
@@ -2272,7 +2199,6 @@ var ForgotPassword = function ForgotPassword(_ref) {
     secondaryActionLabel: propsConfig.texts.secondaryButtonLabel,
     onSecondayActionClick: navigateToLogin,
     heading: propsConfig.texts.header,
-    description: propsConfig.texts.description,
     headingStyle: {
       textAlign: "center"
     },
@@ -2280,11 +2206,7 @@ var ForgotPassword = function ForgotPassword(_ref) {
       maxWidth: "400px",
       margin: "auto"
     }
-  }, /*#__PURE__*/React__default.createElement(Header, null)), showToast && /*#__PURE__*/React__default.createElement(digitUiReactComponents.Toast, {
-    error: true,
-    label: t(showToast),
-    onClose: closeToast
-  }));
+  });
 };
 
 ForgotPassword.propTypes = {
@@ -2314,79 +2236,13 @@ var EmployeeForgotPassword = function EmployeeForgotPassword() {
       });
     }, [loginConfig$1]);
   });
-  console.log({
-    params: params
-  });
-  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+  return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.AppContainer, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: "" + path,
     exact: true
   }, /*#__PURE__*/React__default.createElement(ForgotPassword, {
     config: params[0],
     t: t
-  })));
-};
-
-var LanguageSelection = function LanguageSelection() {
-  var _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-      storeData = _Digit$Hooks$useStore.data,
-      isLoading = _Digit$Hooks$useStore.isLoading;
-
-  var _useTranslation = reactI18next.useTranslation(),
-      t = _useTranslation.t;
-
-  var history = reactRouterDom.useHistory();
-
-  var _ref = storeData || {},
-      languages = _ref.languages,
-      stateInfo = _ref.stateInfo;
-
-  var selectedLanguage = Digit.StoreData.getCurrentLanguage();
-
-  var _useState = React.useState(selectedLanguage),
-      selected = _useState[0],
-      setselected = _useState[1];
-
-  var handleChangeLanguage = function handleChangeLanguage(language) {
-    setselected(language.value);
-    Digit.LocalizationService.changeLanguage(language.value, stateInfo.code);
-  };
-
-  var handleSubmit = function handleSubmit(event) {
-    history.push("/digit-ui/employee/user/login");
-  };
-
-  if (isLoading) return null;
-  return /*#__PURE__*/React__default.createElement(Background, null, /*#__PURE__*/React__default.createElement(digitUiReactComponents.Card, {
-    className: "bannerCard"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "bannerHeader"
-  }, /*#__PURE__*/React__default.createElement("img", {
-    className: "bannerLogo",
-    src: stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.logoUrl
-  }), /*#__PURE__*/React__default.createElement("p", null, stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.name)), /*#__PURE__*/React__default.createElement("div", {
-    className: "language-selector",
-    style: {
-      justifyContent: "space-between",
-      marginBottom: "24px"
-    }
-  }, languages.map(function (language, index) {
-    return /*#__PURE__*/React__default.createElement("div", {
-      className: "language-button-container",
-      key: index
-    }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CustomButton, {
-      selected: language.value === selected,
-      text: language.label,
-      onClick: function onClick() {
-        return handleChangeLanguage(language);
-      }
-    }));
-  })), /*#__PURE__*/React__default.createElement(digitUiReactComponents.SubmitBar, {
-    style: {
-      width: "100%"
-    },
-    label: t("CORE_COMMON_CONTINUE"),
-    onSubmit: handleSubmit
-  })));
+  }))));
 };
 
 var getTenants = function getTenants(codes, tenants) {
@@ -2423,11 +2279,18 @@ var AppModules = function AppModules(_ref) {
   });
   return /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, appRoutes, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: path + "/login"
-  }, /*#__PURE__*/React__default.createElement(EmployeeLogin, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+  }, userType === "citizen" ? /*#__PURE__*/React__default.createElement(Login, {
+    stateCode: stateCode
+  }) : /*#__PURE__*/React__default.createElement(EmployeeLogin, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: path + "/forgot-password"
-  }, /*#__PURE__*/React__default.createElement(EmployeeForgotPassword, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+  }, userType === "citizen" ? null : /*#__PURE__*/React__default.createElement(EmployeeForgotPassword, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: path + "/change-password"
-  }, " ", /*#__PURE__*/React__default.createElement(EmployeeChangePassword, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(AppHome, {
+  }, userType === "citizen" ? null : /*#__PURE__*/React__default.createElement(EmployeeChangePassword, null)), userType === "citizen" && /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
+    path: path + "/register"
+  }, /*#__PURE__*/React__default.createElement(Login, {
+    stateCode: stateCode,
+    isUserRegistered: false
+  })), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(AppHome, {
     userType: userType,
     modules: modules
   })));
@@ -2802,9 +2665,7 @@ var TopBarSideBar = function TopBarSideBar(_ref) {
       cityDetails = _ref.cityDetails,
       mobileView = _ref.mobileView,
       handleUserDropdownSelection = _ref.handleUserDropdownSelection,
-      logoUrl = _ref.logoUrl,
-      _ref$showSidebar = _ref.showSidebar,
-      showSidebar = _ref$showSidebar === void 0 ? true : _ref$showSidebar;
+      logoUrl = _ref.logoUrl;
 
   var _useState = React.useState(false),
       isSidebarOpen = _useState[0],
@@ -2835,7 +2696,7 @@ var TopBarSideBar = function TopBarSideBar(_ref) {
     userOptions: userOptions,
     handleUserDropdownSelection: handleUserDropdownSelection,
     logoUrl: logoUrl
-  }), showSidebar && /*#__PURE__*/React__default.createElement(SideBar, {
+  }), /*#__PURE__*/React__default.createElement(SideBar, {
     t: t,
     CITIZEN: CITIZEN,
     isSidebarOpen: isSidebarOpen,
@@ -2863,39 +2724,9 @@ var EmployeeApp = function EmployeeApp(_ref) {
   var _useTranslation = reactI18next.useTranslation(),
       t = _useTranslation.t;
 
-  var _useRouteMatch = reactRouterDom.useRouteMatch(),
-      path = _useRouteMatch.path;
-
   return /*#__PURE__*/React__default.createElement("div", {
-    class: "employee"
-  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/user"
+    className: "employee"
   }, /*#__PURE__*/React__default.createElement(TopBarSideBar, {
-    t: t,
-    stateInfo: stateInfo,
-    userDetails: userDetails,
-    CITIZEN: CITIZEN,
-    cityDetails: cityDetails,
-    mobileView: mobileView,
-    handleUserDropdownSelection: handleUserDropdownSelection,
-    logoUrl: logoUrl,
-    showSidebar: false
-  }), /*#__PURE__*/React__default.createElement("div", {
-    class: "loginContainer",
-    style: {
-      '--banner-url': "url(" + (stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.bannerUrl) + ")"
-    }
-  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/user/login"
-  }, /*#__PURE__*/React__default.createElement(EmployeeLogin, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/user/forgot-password"
-  }, /*#__PURE__*/React__default.createElement(EmployeeForgotPassword, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/user/change-password"
-  }, " ", /*#__PURE__*/React__default.createElement(EmployeeChangePassword, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/user/language-selection"
-  }, /*#__PURE__*/React__default.createElement(LanguageSelection, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
-    to: path + "/user/language-selection"
-  }))))), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(TopBarSideBar, {
     t: t,
     stateInfo: stateInfo,
     userDetails: userDetails,
@@ -2922,226 +2753,10 @@ var EmployeeApp = function EmployeeApp(_ref) {
     onClick: function onClick() {
       window.open("https://www.digit.org/", "_blank").focus();
     }
-  }))))));
-};
-
-var Home = function Home() {
-  var _Digit$SessionStorage, _Digit$UserService;
-
-  var _useTranslation = reactI18next.useTranslation(),
-      t = _useTranslation.t;
-
-  var history = reactRouterDom.useHistory();
-  var tenantId = (_Digit$SessionStorage = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")) === null || _Digit$SessionStorage === void 0 ? void 0 : _Digit$SessionStorage.code;
-
-  var _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-      _Digit$Hooks$useStore2 = _Digit$Hooks$useStore.data;
-
-  _Digit$Hooks$useStore2 = _Digit$Hooks$useStore2 === void 0 ? {} : _Digit$Hooks$useStore2;
-  var stateInfo = _Digit$Hooks$useStore2.stateInfo,
-      isLoading = _Digit$Hooks$useStore.isLoading;
-
-  var _Digit$Hooks$useEvent = Digit.Hooks.useEvents({
-    tenantId: tenantId
-  }),
-      EventsData = _Digit$Hooks$useEvent.data,
-      EventsDataLoading = _Digit$Hooks$useEvent.isLoading;
-
-  if (!((_Digit$UserService = Digit.UserService) !== null && _Digit$UserService !== void 0 && _Digit$UserService.getUser())) {
-    history.push("/digit-ui/citizen/login?from=" + encodeURIComponent(window.location.pathname + window.location.search));
-  }
-
-  if (!tenantId) {
-    history.push("/digit-ui/citizen/select-language");
-  }
-
-  var allCitizenServicesProps = {
-    header: t("DASHBOARD_CITIZEN_SERVICES_LABEL"),
-    sideOption: {
-      name: t("DASHBOARD_VIEW_ALL_LABEL"),
-      onClick: function onClick() {
-        return history.push("/digit-ui/citizen/all-services");
-      }
-    },
-    options: [{
-      name: t("ES_PGR_HEADER_COMPLAINT"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.ComplaintIcon, null),
-      onClick: function onClick() {
-        return history.push("/digit-ui/citizen/pgr/complaints");
-      }
-    }, {
-      name: t("MODULE_PT"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.PTIcon, {
-        className: "fill-path-primary-main"
-      }),
-      onClick: function onClick() {
-        return history.push("/digit-ui/citizen/pt/property/my-properties");
-      }
-    }, {
-      name: t("MODULE_TL"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.CaseIcon, {
-        className: "fill-path-primary-main"
-      }),
-      onClick: function onClick() {
-        return history.push("/digit-ui/citizen/tl/tradelicence/my-application");
-      }
-    }, {
-      name: t("ACTION_TEST_WATER_AND_SEWERAGE"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.DropIcon, null),
-      onClick: function onClick() {
-        return history.push("/digit-ui/citizen/all-services");
-      }
-    }]
-  };
-  var allInfoAndUpdatesProps = {
-    header: t("CS_COMMON_DASHBOARD_INFO_UPDATES"),
-    sideOption: {
-      name: t("DASHBOARD_VIEW_ALL_LABEL"),
-      onClick: function onClick() {
-        return console.log("view all");
-      }
-    },
-    options: [{
-      name: t("CS_HEADER_MYCITY"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.HomeIcon, null)
-    }, {
-      name: t("EVENTS_EVENTS_HEADER"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.Calender, null)
-    }, {
-      name: t("CS_COMMON_DOCUMENTS"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.DocumentIcon, null)
-    }, {
-      name: t("CS_COMMON_HELP"),
-      Icon: /*#__PURE__*/React__default.createElement(digitUiReactComponents.HelpIcon, null)
-    }]
-  };
-  return isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement("div", {
-    className: "HomePageWrapper"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "BannerWithSearch"
-  }, /*#__PURE__*/React__default.createElement("img", {
-    src: stateInfo === null || stateInfo === void 0 ? void 0 : stateInfo.bannerUrl
-  }), /*#__PURE__*/React__default.createElement("div", {
-    className: "Search"
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.StandaloneSearchBar, {
-    placeholder: t("CS_COMMON_SEARCH_PLACEHOLDER")
-  }))), /*#__PURE__*/React__default.createElement("div", {
-    className: "ServicesSection"
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardBasedOptions, allCitizenServicesProps), /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardBasedOptions, allInfoAndUpdatesProps)), EventsDataLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement("div", {
-    className: "WhatsNewSection"
-  }, /*#__PURE__*/React__default.createElement("div", {
-    className: "headSection"
-  }, /*#__PURE__*/React__default.createElement("h2", null, t("DASHBOARD_WHATS_NEW_LABEL")), /*#__PURE__*/React__default.createElement("p", null, t("DASHBOARD_VIEW_ALL_LABEL"))), /*#__PURE__*/React__default.createElement(digitUiReactComponents.WhatsNewCard, EventsData === null || EventsData === void 0 ? void 0 : EventsData[0])));
-};
-
-var LanguageSelection$1 = function LanguageSelection() {
-  var _useTranslation = reactI18next.useTranslation(),
-      t = _useTranslation.t;
-
-  var history = reactRouterDom.useHistory();
-
-  var _Digit$Hooks$useStore = Digit.Hooks.useStore.getInitData(),
-      _Digit$Hooks$useStore2 = _Digit$Hooks$useStore.data;
-
-  _Digit$Hooks$useStore2 = _Digit$Hooks$useStore2 === void 0 ? {} : _Digit$Hooks$useStore2;
-  var languages = _Digit$Hooks$useStore2.languages,
-      stateInfo = _Digit$Hooks$useStore2.stateInfo,
-      isLoading = _Digit$Hooks$useStore.isLoading;
-  var selectedLanguage = Digit.StoreData.getCurrentLanguage();
-  var texts = React.useMemo(function () {
-    return {
-      header: t("CS_COMMON_CHOOSE_LANGUAGE"),
-      submitBarLabel: t("CS_COMMON_SUBMIT")
-    };
-  }, [t]);
-  var RadioButtonProps = React.useMemo(function () {
-    return {
-      options: languages,
-      optionsKey: "label",
-      additionalWrapperClass: "reverse-radio-selection-wrapper",
-      onSelect: function onSelect(language) {
-        return Digit.LocalizationService.changeLanguage(language.value, stateInfo.code);
-      },
-      selectedOption: languages === null || languages === void 0 ? void 0 : languages.filter(function (i) {
-        return i.value === selectedLanguage;
-      })[0]
-    };
-  }, [selectedLanguage, languages]);
-
-  function onSubmit() {
-    history.push("/digit-ui/citizen/select-location");
-  }
-
-  return isLoading ? /*#__PURE__*/React__default.createElement(digitUiReactComponents.Loader, null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.PageBasedInput, {
-    texts: texts,
-    onSubmit: onSubmit
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, null, t("CS_COMMON_CHOOSE_LANGUAGE")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.RadioButtons, RadioButtonProps));
-};
-
-var LocationSelection = function LocationSelection() {
-  var _useTranslation = reactI18next.useTranslation(),
-      t = _useTranslation.t;
-
-  var history = reactRouterDom.useHistory();
-
-  var _Digit$Hooks$useTenan = Digit.Hooks.useTenants(),
-      cities = _Digit$Hooks$useTenan.data,
-      isLoading = _Digit$Hooks$useTenan.isLoading;
-
-  var _useState = React.useState(function () {
-    return Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY");
-  }),
-      selectedCity = _useState[0],
-      setSelectedCity = _useState[1];
-
-  var texts = React.useMemo(function () {
-    return {
-      header: t("CS_COMMON_CHOOSE_LOCATION"),
-      submitBarLabel: t("CS_COMMON_SUBMIT")
-    };
-  }, [t]);
-
-  function selectCity(city) {
-    setSelectedCity(city);
-  }
-
-  var RadioButtonProps = React.useMemo(function () {
-    return {
-      options: cities,
-      optionsKey: "i18nKey",
-      additionalWrapperClass: "reverse-radio-selection-wrapper",
-      onSelect: selectCity,
-      selectedOption: selectedCity
-    };
-  }, [cities, t, selectedCity]);
-
-  function onSubmit() {
-    Digit.SessionStorage.set("CITIZEN.COMMON.HOME.CITY", selectedCity);
-    history.push("/digit-ui/citizen");
-  }
-
-  return isLoading ? /*#__PURE__*/React__default.createElement("loader", null) : /*#__PURE__*/React__default.createElement(digitUiReactComponents.PageBasedInput, {
-    texts: texts,
-    onSubmit: onSubmit
-  }, /*#__PURE__*/React__default.createElement(digitUiReactComponents.CardHeader, null, t("CS_COMMON_CHOOSE_LOCATION")), /*#__PURE__*/React__default.createElement(digitUiReactComponents.Dropdown, {
-    className: "form-field",
-    selected: selectedCity,
-    option: cities,
-    select: selectCity,
-    optionKey: "i18nKey",
-    t: t
-  }), /*#__PURE__*/React__default.createElement(digitUiReactComponents.RadioButtons, RadioButtonProps));
-};
-
-var getTenants$1 = function getTenants(codes, tenants) {
-  return tenants.filter(function (tenant) {
-    return codes.map(function (item) {
-      return item.code;
-    }).includes(tenant.code);
-  });
+  }))));
 };
 
-var Home$1 = function Home$1(_ref) {
+var CitizenApp = function CitizenApp(_ref) {
   var stateInfo = _ref.stateInfo,
       userDetails = _ref.userDetails,
       CITIZEN = _ref.CITIZEN,
@@ -3154,28 +2769,11 @@ var Home$1 = function Home$1(_ref) {
       appTenants = _ref.appTenants,
       sourceUrl = _ref.sourceUrl,
       pathname = _ref.pathname;
-  var classname = Digit.Hooks.fsm.useRouteSubscription(pathname);
 
   var _useTranslation = reactI18next.useTranslation(),
       t = _useTranslation.t;
 
-  var _useRouteMatch = reactRouterDom.useRouteMatch(),
-      path = _useRouteMatch.path;
-
-  var appRoutes = modules.map(function (_ref2, index) {
-    var code = _ref2.code,
-        tenants = _ref2.tenants;
-    var Module = Digit.ComponentRegistryService.getComponent(code + "Module");
-    return /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-      key: index,
-      path: path + "/" + code.toLowerCase()
-    }, /*#__PURE__*/React__default.createElement(Module, {
-      stateCode: stateCode,
-      moduleCode: code,
-      userType: "citizen",
-      tenants: getTenants$1(tenants, appTenants)
-    }));
-  });
+  var classname = Digit.Hooks.fsm.useRouteSubscription(pathname);
   return /*#__PURE__*/React__default.createElement("div", {
     className: classname
   }, /*#__PURE__*/React__default.createElement(TopBarSideBar, {
@@ -3188,31 +2786,13 @@ var Home$1 = function Home$1(_ref) {
     handleUserDropdownSelection: handleUserDropdownSelection,
     logoUrl: logoUrl
   }), /*#__PURE__*/React__default.createElement("div", {
-    className: "main center-container mb-25"
-  }, /*#__PURE__*/React__default.createElement(reactRouterDom.Switch, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    exact: true,
-    path: path
-  }, /*#__PURE__*/React__default.createElement(Home, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    exact: true,
-    path: path + "/select-language"
-  }, /*#__PURE__*/React__default.createElement(LanguageSelection$1, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    exact: true,
-    path: path + "/select-location"
-  }, /*#__PURE__*/React__default.createElement(LocationSelection, null)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/all-services"
-  }, /*#__PURE__*/React__default.createElement(AppHome, {
-    userType: "citizen",
-    modules: modules
-  })), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/login"
-  }, " ", /*#__PURE__*/React__default.createElement(Login, {
-    stateCode: stateCode
-  })), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
-    path: path + "/register"
-  }, /*#__PURE__*/React__default.createElement(Login, {
+    className: "main center-container mb-50"
+  }, /*#__PURE__*/React__default.createElement(AppModules, {
     stateCode: stateCode,
-    isUserRegistered: false
-  })), appRoutes)), /*#__PURE__*/React__default.createElement("div", {
+    userType: "citizen",
+    modules: modules,
+    appTenants: appTenants
+  }), /*#__PURE__*/React__default.createElement("div", {
     className: "citizen-home-footer"
   }, /*#__PURE__*/React__default.createElement("img", {
     src: sourceUrl + "/digit-footer.png",
@@ -3223,7 +2803,7 @@ var Home$1 = function Home$1(_ref) {
     onClick: function onClick() {
       window.open("https://www.digit.org/", "_blank").focus();
     }
-  })));
+  }))));
 };
 
 var DigitApp = function DigitApp(_ref) {
@@ -3300,7 +2880,7 @@ var DigitApp = function DigitApp(_ref) {
     path: "/digit-ui/employee"
   }, /*#__PURE__*/React__default.createElement(EmployeeApp, commonProps)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, {
     path: "/digit-ui/citizen"
-  }, /*#__PURE__*/React__default.createElement(Home$1, commonProps)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
+  }, /*#__PURE__*/React__default.createElement(CitizenApp, commonProps)), /*#__PURE__*/React__default.createElement(reactRouterDom.Route, null, /*#__PURE__*/React__default.createElement(reactRouterDom.Redirect, {
     to: "/digit-ui/citizen"
   })));
 };