Merge pull request #1040 from abhijniua/Dev-2.0

Adding pet icon in citizen side
upyog · Apr 5, 2024 · eef6568 · eef6568
2 parents ec3f112 + db9aa01
commit eef6568
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 8 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/Home.js
@@ -11,6 +11,8 @@ import {
   PTIcon,
   TLIcon,
   WSICon,
+  PTRIcon
+
 } from "@upyog/digit-ui-react-components";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -75,6 +77,8 @@ const iconSelector = (code) => {
       return <OBPSIcon className="fill-path-primary-main" />;
     case "Bills":
       return <BillsIcon className="fill-path-primary-main" />;
+    case "PTR":
+      return <PTRIcon className="fill-path-primary-main" />;
     default:
       return <PTIcon className="fill-path-primary-main" />;
   }

diff --git a/...rnals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js b/...rnals/packages/modules/core/src/components/TopBarSideBar/SideBar/CitizenSubMenuSideBar.js
@@ -13,6 +13,7 @@ import {
   BirthIcon,
   DeathIcon,
   FirenocIcon,
+  PTRIcon
 } from "@upyog/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
 
@@ -36,6 +37,7 @@ const CitizenSubMenuSideBar = ({ item }) => {
     FirenocIcon: <FirenocIcon className="icon" />,
     MCollectIcon: <MCollectIcon />,
     BillsIcon: <CollectionIcon />,
+    PTRIcon: <PTRIcon />
   };
 
   const leftIconArray = item.icon;

diff --git a/...end/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js b/...end/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js
@@ -14,6 +14,7 @@ import {
   WhatsNewCard,
   OBPSIcon,
   WSICon,
+  PTRIcon
 } from "@upyog/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
@@ -82,6 +83,11 @@ const Home = () => {
         Icon: <CaseIcon className="fill-path-primary-main" />,
         onClick: () => history.push(citizenServicesObj?.props?.[2]?.navigationUrl),
       },
+      {
+        name: t(citizenServicesObj?.props?.[1]?.label),
+        Icon: <PTRIcon className="fill-path-primary-main" />,
+        onClick: () => history.push(citizenServicesObj?.props?.[1]?.navigationUrl),
+      },
       // {
       //     name: t("ACTION_TEST_WATER_AND_SEWERAGE"),
       //     Icon: <DropIcon/>,

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/Module.js
@@ -1,4 +1,4 @@
-import { Header, CitizenHomeCard, PTIcon } from "@upyog/digit-ui-react-components";
+import { Header, CitizenHomeCard, PTRIcon } from "@upyog/digit-ui-react-components";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useRouteMatch } from "react-router-dom";
@@ -133,13 +133,13 @@ export const PTRLinks = ({ matchPath, userType }) => {
     },
   ];
 
-  return <CitizenHomeCard header={t("ACTION_TEST_PTR")} links={links} Icon={() => <PTIcon className="fill-path-primary-main" />} />;
+  return <CitizenHomeCard header={t("ACTION_TEST_PTR")} links={links} Icon={() => <PTRIcon className="fill-path-primary-main" />} />;
 };
 
 export const PTRComponents = {
   PTRCard,
   PTRModule,
   PTRLinks,
-  PT_INBOX_FILTER: (props) => <InboxFilter {...props} />,
+  PTR_INBOX_FILTER: (props) => <InboxFilter {...props} />,
   PTRInboxTableConfig: TableConfig,
 };
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/PTRCard.js
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
-import { EmployeeModuleCard, PropertyHouse } from "@upyog/digit-ui-react-components";
+import { EmployeeModuleCard, PTRIcon } from "@upyog/digit-ui-react-components";
 
 const PTRCard = () => {
   const { t } = useTranslation();
@@ -45,7 +45,7 @@ const PTRCard = () => {
   ]
   const PT_CEMP = Digit.UserService.hasAccess(["PT_CEMP"]) || false;
   const propsForModuleCard = {
-    Icon: <PropertyHouse />,
+    Icon: <PTRIcon />,
     moduleName: t("PTR_TITLE_PET_REGISTRATION"),
     kpis: [
       {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/employee/index.js
@@ -80,7 +80,7 @@ const EmployeeApp = ({ path, url, userType }) => {
                 useNewInboxAPI={true}
                 parentRoute={path}
                 businessService="ptr"
-                filterComponent="PT_INBOX_FILTER"
+                filterComponent="PTR_INBOX_FILTER"
                 initialStates={inboxInitialState}
                 isInbox={true}
               />

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js
@@ -25,7 +25,8 @@ import {
   LogoutIcon,
   EditPencilIcon,
   LanguageIcon,
-  LoginIcon
+  LoginIcon,
+  PTRIcon
 } from "./svgindex";
 import { BirthIcon, DeathIcon, FirenocIcon } from "..";
 
@@ -61,7 +62,8 @@ const IconsObject = {
   LogoutIcon: <LogoutIcon className="icon" />,
   Phone: <Phone className="icon" />,
   LanguageIcon: <LanguageIcon className="icon" />,
-  LoginIcon: <LoginIcon className="icon" />
+  LoginIcon: <LoginIcon className="icon" />,
+  PTRIcon: <PTRIcon className="icon" />
 };
 const NavBar = ({ open, toggleSidebar, profileItem, menuItems, onClose, Footer, isEmployee, search, setSearch,isSideBarScroll }) => {
   const node = useRef();

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/SubMenu.js
@@ -17,6 +17,7 @@ import {
   DropIcon,
   CollectionsBookmarIcons,
   FinanceChartIcon,
+  PTRIcon,
 } from "./svgindex";
 
 const IconsObject = {
@@ -42,6 +43,7 @@ const IconsObject = {
   "insert-chart": <FinanceChartIcon />,
   edcr: <CollectionIcon />,
   collections: <CollectionIcon />,
+  PTRIcon: <PTRIcon />
 };
 const SubMenu = ({ item, t, isEmployee }) => {
   const [subnav, setSubnav] = useState(false);

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/svgindex.js
@@ -1088,6 +1088,14 @@ const InboxIcon = () => (
     />
   </svg>
 );
+const PTRIcon = ({ className, styles }) => (
+  <svg width="512" height="512" style={{ ...styles }} viewBox="0 0 512 512" fill="#ffffff" className={className} xmlns="http://www.w3.org/2000/svg">
+<path d="M256 224c-79.41 0-192 122.76-192 200.25 0 34.9 26.81 55.75 71.74 55.75 48.84 0 81.09-25.08 120.26-25.08 39.51 0 71.85 25.08 120.26 25.08 44.93 0 71.74-20.85 71.74-55.75C448 346.76 335.41 224 256 224zm-147.28-12.61c-10.4-34.65-42.44-57.09-71.56-50.13-29.12 6.96-44.29 40.69-33.89
+75.34 10.4 34.65 42.44 57.09 71.56 50.13 29.12-6.96 44.29-40.69 33.89-75.34zm84.72-20.78c30.94-8.14 46.42-49.94 34.58-93.36s-46.52-72.01-77.46-63.87-46.42 49.94-34.58 93.36c11.84 43.42 46.53 72.02 77.46 63.87zm281.39-29.34c-29.12-6.96-61.15 15.48-71.56
+50.13-10.4 34.65 4.77 68.38 33.89 75.34 29.12 6.96 61.15-15.48 71.56-50.13 10.4-34.65-4.77-68.38-33.89-75.34zm-156.27 29.34c30.94 8.14 65.62-20.45 77.46-63.87 11.84-43.42-3.64-85.21-34.58-93.36s-65.62 20.45-77.46 63.87c-11.84 43.42 3.64 85.22 34.58 93.36z"/>
+</svg>
+);
+
 
 export {
   AnnouncementIcon,
@@ -1211,4 +1219,5 @@ export {
   BirthIcon,
   DeathIcon,
   InfoIcon,
+  PTRIcon,
 };
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/index.js
@@ -173,6 +173,7 @@ import {
   FirenocIcon,
   InfoIcon,
   LoginIcon,
+  PTRIcon,
 } from "./atoms/svgindex";
 import Table from "./atoms/Table";
 import TelePhone from "./atoms/TelePhone";
@@ -333,6 +334,7 @@ export {
   MultiSelectDropdown,
   CaseIcon,
   PTIcon,
+  PTRIcon,
   DocumentIcon,
   DocumentIconSolid,
   PMBIconSolid,