removed some changes

egovernments · Jul 5, 2024 · be94080 · be94080
1 parent f628857
commit be94080
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 53 deletions.
diff --git a/micro-ui/web/packages/core/src/components/Home.js b/micro-ui/web/packages/core/src/components/Home.js
@@ -129,12 +129,12 @@ import {
   const EmployeeHome = ({ modules }) => {
     return (
       <div className="employee-app-container">
-
+         <div className="ground-container moduleCardWrapper gridModuleWrapper">
           {modules.map(({ code }, index) => {
             const Card = Digit.ComponentRegistryService.getComponent(`${code}Card`) || (() => <React.Fragment />);
             return <Card key={index} />;
           })}
-
+        </div>
       </div>
     );
   };

diff --git a/micro-ui/web/packages/core/src/pages/employee/index.js b/micro-ui/web/packages/core/src/pages/employee/index.js
@@ -54,7 +54,7 @@ const EmployeeApp = ({
               cityDetails={cityDetails}
               mobileView={mobileView}
               handleUserDropdownSelection={handleUserDropdownSelection}
-              logoUrl={logoUrl}
+            logoUrl={logoUrl}
               showSidebar={isUserProfile ? true : false}
               showLanguageChange={!showLanguageChange}
             />
@@ -110,11 +110,11 @@ const EmployeeApp = ({
             modules={modules}
           />
           <div className={`main ${DSO ? "m-auto" : ""}`}>
-           
+          <div className="employee-app-wrapper">
               <ErrorBoundary initData={initData}>
                 <AppModules stateCode={stateCode} userType="employee" modules={modules} appTenants={appTenants} />
               </ErrorBoundary>
-
+            </div>
 
           </div>
         </Route>

diff --git a/micro-ui/web/packages/engagement/src/EngagementWrapper.js b/micro-ui/web/packages/engagement/src/EngagementWrapper.js
@@ -2,7 +2,8 @@ import React from 'react';
 import { QueryClientProvider } from 'react-query';
 import { Switch, useLocation, BrowserRouter as Router } from 'react-router-dom';
 import { initEngagementComponents,EngagementModule } from './Module';
-
+import './engagement.css';
+import './styles.tw.css';
 const App = ({ queryClient, title,userType }) => {
   initEngagementComponents();
 

diff --git a/micro-ui/web/packages/engagement/src/engagement.css b/micro-ui/web/packages/engagement/src/engagement.css
@@ -0,0 +1,33 @@
+.careerTitle {
+  @apply text-3xl mb-6 text-center font-bold sm:text-5xl;
+}
+
+.employeeCard {
+  margin-left: 5.5em;
+}
+.h1 
+{
+  margin-left:2.5em;
+}
+.employee-app-wrapper
+{
+  min-height:0;
+}
+.body-container
+{
+  display:contents;
+}
+.employee .ground-container
+{
+  margin-bottom: 0px;
+}
+.bread-crumb 
+{
+  margin-left:6.1em;
+}
+.inbox-container .filters-container {
+  margin-left: 6em;
+}
+.documentDetails_wrapper {
+  margin-left: 5em;
+}
diff --git a/micro-ui/web/packages/engagement/src/pages/employee/CitizenSurveys/index.js b/micro-ui/web/packages/engagement/src/pages/employee/CitizenSurveys/index.js
@@ -9,9 +9,7 @@ import DeleteResponse from "./responses/delete"
 //import EditSurvey from "./EditSurvey"
 import SurveyDetails from "./SurveyDetails"
 import SurveyResults from "./SurveyResults"
-import '../../../career.css';
-import '../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../lib/prefix-classes"
+
 const Surveys = ({match:{path} = {}, tenants, parentRoute}) => {
     return <Switch>
         <PrivateRoute path={`${path}/inbox/create`} component={props => <NewSurvey {...props} />} />

diff --git a/micro-ui/web/packages/engagement/src/pages/employee/Documents/Inbox/index.js b/micro-ui/web/packages/engagement/src/pages/employee/Documents/Inbox/index.js
@@ -4,10 +4,6 @@ import { Header } from "@egovernments/digit-ui-react-components";
 import DesktopInbox from "../../../../components/Documents/DesktopInbox";
 import MobileInbox from "../../../../components/Documents/MobileInbox";
 
-import '../../../../career.css';
-import '../../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../../lib/prefix-classes";
-
 const Inbox = ({ tenants }) => {
     const { t } = useTranslation()
     Digit.SessionStorage.set("ENGAGEMENT_TENANTS", tenants);

diff --git a/micro-ui/web/packages/engagement/src/pages/employee/Events/Inbox/index.js b/micro-ui/web/packages/engagement/src/pages/employee/Events/Inbox/index.js
@@ -4,9 +4,7 @@ import { format, isValid } from "date-fns";
 import { Header } from "@egovernments/digit-ui-react-components";
 import DesktopInbox from "../../../../components/Events/DesktopInbox";
 import MobileInbox from "../../../../components/Events/MobileInbox";
-import '../../../../career.css';
-import '../../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../../lib/prefix-classes";
+
 
 
 const Inbox = ({ tenants, parentRoute }) => {

diff --git a/micro-ui/web/packages/engagement/src/pages/employee/Events/NewEvent/index.js b/micro-ui/web/packages/engagement/src/pages/employee/Events/NewEvent/index.js
@@ -3,9 +3,7 @@ import React, { Fragment, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useHistory } from "react-router-dom";
 import { config } from "../../../../config/NewEventConfig";
-import '../../../../career.css';
-import '../../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../../lib/prefix-classes";
+
 const NewEvents = () => {
   const { t } = useTranslation();
   const history = useHistory();

diff --git a/micro-ui/web/packages/engagement/src/pages/employee/Messages/MessageDetails.js b/micro-ui/web/packages/engagement/src/pages/employee/Messages/MessageDetails.js
@@ -4,9 +4,6 @@ import { useTranslation } from "react-i18next";
 import { Header, Card, CardSectionHeader, PDFSvg, Loader, StatusTable, Menu, ActionBar, SubmitBar, Modal, CardText } from "@egovernments/digit-ui-react-components";
 //import ApplicationDetailsTemplate from "../../../../../templates/ApplicationDetails";
 import { format } from "date-fns";
-import '../../../career.css';
-import '../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../lib/prefix-classes";
 const Heading = (props) => {
   return <h1 className="heading-m">{props.label}</h1>;
 };

diff --git a/micro-ui/web/packages/engagement/webpack.prod.js b/micro-ui/web/packages/engagement/webpack.prod.js
@@ -30,7 +30,7 @@ module.exports = () => {
         },
       }),
       new MiniCssExtractPlugin(
-        false
+    true
           ? {
               filename: 'static/css/[name].[contenthash].css',
               chunkFilename: 'static/css/[name].[contenthash].css',

diff --git a/micro-ui/web/packages/pgr/package.json b/micro-ui/web/packages/pgr/package.json
@@ -16,31 +16,31 @@
   "license": "ISC",
   "devDependencies": {
     "@babel/core": "7.12.10",
-    "@babel/preset-env": "7.23.9",
-    "@babel/preset-react": "7.12.10",
-    "autoprefixer": "^10.4.13",
-    "babel-loader": "8.2.2",
-    "babel-plugin-react-html-attrs": "^3.0.5",
-    "cross-env": "^7.0.2",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "dotenv": "^16.0.3",
-    "external-remotes-plugin": "^1.0.0",
-    "gh-pages": "^5.0.0",
-    "html-webpack-plugin": "^5.5.0",
-    "mini-css-extract-plugin": "^2.9.0",
-    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.4.38",
-    "postcss-cli": "^10.1.0",
-    "postcss-loader": "^8.1.1",
-    "postcss-prefixer": "^3.0.0",
-    "regex-escape": "^3.4.10",
-    "style-loader": "^3.3.1",
-    "tailwindcss": "^3.2.7",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
-    "webpack-merge": "5.7.3"
+        "@babel/preset-env": "7.23.9",
+        "@babel/preset-react": "7.12.10",
+        "autoprefixer": "^10.4.13",
+        "babel-loader": "8.2.2",
+        "babel-plugin-react-html-attrs": "^3.0.5",
+        "cross-env": "^7.0.2",
+        "css-loader": "^6.7.3",
+        "css-minimizer-webpack-plugin": "^4.2.2",
+        "dotenv": "^16.0.3",
+        "external-remotes-plugin": "^1.0.0",
+        "gh-pages": "^5.0.0",
+        "html-webpack-plugin": "^5.5.0",
+        "mini-css-extract-plugin": "^2.9.0",
+        "optimize-css-assets-webpack-plugin": "^6.0.1",
+        "postcss": "^8.4.21",
+        "postcss-cli": "^10.1.0",
+        "postcss-loader": "^7.0.2",
+        "postcss-prefixer": "^2.1.3",
+        "regex-escape": "^3.4.10",
+        "style-loader": "^3.3.1",
+        "tailwindcss": "^3.2.7",
+        "webpack": "^5.75.0",
+        "webpack-cli": "^5.0.1",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-merge": "5.7.3"
   },
   "dependencies": {
     "@digit-ui/digit-ui-libraries-mfe": "1.0.17",
@@ -67,6 +67,9 @@
     "webpack": "^5.68.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.8.1",
-    "webpack-merge": "5.7.3"
+    "webpack-merge": "5.7.3",
+    "date-fns": "2.28.0",
+    "react-time-picker": "4.2.1",
+    "recharts": "^2.0.9"
   }
 }
diff --git a/micro-ui/web/packages/pgr/src/PgrApp.js b/micro-ui/web/packages/pgr/src/PgrApp.js
@@ -11,6 +11,8 @@ import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import getStore from './redux/store';
 
+import './pgr.css';
+import './styles.tw.css';
 const App = ({ userType, queryClient, ...props }) => {
   return (
     <QueryClientProvider client={queryClient}>

diff --git a/micro-ui/web/packages/pgr/src/pages/employee/CreateComplaint/index.js b/micro-ui/web/packages/pgr/src/pages/employee/CreateComplaint/index.js
@@ -7,9 +7,7 @@ import { useQueryClient } from "react-query";
 
 import { FormComposer } from "../../../components/FormComposer";
 import { createComplaint } from "../../../redux/actions/index";
-import '../../../career.css';
-import '../../../styles.tw.css';
-import { prefixClasses as cx } from "../../../../../engagement/src/lib/prefix-classes";
+
 export const CreateComplaint = ({ parentUrl }) => {
 
   const cities = [

diff --git a/micro-ui/web/packages/pgr/src/pgr.css b/micro-ui/web/packages/pgr/src/pgr.css
@@ -0,0 +1,35 @@
+.careerTitle {
+  @apply text-3xl mb-6 text-center font-bold sm:text-5xl;
+}
+
+
+.employeeCard {
+
+  margin-left: 5.5em;
+}
+.h1 
+{
+  margin-left:2.5em;
+}
+.employee-app-wrapper
+{
+  min-height:0;
+}
+.body-container
+{
+  display:contents;
+}
+.employee .ground-container
+{
+  margin-bottom: 0px;
+}
+.bread-crumb 
+{
+  margin-left:6.1em;
+}
+.inbox-container .filters-container {
+  margin-left: 6em;
+}
+.documentDetails_wrapper {
+  margin-left: 5em;
+}
diff --git a/micro-ui/web/packages/pgr/webpack.prod.js b/micro-ui/web/packages/pgr/webpack.prod.js
@@ -28,7 +28,7 @@ module.exports = () => {
         },
       }),
       new MiniCssExtractPlugin(
-        false
+        true
           ? {
               filename: 'static/css/[name].[contenthash].css',
               chunkFilename: 'static/css/[name].[contenthash].css',
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ module.exports = () => { @@
             },
           }),
           new MiniCssExtractPlugin(
-            false
+        true
               ? {
                   filename: 'static/css/[name].[contenthash].css',
                   chunkFilename: 'static/css/[name].[contenthash].css',
@@ Expand Down @@