diff --git a/web/egov-common-screen/src/myindex.css b/web/egov-common-screen/src/myindex.css index 3c9012765b..413d31916f 100644 --- a/web/egov-common-screen/src/myindex.css +++ b/web/egov-common-screen/src/myindex.css @@ -261,10 +261,12 @@ div.cardservice img { } a.custom-btn { - background: #f47738; + background: #2947a3; color: white; padding: 5px 60px; - border-radius: 20px; + border-radius: 0.375rem; + font-family: "Noto Sans", sans-serif; + font-weight: 500; } .message { @@ -373,4 +375,158 @@ button.btn.btn-link:hover { h5.card-title { font-size: 18px; } +} + +/* Selector Button Styles */ +.selector-button, .selector-button-primary, .selector-button-secondary { + color: #ffffff !important; + border: none !important; + border-radius: 0.375rem; + padding: 0.5rem 1rem; + font-family: "Noto Sans", sans-serif; + font-weight: 500; + font-size: 0.875rem; + line-height: 1.25rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; + text-align: center; + display: inline-flex; + align-items: center; + justify-content: center; + min-height: 40px; + height: auto; + width: 100%; + margin: 0; +} +@media (min-width: 768px) { + .selector-button, .selector-button-primary, .selector-button-secondary { + width: 30%; + } +} +.selector-button:hover, .selector-button-primary:hover, .selector-button-secondary:hover { + opacity: 0.9; +} +.selector-button h2, .selector-button-primary h2, .selector-button-secondary h2 { + color: #ffffff !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + font-weight: 500 !important; + margin: 0 !important; + padding: 0 !important; + width: 100%; +} + +.selector-button-primary { + background-color: #2947a3 !important; + width: 100%; +} +.selector-button-primary:hover { + background-color: #1e3a8a !important; +} + +.selector-button-secondary { + background-color: #ffffff !important; + color: #2947a3 !important; +} +.selector-button-secondary h2 { + color: #2947a3 !important; +} + +.selector-button-border { + background-color: #2947a3 !important; + color: #ffffff !important; + border: none !important; + border-radius: 0.375rem; + padding: 0.5rem 1rem; + font-family: "Noto Sans", sans-serif; + font-weight: 500; + font-size: 0.875rem; + line-height: 1.25rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; + text-align: center; + display: inline-flex; + align-items: center; + justify-content: center; + height: auto; + min-height: 40px; + margin: 0; + width: 100%; +} +.selector-button-border:hover { + background-color: #1e3a8a !important; + opacity: 0.9; +} +.selector-button-border h2 { + color: #ffffff !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + font-weight: 500 !important; + margin: 0 !important; + padding: 0 !important; + border: none !important; + width: 100%; +} + +.input-mirror-selector-button { + height: 4rem !important; + background-color: #f2f2f2 !important; + text-align: center !important; + border-bottom: 2px solid #e0e0e0 !important; + outline: none !important; + padding-left: 24px !important; + padding-right: 24px !important; +} +.input-mirror-selector-button:focus { + outline: none !important; +} +.input-mirror-selector-button h2 { + font-family: "Noto Sans", sans-serif; + font-weight: 500; + font-size: 0.875rem; + color: #484848; +} + +.selector-button-primary-disabled { + height: 2rem !important; + background-color: #2947a3 !important; + text-align: center !important; + border-bottom: 2px solid #e0e0e0 !important; + outline: none !important; + padding-left: 24px !important; + padding-right: 24px !important; + opacity: 0.5 !important; +} +.selector-button-primary-disabled:focus { + outline: none !important; +} +.selector-button-primary-disabled h2 { + font-family: "Noto Sans", sans-serif; + font-weight: 500; + font-size: 0.875rem; + color: #ffffff; +} + +.submit-bar:focus { + outline: none !important; +} + +.go-back-footer-button { + background-color: white !important; + color: black !important; + border: 1px solid !important; + margin-right: 10px !important; +} + +.action-button-myapplication { + display: flex; + gap: 20px; + flex-wrap: wrap; + margin-top: 10px; } \ No newline at end of file diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/index.scss b/web/rainmaker/dev-packages/egov-abg-dev/src/index.scss index bdd927bee6..293f4813b1 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/Checkbox/index.js index 42861130bb..a555ceaff5 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/applicationNumber/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/applicationNumber/index.js index b456d0b170..8e72b584fc 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/applicationNumber/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/applicationNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/billNumber/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/billNumber/index.js index 9465202f7a..155e991bde 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/billNumber/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-atoms-local/billNumber/index.js @@ -1,7 +1,7 @@ import React from "react"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/abg-app-config.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/abg-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/abg-app-config.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/abg-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/acknowledgementResource/acknowledgementUtils.js index 0fe88442e0..60cbae1ca6 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/acknowledgementResource/acknowledgementUtils.js @@ -5,38 +5,7 @@ import { getCommonContainer } from "egov-ui-framework/ui-config/screens/specs/utils"; -const style = { - bodyBox: { - marginLeft: 16, - flex: 2 - }, - tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", - fontSize: 16, - fontWeight: 400 - }, - tailNumber: { - fontSize: 24, - fontWeight: 500 - }, - tailBox: { - textAlign: "right", - justifyContent: "center", - flex: 1 - }, - bodySub: { - marginTop: "8px", - marginBottom: "0px", - color: "rgba(0, 0, 0, 0.60)", - fontFamily: "Roboto" - }, - container: { - display: "flex", - minHeight: "106px", - justifyContent: "center", - alignItems: "center" - } -}; + const acknowledgementCard = ({ icon = "done", @@ -52,16 +21,16 @@ const acknowledgementCard = ({ uiFramework: "custom-atoms", componentPath: "Div", children: { - text: getCommonHeader(tailText, { style: style.tailText }), + text: getCommonHeader(tailText, { className: "abg-ack-tail-text" }), paragraph: getCommonHeader( { labelName: number }, - { style: style.tailNumber } + { className: "abg-ack-tail-number" } ) }, props: { - style: style.tailBox + className: "abg-ack-tail-box" } } : {}; @@ -99,18 +68,18 @@ const acknowledgementCard = ({ header: getCommonHeader(header), paragraph: body ? getCommonParagraph(body, { - style: style.bodySub + className: "abg-ack-body-sub" }) : {} }, props: { - style: style.bodyBox + className: "abg-ack-body-box" } }, tail: tail }, { - style: style.container + className: "abg-ack-container" } ) }); diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/billGensearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/billGensearch.js index 032e31143f..7d44aacdc6 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/billGensearch.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/billGensearch.js @@ -132,7 +132,7 @@ export const billGenSearchCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/searchResults.js index 58ddc1e5d6..a0263bd4f8 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/searchResults.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billGenerationResource/searchResults.js @@ -43,7 +43,7 @@ export const searchResults = { {rowData[get(textToLocalMapping, "Job ID No.")]} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCard.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCard.js index fd237cecb9..5d706b90d6 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCard.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCard.js @@ -244,9 +244,9 @@ export const billSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCardProperty.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCardProperty.js index e5e6cece51..9f66d614c7 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCardProperty.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchCardProperty.js @@ -308,9 +308,9 @@ export const billSearchCardProperty = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchpropertyResult.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchpropertyResult.js index a544819523..edc5c50f0c 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchpropertyResult.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/billSearchResources/billSearchpropertyResult.js @@ -20,7 +20,7 @@ export const billSearchpropertyResult = { return ( { e.preventDefault(); window.location.href = `${window.location.origin}${targetUrl}`; @@ -79,7 +79,7 @@ export const billSearchpropertyResult = { + ); + } + } + }, + ], + title: { labelName: "Search Results for Water Connection", labelKey: "BILL_GENIE_GROUP_SEARCH_HEADER_Water-Connection" }, + rows: "", + options: { + filter: true, + download: false, + responsive: "stacked", + pagination: true, + rowsPerPage: 10, + selectableRows: false, + hover: true, + rowsPerPageOptions: [10, 15, 20], + }, + customSortColumn: { + column: "Date Created", + sortingFn: (data, i, sortDateOrder) => { + const epochDates = data.reduce((acc, curr) => { + acc.push([...curr, getEpochForDate(curr[3], "dayend")]); + return acc; + }, []); + const order = sortDateOrder === "asc" ? true : false; + const finalData = sortByEpoch(epochDates, !order).map(item => { + item.pop(); + return item; + }); + return { data: finalData, currentOrder: !order ? "asc" : "desc" }; + } + } + } +}; +export const updateAllReadings = async (state, dispatch) => { + + let allarray = []; + let skippedRows = 0; + let errorRows = []; + + const rows = get( + state, + "screenConfiguration.screenConfig.bulkmeterreading.components.div.children.searchResults.props.data", + [] + ); + + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + const isArrayRow = Array.isArray(row); + + const consumerId = isArrayRow ? row[0] : row["Consumer ID"]; + const usageCategory = isArrayRow ? row[1] : row["Usage Category"]; + const lastReading = Number(isArrayRow ? row[2] : row["Last Reading"]) || 0; + const currentReadingDateDisplay = isArrayRow ? row[3] : row["Last Reading Date"]; + const lastReadingDate = getEpochForDate(currentReadingDateDisplay); + + // Read from persistent storage first, then fall back to table data + const currentReadingRaw = editedReadingsMap[`${consumerId}-reading`] || ""; + const newReadingDate = editedReadingsMap[`${consumerId}-date`] || ""; + const statusFromStorage = editedReadingsMap[`${consumerId}-status`]; + const statusFromRow = isArrayRow ? row[4] : row["Meter Status"]; + const status = statusFromStorage || statusFromRow || ""; + const tenantId = isArrayRow ? row[9] : row["TENANT_ID"]; + + const isEditableStatus = ["Working", "Reset", "Replacement", "Locked", "Breakdown"].includes(status); + if (!isEditableStatus) { + continue; + } + + if (["Locked", "Breakdown"].includes(status)) { + // For Locked/Breakdown meters, only generate payload if user explicitly entered something. + // Otherwise they should be skipped (fixes unwanted extra records). + const userEnteredReading = editedReadingsMap[`${consumerId}-reading`]; + const userEnteredDate = editedReadingsMap[`${consumerId}-date`]; + if ((userEnteredReading === undefined || userEnteredReading === "") && (!userEnteredDate || userEnteredDate === "")) { + continue; + } + + // Auto-fill date with today if missing, but only when user entered reading/date. + let finalDate = newReadingDate; + if (!finalDate) { + const today = new Date(); + const yyyy = today.getFullYear(); + const mm = String(today.getMonth() + 1).padStart(2, '0'); + const dd = String(today.getDate()).padStart(2, '0'); + finalDate = `${yyyy}-${mm}-${dd}`; + } + + const readingDatenew = finalDate + ? finalDate.split("-").reverse().join("/") + : null; + const billingPeriod = + readingDatenew && currentReadingDateDisplay + ? `${currentReadingDateDisplay} - ${readingDatenew}` + : ""; + const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null; + + const currentReadingDateEpoch = currentReadingDateDisplay + ? getEpochForDate(currentReadingDateDisplay) + : null; + if (readingDate && currentReadingDateEpoch && readingDate < currentReadingDateEpoch) { + errorRows.push(consumerId); + continue; + } + + const payload = { + meterReadingslist: [ + { + currentReadingDate: readingDate, + currentReading: lastReading, + billingPeriod: billingPeriod, + meterStatus: status, + connectionNo: consumerId, + lastReading: status === "Replacement" ? 0 : lastReading, + lastReadingDate: lastReadingDate, + tenantId: tenantId, + generateDemand: true, + isBulkMeter: lastReading > 10000 ? true : false + } + ] + }; + allarray.push(payload.meterReadingslist[0]); + continue; + } + + // For Working, Reset, Replacement - reading is required + if (!currentReadingRaw) { + continue; + } + + // Auto-fill date with today if reading is provided but date is missing + let finalDate = newReadingDate; + if (!finalDate) { + const today = new Date(); + const yyyy = today.getFullYear(); + const mm = String(today.getMonth() + 1).padStart(2, '0'); + const dd = String(today.getDate()).padStart(2, '0'); + finalDate = `${yyyy}-${mm}-${dd}`; + } + + let currentReading = Number(currentReadingRaw) || 0; + + if (!Number.isFinite(currentReading) || currentReading > 10000) { + errorRows.push(consumerId); + continue; + } + + if (status !== "Reset" && status !== "Replacement" && currentReading < lastReading) { + errorRows.push(consumerId); + continue; + } + + const readingDatenew = finalDate + ? finalDate.split("-").reverse().join("/") + : null; + const billingPeriod = + readingDatenew && currentReadingDateDisplay + ? `${currentReadingDateDisplay} - ${readingDatenew}` + : ""; + const readingDate = readingDatenew ? getEpochForDate(readingDatenew) : null; + + // New Reading Date must not be earlier than Last Reading Date + const currentReadingDateEpoch = currentReadingDateDisplay + ? getEpochForDate(currentReadingDateDisplay) + : null; + if (readingDate && currentReadingDateEpoch && readingDate < currentReadingDateEpoch) { + errorRows.push(consumerId); + continue; + } + + // push row into array + const payload = { + meterReadingslist: [ + { + currentReadingDate: readingDate, + currentReading: currentReading, + billingPeriod: billingPeriod, + meterStatus: status, + connectionNo: consumerId, + lastReading: status === "Replacement" ? 0 : lastReading, + lastReadingDate: lastReadingDate, + tenantId: tenantId, + generateDemand: true, + isBulkMeter: lastReading > 10000 ? true : false + } + ] + }; + allarray.push(payload.meterReadingslist[0]); + + } + + if (allarray.length === 0) { + let errorMessage = "No valid records to update."; + if (errorRows.length > 0) { + errorMessage += `\n\nRecords with errors (${errorRows.length}): ${errorRows.join(", ")}`; + } + alert(errorMessage); + return; + } + + try { + dispatch(toggleSpinner(true)); + const url = "/ws-calculator/meterConnection/_createmultiple"; + + const response = await httpRequest("post", url, "_update", [], { meterReadingslist: allarray }); + if (response && response.meterReadingslist && response.meterReadingslist.length > 0) { + dispatch(toggleSpinner(false)); + let successMessage = `Bulk update successful! ${allarray.length} record(s) updated.`; + if (errorRows.length > 0) { + successMessage += `\n\n${errorRows.length} record(s) had errors and were skipped: ${errorRows.join(", ")}`; + } + dispatch( + toggleSnackbar( + true, + { + labelName: successMessage, + labelKey: "ABG_BULK_UPDATE_SUCCESS" + }, + "success" + ) + ); + // Clear persistent storage after successful update + Object.keys(editedReadingsMap).forEach(key => delete editedReadingsMap[key]); + } + return response; + } catch (e) { + dispatch(toggleSpinner(false)); + console.error("API error:", e); + throw e; + } +} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billSearchResult.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billSearchResult.js index 2e0bea1595..799e64a8a8 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billSearchResult.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billSearchResult.js @@ -61,7 +61,7 @@ export const billSearchResult = { type="button" style={{ color: "#fff", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", border: "none", padding: "6px 14px", borderRadius: "4px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billdownloadfunction.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billdownloadfunction.js index 9ba7b3d703..77035df697 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billdownloadfunction.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/billdownloadfunction.js @@ -35,9 +35,9 @@ export var searchApiCall = function (state, dispatch, limit, offset) { ); return; } - + var params = [{ key: "tenantId", value: tenantId }]; - + return httpRequest( "post", "/pdf-service/v1/_getBulkPdfRecordsDetails", @@ -70,17 +70,79 @@ export var searchApiCall = function (state, dispatch, limit, offset) { //make table data - let tableData = filteredBillData.map(item => ({ - ["ABG_JOB_ID"]: item.jobid || "-", - ["ABG_TENANT_ID"]: item.tenantId || "-", - ["ABG_FILESTORE_ID"]: item.filestoreid || "-", - ["ABG_TOTAL_RECORDS"]: item.totalrecords || "-", - ["ABG_RECORDS_COMPLETED"]:item.recordscompleted || "-", - ["ABG_LOCALITY_NAME"]: generateLocalityKey(state, item.locality)|| "-", - ["ABG_BUSINESS_SERVICE"]: item.bussinessService|| "-", - })); - - + const tableData = (filteredBillData || []).map(function (item) { + + var localityNames = "-"; + + if (item && item.locality) { + + var localityArray = []; + + // Case 1: {"SC1","SC2"} + if (item.locality.indexOf("{") !== -1) { + localityArray = item.locality + .replace(/[{}"]/g, "") + .split(",") + .filter(function (value) { + return value && value.trim(); + }); + } + // Case 2: SC1 + else { + localityArray = [item.locality]; + } + + localityNames = localityArray + .map(function (code) { + return generateLocalityKey(state, code.trim()); + }) + .filter(function (name) { + return name; + }) + .join(", "); + + if (!localityNames) { + localityNames = "-"; + } + } + + return { + ABG_JOB_ID: + item && item.jobid + ? item.jobid + : "-", + + ABG_TENANT_ID: + item && item.tenantId + ? item.tenantId + : "-", + + ABG_FILESTORE_ID: + item && item.filestoreid + ? item.filestoreid + : "-", + + ABG_TOTAL_RECORDS: + item && item.totalrecords + ? item.totalrecords + : "-", + + ABG_RECORDS_COMPLETED: + item && item.recordscompleted + ? item.recordscompleted + : "-", + + ABG_LOCALITY_NAME: + localityNames, + + ABG_BUSINESS_SERVICE: + item && item.bussinessService + ? item.bussinessService + : "-", + }; + }); + + dispatch( handleField( "groupBillDownloads", @@ -136,14 +198,13 @@ export var searchApiCall = function (state, dispatch, limit, offset) { ); }); }; -const generateLocalityKey=(state,localityCode) =>{ - debugger +const generateLocalityKey = (state, localityCode) => { const localitiesData = get( state, "screenConfiguration.preparedFinalObject.localitiesData", {} ); - let localityName = localitiesData.find((item=> item.code === localityCode)); + let localityName = localitiesData.find((item => item.code === localityCode)); return localityName.name; } const showHideTable = (booleanHideOrShow, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/downloadbillSearchCard.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/downloadbillSearchCard.js index 661952231e..0f3d80514a 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/downloadbillSearchCard.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillDownloadResource/downloadbillSearchCard.js @@ -275,9 +275,9 @@ export const downloadbillSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillResource/groupBillSearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillResource/groupBillSearch.js index 9ef01fdba9..c127327634 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillResource/groupBillSearch.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBillResource/groupBillSearch.js @@ -521,8 +521,8 @@ export const abgSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" @@ -550,7 +550,7 @@ export const abgSearchCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js index 59b2196714..8f6a08967c 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/groupBills.js @@ -145,21 +145,29 @@ const abgSearchAndResult = { ? `/egov-ui-framework/abg/groupBillDownloads` : `/abg/groupBillDownloads` }, - //visible: (process.env.REACT_APP_NAME === "Citizen") ? false : true - visible: false + visible: (process.env.REACT_APP_NAME === "Citizen") ? false : true + //visible: false } } }, - abgSearchCard, - breakAfterSearch: getBreak(), - // progressStatus, - searchResults, - searchResultsIntergrated, - breakAfterSearchResults: getBreak(), - mergeDownloadButton + abgSearchCard, + breakAfterSearch: getBreak(), + // progressStatus, + searchResults, + searchResultsIntergrated, + breakAfterSearchResults: getBreak(), + mergeDownloadButton + } + }, + batchJobDialog: { + uiFramework: "custom-containers-local", + moduleName: "egov-abg", + componentPath: "DialogContainer", + props: { + screenKey: "groupBills" + } } } -} }; export default abgSearchAndResult; diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/notificationSearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/notificationSearch.js index 5333905d72..a6f94523be 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/notificationSearch.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/notificationSearch.js @@ -140,7 +140,7 @@ import { variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/searchResults.js index c8d26010c4..786978a741 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/searchResults.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/notificationResource/searchResults.js @@ -44,7 +44,7 @@ export const searchResults = { {rowData[get(textToLocalMapping, "Job ID No.")]} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/payResource/paymentMethod.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/payResource/paymentMethod.js index 93fffaec6c..fdfde1ddc7 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/payResource/paymentMethod.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/payResource/paymentMethod.js @@ -151,7 +151,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -231,7 +231,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/groupBillSearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/groupBillSearch.js index 14209d4b23..049b4fdb80 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/groupBillSearch.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/groupBillSearch.js @@ -197,8 +197,8 @@ export const abgSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" @@ -226,7 +226,7 @@ export const abgSearchCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/searchResults.js index bf804a20a4..be79afa853 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/searchResults.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/propertyMapped/searchResults.js @@ -56,7 +56,7 @@ export const searchResults = { 480 ? "80%" : "100%", height: "48px" @@ -219,7 +219,7 @@ export const abgSearchCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/searchResults.js index 6994dd3994..13b70eb0ce 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/searchResults.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/abg/ptMaps/searchResults.js @@ -76,7 +76,7 @@ export const searchResults = { style={{ minWidth: "64px", padding: "4px 12px", - background: "#FE7A51", + background: "#2947a3", border: "none", color: "#fff", borderRadius: "2px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/acknowledgementResource/acknowledgementUtils.js index e228fdcf53..b42f5cdb56 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/acknowledgementResource/acknowledgementUtils.js @@ -6,38 +6,7 @@ import { } from "egov-ui-framework/ui-config/screens/specs/utils"; -const style = { - bodyBox: { - marginLeft: 16, - flex: 2 - }, - tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", - fontSize: 16, - fontWeight: 400 - }, - tailNumber: { - fontSize: 24, - fontWeight: 500 - }, - tailBox: { - textAlign: "right", - justifyContent: "center", - flex: 1 - }, - bodySub: { - marginTop: "8px", - marginBottom: "0px", - color: "rgba(0, 0, 0, 0.60)", - fontFamily: "Roboto" - }, - container: { - display: "flex", - minHeight: "106px", - justifyContent: "center", - alignItems: "center" - } -}; + const acknowledgementCard = ({ icon = "done", @@ -52,16 +21,16 @@ const acknowledgementCard = ({ uiFramework: "custom-atoms", componentPath: "Div", children: { - text: getCommonHeader(tailText, { style: style.tailText }), + text: getCommonHeader(tailText, { className: "abg-ack-tail-text" }), paragraph: getCommonHeader( { labelName: number }, - { style: style.tailNumber } + { className: "abg-ack-tail-number" } ) }, props: { - style: style.tailBox, + className: "abg-ack-tail-box", className: "ack-tail" } } @@ -99,18 +68,18 @@ const acknowledgementCard = ({ children: { header: getCommonHeader(header), paragraph: getCommonParagraph(body, { - style: style.bodySub + className: "abg-ack-body-sub" }) }, props: { - style: style.bodyBox, + className: "abg-ack-body-box", className: "ack-body" } }, tail: tail }, { - style: style.container + className: "abg-ack-container" } ) }); diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/searchResults.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/searchResults.js index 346ab948e8..d1d4dc7eec 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/searchResults.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/searchResults.js @@ -70,7 +70,7 @@ export const searchResults = { setRoute(`/receipts/viewReceipt?receiptNumbers=${tableMeta.rowData[0]}&tenantId=${tableMeta.rowData[9]}&businessService=${tableMeta.rowData[10]}`); } - }} style={{color:tableMeta.rowData[7]=='CANCEL'?'rgb(254, 122, 81)':"inherit",cursor:tableMeta.rowData[7]=='CANCEL'?'pointer':"initial"}}> + }} style={{color:tableMeta.rowData[7]=='CANCEL'?'rgb(41, 71, 163)':"inherit",cursor:tableMeta.rowData[7]=='CANCEL'?'pointer':"initial"}}> {value} ) diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/ucSearch.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/ucSearch.js index 705fc0adaa..59acbcd005 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/ucSearch.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/receipts/universalCollectionResources/ucSearch.js @@ -174,9 +174,9 @@ export const UCSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/index.js index ea780227b4..419afaa032 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/index.js @@ -14,7 +14,7 @@ import { } from "egov-ui-framework/ui-config/screens/specs/utils"; import { httpRequest } from "../../../../ui-utils"; import { prepareFinalObject } from "egov-ui-framework/ui-redux/screen-configuration/actions"; -import { set } from "lodash"; +import { set, values } from "lodash"; import { downloadReceiptFromFilestoreID } from "egov-common/ui-utils/commons"; import commonConfig from "config/common.js"; @@ -629,30 +629,51 @@ export const checkValueForNA = (value) => { return value == null || value == undefined || value == "" ? "NA" : value; }; -export const batchMergeAndDownload = async (billkey, locality, businesService, tenantId, isConsolidated = false)=>{ +export const batchMergeAndDownload = async ( + billkey, + batchType, + searchCriteria, + isConsolidated = false +) => { - const DOWNLOADRECEIPT = { - GET: { - URL: "egov-pdf/download/WNS/wnsgroupbill", - ACTION: "", - }, - }; - - const queryStr = [ - { key: "key", value: billkey }, - { key: "tenantId", value: tenantId }, - {key : "locality", value : locality}, - {key : "isConsolidated", value : isConsolidated}, - {key : "bussinessService", value : businesService} - ]; + const DOWNLOADRECEIPT = { + GET: { + URL: "egov-pdf/download/WNS/wnsgroupbill", + ACTION: "", + }, + }; - const egovPdfResponse = await httpRequest( + const queryStr = [ + { key: "key", value: billkey }, + { key: "batchType", value: batchType }, + { key: "isConsolidated", value: isConsolidated } + ]; + + // ✅ Append searchCriteria dynamically + if (searchCriteria) { + Object.keys(searchCriteria).forEach((key) => { + const value = searchCriteria[key]; + + // 🔹 Handle array (multiple locality case) + if (Array.isArray(value)) { + value.forEach((item) => { + queryStr.push({ key, value: item }); + }); + } + + // 🔹 Handle normal values (group / locality string / tenantId etc.) + else if (value !== undefined && value !== null && value !== "") { + queryStr.push({ key, value }); + } + }); + } + + const egovPdfResponse = await httpRequest( "post", DOWNLOADRECEIPT.GET.URL, DOWNLOADRECEIPT.GET.ACTION, - queryStr, - + queryStr ); - return egovPdfResponse -} + return egovPdfResponse; +}; \ No newline at end of file diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js index 3c8f4ed808..5a930b6632 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/screens/specs/utils/receiptPdf.js @@ -1,5 +1,5 @@ // import { downloadMultipleBill } from "egov-common/ui-utils/commons"; -import { toggleSpinner, toggleSnackbar } from "egov-ui-framework/ui-redux/screen-configuration/actions"; +import { toggleSpinner, toggleSnackbar, prepareFinalObject } from "egov-ui-framework/ui-redux/screen-configuration/actions"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; import pdfMake from "pdfmake/build/pdfmake"; @@ -166,125 +166,151 @@ const getMutlipleBillsData = transformedDataArray => { return finalMultipleBillData; }; //generateMutlipleBills PDF -export const generateMultipleBill = async (state, dispatch, type) => { - debugger - dispatch(toggleSpinner()); - let allBills = get( - state.screenConfiguration, - "preparedFinalObject.searchScreenMdmsData.billSearchResponse", - [] - ); - let integratedBills = get(state.screenConfiguration, - "preparedFinalObject.searchScreenMdmsData.intergratedBills", - [] - ) +export const generateMultipleBill = async function (state, dispatch, type) { + try { + dispatch(toggleSpinner()); + + var preparedData = get(state, "screenConfiguration.preparedFinalObject", {}); + + var allBills = get(preparedData, "searchScreenMdmsData.billSearchResponse", []); + var integratedBills = get(preparedData, "searchScreenMdmsData.intergratedBills", []); + var commonPayDetails = get(preparedData, "searchScreenMdmsData.common-masters.uiCommonPay", []); + var searchCriteria = get(preparedData, "searchCriteria"); + var businessService = get(preparedData, "searchCriteria.businesService", ""); + var locality = get(preparedData, "searchCriteria.locality", ""); + var tenantId = get(preparedData, "searchCriteria.tenantId", ""); + var batchType = get(preparedData, "generateBillScreen.batchtype", ""); + var group = get(preparedData, "searchCriteria.group", ""); + + // ---------------------------- + // Get Bill Key + // ---------------------------- + function getBillKey() { + if (batchType === "Integrated Bill") { + return "wsn-integrated"; + } - const commonPayDetails = get( - state.screenConfiguration, - "preparedFinalObject.searchScreenMdmsData.common-masters.uiCommonPay", - [] - ); - const businessService = get( - state.screenConfiguration, - "preparedFinalObject.searchCriteria.businesService", - '' - ); - const locality = get( - state.screenConfiguration, - "preparedFinalObject.searchCriteria.locality", - '' - ); - const tenantId = get( - state.screenConfiguration, - "preparedFinalObject.searchCriteria.tenantId", - '' - ); - let batchtype = get( - state.screenConfiguration, - "preparedFinalObject.generateBillScreen.batchtype", - '' - ); - let billkey = '' - const index = commonPayDetails && commonPayDetails.findIndex((item) => { - return item.code == businessService; - }); - if(batchtype === "Integrated Bill"){ - billkey = 'wsn-integrated' - }else{ - if (index > -1) { - billkey = get(commonPayDetails[index], 'billKey', ''); + var match = null; + if (commonPayDetails && commonPayDetails.length) { + for (var i = 0; i < commonPayDetails.length; i++) { + if (commonPayDetails[i].code === businessService) { + match = commonPayDetails[i]; + break; + } + } + } + + if (match) { + return get(match, "billKey", ""); + } + + // fallback DEFAULT + if (commonPayDetails && commonPayDetails.length) { + for (var j = 0; j < commonPayDetails.length; j++) { + if (commonPayDetails[j].code === "DEFAULT") { + return get(commonPayDetails[j], "billKey", ""); + } + } + } + + return ""; + } + + var billKey = getBillKey(); + + // ---------------------------- + // Filter Bills + // ---------------------------- + function filterBills(bills) { + if (!bills || !bills.length) return []; + + var result = []; + + for (var i = 0; i < bills.length; i++) { + var bill = bills[i]; + + if (batchType === "Integrated Bill") { + if ( + bill && + bill.connection && + bill.connection.propertyTotalAmount > 0 + ) { + result.push(bill); + } + } else { + if ( + bill && + bill.status === "ACTIVE" && + bill.totalAmount > 0 && + bill.connection && + bill.connection.status === "Active" + ) { + result.push(bill); + } + } + } + + return result; + } + + var filteredBills = filterBills(allBills); + + // ---------------------------- + // Locality Batch Processing + // ---------------------------- + var isValidLocalityOrGroup = + (batchType === "Locality" && + typeof locality === "string" && + locality.trim() !== "") || + (batchType === "Group" && + typeof group === "string" && + group.trim() !== "") || + (batchType === "Integrated Bill") || + Array.isArray(locality) && locality.length > 0 + + if (isValidLocalityOrGroup) { + try { + var response = await batchMergeAndDownload( + billKey, + batchType, + searchCriteria + ); + + var message = response.message + " Job ID: " + response.jobId; + + // dispatch( + // toggleSnackbar(true, { labelName: message, labelKey: message }, "warning") + // ); + dispatch( + prepareFinalObject("batchJobModal", { + open: true, + message: response.message, + jobId: response.jobId + }) + ); + + } catch (error) { + console.error("Batch download error:", error); + + dispatch( + toggleSnackbar( + true, + { labelName: "Batch processing failed", labelKey: "Batch processing failed" }, + "error" + ) + ); + } } else { - const details = commonPayDetails && commonPayDetails.filter(item => item.code === "DEFAULT"); - billkey = get(details, 'billKey', ''); + if (filteredBills && filteredBills.length > 0) { + await downloadMultipleBill(filteredBills, billKey, businessService); + } } - } - if(batchtype === "Integrated Bill"){ - allBills = allBills.filter(bill => bill.connection.propertyTotalAmount >0); - }else{ - allBills = allBills.filter(bill => bill.status === 'ACTIVE' && bill.totalAmount >0 && bill.connection.status=="Active"); - } - - - //allBills = allBills.filter(bill => bill.status === 'ACTIVE' && bill.totalAmount > 0); - // if ( - // batchtype == 'Locality' && locality && - // !Array.isArray(locality) && - // typeof locality === "string" && - // locality.trim() !== "" - // ) { - // try { - // const egovPdfResponse = await batchMergeAndDownload( - // billkey, - // locality, - // businessService, - // tenantId - // ); - // let labelKey = egovPdfResponse.message+" Job ID :"+egovPdfResponse.jobId - // dispatch( - // toggleSnackbar( - // true, - // { - // labelName: labelKey, - // labelKey: labelKey - // }, - // "warning" - // ) - // ); - // } catch (error) { - // console.error("Error while batch merge and download:", error); - // dispatch( - // toggleSnackbar( - // true, - // { - // labelName: error, - // labelKey: error - // }, - // "warning" - // ) - // ); - // } - // } else { - allBills && allBills.length > 0 && await downloadMultipleBill(allBills, billkey, businessService); - // } - /* -To Download Files based on Filestoreid logic - -let filestoreids=[]; -let bills=[]; -allBills.map(bill=>{ - if(bill.status==='ACTIVE'){ - if(bill.fileStoreId==null){ - bills.push(bill); - }else{ - filestoreids.push(bill.fileStoreId) + } catch (error) { + console.error("generateMultipleBill error:", error); + } finally { + dispatch(toggleSpinner()); } - } -}) -bills&&bills.length>0&&await downloadMultipleBill(bills,billkey); -filestoreids&&filestoreids.length>0&&downloadMultipleFileFromFilestoreIds(filestoreids,'download'); */ - dispatch(toggleSpinner()); - }; /* await loadMdmsData(tenant); // data1 is for ULB logo from loadUlbLogo @@ -857,4 +883,4 @@ const getPdfContent = (transformedData, length, index) => { } ] -} \ No newline at end of file +} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/DialogContainer/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/DialogContainer/index.js index e0a7b2a89c..01526aaead 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/DialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/DialogContainer/index.js @@ -2,7 +2,9 @@ import React from "react"; import { connect } from "react-redux"; import get from "lodash/get"; import { Dialog, DialogContent } from "@material-ui/core"; -import { handleScreenConfigurationFieldChange as handleField } from "egov-ui-framework/ui-redux/screen-configuration/actions"; +import { handleScreenConfigurationFieldChange as handleField, prepareFinalObject } from "egov-ui-framework/ui-redux/screen-configuration/actions"; +import { Dialog as EgovDialog } from "components"; +import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; class DialogContainer extends React.Component { handleClose = () => { @@ -14,13 +16,34 @@ class DialogContainer extends React.Component { false ); }; + closeBatchJobModal = () => { + this.props.closeBatchJob(); + }; render() { - const { open, maxWidth, children } = this.props; + const { open, maxWidth, children, batchJobOpen, batchMessage, batchJobId } = this.props; return ( - - - + + + + + } + handleClose={this.closeBatchJobModal} + titleStyle={{ padding: 0, backgroundColor: "#f7f7f7" }} + bodyStyle={{ padding: "0% 2% 2% 2%", backgroundColor: "white" }} + > +
+ {batchMessage &&
{batchMessage}
} + {batchJobId &&
Job ID: {batchJobId}
} +
+
+ +
+ + ); } } @@ -28,21 +51,25 @@ class DialogContainer extends React.Component { const mapStateToProps = (state, ownProps) => { const { screenConfiguration } = state; const { screenKey } = ownProps; - const { screenConfig } = screenConfiguration; + const { screenConfig, preparedFinalObject } = screenConfiguration; const open = get( screenConfig, - `${screenKey}.components.adhocDialog.props.open` + `${screenKey}.components.adhocDialog.props.open`, ); + const batchJobModal = get(preparedFinalObject, "batchJobModal", {}); return { open, screenKey, - screenConfig + screenConfig, + batchJobOpen: !!batchJobModal.open, + batchMessage: batchJobModal.message || "", + batchJobId: batchJobModal.jobId || "", }; }; const mapDispatchToProps = dispatch => { - return { handleField: (a, b, c, d) => dispatch(handleField(a, b, c, d)) }; + return { handleField: (a, b, c, d) => dispatch(handleField(a, b, c, d)), closeBatchJob: () => dispatch(prepareFinalObject("batchJobModal", { open: false, message: "", jobId: "" })) }; }; export default connect( diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..30f0dce3e9 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { { diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/DividerWithLabel/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/DividerWithLabel/index.js index 17c455995c..9558f77f73 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/DividerWithLabel/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/DividerWithLabel/index.js @@ -12,7 +12,7 @@ const labelStyle = { const underlineStyle = { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }; diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/FeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/FeesEstimateCard/index.js index 63bbc71a3c..a1a850ed39 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/FeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/FeesEstimateCard/index.js @@ -22,7 +22,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, @@ -52,7 +52,7 @@ const styles = { marginBottom: 16 }, taxStylesLeft: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontSize: 14, fontWeight: 400, lineHeight: "17px", diff --git a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/RadioGroup/index.scss b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/RadioGroup/index.scss index bd6cfb0078..05dfad95c9 100644 --- a/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/RadioGroup/index.scss +++ b/web/rainmaker/dev-packages/egov-abg-dev/src/ui-molecules-local/RadioGroup/index.scss @@ -1,7 +1,7 @@ .radio-root { margin-bottom: 0; height: 30px; - color: #fe7a51; + color: #2947a3; width: 35px; } diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/index.scss b/web/rainmaker/dev-packages/egov-billamend-dev/src/index.scss index bdd927bee6..293f4813b1 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.js index 79ee1236b6..69a10e88c3 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.scss b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.scss index 075015dbf1..f983e5bd36 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.scss +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/ConsumerNo/index.scss @@ -1,5 +1,5 @@ .application-no-container { - background-color: rgba(0, 0, 0, 0.6000000238418579); + background-color: #2947a3; color: rgba(255, 255, 255, 0.8700000047683716); text-align: center; vertical-align: middle; diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/MenuButton/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/MenuButton/index.js index f7453b49e8..e1fb647dce 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/MenuButton/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-atoms-local/MenuButton/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/noc-app-config.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/noc-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/noc-app-config.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/noc-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgement.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgement.js index 63026b3d54..34354365f8 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgement.js @@ -145,7 +145,7 @@ const downloadprintMenu = (state, dispatch, status) => { label: { labelName: "Download", labelKey: "BILL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -158,7 +158,7 @@ const downloadprintMenu = (state, dispatch, status) => { label: { labelName: "PRINT", labelKey: "BILL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgementResource/acknowledgementUtils.js index 35baee7d3e..85d3291720 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/search-preview.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/search-preview.js index 94a907e18e..dd1db75348 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/search-preview.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/search-preview.js @@ -77,7 +77,7 @@ export const downloadPrintContainer = ( label: { labelName: "DOWNLOAD", labelKey: "BILL_AMEND_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "pt-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "pt-download-button" }, menu: downloadMenu } } @@ -91,7 +91,7 @@ export const downloadPrintContainer = ( label: { labelName: "PRINT", labelKey: "BILL_AMEND_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "pt-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "pt-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/searchResources/searchCard.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/searchResources/searchCard.js index 93e92a37ec..d6259c02b0 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/searchResources/searchCard.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/screens/specs/bill-amend/searchResources/searchCard.js @@ -247,9 +247,9 @@ export const searchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/AdjustmentAmountContainer/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/AdjustmentAmountContainer/index.js index 9c0a95e3b3..4928b23316 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/AdjustmentAmountContainer/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/AdjustmentAmountContainer/index.js @@ -26,7 +26,7 @@ const styles = (theme) => ({ textAlign: "right", }, "&:after": { - border: "2px solid #DB6844 !important", + border: "2px solid #2947a3 !important", height: "40px !important", borderRadius: "5px !important", padding: "0.5rem", diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/CheckBoxContainer/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/CheckBoxContainer/index.js index 120cb20442..57b2c35f33 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/CheckBoxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/CheckBoxContainer/index.js @@ -12,9 +12,9 @@ import "./index.css" const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/RequiredDocuments/reqDocs.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/RequiredDocuments/reqDocs.js index 7948658730..785485b3fb 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/RequiredDocuments/reqDocs.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-containers-local/RequiredDocuments/reqDocs.js @@ -31,7 +31,7 @@ const styles = { lineHeight: "19px", }, docs: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontFamily: "Roboto", fontSize: "14px", fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DemandRevisionDetailsCard/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DemandRevisionDetailsCard/index.js index 68edc66608..261acc797f 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DemandRevisionDetailsCard/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DemandRevisionDetailsCard/index.js @@ -26,7 +26,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DividerWithLabel/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DividerWithLabel/index.js index cdd7a097a9..4b75cee838 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DividerWithLabel/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/DividerWithLabel/index.js @@ -14,7 +14,7 @@ const labelStyle = { const underlineStyle = { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }; diff --git a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/FeeEstimateCard/index.js b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/FeeEstimateCard/index.js index 3bddfedab8..c9a1b50a02 100644 --- a/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/FeeEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-billamend-dev/src/ui-molecules-local/FeeEstimateCard/index.js @@ -28,7 +28,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/index.scss b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/index.scss index bdd927bee6..293f4813b1 100644 --- a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/noc-app-config.js b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/noc-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/noc-app-config.js +++ b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/noc-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-boilerplate-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/config/common.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/config/common.js index 5e079f3062..8f3c8b6ce6 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/config/common.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/config/common.js @@ -1,5 +1,5 @@ const commonConfig = { - MAP_API_KEY: "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM", + MAP_API_KEY: "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo", tenantId: process.env.REACT_APP_DEFAULT_TENANT_ID // forgotPasswordTenant: "pb.amritsar", }; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/index.css b/web/rainmaker/dev-packages/egov-bpa-dev/src/index.css index 9daac7bb54..39b7c19360 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/index.css +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/index.css @@ -57,7 +57,7 @@ body { text-align: left; } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -66,7 +66,7 @@ body { text-align: left; } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.24), 0 0 8px 0 rgba(0, 0, 0, 0.12), 0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12); width: 200px; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/index.scss b/web/rainmaker/dev-packages/egov-bpa-dev/src/index.scss index bdd927bee6..293f4813b1 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNo/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNo/index.js index 804868864e..f5158bafed 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNo/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNo/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNumber/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNumber/index.js index 799398a378..38588abecf 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNumber/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ApplicationNumber/index.js @@ -1,7 +1,7 @@ import React from "react"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Checkbox/index.js index 42861130bb..a555ceaff5 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.css b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.css index 4ca94d9371..b7eb525b40 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.css +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.css @@ -1,7 +1,7 @@ .module-page-icon { height: 40px; width: 40px; - color: #fe7a51; } + color: #2947a3; } @media only screen and (min-width: 768px) { .module-page-icon { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.scss b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.scss index e1a95c938d..11c271b695 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.scss +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/Icons/index.scss @@ -1,7 +1,7 @@ .module-page-icon { height: 40px; width: 40px; - color: #fe7a51; + color: #2947a3; } @media only screen and (min-width: 768px) { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.css b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.css index 9ee1de51c1..d3759433ee 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.css +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.css @@ -40,7 +40,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuButton/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuButton/index.js index a076160d21..4cba4191e9 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuButton/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuButton/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuListCompositionForBpa/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuListCompositionForBpa/index.js index ad7a051351..2261061cd3 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuListCompositionForBpa/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/MenuListCompositionForBpa/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NocNumber/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NocNumber/index.js index 2fae2f1b0d..b530b0a359 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NocNumber/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NocNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NoteAtom/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NoteAtom/index.js index ac938ac1d2..4a821f76d0 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NoteAtom/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/NoteAtom/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; // const styles = { -// backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", +// backgroundColor: "#2947a3", // color: "rgba(255, 255, 255, 0.8700000047683716)", // marginLeft: "8px", // paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/PermitNumber/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/PermitNumber/index.js index a6127f54a1..4a4f61446e 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/PermitNumber/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/PermitNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ocPermitNumber/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ocPermitNumber/index.js index 9fff58bc1e..b2225abf75 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ocPermitNumber/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-atoms-local/ocPermitNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/noc-app-config.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/noc-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/noc-app-config.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/noc-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder-citizen/home.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder-citizen/home.js index 82616449e2..b857cff8d1 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder-citizen/home.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder-citizen/home.js @@ -133,7 +133,7 @@ const tradeLicenseSearchAndResult = { // fontSize: "110px", // width: 120, // height: 100, - // color: "rgba(0, 0, 0, 0.6)", + // color: "#2947a3", // marginLeft: -22 // }, // iconSize: "110px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/acknowledgementResource/acknowledgementUtils.js index 0fe88442e0..169ead358d 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/acknowledgementResource/acknowledgementUtils.js @@ -11,7 +11,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/approve.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/approve.js index b5761e453b..855737e88f 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/approve.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/approve.js @@ -73,7 +73,7 @@ const getApproveCard = queryValuePurpose => { style: { fontSize: 12, marginBottom: 0, - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), @@ -96,7 +96,7 @@ const getApproveCard = queryValuePurpose => { fontSize: 12, marginBottom: 0, marginTop: 5, - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/payResource/payment-methods.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/payResource/payment-methods.js index 93fffaec6c..fdfde1ddc7 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/payResource/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/payResource/payment-methods.js @@ -151,7 +151,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -231,7 +231,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/search-preview.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/search-preview.js index 9857d133c4..92fca0ca1d 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/search-preview.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/search-preview.js @@ -465,7 +465,7 @@ const rightdiv = { label: {labelName : "DOWNLOAD" , labelKey :"BPA_DOWNLOAD"}, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color : "#FE7A51" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color : "#2947a3" }, className: "tl-download-button" }, // menu: downloadMenu } } @@ -479,7 +479,7 @@ const rightdiv = { label: {labelName : "PRINT" , labelKey :"BPA_PRINT"}, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color : "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color : "#2947a3" }, className: "tl-print-button" }, // menu: printMenu } } @@ -557,7 +557,7 @@ const screenConfig = { { style: { marginRight: "10px", - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ) diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/searchResource/tradeLicenseApplication.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/searchResource/tradeLicenseApplication.js index 7bd98344cb..294c92385a 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/searchResource/tradeLicenseApplication.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/bpastakeholder/searchResource/tradeLicenseApplication.js @@ -159,7 +159,7 @@ export const tradeLicenseApplication = getCommonCard({ style: { color: "white", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "80%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/acknowledgementResource/acknowledgementUtils.js index f0e8f09f11..6826306dee 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/acknowledgementResource/acknowledgementUtils.js @@ -13,7 +13,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, @@ -202,7 +202,7 @@ export const downloadPrintContainer = ( label: {labelName : "DOWNLOAD" , labelKey :"BPA_DOWNLOAD"}, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color : "#FE7A51" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color : "#2947a3" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -216,7 +216,7 @@ export const downloadPrintContainer = ( label: {labelName : "PRINT" , labelKey :"BPA_PRINT"}, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color : "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color : "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/apply.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/apply.js index 4efc8050b5..e8b72eb67b 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/apply.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/apply.js @@ -164,9 +164,9 @@ const buildingInfoCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" @@ -195,7 +195,7 @@ const buildingInfoCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/my-applications-stakeholder.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/my-applications-stakeholder.js index 13cc5beafc..ab7113105b 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/my-applications-stakeholder.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/my-applications-stakeholder.js @@ -146,7 +146,7 @@ const screenConfig = { style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/ocapply.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/ocapply.js index 6de5fda489..6b88208927 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/ocapply.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/edcrscrutiny/ocapply.js @@ -162,7 +162,7 @@ const buildingInfoCard = getCommonCard({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { @@ -315,8 +315,8 @@ const buildingInfoCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" @@ -344,7 +344,7 @@ const buildingInfoCard = getCommonCard({ variant: "contained", style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgement.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgement.js index bab28b3253..10a9e9c00d 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgement.js @@ -147,7 +147,7 @@ const downloadprintMenu = (action, state, dispatch, applicationNumber, tenantId, label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51",marginRight:"5px" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3",marginRight:"5px" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -160,7 +160,7 @@ const downloadprintMenu = (action, state, dispatch, applicationNumber, tenantId, label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgementResource/acknowledgementUtils.js index dba614fc6d..5721ce77bf 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/applicantDetails.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/applicantDetails.js index ee563c975a..b910536ad1 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/applicantDetails.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/applicantDetails.js @@ -61,7 +61,7 @@ const commonApplicantInformation = () => { iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/basicDetails.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/basicDetails.js index a930853306..5276d60af7 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/basicDetails.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/applyResource/basicDetails.js @@ -44,7 +44,7 @@ export const basicDetails = getCommonCard({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-search-preview.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-search-preview.js index b846e7a92d..3853b8115d 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-search-preview.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-search-preview.js @@ -111,8 +111,8 @@ const applicationOverview = getCommonContainer({ props: { variant: "outlined", style: { - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px" } }, diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-searchResource/nocApplication.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-searchResource/nocApplication.js index 58df0558ca..0a664e124c 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-searchResource/nocApplication.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/noc-searchResource/nocApplication.js @@ -136,8 +136,8 @@ export const nocApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -166,7 +166,7 @@ export const nocApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payResource/payment-methods.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payResource/payment-methods.js index 58626bc8c2..2b2c25f5c6 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payResource/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payResource/payment-methods.js @@ -156,7 +156,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -239,7 +239,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payment-methods.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payment-methods.js index a84adf761f..a71f3ef32a 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/payment-methods.js @@ -157,7 +157,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -240,7 +240,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/search-preview.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/search-preview.js index c24a8baddd..31e5fb9779 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/search-preview.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/search-preview.js @@ -118,7 +118,7 @@ const titlebar2 = { label: { labelName: "DOWNLOAD", labelKey: "BPA_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: 10 }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: 10 }, className: "tl-download-button" }, menu: [] } } @@ -131,7 +131,7 @@ const titlebar2 = { label: { labelName: "PRINT", labelKey: "BPA_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-download-button" }, menu: [] } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/bpaApplication.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/bpaApplication.js index bd42e9b64e..aeec3adbf0 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/bpaApplication.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/bpaApplication.js @@ -139,8 +139,8 @@ export const BPAApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -169,7 +169,7 @@ export const BPAApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/citizenFooter.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/citizenFooter.js index 952d2ca3f4..6452de2ba1 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/citizenFooter.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/egov-bpa/searchResource/citizenFooter.js @@ -93,7 +93,7 @@ export const sendToArchContainer = () => { data: { label: {labelName : "Take Action" , labelKey :"WF_TAKE_ACTION"}, rightIcon: "arrow_drop_down", - props: { variant: "contained", style: { height: "60px", color : "#fff", backgroundColor: "#FE7A51", } }, + props: { variant: "contained", style: { height: "60px", color : "#fff", backgroundColor: "#2947a3", } }, menu: {} } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/applyResource/scrutinyDetails.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/applyResource/scrutinyDetails.js index 1457056e54..c3104b7898 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/applyResource/scrutinyDetails.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/applyResource/scrutinyDetails.js @@ -50,7 +50,7 @@ export const basicDetails = getCommonCard({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/search-preview.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/search-preview.js index 4e51f60d35..19048f529b 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/search-preview.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/search-preview.js @@ -117,7 +117,7 @@ const titlebar2 = { label: { labelName: "DOWNLOAD", labelKey: "BPA_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: 10 }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: 10 }, className: "tl-download-button" }, menu: [] } } @@ -130,7 +130,7 @@ const titlebar2 = { label: { labelName: "PRINT", labelKey: "BPA_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-download-button" }, menu: [] } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/searchResource/citizenFooter.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/searchResource/citizenFooter.js index 59521033ff..ce4ab323c3 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/searchResource/citizenFooter.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/screens/specs/oc-bpa/searchResource/citizenFooter.js @@ -83,7 +83,7 @@ export const sendToArchContainer = () => { data: { label: {labelName : "Take Action" , labelKey :"WF_TAKE_ACTION"}, rightIcon: "arrow_drop_down", - props: { variant: "contained", style: { height: "60px", color : "#fff", backgroundColor: "#FE7A51", } }, + props: { variant: "contained", style: { height: "60px", color : "#fff", backgroundColor: "#2947a3", } }, menu: {} } } diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/themes/index.js index 31856712a4..6c716eeda8 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/tl-app-config.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/tl-app-config.js index f04a1aacbe..bb9925a947 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/tl-app-config.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-config/tl-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaCheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaCheckboxContainer/index.js index a240706e2c..30c8663408 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaCheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaCheckboxContainer/index.js @@ -20,9 +20,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaConditionsContainer/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaConditionsContainer/index.js index 7d703b9093..84aa06f914 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaConditionsContainer/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/BpaConditionsContainer/index.js @@ -14,9 +14,9 @@ import Checkbox from "@material-ui/core/Checkbox"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {}, diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/CheckboxContainer/index.js index 62f64da91a..79ea121ea5 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -12,9 +12,9 @@ import get from "lodash/get"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 7d4e1221d5..2343b86e63 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -40,7 +40,7 @@ const getMultiItem = (billingslabData, classes, style) => { .toUpperCase() .replace(/[.:-\s\/]/g, "_")}`} style={{ - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: "14px", fontWeigt: 400, lineSpacing: "17px" diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/BpaFeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/BpaFeesEstimateCard/index.js index 0b329e54a5..1a17b3c126 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/BpaFeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/BpaFeesEstimateCard/index.js @@ -22,7 +22,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, @@ -52,7 +52,7 @@ const styles = { marginBottom: 16 }, taxStylesLeft: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontSize: 14, fontWeight: 400, lineHeight: "17px", diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/DividerWithLabel/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/DividerWithLabel/index.js index b10f89c78b..f9a0401b82 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/DividerWithLabel/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/DividerWithLabel/index.js @@ -14,7 +14,7 @@ const labelStyle = { const underlineStyle = { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }; diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/EdcrSingleApplication/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/EdcrSingleApplication/index.js index 0d67364453..61c580b9f3 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/EdcrSingleApplication/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/EdcrSingleApplication/index.js @@ -109,7 +109,7 @@ class EdcrSingleApplication extends React.Component { labelKey={"EDCR_DOWNLOAD_BUILDING_PLAN"} textTransform={"uppercase"} style={{ - color: "#fe7a51", + color: "#2947a3", fontSize: 14, textTransform: "uppercase" }} @@ -126,7 +126,7 @@ class EdcrSingleApplication extends React.Component { labelKey={"EDCR_DOWNLOAD_REPORT"} textTransform={"uppercase"} style={{ - color: "#fe7a51", + color: "#2947a3", fontSize: 14, textTransform: "uppercase" }} diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/FeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/FeesEstimateCard/index.js index 31efc55dd3..6d4ac3140e 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/FeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/FeesEstimateCard/index.js @@ -21,7 +21,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocData/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocData/index.js index 67ad203139..70a010f738 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocData/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocData/index.js @@ -68,7 +68,7 @@ const styles = { underlineStyle: { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }, dividerStyle : { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDetailCard/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDetailCard/index.js index b877fc19ed..130136fbbe 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDetailCard/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDetailCard/index.js @@ -73,7 +73,7 @@ const styles = { underlineStyle: { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }, dividerStyle : { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDocDetailCard/index.js b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDocDetailCard/index.js index 38d23e5269..acc1e9a14d 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDocDetailCard/index.js +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/NocDocDetailCard/index.js @@ -68,7 +68,7 @@ const styles = { underlineStyle: { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }, dividerStyle : { diff --git a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/RadioGroup/index.css b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/RadioGroup/index.css index 7b7b0a20d7..c9bf546a08 100644 --- a/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/RadioGroup/index.css +++ b/web/rainmaker/dev-packages/egov-bpa-dev/src/ui-molecules-local/RadioGroup/index.css @@ -1,7 +1,7 @@ .radio-root { margin-bottom: 0; height: 30px; - color: #fe7a51; + color: #2947a3; width: 35px; } diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/config/common.js b/web/rainmaker/dev-packages/egov-common-dev/src/config/common.js index 5e079f3062..8f3c8b6ce6 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/config/common.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/config/common.js @@ -1,5 +1,5 @@ const commonConfig = { - MAP_API_KEY: "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM", + MAP_API_KEY: "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo", tenantId: process.env.REACT_APP_DEFAULT_TENANT_ID // forgotPasswordTenant: "pb.amritsar", }; diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/index.scss b/web/rainmaker/dev-packages/egov-common-dev/src/index.scss index 786b8e4af9..cbb0c4b827 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-common-dev/src/index.scss @@ -78,7 +78,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -88,7 +88,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), 0 2px 2px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 2px 0 rgba(0, 0, 0, 0.11999999731779099); width: 200px; diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/ApplicationNo/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/ApplicationNo/index.js index b456d0b170..8e72b584fc 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/ApplicationNo/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/ApplicationNo/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/OthersContainer/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/OthersContainer/index.js index 60ec75469b..d0f435cb02 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/OthersContainer/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-atoms-local/OthersContainer/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - // backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + // backgroundColor: "#2947a3", color: "rgba(0, 0, 0, 0.75)", marginTop: "19px", paddingRight: "19px", diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/common-app-config.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/common-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/common-app-config.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/common-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgement.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgement.js index f71023238a..ea97267f59 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgement.js @@ -106,7 +106,7 @@ const downloadprintMenu = ( rightIcon: "arrow_drop_down", props: { variant: "outlined", - style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, + style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button", }, menu: downloadMenu, @@ -123,7 +123,7 @@ const downloadprintMenu = ( rightIcon: "arrow_drop_down", props: { variant: "outlined", - style: { height: "60px", color: "#FE7A51" }, + style: { height: "60px", color: "#2947a3" }, className: "tl-print-button", }, menu: printMenu, diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgementResource/acknowledgementUtils.js index ee9f35858f..9b76fae13f 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/payResource/footer.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/payResource/footer.js index 3e267c59d6..ad67f63d23 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/payResource/footer.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/screens/specs/egov-common/payResource/footer.js @@ -663,8 +663,8 @@ export const download = async (receiptQueryString, mode = "download", configKey code = "Interest"; amount = dd.adjustedAmount; } - else if (dd.taxHeadCode == "WS_TIME_PENALTY" || dd.taxHeadCode == "SW_TIME_PENALTY") { - code = "Penalty"; amount = dd.adjustedAmount; + else if (dd.taxHeadCode == "WS_TIME_PENALTY" || dd.taxHeadCode == "SW_TIME_PENALTY" || dd.taxHeadCode == "WS_BREAKDOWN_PENALTY" || dd.taxHeadCode == "SW_BREAKDOWN_PENALTY") { + code = (dd.taxHeadCode == "WS_BREAKDOWN_PENALTY" || dd.taxHeadCode == "SW_BREAKDOWN_PENALTY") ? "Breakdown Penalty" : "Penalty"; amount = dd.adjustedAmount; } else if (dd.taxHeadCode == "WS_SCRUTINY_FEE" || dd.taxHeadCode == "SW_SCRUTINY_FEE") { code = "Scrutiny Fee"; amount = dd.adjustedAmount; diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ArrearsCardContainer/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ArrearsCardContainer/index.js index 85a2c83ad2..b852e289d1 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ArrearsCardContainer/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ArrearsCardContainer/index.js @@ -37,11 +37,11 @@ class ArrearsCardContainer extends Component { labelName={'CS_NO_ARREARS'} labelKey={'CS_NO_ARREARS'} />} - {this.state.showArrearsCard && } - {!this.state.showArrearsCard && } diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CustomTabContainer/payment-methods.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CustomTabContainer/payment-methods.js index 467193f0c1..aab310da99 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CustomTabContainer/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/CustomTabContainer/payment-methods.js @@ -225,7 +225,7 @@ export const onlineDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -306,7 +306,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -484,7 +484,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..5968ed50b0 100644 --- a/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-common-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { { return (
- +
❯
diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Checkbox/index.js index 42861130bb..a555ceaff5 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Icons/index.scss b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Icons/index.scss index e1a95c938d..11c271b695 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Icons/index.scss +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/Icons/index.scss @@ -1,7 +1,7 @@ .module-page-icon { height: 40px; width: 40px; - color: #fe7a51; + color: #2947a3; } @media only screen and (min-width: 768px) { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/PropertyLink/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/PropertyLink/index.js index bd4a0bcc97..988b0da016 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/PropertyLink/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/PropertyLink/index.js @@ -15,7 +15,7 @@ const styles = { const clickHereStyles = { cursor: "pointer", textDecoration: "none", - color: "#FE7A51" + color: "#2947a3" } class AddLinkForProperty extends React.Component { render() { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/applicationNumber/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/applicationNumber/index.js index 79565fe461..585fb7d1e8 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/applicationNumber/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-atoms-local/applicationNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import { getQueryArg } from "egov-ui-framework/ui-utils/commons"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/noc-app-config.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/noc-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/noc-app-config.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/noc-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/acknowledgementResource/acknowledgementUtils.js index dba614fc6d..5721ce77bf 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/applicantDetails.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/applicantDetails.js index 451d2cc5f4..ea193f6666 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/applicantDetails.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/applicantDetails.js @@ -62,7 +62,7 @@ const commonApplicantInformation = () => { // iconObj: { // iconName: "search", // position: "end", - // color: "#FE7A51", + // color: "#2947a3", // onClickDefination: { // action: "condition", // callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/nocDetails.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/nocDetails.js index a52d293a99..33464d9d02 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/nocDetails.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/nocDetails.js @@ -547,7 +547,7 @@ export const nocDetails = getCommonCard({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { @@ -586,7 +586,7 @@ export const nocDetails = getCommonCard({ // iconObj: { // iconName: "search", // position: "end", - // color: "#FE7A51", + // color: "#2947a3", // onClickDefination: { // action: "condition", @@ -619,7 +619,7 @@ export const nocDetails = getCommonCard({ style: { marginTop: "14px", height: "40px", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", color: "#fff", }, }, diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/propertyLocationDetails.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/propertyLocationDetails.js index 45ed07d33c..d19ca39462 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/propertyLocationDetails.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/applyResource/propertyLocationDetails.js @@ -716,7 +716,7 @@ export const propertyLocationDetails = getCommonCard( // iconObj: { // iconName: "search", // position: "end", - // color: "#FE7A51", + // color: "#2947a3", // onClickDefination: { // action: "condition", // callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/payResource/payment-methods.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/payResource/payment-methods.js index 58626bc8c2..2b2c25f5c6 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/payResource/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/payResource/payment-methods.js @@ -156,7 +156,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -239,7 +239,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/requiredDocuments/reqDocs.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/requiredDocuments/reqDocs.js index 96cb73940f..79c99e6d1d 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/requiredDocuments/reqDocs.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/requiredDocuments/reqDocs.js @@ -26,7 +26,7 @@ const styles = { lineHeight: "19px" }, docs: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontFamily: "Roboto", fontSize: "14px", fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/search-preview.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/search-preview.js index d2933080bd..e8ef8d3b71 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/search-preview.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/search-preview.js @@ -157,7 +157,7 @@ let tenantId=get( label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -170,7 +170,7 @@ let tenantId=get( label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/searchResource/fireNocApplication.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/searchResource/fireNocApplication.js index 62b1b5cfef..3b0853ddff 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/searchResource/fireNocApplication.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/searchResource/fireNocApplication.js @@ -219,8 +219,8 @@ export const NOCApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -250,7 +250,7 @@ export const NOCApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/verifyReferReject.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/verifyReferReject.js index e91416ec10..7e62465171 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/verifyReferReject.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/fire-noc/verifyReferReject.js @@ -98,7 +98,7 @@ const getVerifyReferRejet = contract => { marginBottom: 0, marginTop: 5, width: "100%", - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptPdf.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptPdf.js index 325846bd19..f867b02bc5 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptPdf.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptPdf.js @@ -1390,9 +1390,11 @@ const getApplicationData = async (transformedData, ulbLogo, type) => { } ]; + const qRvalidityYears = !isNaN(Number(transformedData.validityYears)) ? transformedData.validityYears : 1; + qrText = `Application: ${transformedData.applicationNumber }, NOC Number: ${transformedData.fireNOCNumber}, Date of Issue: ${transformedData.issuedDate - }, Valid Till: ${transformedData.validTo}, Buildings: ${transformedData.propertyType + }, Valid Years: ${qRvalidityYears}, Buildings: ${transformedData.propertyType },Applicant: ${transformedData.owners[0].name}`; break; } @@ -1601,7 +1603,7 @@ const getApplicationData = async (transformedData, ulbLogo, type) => { }; const newgetApplicationData = async (transformedData, ulbLogo, type) => { - + console.log("transformedData",transformedData); const ddi = transformedData.buildings[0].uoms; let buildingString = ""; if (transformedData.buildings.length > 1) { @@ -2527,11 +2529,14 @@ const newgetApplicationData = async (transformedData, ulbLogo, type) => { } ]; + const qRvalidityYears = !isNaN(Number(transformedData.validityYears)) ? transformedData.validityYears : 1; + qrText = `Application: ${transformedData.applicationNumber }, NOC Number: ${transformedData.fireNOCNumber}, Date of Issue: ${transformedData.issuedDate - }, Valid Till: ${transformedData.validTo}, Buildings: ${transformedData.propertyType - }, Applicant: ${transformedData.owners[0].name}`; + }, Valid Years: ${qRvalidityYears}, Buildings: ${transformedData.propertyType + },Applicant: ${transformedData.owners[0].name}`; break; + } // Generate QR code base64 image @@ -6054,11 +6059,14 @@ const provisionApplicationData = async (transformedData, ulbLogo, type) => { } ]; + const qRvalidityYears = !isNaN(Number(transformedData.validityYears)) ? transformedData.validityYears : 1; + qrText = `Application: ${transformedData.applicationNumber }, NOC Number: ${transformedData.fireNOCNumber}, Date of Issue: ${transformedData.issuedDate - }, Valid Till: ${transformedData.validTo}, Buildings: ${transformedData.propertyType - }, Applicant: ${transformedData.owners[0].name}`; + }, Valid Years: ${qRvalidityYears}, Buildings: ${transformedData.propertyType + },Applicant: ${transformedData.owners[0].name}`; break; + } // Generate QR code base64 image diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptTransformer.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptTransformer.js index ad07c58ba2..a252422c5e 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptTransformer.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/screens/specs/utils/receiptTransformer.js @@ -14,7 +14,8 @@ import { transformById, getTransformedLocale, getUserDataFromUuid, - getQueryArg + getQueryArg, + getTransformedLocalStorgaeLabels } from "egov-ui-framework/ui-utils/commons"; import { fetchLocalizationLabel } from "egov-ui-kit/redux/app/actions"; @@ -48,12 +49,20 @@ const epochToDate = et => { }; export const getMessageFromLocalization = code => { - let messageObject = JSON.parse(getLocalization("localization_en_IN")).find( - item => { - return item.code == code; - } - ); - return messageObject ? messageObject.message : code; + const data = JSON.parse(getLocalization("localization_en_IN_common") || "[]"); + + let messageObject; + + if (Array.isArray(data)) { + messageObject = data.find(item => item.code == code); + return messageObject ? messageObject.message : code; + } + + if (data && typeof data === "object") { + return data[code] || code; + } + + return code; }; export const loadUlbLogo = async (utenantId) => { @@ -759,10 +768,40 @@ export const loadReceiptData = async (consumerCode, tenant) => { }; export const loadMdmsData = async tenantid => { - let localStorageLabels = JSON.parse( - window.localStorage.getItem(`localization_${getLocale()}`) - ); - let localizationLabels = transformById(localStorageLabels, "code"); + // Try multiple possible localStorage keys for localization data + let localizationLabels = {}; + const possibleKeys = [ + `localization_${getLocale()}`, + `localization_${getLocale()}_common`, + `localization_${getLocale()}_firenoc`, + "localization_en_IN_common", + "localization_en_IN", + ]; + + //console.log("DEBUG - Available localStorage keys:", Object.keys(window.localStorage).filter(k => k.includes('localization'))); + + for (const key of possibleKeys) { + const data = window.localStorage.getItem(key); + if (data) { + try { + const parsed = JSON.parse(data); + if (Array.isArray(parsed) && parsed.length > 0) { + localizationLabels = transformById(parsed, "code") || {}; + console.log(`DEBUG - Loaded localization from key: ${key}`); + console.log("DEBUG - localizationLabels:", localizationLabels); + break; + } + } catch (e) { + console.warn(`DEBUG - Failed to parse ${key}:`, e); + } + } + } + + if (Object.keys(localizationLabels).length === 0) { + console.warn("DEBUG - No localization data found in any key"); + localizationLabels = {}; + } + let data = {}; let queryObject = [ { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..5968ed50b0 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { @@ -156,7 +156,7 @@ class Applications extends React.Component { labelName="VIEW DETAILS" // labelKey="CS_COMMON_PAY" style={{ - color: "#fe7a51", + color: "#2947a3", fontSize: 14, }} /> diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/DividerWithLabel/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/DividerWithLabel/index.js index 17c455995c..9558f77f73 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/DividerWithLabel/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/DividerWithLabel/index.js @@ -12,7 +12,7 @@ const labelStyle = { const underlineStyle = { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }; diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/FeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/FeesEstimateCard/index.js index 2ae5f0b5f0..ab6297abb9 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/FeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/FeesEstimateCard/index.js @@ -22,7 +22,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, @@ -52,7 +52,7 @@ const styles = { marginBottom: 16 }, taxStylesLeft: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontSize: 14, fontWeight: 400, lineHeight: "17px", diff --git a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/RadioGroup/index.scss b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/RadioGroup/index.scss index 3633735ccd..c947fc413c 100644 --- a/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/RadioGroup/index.scss +++ b/web/rainmaker/dev-packages/egov-firenoc-dev/src/ui-molecules-local/RadioGroup/index.scss @@ -1,7 +1,7 @@ .radio-root { margin-bottom: 0; height: 30px; - color: #fe7a51; + color: #2947a3; width: 35px; } diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/index.css b/web/rainmaker/dev-packages/egov-hrms-dev/src/index.css index 5286240e6d..890fe4d81e 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/index.css +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/index.css @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/ApplicationNo/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/ApplicationNo/index.js index d346836a7a..2e3a4b1542 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/ApplicationNo/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/ApplicationNo/index.js @@ -1,7 +1,7 @@ import React from "react"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/BreadCrumbs/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/BreadCrumbs/index.js index 380da79588..9489d03043 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/BreadCrumbs/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/BreadCrumbs/index.js @@ -10,7 +10,7 @@ const BreadCrumbs = ({ url, history, label }) => { return (
- +
❯
diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/Checkbox/index.js index 6628d899da..f90d380d30 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.css"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.css b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.css index 9ee1de51c1..d3759433ee 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.css +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.css @@ -40,7 +40,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/acknowledgementResource/acknowledgementUtils.js index edacc7b0af..99b98f4f84 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/acknowledgementResource/acknowledgementUtils.js @@ -11,7 +11,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/searchResource/searchForm.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/searchResource/searchForm.js index 24e7475046..99d221f8e7 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/searchResource/searchForm.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/searchResource/searchForm.js @@ -251,8 +251,8 @@ export const searchForm = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", // borderRadius: "2px", // width: "220px", height: "48px", @@ -283,7 +283,7 @@ export const searchForm = getCommonCard({ style: { color: "white", // margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", // width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/viewResource/deactivate-employee.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/viewResource/deactivate-employee.js index 0c2a77c04c..357bb8b729 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/viewResource/deactivate-employee.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/screens/specs/hrms/viewResource/deactivate-employee.js @@ -227,7 +227,7 @@ export const deactivateEmployee = getCommonContainer({ marginBottom: 0, marginTop: 5, width: "100%", - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), @@ -494,7 +494,7 @@ export const ActivateEmployee = getCommonContainer({ marginBottom: 0, marginTop: 5, width: "100%", - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/themes/index.js index bdf76a8ebd..bde771ba24 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-containers-local/CheckboxContainer/index.js index c25692c2cb..800c3a5e39 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.css"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/DividerWithLabel/index.js b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/DividerWithLabel/index.js index 640d5b16be..7118ddd1bd 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/DividerWithLabel/index.js +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/DividerWithLabel/index.js @@ -14,7 +14,7 @@ const labelStyle = { const underlineStyle = { position: "absolute", bottom: -1, - borderBottom: "2px solid #FE7A51", + borderBottom: "2px solid #2947a3", width: "100%" }; diff --git a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/Table/index.css b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/Table/index.css index 5a8727adf0..235d81414f 100644 --- a/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/Table/index.css +++ b/web/rainmaker/dev-packages/egov-hrms-dev/src/ui-molecules-local/Table/index.css @@ -16,5 +16,5 @@ div[class^="MUIDataTableHeadCell-data"] { } .hr-table-container a { - text-decoration-color: rgb(254, 122, 81); + text-decoration-color: rgb(41, 71, 163); } diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/config/common.js b/web/rainmaker/dev-packages/egov-noc-dev/src/config/common.js index 5e079f3062..8f3c8b6ce6 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/config/common.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/config/common.js @@ -1,5 +1,5 @@ const commonConfig = { - MAP_API_KEY: "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM", + MAP_API_KEY: "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo", tenantId: process.env.REACT_APP_DEFAULT_TENANT_ID // forgotPasswordTenant: "pb.amritsar", }; diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/index.scss b/web/rainmaker/dev-packages/egov-noc-dev/src/index.scss index bdd927bee6..293f4813b1 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-atoms-local/NocNumber/index.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-atoms-local/NocNumber/index.js index 2fae2f1b0d..b530b0a359 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-atoms-local/NocNumber/index.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-atoms-local/NocNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import LabelContainer from "egov-ui-framework/ui-containers/LabelContainer"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/noc-app-config.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/noc-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/noc-app-config.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/noc-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/acknowledgementResource/acknowledgementUtils.js index dba614fc6d..5721ce77bf 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/search-preview.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/search-preview.js index a5711c9a13..1684551d32 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/search-preview.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/search-preview.js @@ -103,8 +103,8 @@ const applicationOverview = getCommonContainer({ props: { variant: "outlined", style: { - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px" } }, diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/searchResource/nocApplication.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/searchResource/nocApplication.js index 9a4fdd01ab..ccc7071012 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/searchResource/nocApplication.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/screens/specs/noc/searchResource/nocApplication.js @@ -136,8 +136,8 @@ export const nocApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -166,7 +166,7 @@ export const nocApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/themes/index.js index 2434a1ef79..272205c05b 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..5968ed50b0 100644 --- a/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-noc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { { return (
- +
❯
diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Checkbox/index.js index 3c177d836c..1df053cb44 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Checkbox/index.js @@ -13,9 +13,9 @@ import { prepareFinalObject } from "egov-ui-framework/ui-redux/screen-configurat const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Icons/index.scss b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Icons/index.scss index e1a95c938d..11c271b695 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Icons/index.scss +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/Icons/index.scss @@ -1,7 +1,7 @@ .module-page-icon { height: 40px; width: 40px; - color: #fe7a51; + color: #2947a3; } @media only screen and (min-width: 768px) { diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MenuButton/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MenuButton/index.js index f7453b49e8..e1fb647dce 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MenuButton/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/MenuButton/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/applicationNumber/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/applicationNumber/index.js index b456d0b170..8e72b584fc 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/applicationNumber/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/applicationNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/propertyId/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/propertyId/index.js index 983b91df0e..b47be6a603 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/propertyId/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-atoms-local/propertyId/index.js @@ -1,7 +1,7 @@ import React from "react"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/pt-app-config.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/pt-app-config.js index fb3bfac35d..ff272ed63f 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/pt-app-config.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/pt-app-config.js @@ -1,2 +1,2 @@ export const defaultLocation = { lat: 30.7333, lng: 76.7794 }; -export const MAP_API_KEY = "AIzaSyCH9PmCbk_mcpgijAAlTeltC4deOxC5wEM"; //CHANGE THIS +export const MAP_API_KEY = "AIzaSyB5xqCmrgz-IL-mPQiy7PI_mA4drmyr2fo"; //CHANGE THIS diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/mutation-methods.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/mutation-methods.js index 347da02759..ad7db716c1 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/mutation-methods.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/mutation-methods.js @@ -194,8 +194,8 @@ export const searchPropertyDetails = getCommonCard({ props: { variant: "outlined", style: { - color: "rgba(0, 0, 0, 0.6000000238418579)", - borderColor: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -225,7 +225,7 @@ export const searchPropertyDetails = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/searchResource/fireNocApplication.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/searchResource/fireNocApplication.js index b447ba190f..5cb085c41a 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/searchResource/fireNocApplication.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-common-screens/searchResource/fireNocApplication.js @@ -204,8 +204,8 @@ export const NOCApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -235,7 +235,7 @@ export const NOCApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgement.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgement.js index 5486818e90..fc43983e98 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgement.js @@ -123,7 +123,7 @@ const downloadprintMenu = (state, applicationNumber, tenantId, purpose, moduleNa label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", visibility, marginRight: "5px" }, className: "pt-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", visibility, marginRight: "5px" }, className: "pt-download-button" }, menu: downloadMenu } } @@ -136,7 +136,7 @@ const downloadprintMenu = (state, applicationNumber, tenantId, purpose, moduleNa label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", visibility }, className: "pt-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", visibility }, className: "pt-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgementResource/acknowledgementUtils.js index e228fdcf53..d870ff5cf1 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/acknowledgementResource/acknowledgementUtils.js @@ -12,7 +12,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/nocDetails.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/nocDetails.js index c69e29e8a1..a35d9a889f 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/nocDetails.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/nocDetails.js @@ -165,7 +165,7 @@ export const nocDetails = getCommonCard({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/propertyLocationDetails.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/propertyLocationDetails.js index 59db770d89..57c227ac5f 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/propertyLocationDetails.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/applyResource/propertyLocationDetails.js @@ -157,7 +157,7 @@ export const propertyLocationDetails = getCommonCard( iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/financialYearPopup.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/financialYearPopup.js index d0994767fe..eb537484c5 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/financialYearPopup.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/financialYearPopup.js @@ -140,9 +140,9 @@ import { props: { variant: "text", style: { - color: "#FE7A51", + color: "#2947a3", border: "1px solid rgb(255, 255, 255)", - // borderColor: "#FE7A51", + // borderColor: "#2947a3", // width: "50px", // height: "48px", // margin: "8px", @@ -174,7 +174,7 @@ import { // margin: "8px", border: "1px solid rgb(255, 255, 255)", backgroundColor: "#FFF", - color: "#FE7A51", + color: "#2947a3", // borderRadius: "2px", // width: "50px", // height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/functions.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/functions.js index 0d11838e07..050406f0c4 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/functions.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/functions.js @@ -645,7 +645,7 @@ export const downloadPrintContainer = ( label: { labelName: "DOWNLOAD", labelKey: "MT_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "pt-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "pt-download-button" }, menu: downloadMenu } } @@ -659,7 +659,7 @@ export const downloadPrintContainer = ( label: { labelName: "PRINT", labelKey: "MT_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "pt-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "pt-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js index 2cdcc79b90..d9a2cbeb60 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/mutation-methods.js @@ -488,7 +488,7 @@ export const searchPropertyDetails = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" @@ -629,7 +629,7 @@ export const searchApplicationDetails = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-resources.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-resources.js index 1d1f6abbb8..d762e66930 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-resources.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-resources.js @@ -227,7 +227,7 @@ export const searchPropertyDetails = { style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-table.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-table.js index d1d4582218..7e24af6996 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-table.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/publicSearchResource/search-table.js @@ -88,7 +88,7 @@ const getPayButton = (tableMeta) => { return ( payAmount(tableMeta)} - style={{ color: "#FE7A51" }} + style={{ color: "#2947a3" }} > diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/requiredDocuments/reqDocs.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/requiredDocuments/reqDocs.js index a8d37c5f6a..e85357f38b 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/requiredDocuments/reqDocs.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/requiredDocuments/reqDocs.js @@ -20,7 +20,7 @@ const styles = { lineHeight: "19px" }, docs: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontFamily: "Roboto", fontSize: "14px", fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/search-preview.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/search-preview.js index c2870bfb3c..d7e281ed30 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/search-preview.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/search-preview.js @@ -8,7 +8,7 @@ import get from "lodash/get"; import set from "lodash/set"; import { httpRequest } from "../../../../ui-utils"; import { getSearchResults } from "../../../../ui-utils/commons"; -import { downloadCertificateForm, downloadReceitForm, getpayments, prepareDocumentsView, searchBill, showHideMutationDetailsCard } from "../utils/index"; +import { downloadCertificateForm, getpayments, prepareDocumentsView, searchBill, showHideMutationDetailsCard } from "../utils/index"; import { loadPdfGenerationData } from "../utils/receiptTransformer"; import { mutationSummary } from "./applyResourceMutation/mutationSummary"; import { downloadPrintContainer } from "./functions"; @@ -61,20 +61,20 @@ const setDownloadMenu = (state, dispatch, tenantId, applicationNumber) => { }, leftIcon: "book" }; - let receiptDownloadObject = { - label: { labelName: "Receipt", labelKey: "MT_RECEIPT" }, - link: () => { - downloadReceitForm(get(state, "screenConfiguration.preparedFinalObject.Payments"), "consolidatedreceipt", tenantId, applicationNumber); - }, - leftIcon: "receipt" - }; - let receiptPrintObject = { - label: { labelName: "Receipt", labelKey: "MT_RECEIPT" }, - link: () => { - downloadReceitForm(get(state, "screenConfiguration.preparedFinalObject.Payments"), "consolidatedreceipt", tenantId, applicationNumber, 'print'); - }, - leftIcon: "receipt" - }; + // let receiptDownloadObject = { + // label: { labelName: "Receipt", labelKey: "MT_RECEIPT" }, + // link: () => { + // downloadReceitForm(get(state, "screenConfiguration.preparedFinalObject.Payments"), "consolidatedreceipt", tenantId, applicationNumber); + // }, + // leftIcon: "receipt" + // }; + // let receiptPrintObject = { + // label: { labelName: "Receipt", labelKey: "MT_RECEIPT" }, + // link: () => { + // downloadReceitForm(get(state, "screenConfiguration.preparedFinalObject.Payments"), "consolidatedreceipt", tenantId, applicationNumber, 'print'); + // }, + // leftIcon: "receipt" + // }; let applicationDownloadObject = { label: { labelName: "Application", labelKey: "MT_APPLICATION" }, link: () => { @@ -99,12 +99,12 @@ const setDownloadMenu = (state, dispatch, tenantId, applicationNumber) => { case "ACTIVE": downloadMenu = [ certificateDownloadObject, - receiptDownloadObject, + // receiptDownloadObject, applicationDownloadObject ]; printMenu = [ certificatePrintObject, - receiptPrintObject, + // receiptPrintObject, applicationPrintObject ]; break; diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/searchResource/fireNocApplication.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/searchResource/fireNocApplication.js index 5803e21628..f1492e5ed6 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/searchResource/fireNocApplication.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/screens/specs/pt-mutation/searchResource/fireNocApplication.js @@ -204,8 +204,8 @@ export const NOCApplication = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - borderColor: "#FE7A51", + color: "#2947a3", + borderColor: "#2947a3", width: "220px", height: "48px", margin: "8px", @@ -235,7 +235,7 @@ export const NOCApplication = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/themes/index.js index 41038059d0..6cc2af2a13 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainerPTCommon/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainerPTCommon/index.js index 7d9024a516..cdd6d11a26 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainerPTCommon/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/CheckboxContainerPTCommon/index.js @@ -14,9 +14,9 @@ import get from 'lodash/get'; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, formControl: { diff --git a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..5968ed50b0 100644 --- a/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-pt-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { { return (
- +
❯
diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Checkbox/index.js index 4753a11a49..3c8f7e4e09 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.css"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Icons/index.css b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Icons/index.css index e1a95c938d..11c271b695 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Icons/index.css +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/Icons/index.css @@ -1,7 +1,7 @@ .module-page-icon { height: 40px; width: 40px; - color: #fe7a51; + color: #2947a3; } @media only screen and (min-width: 768px) { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/LicenceNo/index.scss b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/LicenceNo/index.scss index 78e2a880d6..069ff0a852 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/LicenceNo/index.scss +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/LicenceNo/index.scss @@ -1,5 +1,5 @@ .application-no-container { - background-color: rgba(0, 0, 0, 0.6000000238418579); + background-color: #2947a3; color: rgba(255, 255, 255, 0.8700000047683716); text-align: center; vertical-align: middle; diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.css b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.css index 9ee1de51c1..d3759433ee 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.css +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.css @@ -40,7 +40,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.scss b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.scss index 6b1fb90c0e..2609a45be1 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.scss +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MapLocation/index.scss @@ -47,7 +47,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MenuButton/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MenuButton/index.js index f7453b49e8..e1fb647dce 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MenuButton/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-atoms-local/MenuButton/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgement.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgement.js index d9018cf7e9..080f330e76 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgement.js @@ -131,7 +131,7 @@ const downloadprintMenu = (state, dispatch) => { label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -144,7 +144,7 @@ const downloadprintMenu = (state, dispatch) => { label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgementResource/acknowledgementUtils.js index 5683265d71..e4eacf9e92 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/acknowledgementResource/acknowledgementUtils.js @@ -11,7 +11,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/apply.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/apply.js index 120e5761b9..7828845b57 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/apply.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/apply.js @@ -81,7 +81,7 @@ export const tradeDocumentDetails = getCommonCard({ style: { color: "white", margin: "8px", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "220px", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/footer.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/footer.js index 49778a3626..76d4635b54 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/footer.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/footer.js @@ -1004,7 +1004,7 @@ export const footerReviewTop = ( label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -1018,7 +1018,7 @@ export const footerReviewTop = ( label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } @@ -1175,7 +1175,7 @@ export const downloadPrintContainer = ( label: { labelName: "DOWNLOAD", labelKey: "TL_DOWNLOAD" }, leftIcon: "cloud_download", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-download-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-download-button" }, menu: downloadMenu } } @@ -1189,7 +1189,7 @@ export const downloadPrintContainer = ( label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeDetails.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeDetails.js index c504a7aa6d..ad641845cb 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeDetails.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeDetails.js @@ -1012,7 +1012,7 @@ export const tradeDetails = getCommonCard({ // iconObj: { // iconName: "search", // position: "end", - // color: "#FE7A51", + // color: "#2947a3", // onClickDefination: { // action: "condition", // callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeLocationDetails.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeLocationDetails.js index 27adc5c91f..7953857e68 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeLocationDetails.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeLocationDetails.js @@ -128,7 +128,7 @@ export const tradeLocationDetails = getCommonCard( iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeOwnerDetails.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeOwnerDetails.js index 495a862b9d..18808c8c48 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeOwnerDetails.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/applyResource/tradeOwnerDetails.js @@ -37,7 +37,7 @@ export const getOwnerMobNoField = getTextField({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { @@ -197,7 +197,7 @@ export const OwnerInfoCard = { // iconObj: { // iconName: "search", // position: "end", - // color: "#FE7A51", + // color: "#2947a3", // onClickDefination: { // action: "condition", // callBack: (state, dispatch, fieldInfo) => { @@ -450,7 +450,7 @@ export const ownerInfoInstitutional = { iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch, fieldInfo) => { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/approve.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/approve.js index cea91b7cf1..4dcf2f2d0f 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/approve.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/approve.js @@ -73,7 +73,7 @@ const getApproveCard = queryValuePurpose => { style: { fontSize: 12, marginBottom: 0, - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), @@ -96,7 +96,7 @@ const getApproveCard = queryValuePurpose => { fontSize: 12, marginBottom: 0, marginTop: 5, - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ), diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/payResource/payment-methods.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/payResource/payment-methods.js index 93fffaec6c..fdfde1ddc7 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/payResource/payment-methods.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/payResource/payment-methods.js @@ -151,7 +151,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -231,7 +231,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/search-preview.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/search-preview.js index ecd0e85fde..58e8e1de09 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/search-preview.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/search-preview.js @@ -258,7 +258,7 @@ const beforeInitFn = async (action, state, dispatch, applicationNumber) => { { style: { marginRight: "10px", - color: "rgba(0, 0, 0, 0.6000000238418579)" + color: "#2947a3" } } ) diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/FsApplication.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/FsApplication.js index 00c27fb25f..4a204877a4 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/FsApplication.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/FsApplication.js @@ -68,7 +68,7 @@ export const fsApplication = getCommonCard( style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: "80%", height: "48px", diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Fsenaksha.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Fsenaksha.js index edf2a15929..368f904b37 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Fsenaksha.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Fsenaksha.js @@ -68,7 +68,7 @@ export const Fsenaksha = getCommonCard( style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: "80%", height: "48px", diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Obps.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Obps.js index 1d0fa25a27..0dec320a34 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Obps.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/Obps.js @@ -42,7 +42,7 @@ export const Obps = getCommonCard( style: { color: "white", - backgroundColor: "#FE7A51", + backgroundColor: "#2947a3", borderRadius: "2px", width: "80%", height: "48px", diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/tradeLicenseApplication.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/tradeLicenseApplication.js index e15887017e..f17d1cb6ab 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/tradeLicenseApplication.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicence/searchResource/tradeLicenseApplication.js @@ -357,7 +357,7 @@ ownerName: getTextField({ style: { color: "white", - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", borderRadius: "2px", width: "80%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicense-citizen/home.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicense-citizen/home.js index fddef0829d..17157e6230 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicense-citizen/home.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/screens/specs/tradelicense-citizen/home.js @@ -121,7 +121,7 @@ const tradeLicenseSearchAndResult = { // fontSize: "110px", // width: 120, // height: 100, - // color: "rgba(0, 0, 0, 0.6)", + // color: "#2947a3", // marginLeft: -22 // }, // iconSize: "110px" diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/themes/index.js index 31856712a4..6c716eeda8 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/CheckboxContainer/index.js index 2c15a1c4c2..e1bd2a2317 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -12,9 +12,9 @@ import { getLocaleLabels } from "egov-ui-framework/ui-utils/commons"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51", + color: "#2947a3", }, }, checked: {}, diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index fd36adc976..65502f9aea 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -40,7 +40,7 @@ const getMultiItem = (billingslabData, classes, style) => { .toUpperCase() .replace(/[.:-\s\/]/g, "_")}`} style={{ - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: "14px", fontWeigt: 400, lineSpacing: "17px" diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/FeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/FeesEstimateCard/index.js index a692be7f85..6c93e7cbb0 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/FeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/FeesEstimateCard/index.js @@ -21,7 +21,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/RadioGroup/index.css b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/RadioGroup/index.css index 7b7b0a20d7..c9bf546a08 100644 --- a/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/RadioGroup/index.css +++ b/web/rainmaker/dev-packages/egov-tradelicence-dev/src/ui-molecules-local/RadioGroup/index.css @@ -1,7 +1,7 @@ .radio-root { margin-bottom: 0; height: 30px; - color: #fe7a51; + color: #2947a3; width: 35px; } diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/index.css b/web/rainmaker/dev-packages/egov-uc-dev/src/index.css index 14399aa7e3..363b033d7b 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/index.css +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/index.css @@ -57,7 +57,7 @@ body { text-align: left; } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -66,7 +66,7 @@ body { text-align: left; } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.24), 0 0 8px 0 rgba(0, 0, 0, 0.12), 0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12); width: 200px; diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/index.scss b/web/rainmaker/dev-packages/egov-uc-dev/src/index.scss index 5018c88d3a..713d657332 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/index.scss +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/index.scss @@ -67,7 +67,7 @@ body { } .mihy-paragraph { - color: rgba(0, 0, 0, 0.6000000238418579); + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 400; @@ -77,7 +77,7 @@ body { } .mihy-primary-button { - background-color: #fe7a51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.23999999463558197), 0 0 8px 0 rgba(0, 0, 0, 0.11999999731779099), diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/Checkbox/index.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/Checkbox/index.js index 42861130bb..a555ceaff5 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/Checkbox/index.js @@ -8,9 +8,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/applicationNumber/index.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/applicationNumber/index.js index 92b03817f8..b36c7c6d73 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/applicationNumber/index.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-atoms-local/applicationNumber/index.js @@ -2,7 +2,7 @@ import React from "react"; import { LabelContainer } from "egov-ui-framework/ui-containers"; const styles = { - backgroundColor: "rgba(0, 0, 0, 0.6000000238418579)", + backgroundColor: "#2947a3", color: "rgba(255, 255, 255, 0.8700000047683716)", marginLeft: "8px", paddingLeft: "19px", diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc-citizen/receiptsResources/ucSearch.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc-citizen/receiptsResources/ucSearch.js index ee87ff0ac9..ad1133d9da 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc-citizen/receiptsResources/ucSearch.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc-citizen/receiptsResources/ucSearch.js @@ -256,9 +256,9 @@ export const UCSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgement.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgement.js index 2549d96be1..38d349230e 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgement.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgement.js @@ -71,7 +71,7 @@ const downloadprintMenu = (state, dispatch, applicationNumber, tenantId) => { props: { variant: "outlined", style: { - height: "60px", color: "#FE7A51", + height: "60px", color: "#2947a3", marginRight: "5px" }, className: "uc-download-button" @@ -90,7 +90,7 @@ const downloadprintMenu = (state, dispatch, applicationNumber, tenantId) => { rightIcon: "arrow_drop_down", props: { variant: "outlined", - style: { height: "60px", color: "#FE7A51" }, + style: { height: "60px", color: "#2947a3" }, className: "uc-print-button" }, menu: printMenu diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgementResource/acknowledgementUtils.js index 0fe88442e0..169ead358d 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/acknowledgementResource/acknowledgementUtils.js @@ -11,7 +11,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/payResource/paymentMethod.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/payResource/paymentMethod.js index 047a8324e1..21479e6e7f 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/payResource/paymentMethod.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/payResource/paymentMethod.js @@ -155,7 +155,7 @@ export const chequeDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { @@ -235,7 +235,7 @@ export const demandDraftDetails = getCommonContainer({ iconObj: { iconName: "search", position: "end", - color: "#FE7A51", + color: "#2947a3", onClickDefination: { action: "condition", callBack: (state, dispatch) => { diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/search-preview.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/search-preview.js index e9c865075e..2bd22aa4b6 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/search-preview.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/search-preview.js @@ -277,7 +277,7 @@ const downloadprintMenu = (state, dispatch, applicationNumber, tenantId, status) props: { variant: "outlined", style: { - height: "60px", color: "#FE7A51", + height: "60px", color: "#2947a3", marginRight: "5px" }, className: "uc-download-button", @@ -296,7 +296,7 @@ const downloadprintMenu = (state, dispatch, applicationNumber, tenantId, status) rightIcon: "arrow_drop_down", props: { variant: "outlined", - style: { height: "60px", color: "#FE7A51" }, + style: { height: "60px", color: "#2947a3" }, className: "uc-print-button", }, menu: printMenu, diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/searchChallanCard.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/searchChallanCard.js index 4123a49466..886fcb6471 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/searchChallanCard.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/searchChallanCard.js @@ -226,8 +226,8 @@ import { color: "primary", style: { width: window.innerWidth > 480 ? "80%" : "100%", - color: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", height: "48px", margin:"5px" diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/ucSearch.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/ucSearch.js index fa3f8ef91b..cd3655a1ce 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/ucSearch.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/universalCollectionResources/ucSearch.js @@ -249,9 +249,9 @@ export const UCSearchCard = getCommonCard({ props: { variant: "outlined", style: { - color: "#FE7A51", - // backgroundColor: "#FE7A51", - border: "#FE7A51 solid 1px", + color: "#2947a3", + // backgroundColor: "#2947a3", + border: "#2947a3 solid 1px", borderRadius: "2px", width: window.innerWidth > 480 ? "80%" : "100%", height: "48px" diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/themes/index.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/themes/index.js index df58d4a120..236824f429 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/themes/index.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/themes/index.js @@ -1,8 +1,8 @@ const themeObject = { palette: { primary: { - main: "#FE7A51", - dark: "#DB6844", + main: "#2947a3", + dark: "#2947a3", contrastText: "#fff" }, secondary: { diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/CheckboxContainer/index.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/CheckboxContainer/index.js index e7fd79aff1..a59c8cc5a8 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/CheckboxContainer/index.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/CheckboxContainer/index.js @@ -10,9 +10,9 @@ import "./index.scss"; const styles = { root: { - color: "#FE7A51", + color: "#2947a3", "&$checked": { - color: "#FE7A51" + color: "#2947a3" } }, checked: {} diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js index 9d07a207a5..5968ed50b0 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-containers-local/ViewbreakupDialogContainer/index.js @@ -35,7 +35,7 @@ const getMultiItem = (billingslabData, classes, style) => { { componentPath: "Typography", props: { variant: "headline", + color: "primary", ...props }, children: { @@ -84,11 +85,13 @@ export const getCommonParagraph = (paragraph, props = {}) => { }; export const getCommonCaption = (paragraph, props = {}) => { - return getCommonHeader(paragraph, { variant: "caption", ...props }); + const mergedStyle = props.style ? { color: "#374151", ...props.style } : { color: "#374151" }; + return getCommonHeader(paragraph, { variant: "caption", ...props, style: mergedStyle }); }; export const getCommonValue = (value, props = {}) => { - return getCommonHeader(value, { variant: "body2", ...props }); + const mergedStyle = props.style ? { color: "#2947a3", ...props.style } : { color: "#2947a3" }; + return getCommonHeader(value, { variant: "body2", ...props, style: mergedStyle }); }; @@ -168,7 +171,8 @@ export const getCommonGrayCard = children => { backgroundColor: "rgb(242, 242, 242)", boxShadow: "none", borderRadius: 0, - overflow: "visible" + overflow: "visible", + padding: "12px" } }); }; diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/RequiredDocuments/reqDocs.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/RequiredDocuments/reqDocs.js index 8b0e8a9d5c..2b33708ba2 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/RequiredDocuments/reqDocs.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/RequiredDocuments/reqDocs.js @@ -21,7 +21,7 @@ const styles = { paddingLeft: "5px" }, ptheader: { - color: "red", + color: "#2947a3", fontFamily: "Roboto", fontSize: "20px", fontWeight: 500, @@ -36,7 +36,7 @@ const styles = { lineHeight: "19px" }, docs: { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontFamily: "Roboto", fontSize: "14px", fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/acknowledgementResource/acknowledgementUtils.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/acknowledgementResource/acknowledgementUtils.js index 98d78ac91a..c38173ab44 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/acknowledgementResource/acknowledgementUtils.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-containers/acknowledgementResource/acknowledgementUtils.js @@ -15,7 +15,7 @@ const style = { flex: 2 }, tailText: { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, fontWeight: 400 }, @@ -65,7 +65,7 @@ const constructFooterObj = (footerUrlConfig)=>{ minWidth: "180px", height: "48px", color: "#fff", - backgroundolor:" #FE7A51" + backgroundolor:" #2947a3" } }, ButtonLabel:{ @@ -114,7 +114,7 @@ const downloadprintMenu = ( downloadMenu, printMenu) => { leftIcon: "cloud_download", rightIcon: "arrow_drop_down", props: { - variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: + variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu @@ -129,7 +129,7 @@ const downloadprintMenu = ( downloadMenu, printMenu) => { label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } } @@ -201,7 +201,7 @@ export const getAcknowledgementCard = ({ leftIcon: "cloud_download", rightIcon: "arrow_drop_down", props: { - variant: "outlined", style: { height: "60px", color: "#FE7A51", marginRight: "5px" }, className: + variant: "outlined", style: { height: "60px", color: "#2947a3", marginRight: "5px" }, className: "tl-download-button" }, menu: downloadMenu @@ -210,7 +210,7 @@ export const getAcknowledgementCard = ({ label: { labelName: "PRINT", labelKey: "TL_PRINT" }, leftIcon: "print", rightIcon: "arrow_drop_down", - props: { variant: "outlined", style: { height: "60px", color: "#FE7A51" }, className: "tl-print-button" }, + props: { variant: "outlined", style: { height: "60px", color: "#2947a3" }, className: "tl-print-button" }, menu: printMenu } }, diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/DownloadPrintButton/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/DownloadPrintButton/index.js index 2555e1ee9d..201d4fe7cb 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/DownloadPrintButton/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/DownloadPrintButton/index.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginRight: theme.spacing.unit * 2 }, button: { - border : "1px solid #FE7A51" + border : "1px solid #2947a3" }, leftIcon: { marginRight: theme.spacing.unit diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/FeesEstimateCard/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/FeesEstimateCard/index.js index b9eb3bc587..68af33f927 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/FeesEstimateCard/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/FeesEstimateCard/index.js @@ -22,7 +22,7 @@ const styles = { }, whiteCardText: { padding: 8, - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontFamily: "Roboto", fontSize: 14, fontWeight: 400, diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LandingPage/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LandingPage/index.js index 41a91c602a..c9768c8a74 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LandingPage/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LandingPage/index.js @@ -25,7 +25,7 @@ const styles = theme => ({ cursor: "pointer" }, icon: { - color: "#fe7a51" + color: "#2947a3" }, item: { padding: 8 diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LoadingIndicator/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LoadingIndicator/index.js index fdea9fe9ae..6ab7b4e624 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LoadingIndicator/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/LoadingIndicator/index.js @@ -26,7 +26,7 @@ const style = { left: 0, right: 0, transform: "none", - color: "#FE7A51" + color: "#2947a3" } }; diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Map/index.css b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Map/index.css index da0fc9ed88..a00956e228 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Map/index.css +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Map/index.css @@ -65,7 +65,7 @@ margin-left: 32px; width: 82%; height: 40px; - background-color: #f89a3f; + background-color: #2947a3; position: absolute; font-family: Roboto; font-size: 14px; diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/RadioGroup/index.css b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/RadioGroup/index.css index f536cc805f..af82663d15 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/RadioGroup/index.css +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/RadioGroup/index.css @@ -1,7 +1,7 @@ .radio-root { margin-bottom: 0; height: 30px; - color: #fe7a51; + color: #2947a3; width: 35px; } diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/SingleApplication/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/SingleApplication/index.js index ce9756c0c8..c16b66bd7d 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/SingleApplication/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/SingleApplication/index.js @@ -245,7 +245,7 @@ class SingleApplication extends React.Component { labelKey={(item.status === "APPROVED" || item.status === "EXPIRED") && moduleName === "TL" ? "TL_VIEW_DETAILS_RENEWAL" : "TL_VIEW_DETAILS"} textTransform={"uppercase"} style={{ - color: "#fe7a51", + color: "#2947a3", fontSize: 14, textTransform: "uppercase" }} diff --git a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Stepper/index.js b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Stepper/index.js index 8b3ad99c98..9162600075 100644 --- a/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Stepper/index.js +++ b/web/rainmaker/dev-packages/egov-ui-framework-core/src/ui-molecules/Stepper/index.js @@ -25,7 +25,7 @@ const theme = createMuiTheme({ color: '#39CB74!important', }, active: { - color: '#fe7a51!important', + color: '#2947a3!important', }, text:{ fontSize: "12px!important", diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/styles/app.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/styles/app.scss index 69374ad5b6..20076d0abc 100755 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/styles/app.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/styles/app.scss @@ -81,9 +81,11 @@ input[type="number"]::-webkit-outer-spin-button { .color-yellow-green { background: #7ed321; } + .color-deep-lilac { background: #8e44ad; } + .color-white { color: #ffffff !important; } @@ -103,9 +105,11 @@ input[type="number"]::-webkit-outer-spin-button { .color-lightning-yellow { background: #f5a623 !important; } + .color-grey { color: #767676 !important; } + .color-cinnabar { color: #e74c3c; } @@ -143,45 +147,50 @@ body.employee-user-profile { .screen-title-label { display: inline-block; } -.menu-search-container >div >svg{ - color: rgba(0, 0, 0, 0.87) !important; + +.menu-search-container>div>svg { + color: rgba(0, 0, 0, 0.87) !important; } + @media only screen and (max-width: 768px) { .screenHeaderLabelStyle .label-text { line-height: 20px !important; font-size: 18px !important; } } + @media only screen and (min-width: 768px) { .screenHeaderLabelStyle .label-text { color: #484848 !important; font-size: 14px !important; } - - .with-icon-menu{ - width : calc(100% - 50px ); + + .with-icon-menu { + width: calc(100% - 50px); margin-left: 50px; } + .full-menu-drawer .textfield { margin-left: 5px; - width:auto !important; - background-color:#34495E !important; + width: auto !important; + background-color: #ffffff !important; } -.menu-search-container >div >svg{ - color:#fff !important; -} + .menu-search-container>div>svg { + color: #757575 !important; + } - .menu-search-container{ - background-color: #34495E; + .menu-search-container { + background-color: #ffffff; margin: 0 5px; - } - .icon-menu-drawer{ - svg{ + + .icon-menu-drawer { + svg { margin: auto !important; } - input{ + + input { width: 0px !important; } } @@ -195,6 +204,7 @@ body.employee-user-profile { .search-input-style { border-radius: 4px; } + .btn-with-bottom-nav { position: fixed !important; //bottom: 56px; use this value if bottom navigation is included in future design @@ -203,6 +213,7 @@ body.employee-user-profile { width: 100%; padding: 0px !important; } + .btn-without-bottom-nav { position: fixed; bottom: 0px; @@ -270,7 +281,7 @@ body.employee-user-profile { } .action-menu-drawer .drawer-backGround { - background-color:#34495E; + background-color: #ffffff !important; top: 64px !important; } @@ -279,11 +290,11 @@ body.employee-user-profile { } .action-menu-drawer { - background-color:#34495E; + background-color: #ffffff !important; min-height: calc(100vh - 64px); position: fixed; z-index: 1001; - border-right: 1px solid #00000024; + border-right: 1px solid #e0e0e0 !important; padding: 0px; } @@ -312,6 +323,7 @@ body.employee-user-profile { .sort-button { display: none; } + // .screen-with-bredcrumb{ // padding-top:45px; // div:nth-child(1){ @@ -319,27 +331,27 @@ body.employee-user-profile { // div:nth-child(2){ // margin-bottom: -35px; // display: contents !important; - // div:nth-child(1){ - // div{ - // button{ - // width: 340px; - // } - // } - // } - // div:nth-child(2){ - // div{ - // button{ - // width: 340px; - // margin-left: 0px !important; - // } - // } - // } - // } + // div:nth-child(1){ + // div{ + // button{ + // width: 340px; + // } + // } // } - + // div:nth-child(2){ + // div{ + // button{ + // width: 340px; + // margin-left: 0px !important; + // } + // } + // } + // } + // } + // } } - + @media only screen and (max-width: 768px) { @@ -354,7 +366,7 @@ body.employee-user-profile { @media only screen and (min-width: 768px) { .responsive-action-button-cont { - // position: absolute; + // position: absolute; bottom: 0px; width: 100%; background: #fff; @@ -382,46 +394,53 @@ body.employee-user-profile { .form-without-button-cont-generic { padding: 0 16px; } + .pgr-call-icon { pointer-events: none; } - .menu-right-icon{ - fill:rgba(255, 255, 255, 0.87) !important; + + .menu-right-icon { + fill: #374151 !important; } - .left-icon-color{ - fill:rgba(255, 255, 255, 0.87) !important; + .left-icon-color { + fill: #374151 !important; } - .menu-label-style{ - color:rgba(255, 255, 255, 0.87) !important; - fill:rgba(255, 255, 255, 0.87) !important; + + .menu-label-style { + color: #757575 !important; + fill: #757575 !important; } - .menu-label-style1{ - color:rgba(255, 255, 255, 0.87) !important; - fill:rgba(255, 255, 255, 0.87) !important; - background-color:#34495E !important; + .menu-label-style1 { + color: #757575 !important; + fill: #757575 !important; + background-color: #ffffff !important; } - + } + @media only screen and (max-width: 768px) { .pgr-call-icon span { display: none !important; } } + @media only screen and (max-width: 768px) { .citizen-mobileNumber-style { display: block !important; margin-top: 3px; } + .citizen-mobileNumber-style span { margin-left: 25px !important; } + .citizen-mobileNumber-style svg { margin-left: 0px !important; } } -@media only screen and (max-width: 768px) { -} + +@media only screen and (max-width: 768px) {} //report css starts .paginate_button { @@ -432,18 +451,20 @@ body.employee-user-profile { .paginate_button a { box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 6px, rgba(0, 0, 0, 0.12) 0px 1px 4px; } -.pagination > .active > a, -.pagination > .active > a:focus, -.pagination > .active > a:hover, -.pagination > .active > span, -.pagination > .active > span:focus, -.pagination > .active > span:hover { + +.pagination>.active>a, +.pagination>.active>a:focus, +.pagination>.active>a:hover, +.pagination>.active>span, +.pagination>.active>span:focus, +.pagination>.active>span:hover { z-index: 3; color: #fff; cursor: default; - background-color: #f58720 !important; - border-color: #f58720 !important; + background-color: #2947a3 !important; + border-color: #2947a3 !important; } + //bootstrap .pagination { display: inline-block; @@ -451,11 +472,13 @@ body.employee-user-profile { margin: 20px 0; border-radius: 4px; } -.pagination > li { + +.pagination>li { display: inline; } -.pagination > li > a, -.pagination > li > span { + +.pagination>li>a, +.pagination>li>span { position: relative; float: left; padding: 6px 12px; @@ -466,78 +489,89 @@ body.employee-user-profile { background-color: #fff; border: 1px solid #ddd; } -.pagination > li:first-child > a, -.pagination > li:first-child > span { + +.pagination>li:first-child>a, +.pagination>li:first-child>span { margin-left: 0; border-top-left-radius: 4px; border-bottom-left-radius: 4px; } -.pagination > li:last-child > a, -.pagination > li:last-child > span { + +.pagination>li:last-child>a, +.pagination>li:last-child>span { border-top-right-radius: 4px; border-bottom-right-radius: 4px; } -.pagination > li > a:focus, -.pagination > li > a:hover, -.pagination > li > span:focus, -.pagination > li > span:hover { + +.pagination>li>a:focus, +.pagination>li>a:hover, +.pagination>li>span:focus, +.pagination>li>span:hover { z-index: 2; color: #23527c; background-color: #eee; border-color: #ddd; } -.pagination > .active > a, -.pagination > .active > a:focus, -.pagination > .active > a:hover, -.pagination > .active > span, -.pagination > .active > span:focus, -.pagination > .active > span:hover { + +.pagination>.active>a, +.pagination>.active>a:focus, +.pagination>.active>a:hover, +.pagination>.active>span, +.pagination>.active>span:focus, +.pagination>.active>span:hover { z-index: 3; color: #fff; cursor: default; background-color: #337ab7; border-color: #337ab7; } -.pagination > .disabled > a, -.pagination > .disabled > a:focus, -.pagination > .disabled > a:hover, -.pagination > .disabled > span, -.pagination > .disabled > span:focus, -.pagination > .disabled > span:hover { + +.pagination>.disabled>a, +.pagination>.disabled>a:focus, +.pagination>.disabled>a:hover, +.pagination>.disabled>span, +.pagination>.disabled>span:focus, +.pagination>.disabled>span:hover { color: #777; cursor: not-allowed; background-color: #fff; border-color: #ddd; } -.pagination-lg > li > a, -.pagination-lg > li > span { + +.pagination-lg>li>a, +.pagination-lg>li>span { padding: 10px 16px; font-size: 18px; line-height: 1.3333333; } -.pagination-lg > li:first-child > a, -.pagination-lg > li:first-child > span { + +.pagination-lg>li:first-child>a, +.pagination-lg>li:first-child>span { border-top-left-radius: 6px; border-bottom-left-radius: 6px; } -.pagination-lg > li:last-child > a, -.pagination-lg > li:last-child > span { + +.pagination-lg>li:last-child>a, +.pagination-lg>li:last-child>span { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -.pagination-sm > li > a, -.pagination-sm > li > span { + +.pagination-sm>li>a, +.pagination-sm>li>span { padding: 5px 10px; font-size: 12px; line-height: 1.5; } -.pagination-sm > li:first-child > a, -.pagination-sm > li:first-child > span { + +.pagination-sm>li:first-child>a, +.pagination-sm>li:first-child>span { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.pagination-sm > li:last-child > a, -.pagination-sm > li:last-child > span { + +.pagination-sm>li:last-child>a, +.pagination-sm>li:last-child>span { border-top-right-radius: 3px; border-bottom-right-radius: 3px; } @@ -546,35 +580,78 @@ body.employee-user-profile { //menu drawer chnages -.icon-menu-drawer{ - width:50px; +@media only screen and (min-width: 768px) { + .action-menu-drawer { + transition: width 0.25s cubic-bezier(0.4, 0, 0.2, 1) !important; + } + + .icon-menu-drawer { + width: 50px !important; + } + + .full-menu-drawer { + width: 240px !important; + } + + .icon-menu-drawer .menu-search-container { + display: none !important; + } } -.icon-menu-drawer .menuStyle,.icon-menu-drawer .menu-right-icon,.icon-menu-drawer .textfield .label-container,.icon-menu-drawer .menu-item-title{ +.icon-menu-drawer .menuStyle, +.icon-menu-drawer .menu-right-icon, +.icon-menu-drawer .textfield .label-container, +.icon-menu-drawer .menu-item-title, +.icon-menu-drawer .submenu-item { display: none !important; } -.icon-menu-drawer .sideMenuItem >div >span{ + +.icon-menu-drawer .sideMenuItem { + position: relative !important; + width: auto !important; +} + +.icon-menu-drawer .sideMenuItem>div { + width: 100% !important; + height: 100% !important; display: flex !important; - align-items: center + align-items: center !important; + justify-content: center !important; } -.icon-menu-drawer .sideMenuItem >div >span >div{ - width: 100% + +.icon-menu-drawer .sideMenuItem>div>span { + display: flex !important; + align-items: center !important; + justify-content: center !important; + width: 100% !important; + height: 100% !important; +} + +.icon-menu-drawer .sideMenuItem>div>span>div { + display: flex !important; + align-items: center !important; + justify-content: center !important; + width: 100% !important; + height: 100% !important; + padding: 0 !important; } -.icon-menu-drawer .pull-left,.icon-menu-drawer .pull-right { - text-align: center; - float: none !important; +.icon-menu-drawer .pull-left, +.icon-menu-drawer .pull-right { + display: none !important; } -.icon-menu-drawer .iconClassHover{ - margin: auto !important; - left:unset !important; +.icon-menu-drawer .iconClassHover { + position: static !important; + margin: 0 !important; + transform: none !important; } + .drawer-toggle-button { - background : #fe7a511f; - display:inline-block; + background: #2947a31f; + display: inline-block; border-radius: 50%; - border: 1px solid #fe7a511f !important; + border: 1px solid #2947a31f !important; } // div[role="dialog"] { @@ -583,3 +660,369 @@ body.employee-user-profile { // max-height: calc(100% - 150px); // } // } + +/* Selector Button Styles */ +.selector-button { + color: #ffffff !important; + border: none !important; + border-radius: 0.375rem; + padding: 0.5rem 1rem; + font-family: Roboto, sans-serif; + font-weight: 500; + font-size: 0.875rem; + line-height: 1.25rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; + text-align: center; + display: inline-flex; + align-items: center; + justify-content: center; + min-height: 40px; + height: auto; + width: 100%; + margin: 0; + + @media (min-width: 768px) { + width: 30%; + } + + &:hover { + opacity: 0.9; + } + + h2 { + color: #ffffff !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + font-weight: 500 !important; + margin: 0 !important; + padding: 0 !important; + width: 100%; + } +} + +.selector-button-primary { + @extend .selector-button; + background-color: #2947a3 !important; + width: 100%; + + &:hover { + background-color: #1e3a8a !important; + } +} + +.selector-button-secondary { + @extend .selector-button; + background-color: #ffffff !important; + color: #2947a3 !important; + + h2 { + color: #2947a3 !important; + } +} + +.selector-button-border { + background-color: #2947a3 !important; + color: #ffffff !important; + border: none !important; + border-radius: 0.375rem; + padding: 0.5rem 1rem; + font-family: Roboto, sans-serif; + font-weight: 500; + font-size: 0.875rem; + line-height: 1.25rem; + cursor: pointer; + transition: all 0.2s ease; + white-space: normal; + word-break: break-word; + overflow-wrap: break-word; + text-align: center; + display: inline-flex; + align-items: center; + justify-content: center; + height: auto; + min-height: 40px; + margin: 0; + width: 100%; + + &:hover { + background-color: #1e3a8a !important; + opacity: 0.9; + } + + h2 { + color: #ffffff !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + font-weight: 500 !important; + margin: 0 !important; + padding: 0 !important; + border: none !important; + width: 100%; + } +} + +.input-mirror-selector-button { + height: 4rem !important; + background-color: #f2f2f2 !important; + text-align: center !important; + border-bottom: 2px solid #e0e0e0 !important; + outline: none !important; + padding-left: 24px !important; + padding-right: 24px !important; + + &:focus { + outline: none !important; + } + + h2 { + font-family: Roboto, sans-serif; + font-weight: 500; + font-size: 0.875rem; + color: #484848; + } +} + +.selector-button-primary-disabled { + height: 2rem !important; + background-color: #2947a3 !important; + text-align: center !important; + border-bottom: 2px solid #e0e0e0 !important; + outline: none !important; + padding-left: 24px !important; + padding-right: 24px !important; + opacity: 0.5 !important; + + &:focus { + outline: none !important; + } + + h2 { + font-family: Roboto, sans-serif; + font-weight: 500; + font-size: 0.875rem; + color: #ffffff; + } +} + +.submit-bar:focus { + outline: none !important; +} + +.go-back-footer-button { + background-color: white !important; + color: black !important; + border: 1px solid !important; + margin-right: 10px !important; +} + +.action-button-myapplication { + display: flex; + gap: 20px; + flex-wrap: wrap; + margin-top: 10px; +} + +/* Global Material-UI Button Overrides */ +.MuiButton-root { + font-family: Roboto, sans-serif !important; + font-weight: 500 !important; + border-radius: 0.375rem !important; + text-transform: none !important; +} + +/* Contained / Raised buttons (Primary, Secondary, default) */ +.MuiButton-contained, +.MuiButton-containedPrimary, +.MuiButton-containedSecondary, +.MuiButton-raised, +.MuiButton-raisedPrimary, +.MuiButton-raisedSecondary { + background-color: #2947a3 !important; + color: #ffffff !important; + box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1) !important; + + &:hover { + background-color: #1e3a8a !important; + } +} + +/* Outlined buttons */ +.MuiButton-outlined, +.MuiButton-outlinedPrimary, +.MuiButton-outlinedSecondary { + border: 1px solid #2947a3 !important; + color: #2947a3 !important; + background-color: transparent !important; + + &:hover { + background-color: rgba(41, 71, 163, 0.08) !important; + border-color: #1e3a8a !important; + color: #1e3a8a !important; + } + + /* Target icons inside outlined buttons */ + svg, + i, + .material-icons { + color: #2947a3 !important; + fill: #2947a3 !important; + } + + &:hover { + + svg, + i, + .material-icons { + color: #1e3a8a !important; + fill: #1e3a8a !important; + } + } +} + +/* Text / Flat buttons */ +.MuiButton-text, +.MuiButton-textPrimary, +.MuiButton-textSecondary, +.MuiButton-flat, +.MuiButton-flatPrimary, +.MuiButton-flatSecondary { + color: #2947a3 !important; + + &:hover { + background-color: rgba(41, 71, 163, 0.08) !important; + color: #1e3a8a !important; + } + + svg, + i, + .material-icons { + color: #2947a3 !important; + fill: #2947a3 !important; + } +} + +/* Standard HTML Buttons */ +button, +input[type="button"], +input[type="submit"] { + font-family: Roboto, sans-serif !important; + border-radius: 8px !important; +} + +[class*="MuiButton-root"], +[class*="MuiButton-contained"], +[class*="MuiButton-raised"] { + background: linear-gradient(135deg, #2563eb, #1e40af) !important; +} + +[class*="MuiButton-outlined"], +[class*="MuiButton-flat"] { + background: inherit !important; +} + +/* Card Styles */ +.rainmaker-card, +[class*="MuiCard-root"] { + border-radius: 14px !important; + background: linear-gradient(135deg, #fff, #f8fafb) !important; + border: 1px solid #e1e8f0 !important; + box-shadow: 0 12px 32px rgba(30, 58, 138, 0.08), 0 4px 12px rgba(0, 0, 0, 0.04) !important; +} + +.rainmaker-card label, +.rainmaker-card [class*="MuiFormLabel-root"], +.rainmaker-card [class*="MuiInputLabel-root"], +[class*="MuiCard-root"] label, +[class*="MuiCard-root"] [class*="MuiFormLabel-root"], +[class*="MuiCard-root"] [class*="MuiInputLabel-root"] { + font-size: 16px !important; + color: #0f172a; +} + +.rainmaker-card .label-text, +[class*="MuiCard-root"] .label-text { + font-size: 16px !important; + color: #0f172a; +} + +.rainmaker-card [class*="MuiInputLabel-shrink"], +[class*="MuiCard-root"] [class*="MuiInputLabel-shrink"] { + transform: translate(0, 1.5px) scale(1) !important; +} + +.rainmaker-card [class*="MuiTypography-subheading"], +.rainmaker-card [class*="MuiTypography-title"], +.rainmaker-card [class*="MuiTypography-headline"], +.rainmaker-card [class*="MuiTypography-h6"], +.rainmaker-card [class*="MuiTypography-h5"], +.rainmaker-card [class*="MuiTypography-subtitle1"], +[class*="MuiCard-root"] [class*="MuiTypography-subheading"], +[class*="MuiCard-root"] [class*="MuiTypography-title"], +[class*="MuiCard-root"] [class*="MuiTypography-headline"], +[class*="MuiCard-root"] [class*="MuiTypography-h6"], +[class*="MuiCard-root"] [class*="MuiTypography-h5"], +[class*="MuiCard-root"] [class*="MuiTypography-subtitle1"] { + font-size: 24px !important; + font-weight: 700 !important; +} + +[class*="MuiButton-root"] label, +[class*="MuiButton-root"] .label-text, +button label, +button .label-text { + color: inherit; + font-size: inherit !important; +} + +[class*="MuiButton-contained"] label, +[class*="MuiButton-contained"] .label-text, +[class*="MuiButton-raised"] label, +[class*="MuiButton-raised"] .label-text { + color: #ffffff !important; +} + +[class*="MuiButton-contained"], +[class*="MuiButton-raised"], +.btn-primary { + background: linear-gradient(135deg, #2563eb, #1e40af) !important; + color: #ffffff !important; + border: none !important; + border-radius: 8px !important; + padding: 0.5rem 1rem !important; + font-family: Roboto, sans-serif !important; + font-weight: 500 !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + cursor: pointer !important; + transition: all 0.2s ease !important; + white-space: normal !important; + word-break: break-word !important; + overflow-wrap: break-word !important; + text-align: center !important; +} + +[class*="MuiButton-contained"]:hover, +[class*="MuiButton-raised"]:hover, +.btn-primary:hover { + opacity: 0.9 !important; +} + +[class*="MuiButton-contained"] span, +[class*="MuiButton-raised"] span, +.btn-primary span { + color: #ffffff !important; +} + +/* Global Link Styles */ +a, +a:hover, +a:visited, +a:active, +.link, +[class*="link"] { + color: #5b68f0 !important; +} \ No newline at end of file diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.js index f655ddd321..bfcb6b9fbc 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.js @@ -11,8 +11,8 @@ const selectedLabelStyle = { }; const selectedStyle = { - backgroundColor: "#fe7a51", - border: "1px solid #fe7a51", + backgroundColor: "#2947a3", + border: "1px solid #2947a3", }; const defaultStyle = { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.scss index ba03b09d82..e6503aca21 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/LanguageSelectionForm/index.scss @@ -10,7 +10,7 @@ } .lang-continue-button>button{ - background-color: #FE7A51 !important; + background-color: #2947a3 !important; } .lang-continue-button:hover>button>div{ background-color: #D86845 !important; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/OTPForm/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/OTPForm/index.scss index 70c597764c..06ab88780b 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/OTPForm/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/User/components/OTPForm/index.scss @@ -14,9 +14,9 @@ } .otp-resend .label-text { - color: #fe7a51; + color: #2947a3; } .otp-prompt .label-text { - color: "rgba(0, 0, 0, 0.6000000238418579)"; + color: "#2947a3"; } diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/common/ActionFooter/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/common/ActionFooter/index.js index f13e8ea8c7..2ce69816bb 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/common/ActionFooter/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/common/ActionFooter/index.js @@ -9,9 +9,9 @@ const ActionFooter = ({ label1, label2, primaryAction, secondaryAction }) => {
{label1 && (
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.js index 0164e6890f..e72318b2cb 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.js @@ -38,7 +38,7 @@ const statusCommonIconStyle = { ...timelineIconCommonStyle, backgroundColor: "#ffffff", boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12)", - border: "solid 1px #fe7a51", + border: "solid 1px #2947a3", }; const statusResolvedIconStyle = { @@ -66,7 +66,7 @@ const callIconStyle = { const connectorStyle = { display: "block", - border: "solid 1px #fe7a51", + border: "solid 1px #2947a3", minHeight: "28px", }; @@ -74,12 +74,12 @@ const StatusIcon = ({ status }) => { switch (status) { case "open": case "pending": - return ; + return ; case "reassignrequested": - return ; + return ; case "assigned": case "re-assign": - return ; + return ; case "rejected": return ; case "resolved": @@ -547,7 +547,7 @@ class ComplaintTimeLine extends Component { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.scss index ac5c7af597..2c4ec3f2f7 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/ComplaintTimeLine/index.scss @@ -27,7 +27,7 @@ height: 36px; margin-top: 8px; border-radius: 2px; - background-color: #fe7a51; + background-color: #2947a3; text-align: center; cursor: pointer; padding: 3px 3px; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/Details/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/Details/index.js index 7a294f057f..bfccd4f18f 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/Details/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/Details/index.js @@ -169,7 +169,7 @@ class Details extends Component { style={{ height: 'auto', minWidth: '200px', - backgroundColor: '#fe7a51', + backgroundColor: '#2947a3', }} labelStyle={{ padding: '8px 16px', diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/WriteComment/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/WriteComment/index.js index 2f861fb1d8..c0171f37fd 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/WriteComment/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/pgr/complaintDetails/components/WriteComment/index.js @@ -48,7 +48,7 @@ const WriteComment = ({ form, handleFieldChange, submitForm, userImage, currents inputStyle={{ fontSize: 14, paddingLeft: 5, paddingRight: 40 }} rowsMax={3} /> - +
); }; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.js index bad9e71085..0e19d445e1 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.js @@ -34,12 +34,12 @@ const AcknowledgementCard = (props) => {
- +
- {receiptNo&&

- + {receiptNo&&

+

} {receiptNo&&

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.scss index c99cf7152b..daaf9b4ecd 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AcknowledgementCard/index.scss @@ -16,7 +16,7 @@ .ack-sub-body { margin-top: 8px !important; margin-bottom: 0px !important; - color: rgba(0, 0, 0, 0.6) !important; + color: #2947a3 !important; font-family: Roboto !important; } .ack-text { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/ApplicationPreview/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/ApplicationPreview/index.scss index d0f53fda2d..83f04f5bc2 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/ApplicationPreview/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/ApplicationPreview/index.scss @@ -29,7 +29,7 @@ .flex-container>div { margin: 10px; text-align: center; - background-color: rgb(254, 122, 81); + background-color: rgb(41, 71, 163); } .property-info-access-btn { width: 100%; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/ApplicationHistory/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/ApplicationHistory/index.js index c8b34eb9b2..604f6d899f 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/ApplicationHistory/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/ApplicationHistory/index.js @@ -102,7 +102,7 @@ class ApplicationHistory extends Component { }} > -

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/AssessmentHistory/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/AssessmentHistory/index.js index 7e5b8b3844..a6bc5b7508 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/AssessmentHistory/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/AssessmentList/components/PTInformation/components/AssessmentHistory/index.js @@ -73,7 +73,7 @@ class AssessmentHistory extends Component { height: "35px", backgroundColor: "rgb(242, 242, 242)", boxShadow: "none", - border: "1px solid rgb(254, 122, 81)", + border: "1px solid rgb(41, 71, 163)", borderRadius: "2px", outline: "none", alignItems: "right", @@ -90,7 +90,7 @@ class AssessmentHistory extends Component {
- {/* {receiptNo&&

*/} + {/* {receiptNo&&

*/}

{ptIDLabel.visibility && ( - )}

diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTAcknowledgement/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTAcknowledgement/index.scss index 030ba35a4d..f2bbd3ec14 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTAcknowledgement/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTAcknowledgement/index.scss @@ -16,7 +16,7 @@ .ack-sub-body { margin-top: 8px !important; margin-bottom: 0px !important; - color: rgba(0, 0, 0, 0.6) !important; + color: #2947a3 !important; font-family: Roboto !important; } .ack-text { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.js index 7fad3be73b..c490cc2e60 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.js @@ -29,7 +29,7 @@ class PTExample extends Component { // href={require("./PT_Corporation_Notification.pdf")} target="_blank" > -
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.scss index ef138702aa..0959780b0f 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PTExample/index.scss @@ -8,7 +8,7 @@ } .descriptionStyle a { text-decoration: none; - color: #fe7a51; + color: #2947a3; } .example-label-style .label-text { margin-right: 5px; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PaymentStatus/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PaymentStatus/index.js index cc94ae48ec..91d27fe7b6 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PaymentStatus/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PaymentStatus/index.js @@ -57,18 +57,18 @@ const PaymentStatus = ({ assessmentYear,
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PropertTaxNotification/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PropertTaxNotification/index.scss index fb5ac76e9d..ba63b167ee 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PropertTaxNotification/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/PropertTaxNotification/index.scss @@ -8,7 +8,7 @@ } .descriptionStyle a { text-decoration: none; - color: #fe7a51; + color: #2947a3; } .example-label-style .label-text { margin-right: 5px; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/ActionItems/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/ActionItems/index.js index acf468ba71..d1cbd40fbc 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/ActionItems/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/ActionItems/index.js @@ -21,7 +21,7 @@ const buttonStyle = { }; const viewHistoryLabel = { - color: "rgba(0, 0, 0, 0.6)", + color: "#2947a3", fontFamily: "Roboto", fontSize: "14px", fontWeight: 500, @@ -53,7 +53,7 @@ export const TransferOwnership = ({ ownershipTransfer, openDialog }) => {

@@ -77,7 +77,7 @@ class PendingAmountDialog extends Component { return (
-
) } @@ -85,7 +85,7 @@ class PendingAmountDialog extends Component { ) : (
- {amount > 0 &&
) } @@ -98,7 +98,7 @@ class PendingAmountDialog extends Component { return (
-
) } @@ -106,7 +106,7 @@ class PendingAmountDialog extends Component { ) : (
- {amount > 0 &&
) } diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PendingAmountDue/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PendingAmountDue/index.scss index 6cf1bfaa48..59121de97f 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PendingAmountDue/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PendingAmountDue/index.scss @@ -37,7 +37,7 @@ } .footer-button { - background-color: #FE7A51; + background-color: #2947a3; border-radius: 2px; box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.24), 0 0 8px 0 rgba(0, 0, 0, 0.12), 0 2px 2px 0 rgba(0, 0, 0, 0.24), 0 0 2px 0 rgba(0, 0, 0, 0.12); width: 180px; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js index c36a1adf28..57add49e20 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyAddressInfo/index.js @@ -13,7 +13,7 @@ const localizationLabelsData = initLocalizationLabels(locale); export const getAddressItems = (properties, OldProperty) => { let oldTenantInfo = [], oldStateId = "", oldCityId = "", oldLocality = ""; const { address = {}, tenantId = '' } = properties; - const tenantInfo = tenantId.split('.') || []; + const tenantInfo = (tenantId && tenantId.split('.')) || []; const stateId = tenantInfo && tenantInfo.length === 2 && tenantInfo[0] ? tenantInfo[0].toUpperCase() : 'NA'; const cityId = tenantInfo && tenantInfo.length === 2 && tenantInfo[1] ? tenantInfo[1].toUpperCase() : 'NA'; const localityCode = address.locality && address.locality.code ? address.locality.code : 'NA'; @@ -22,7 +22,7 @@ export const getAddressItems = (properties, OldProperty) => { const surveyid = properties.surveyId; const yearConsTruction = properties.additionalDetails && properties.additionalDetails.yearConstruction || 'NA'; if (OldProperty) { - oldTenantInfo = OldProperty.tenantId.split("."); + oldTenantInfo = (OldProperty.tenantId && OldProperty.tenantId.split(".")) || []; oldStateId = oldTenantInfo[0] && oldTenantInfo[0].toUpperCase(); oldCityId = oldTenantInfo[1] && oldTenantInfo[1].toUpperCase(); oldLocality = OldProperty.address && OldProperty.address.locality && OldProperty.address.locality.code || 'NA'; @@ -86,7 +86,7 @@ export const getAddressItems = (properties, OldProperty) => { } const PropertyAddressInfo = ({ properties, editIcon, OldProperty }) => { - + let surveyid = properties.surveyId; const [isDialogOpen, setDialogOpen] = useState(false); const [surveyId, setSurveyId] = useState(properties ? properties.surveyId : ""); diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.js index 58c3700410..af749df1ae 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.js @@ -65,7 +65,7 @@ class PropertyInfoCard extends Component { style={{ backgroundColor: "transparent", border: "none", - color: "#fe7a51", + color: "#2947a3", cursor: "pointer", padding: 0, fontSize: "14px", diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.scss index a94d9bfb0e..2c23266995 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInfoCard/index.scss @@ -1,4 +1,4 @@ .pt-info-card-style { - margin: 0; - padding: 0; + margin: 0; + padding: 12px; } \ No newline at end of file diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInformation/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInformation/index.js index c01db78ac3..c2a0056818 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInformation/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/PropertyInformation/index.js @@ -15,7 +15,7 @@ const editIconStyle = { width: 19, height: 20, marginRight: 8, - fill: "#fe7a51", + fill: "#2947a3", }; const ReceiptItems = ({ items, propertyTaxAssessmentID, history, tenantId, onButtonClick }) => { @@ -68,7 +68,7 @@ const ReceiptItems = ({ items, propertyTaxAssessmentID, history, tenantId, onBut style={{ cursor: "pointer", marginRight: 5 }} > -
)} */}
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/TotalDues/components/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/TotalDues/components/index.js index 08dd8cab56..6a0fb7bd65 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/TotalDues/components/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/Property/components/TotalDues/components/index.js @@ -12,7 +12,7 @@ const buttonStyle = { float: 'right', backgroundColor: "rgb(242, 242, 242)", boxShadow: "none", - border: "1px solid rgb(254, 122, 81)", + border: "1px solid rgb(41, 71, 163)", borderRadius: "2px", outline: "none", alignItems: "right", @@ -24,7 +24,7 @@ export const TotalDuesButton = ({ labelText, onClickAction, primary }) => { onClick={() => { onClickAction(); }} - label={
} diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/TransformedAssessments/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/TransformedAssessments/index.js index 418484e368..6469248491 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/TransformedAssessments/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/TransformedAssessments/index.js @@ -79,7 +79,7 @@ export const getCompletedTransformedItems = (assessmentsByStatus = [], cities, l />
} {process.env.REACT_APP_NAME === "Citizen" &&
- {this.state.otpButton && + {this.state.otpButton && this.setState({ otpButton: false })} otpButton={this.state.otpButton} /> - } + }
}
{process.env.REACT_APP_NAME === "Citizen" && !this.state.verifyButton&&
diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/RadioButtonForm/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/RadioButtonForm/index.scss index dd97814b82..b9fb758956 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/RadioButtonForm/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/RadioButtonForm/index.scss @@ -40,11 +40,11 @@ input[type="radio"]:before { } input[type="radio"]:checked { - border: 1px solid #fe7a51; + border: 1px solid #2947a3; } input[type="radio"]:checked:before { - background: #fe7a51; + background: #2947a3; } input[type="checkbox"]:focus, input[type="radio"]:focus { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.js index c0354bef57..54e793705b 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.js @@ -14,8 +14,8 @@ const SingleButtonForm = ({ label, form, handleFieldChange, history, urlToAppend }} className="year-range-button" label={label} - labelColor="#fe7a51" - buttonStyle={{ borderRadius: "50px", border: "1px solid #fe7a51" }} + labelColor="#2947a3" + buttonStyle={{ borderRadius: "50px", border: "1px solid #2947a3" }} /> ); }; diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.scss b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.scss index 57911f2bff..d6f1033d1c 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.scss +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/components/SingleButtonForm/index.scss @@ -7,7 +7,7 @@ .year-range-button button :hover{ >div { - background-color: #fe7a51 !important; + background-color: #2947a3 !important; span{color: white !important; } } } \ No newline at end of file diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/index.js index 02e64df98c..d0aeb431c4 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/common/propertyTax/YearDialogue/index.js @@ -13,6 +13,7 @@ import { httpRequest } from "../../../utils/api"; import "./index.css"; import { getTenantId, getUserInfo } from "../../../utils/localStorageUtils"; //"egov-ui-kit/utils/localStorageUtils" + var localityCode = null; var surveyIdcode = null; var editlocalityCode = null; @@ -90,13 +91,13 @@ const breakYear = (financialYear)=>{ } return parseInt(financialYear.split("-")[1]); } -const checkAssessmentStatus = (constructionYear, assessmentArray,tenantId,selectedYear) => { - console.log("assessmentArray",assessmentArray) +const checkAssessmentStatus = (constructionYear, assessmentArray,tenantId,selectedYear, getYearList) => { + //console.log("assessmentArray",getYearList) let missingYears = []; // if(tenantId === "pb.testing" || tenantId === "pb.patiala"){ let checkedYears; - const mFinancialYear = getCurrentFinancialYear() + const mFinancialYear = getYearList[0]; //getCurrentFinancialYear() const currentFinancialYear = breakYear(mFinancialYear) const lastFifthFinancialYear = currentFinancialYear - 4; const newConstructionYear = constructionYear ==='NA' ? lastFifthFinancialYear : breakYear(constructionYear); @@ -214,11 +215,11 @@ class YearDialog extends Component {
let assessed = userType.toUpperCase() === 'CITIZEN' ? checkAssessmentStatus(constructionYear,assessment,propertiestenantId,this.state.selectedYear) // : checkAssessmentStatus(constructionYear,assessment,tenantIdcode,this.state.selectedYear); //console.log("assessed",assessed); - let assessed = checkAssessmentStatus(constructionYear,assessment,propertiestenantId,this.state.selectedYear); + let assessed = checkAssessmentStatus(constructionYear,assessment,propertiestenantId,this.state.selectedYear, getYearList); if(isLocMatch){ if (this.state.selectedYear !== '' && surveyIdcode != null) { if(assessed.length > 0){ diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/AutoSuggestDropdown/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/AutoSuggestDropdown/index.js index 48b42171c6..8aaf0a5697 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/AutoSuggestDropdown/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/AutoSuggestDropdown/index.js @@ -16,7 +16,7 @@ const hintBaseStyle = { color: "rgba(0, 0, 0, 0.3799999952316284)", }; const floatingLabelStyle = { - color: "rgba(0, 0, 0, 0.6000000238418579)", + color: "#2947a3", fontSize: 16, letterSpacing: 0.6, fontWeight: 500, diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/BreadCrumbs/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/BreadCrumbs/index.js index e96c9e5da7..0fb44f6589 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/BreadCrumbs/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/BreadCrumbs/index.js @@ -5,13 +5,13 @@ import { Link } from "react-router-dom"; import "./index.css"; const style = { marginLeft: 10, marginTop: 2, cursor: "pointer" }; -const selStyle = { color: "#fe7a51" }; +const selStyle = { color: "#2947a3" }; const BreadCrumbs = ({ url, history }) => { return (
- + {url && url.map((item, index) => { diff --git a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/Checkbox/index.js b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/Checkbox/index.js index 37970504f7..d5831753a2 100644 --- a/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/Checkbox/index.js +++ b/web/rainmaker/dev-packages/egov-ui-kit-dev/src/components/Checkbox/index.js @@ -11,7 +11,7 @@ const defaultStyle = { }; const selectedIconStyle = { - fill: "#fe7a51", + fill: "#2947a3", }; const CheckboxUi = ({ options, labelStyle, onCheck, style = {}, checkedIcon, iconStyle, containerClassName, selected, id }) => { @@ -22,7 +22,7 @@ const CheckboxUi = ({ options, labelStyle, onCheck, style = {}, checkedIcon, ico key={index} id={id + index} value={option.value} - label={
-
downloadReceipt(tenantId, consumerCode)}> - {/* */} +
downloadReceipt(tenantId, consumerCode)}> + {/* */} {/* */}
diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-molecules-local/common/PaymentStatus/index.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-molecules-local/common/PaymentStatus/index.js index b6abe42ab7..94a45ab224 100644 --- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-molecules-local/common/PaymentStatus/index.js +++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-molecules-local/common/PaymentStatus/index.js @@ -132,7 +132,7 @@ const PaymentStatus = ({ >
{ labelStyle={{ width: "100%", wordWrap: "break-word" }} /> diff --git a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/Home/index.js b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/Home/index.js index 753148c1c0..c9c8a9ad8a 100644 --- a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/Home/index.js +++ b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/Home/index.js @@ -16,7 +16,7 @@ import orderby from "lodash/orderBy"; import "./index.css"; const iconStyle = { - color: "#fe7a51", + color: "#2947a3", height: 45, width: 45, overflow: "visible" diff --git a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/MyComplaints/index.js b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/MyComplaints/index.js index d50990b095..f1e3f0957b 100644 --- a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/MyComplaints/index.js +++ b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/MyComplaints/index.js @@ -76,7 +76,7 @@ class MyComplaints extends Component { history.push("/add-complaint"); }} className="floating-button" - backgroundColor={"#fe7a51"} + backgroundColor={"#2947a3"} > diff --git a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.css b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.css index e6149bee1b..87ed42b7c7 100644 --- a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.css +++ b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.css @@ -11,7 +11,7 @@ margin-left: 10px; } .otp-resend .label-text { - color: #f89a3f; } + color: #2947a3; } .citizen-otp-sent-message .label-container, .citizen-otp-sent-message .label-text { diff --git a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.scss b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.scss index bfe9216555..2d168c493f 100644 --- a/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.scss +++ b/web/rainmaker/dev-packages/pgr-citizen-dev/src/Screens/User/OTP/components/OTPForm/index.scss @@ -14,7 +14,7 @@ } .otp-resend .label-text { - color: #f89a3f; + color: #2947a3; } .citizen-otp-sent-message .label-container, diff --git a/web/rainmaker/dev-packages/pgr-citizen-dev/src/config/theme.js b/web/rainmaker/dev-packages/pgr-citizen-dev/src/config/theme.js index 38a9b9231f..513832ab42 100644 --- a/web/rainmaker/dev-packages/pgr-citizen-dev/src/config/theme.js +++ b/web/rainmaker/dev-packages/pgr-citizen-dev/src/config/theme.js @@ -4,7 +4,7 @@ const theme = { backgroundColor: "#fff", palette: { primary1Color: "#00bcd1", - primary2Color: "#fe7a51", + primary2Color: "#2947a3", textColor: "#5f5c62", canvasColor: "#F7F7F7", borderColor: "#e6e6e6" @@ -13,7 +13,7 @@ const theme = { height: 48 }, raisedButton: { - primaryColor: "#fe7a51" + primaryColor: "#2947a3" }, textField: { backgroundColor: "#ffffff", @@ -23,17 +23,17 @@ const theme = { borderColor: "#e6e6e6" }, floatingActionButton: { - color: "#f58720" + color: "#2947a3" }, bottomNavigation: { backgroundColor: "#ffffff", - selectedColor: "#fe7a51" + selectedColor: "#2947a3" }, stepper: { connectorLineColor: "#f5a623" }, radioButton: { - primaryColor: "#fe7a51" + primaryColor: "#2947a3" } }; diff --git a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.css b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.css index 0d39ccec43..8eb82d38ac 100644 --- a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.css +++ b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.css @@ -1,11 +1,11 @@ .box { background: rgba(248, 154, 63, 0.2); - border: 1px solid #f89a3f; + border: 1px solid #2947a3; border-radius: 10px; margin-top: 8px; } .count-details { - color: #f89a3f; + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 500; diff --git a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.scss b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.scss index 4903e85a3f..0221e01d29 100644 --- a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.scss +++ b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/components/CountDetails/index.scss @@ -1,12 +1,12 @@ .box { background: rgba(248, 154, 63, 0.20000000298023224); - border: 1px solid #f89a3f; + border: 1px solid #2947a3; border-radius: 10px; margin-top: 8px; } .count-details { - color: #f89a3f; + color: #2947a3; font-family: Roboto; font-size: 14px; font-weight: 500; diff --git a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.css b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.css index bbd3374cbf..32080908a7 100644 --- a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.css +++ b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.css @@ -39,9 +39,9 @@ .employee-complaints-tab > div:nth-child(2) > div:first-child { position: relative !important; } .selected-tab-label-text { - color: #fe7a51; } + color: #2947a3; } .unselected-tab-label-text { - color: rgba(0, 0, 0, 0.6); } } + color: #2947a3; } } @media only screen and (max-width: 768px) { .csr-action-buttons { diff --git a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.js b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.js index 0a0cf71d14..4f99ee4693 100644 --- a/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.js +++ b/web/rainmaker/dev-packages/pgr-employee-dev/src/Screens/AllComplaints/index.js @@ -572,7 +572,7 @@ class AllComplaints extends Component { /> } style={{ marginRight: 28, width: "36%" }} - backgroundColor="#fe7a51" + backgroundColor="#2947a3" labelStyle={{ letterSpacing: 0.7, padding: 0, @@ -585,16 +585,16 @@ class AllComplaints extends Component { label={