From fe897b086e9d5f47de98d7b27907f52dfb4416f6 Mon Sep 17 00:00:00 2001
From: sachinganesh <sachin.ganesh@bizgaze.in>
Date: Mon, 6 Nov 2023 18:12:57 +0530
Subject: [PATCH] code added

---
 components/layout/sidebar.js       |  8 ++-
 components/widget/InvoiceKPI.js    | 97 +++++++-----------------------
 components/widget/PaymentAddKPI.js |  2 +-
 pages/bill.js                      |  4 +-
 pages/invoice.js                   | 35 ++---------
 5 files changed, 37 insertions(+), 109 deletions(-)

diff --git a/components/layout/sidebar.js b/components/layout/sidebar.js
index 8931543..629a77d 100644
--- a/components/layout/sidebar.js
+++ b/components/layout/sidebar.js
@@ -34,7 +34,9 @@ function Sidebar() {
                         </li>
                         <li
                             className={
-                               ` align-items-center d-flex flex-column justify-content-center`
+                                `${  router.pathname == "/water"
+                                ? "active"
+                                : ""} align-items-center d-flex flex-column justify-content-center`
                             }
                         >
                             <Link href="/water">
@@ -56,7 +58,9 @@ function Sidebar() {
                        
                         <li
                             className={
-                              `align-items-center d-flex flex-column justify-content-center`
+                                `${  router.pathname == "/services"
+                                ? "active"
+                                : ""} align-items-center d-flex flex-column justify-content-center`
                             }
                         >
                             <Link href="/services">
diff --git a/components/widget/InvoiceKPI.js b/components/widget/InvoiceKPI.js
index b1e3c66..5c1bd71 100644
--- a/components/widget/InvoiceKPI.js
+++ b/components/widget/InvoiceKPI.js
@@ -16,16 +16,7 @@ function InvoiceKPI({num}) {
                                         <table className="table">
                                             <thead>
                                                 <tr>
-                                                    <th>
-                                                        <div className="form-check">
-                                                            <input
-                                                                className="form-check-input"
-                                                                type="checkbox"
-                                                                value=""
-                                                                id="flexCheckDefault"
-                                                            />
-                                                        </div>
-                                                    </th>
+                                                    
                                                     <th>Client</th>
                                                     <th>Amount</th>
                                                     <th>Status</th>
@@ -34,23 +25,9 @@ function InvoiceKPI({num}) {
                                             </thead>
                                             <tbody>
                                                 <tr>
+                                                    
                                                     <td>
-                                                        <div className="form-check">
-                                                            <input
-                                                                className="form-check-input"
-                                                                type="checkbox"
-                                                                value=""
-                                                                id="flexCheckDefault"
-                                                            />
-                                                        </div>
-                                                    </td>
-                                                    <td>
-                                                        <img
-                                                            src="/images/avatar/1.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                        
                                                         Weston P. Thomas
                                                     </td>
                                                     <td>₹7000</td>
@@ -62,23 +39,9 @@ function InvoiceKPI({num}) {
                                                     <td>February 16, 2021</td>
                                                 </tr>
                                                 <tr>
+                                                    
                                                     <td>
-                                                        <div className="form-check">
-                                                            <input
-                                                                className="form-check-input"
-                                                                type="checkbox"
-                                                                value=""
-                                                                id="flexCheckDefault"
-                                                            />
-                                                        </div>
-                                                    </td>
-                                                    <td>
-                                                        <img
-                                                            src="/images/avatar/2.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                       
                                                         William D. Gibson
                                                     </td>
                                                     <td>₹650</td>
@@ -93,23 +56,9 @@ function InvoiceKPI({num}) {
 
                                                
                                                 <tr>
+                                                    
                                                     <td>
-                                                        <div className="form-check">
-                                                            <input
-                                                                className="form-check-input"
-                                                                type="checkbox"
-                                                                value=""
-                                                                id="flexCheckDefault"
-                                                            />
-                                                        </div>
-                                                    </td>
-                                                    <td>
-                                                        <img
-                                                            src="/images/avatar/5.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                      
                                                         Terry P. Camacho
                                                     </td>
                                                     <td>₹465</td>
@@ -121,25 +70,25 @@ function InvoiceKPI({num}) {
                                                     <td>November 26, 2021</td>
                                                 </tr>
 
+                                                <tr>
+                                                    
+                                                    <td>
+                                                      
+                                                        Terry P. Camacho
+                                                    </td>
+                                                    <td>₹465</td>
+                                                    <td>
+                                                        <span className="badge px-3 py-2 bg-danger">
+                                                            Cancel
+                                                        </span>
+                                                    </td>
+                                                    <td>November 26, 2021</td>
+                                                </tr>
                                                 {num?<React.Fragment>
                                                     <tr>
+                                                   
                                                     <td>
-                                                        <div className="form-check">
-                                                            <input
-                                                                className="form-check-input"
-                                                                type="checkbox"
-                                                                value=""
-                                                                id="flexCheckDefault"
-                                                            />
-                                                        </div>
-                                                    </td>
-                                                    <td>
-                                                        <img
-                                                            src="/images/avatar/5.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                      
                                                         Terry P. Camacho
                                                     </td>
                                                     <td>₹645</td>
diff --git a/components/widget/PaymentAddKPI.js b/components/widget/PaymentAddKPI.js
index 07f5259..fb50ded 100644
--- a/components/widget/PaymentAddKPI.js
+++ b/components/widget/PaymentAddKPI.js
@@ -36,7 +36,7 @@ function PaymentAddKPI() {
                         </div>
                     </div>
 
-                    <div>
+                    <div className='pb-1'>
                     <button className='btn bg-primary br-btn'>Proceed</button>
                     </div>
 
diff --git a/pages/bill.js b/pages/bill.js
index 32e03d3..50c2c15 100644
--- a/pages/bill.js
+++ b/pages/bill.js
@@ -9,7 +9,7 @@ function Bill() {
             <Layout
                 headTitle="Payments"
                 pageTitle="Payments"
-                pageTitleSub={"Welcome Intez Payments page"}
+                pageTitleSub={""}
                 pageClass={"dashboard"}
                 parent={"Home"}
                 child={"Payments"}
@@ -76,7 +76,7 @@ function Bill() {
                                             <p className="mb-0">
                                                 Amount to pay
                                             </p>
-                                            <h5 className="mb-0">$ 532.69</h5>
+                                            <h5 className="mb-0">₹ 532.69</h5>
                                         </li>
                                         <li>
                                             <p className="mb-0">
diff --git a/pages/invoice.js b/pages/invoice.js
index 2475bd2..829312b 100644
--- a/pages/invoice.js
+++ b/pages/invoice.js
@@ -114,12 +114,7 @@ function Invoice() {
                                                         </div>
                                                     </td>
                                                     <td>
-                                                        <img
-                                                            src="/images/avatar/1.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                      
                                                         Weston P. Thomas
                                                     </td>
                                                     <td>$254</td>
@@ -142,12 +137,7 @@ function Invoice() {
                                                         </div>
                                                     </td>
                                                     <td>
-                                                        <img
-                                                            src="/images/avatar/2.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                       
                                                         William D. Gibson
                                                     </td>
                                                     <td>$254</td>
@@ -170,12 +160,7 @@ function Invoice() {
                                                         </div>
                                                     </td>
                                                     <td>
-                                                        <img
-                                                            src="/images/avatar/3.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                       
                                                         John C. Adams
                                                     </td>
                                                     <td>$254</td>
@@ -198,12 +183,7 @@ function Invoice() {
                                                         </div>
                                                     </td>
                                                     <td>
-                                                        <img
-                                                            src="/images/avatar/4.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                       
                                                         John L. Foster
                                                     </td>
                                                     <td>$254</td>
@@ -226,12 +206,7 @@ function Invoice() {
                                                         </div>
                                                     </td>
                                                     <td>
-                                                        <img
-                                                            src="/images/avatar/5.jpg"
-                                                            alt=""
-                                                            width="30"
-                                                            className="me-2"
-                                                        />
+                                                       
                                                         Terry P. Camacho
                                                     </td>
                                                     <td>$254</td>