gdscnitp · anuj1511 · Mar 25, 2022 · Mar 28, 2022 · Mar 28, 2022 · Mar 28, 2022
diff --git a/config/config.js b/config/config.js
@@ -1,5 +1,5 @@
 let config = {
-    MONGO_URL: `mongodb://admin:[email protected].mongodb.net:27017,cluster0-shard-00-01.evrtj.mongodb.net:27017,cluster0-shard-00-02.evrtj.mongodb.net:27017/myFirstDatabase?ssl=true&replicaSet=atlas-xnzvxt-shard-0&authSource=admin&retryWrites=true&w=majority`,
+    MONGO_URL: `mongodb+srv://Anuj:[email protected].mongodb.net/?retryWrites=true&w=majority`,
     DB_CONNECTION_RETTEMPT_LIMIT_NODE: 5,
     SECRET_KEY: "jksdo"
 }

diff --git a/idpass.txt b/idpass.txt
@@ -0,0 +1,2 @@
+[email protected]
+p4n7j07c
diff --git a/pages/auth/TenantSignUp.js b/pages/auth/TenantSignUp.js
@@ -1,4 +1,4 @@
-import Head from 'next/head'
+import Head from "next/head";
 import Image from "next/image";
 import React, { useContext, useEffect, useState } from "react";
 import Tenant from "../../public/images/tenant.png";
@@ -46,7 +46,11 @@ function Tenant_Signup() {
 
   const onSubmit = (e) => {
     e.preventDefault();
-    submitHandler(details);
+    if (!details.contact.match(`[0-9]{10}`)) {
+      alert("Please provide valid phone number");
+    } else {
+      submitHandler(details);
+    }
   };
 
   if (state.userInfo) {

diff --git a/pages/charges/ParticularSiteCharges.js b/pages/charges/ParticularSiteCharges.js
@@ -112,10 +112,21 @@ export default function ParticularSiteCharges() {
                 {state.particularSiteCharges?.length <= 0 ? (
                   <div>
                     <Header header="Total Charges" />
-                    No charges to display
+                    <NameLabel
+                      label="Alias Name"
+                      details={router.query?.name}
+                    />
+                    <div
+                      style={({ width: "500px" }, { margin: "500px" })}
+                      className="m-5"
+                    >
+                      <strong className="shadow-lg p-5 m-5 a-center">
+                        No charges to display
+                      </strong>
+                    </div>
                   </div>
                 ) : (
-                  <div className="p_right">
+                  <div>
                     <Header header="Total Charges" />
 
                     <NameLabel
@@ -129,22 +140,40 @@ export default function ParticularSiteCharges() {
                       details={state.particularSiteCharges[0]?.site_id?.Type}
                     />
                     <NameLabel label="Address" details={getAddress()} />
-
-                    {state.particularSiteCharges.map((data, index) => {
-                      console.log(data);
-                      return (
-                        <TotalchargesCard
-                          key={index}
-                          description={data.description}
-                          siteDetails={data.site_id}
-                        />
-                      );
-                    })}
+                    <div className="row">
+                      {state.particularSiteCharges.map((data, index) => {
+                        if (data.isPaid) {
+                          return (
+                            <div className="col-3 text-white">
+                              <TotalchargesCard
+                                key={index}
+                                date={data.createdAt}
+                                description={data.description}
+                                siteDetails={data.site_id}
+                                color="bg-success"
+                              />
+                            </div>
+                          );
+                        } else {
+                          return (
+                            <div className="col-3 text-white">
+                              <TotalchargesCard
+                                key={index}
+                                date={data.createdAt}
+                                description={data.description}
+                                siteDetails={data.site_id}
+                                color="bg-warning"
+                              />
+                            </div>
+                          );
+                        }
+                      })}
+                    </div>
                   </div>
                 )}
-                <div className="tc">
+                {/* <div className="tc">
                   <Image src={Total_Charges} alt="TC" />
-                </div>
+                </div> */}
               </div>
             </div>
           </div>

diff --git a/pages/charges/components/totalChargesCard.js b/pages/charges/components/totalChargesCard.js
@@ -1,10 +1,15 @@
 import React from "react";
+import Moment from "react-moment";
 
 const TotalchargesCard = (props) => {
   var totalCharges = 0;
 
   return (
-    <div className="p_card1">
+    // return <button className={`btn ${props.classNameProp}`}>{props.name}</button>;
+
+    // <div className="p_card1 `${props.color}`">
+
+    <div className={`p_card1 ${props.color}`}>
       <div className="p_cardb">
         <table cellPadding="4" cellSpacing="4" border="0">
           <thead>
@@ -17,16 +22,22 @@ const TotalchargesCard = (props) => {
               <td>Rent:</td>
               <td>{props.siteDetails?.rent}</td>
             </tr>
+            <tr>
+              <td>Created on:</td>
+              <td><Moment format="MMMM Do YYYY">{props.date}</Moment></td>
+            </tr>
             {props.description
               ? Object.keys(props.description).map((data, index) => {
+                if (data != 'rent') {
                   totalCharges += parseInt(props.description[data]);
                   return (
                     <tr key={index}>
                       <td>{data}:</td>
                       <td>{props.description[data]}</td>
                     </tr>
                   );
-                })
+                }
+              })
               : ""}
           </tbody>
           <tfoot>

diff --git a/pages/editprofile/EditTenant.js b/pages/editprofile/EditTenant.js
@@ -452,7 +452,7 @@ function EditTenant() {
                     })}
 
                     {/* History */}
-                    <div className="row a-edit-content a-row-wrapper">
+                    {/* <div className="row a-edit-content a-row-wrapper">
                       <div className="col-lg-4 col-sm-12">
                         <span className="a-edit-left-title">History</span>
                       </div>
@@ -461,7 +461,7 @@ function EditTenant() {
                           No History
                         </span>
                       </div>
-                    </div>
+                    </div> */}
 
                     {/* Change Password */}
                     <div className="row a-edit-content a-row-wrapper">

diff --git a/pages/editprofile/components/EditBirthday.js b/pages/editprofile/components/EditBirthday.js
@@ -74,7 +74,7 @@ function EditBirthday(props) {
               name="date"
               className="form-select form-select-sm"
               aria-label="form-select"
-              style={{ width: "80px" }}
+              style={{ width: "100px" }}
               onChange={onChange}
             >
               {runCallback(() => {
@@ -126,7 +126,7 @@ function EditBirthday(props) {
               name="year"
               className="form-select form-select-sm"
               aria-label="form-select"
-              style={{ width: "80px" }}
+              style={{ width: "100px" }}
               onChange={onChange}
             >
               {runCallback(() => {

diff --git a/pages/homepage/HomePage.js b/pages/homepage/HomePage.js
@@ -1,4 +1,4 @@
-import Head from 'next/head'
+import Head from "next/head";
 import HomePageBanner from "./components/HomePageBanner";
 import Features from "./components/Features";
 import GetStarted from "./components/GetStarted";
@@ -23,13 +23,13 @@ function HomePage() {
         <title>Home Page</title>
       </Head>
       <HomePageBanner />
-      <div className="Parent">
-        <Taskbar />
-        <div className="S_right">
-          <Features />
-          <GetStarted />
-        </div>
-      </div>
+      {/* <div className="Parent">
+        <Taskbar /> */}
+      {/* <div className="S_right"> */}
+      <Features />
+      <GetStarted />
+      {/* </div>
+      </div> */}
     </>
   );
 }

diff --git a/pages/landing/ParticularSiteCharges.js b/pages/landing/ParticularSiteCharges.js
@@ -16,8 +16,6 @@ export default function ParticularSiteC() {
   const { enqueueSnackbar, closeSnackbar } = useSnackbar();
   const { dispatch, state } = useContext(Store);
 
-
-
   const getAllCharges = async () => {
     console.log("get all called");
     closeSnackbar();

diff --git a/pages/landing/components/ChargesList.js b/pages/landing/components/ChargesList.js
@@ -29,6 +29,7 @@ const ChargesList = (props) => {
         // });
         console.log(res);
         if (res.data?.success) {
+          props.refreshPage();
           enqueueSnackbar("Paid Successfully", { variant: "success" });
         }
       });
@@ -94,8 +95,8 @@ const ChargesList = (props) => {
                 <td>{TitleCaseFormatter(data.site_id?.alias_name)}</td>
                 <td>{TitleCaseFormatter(address)}</td>
                 <td>{rent}</td>
+                <td>{totalCharges - rent}</td>
                 <td>{totalCharges}</td>
-                <td>{rent + totalCharges}</td>
                 <td>
                   {data?.isPaid ? (
                     <button className="btn btn-success" disabled>

diff --git a/pages/landing/components/Identity.js b/pages/landing/components/Identity.js
@@ -1,4 +1,39 @@
+// import { TitleCaseFormatter } from "../../../utility/functions/Formatters/TitleCaseFormatter";
+
+// const Identity = (props) => {
+//   return (
+//     <div className="S_landing">
+//       <div className="S_leftbar">
+//         <div className="S_identity">
+//           <img
+//             className="S_profile img-fluid"
+//             src="/images/Profile.svg"
+//             alt="Profile"
+//           />
+//           <div className="name">
+//             {TitleCaseFormatter(props.userDetails?.firstName)}
+//           </div>
+//         </div>
+//         <div className="S_menu">
+//           <div className="S_option S_option1" onClick={() => props.onShow1()}>
+//             <i className="fas fa-tachometer-alt-fastest"></i>
+//             <span>Your Sites</span>
+//           </div>
+//           <div className="S_option S_option1" onClick={() => props.onShow2()}>
+//             <i className="fab fa-buffer"></i>
+//             <span>Requests</span>
+//           </div>
+//         </div>
+//       </div>
+//     </div>
+//   );
+// };
+
+// export default Identity;
+
 import { TitleCaseFormatter } from "../../../utility/functions/Formatters/TitleCaseFormatter";
+import { useState } from "react";
+import { useEffect } from "react";
 
 const Identity = (props) => {
   return (
@@ -22,6 +57,13 @@ const Identity = (props) => {
           <div className="S_option S_option1" onClick={() => props.onShow2()}>
             <i className="fab fa-buffer"></i>
             <span>Requests</span>
+            {props.getCount() == 0 ? (
+              ""
+            ) : (
+              <i className="fas fa-bell a-set-icon">
+                <span className="a-set-count"> {props.getCount()}</span>
+              </i>
+            )}
           </div>
         </div>
       </div>

diff --git a/pages/landing/components/LandingCardButton.js b/pages/landing/components/LandingCardButton.js
@@ -2,10 +2,11 @@ import { useRouter } from "next/router";
 import NormalBootstrapButton from "./NormalBootstrapButton";
 
 function LandingCardButton(props) {
-  const router = useRouter()
+  const router = useRouter();
   const goToDetailsPage = () => {
-    router.push(props.link)
-  }
+    if (router)
+      router.push(props.link);
+  };
   return (
     <div className="a-landing-card-button" onClick={goToDetailsPage}>
       <NormalBootstrapButton

diff --git a/pages/landing/components/LandingPageCard.js b/pages/landing/components/LandingPageCard.js
@@ -24,7 +24,7 @@ function LandingPageCard(props) {
         console.log(res);
         if (res.data?.success) {
           enqueueSnackbar("Site left", { variant: "success" });
-          router.push("/profile/tenant"); 
+          router.push("/profile/tenant");
         }
       });
     } catch (err) {
@@ -38,7 +38,7 @@ function LandingPageCard(props) {
   return (
     <section className="a-card">
       <div
-        className={`container shadow-lg text-white a-landing-card mt-5 ${props.cclass}`}
+        className={`container shadow-lg a-landing-card mt-5 ${props.cclass}`}
         style={{ width: "65vw" }}
       >
         <div className="row justify-content-md-center p-3">
@@ -52,7 +52,7 @@ function LandingPageCard(props) {
           <div className="col col-lg-8">
             <div className="card-body a-card-body">
               <h5 className="card-title a-landing-card-title">
-                <span className="a-landing-card-heading"> Alias Name: </span>
+                <span className="a-landing-card-heading"> Site Name: </span>
                 <span className="a-landing-card-data">{props.alias}</span>
               </h5>
               <div className="card-text">
@@ -75,7 +75,36 @@ function LandingPageCard(props) {
                 <div>
                   <div className="a-button-container">
                     <div>
-                      <LandingCardButton
+                      <div className="row">
+                        <div className="col">
+                          <LandingCardButton
+                            classNameProp={props.class1}
+                            name={props.text1}
+                            link={`/charges/ParticularSiteCharges?site_id=${props.site_id}&name=${props.alias}`}
+                          />
+                        </div>
+                        <div className="col">
+                          <LandingCardButton
+                            classNameProp={props.class2}
+                            name={props.text2}
+                          />
+                        </div>
+                        <div className="col">
+                          {/* <LandingCardButton
+                            classNameProp={props.class3}
+                            name={props.text3}
+                          /> */}
+                        </div>
+                        <div className="col">
+                          <button
+                            className="btn btn-danger a-landing-card-button"
+                            onClick={leaveHandler}
+                          >
+                            Leave
+                          </button>
+                        </div>
+                      </div>
+                      {/* <LandingCardButton
                         classNameProp={props.class1}
                         name={props.text1}
                         link={`/charges/ParticularSiteCharges?site_id=${props.site_id}`}
@@ -89,13 +118,13 @@ function LandingPageCard(props) {
                         name={props.text3}
                       />
                       <div className="a-landing-card-button">
-                      <button
-                        className="btn btn-danger a-landing-card-button"
-                        onClick={leaveHandler}
-                      >
-                        Leave
-                      </button>
-                    </div>
+                        <button
+                          className="btn btn-danger a-landing-card-button"
+                          onClick={leaveHandler}
+                        >
+                          Leave
+                        </button>
+                      </div> */}
                     </div>
                   </div>
                 </div>