kunpaoo · Ms-Crexa · Nov 17, 2023 · Nov 19, 2023 · Nov 19, 2023 · Nov 19, 2023
diff --git a/front/package-lock.json b/front/package-lock.json
diff --git a/front/package.json b/front/package.json
@@ -6,21 +6,32 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@fullcalendar/daygrid": "^6.1.9",
+    "@fullcalendar/interaction": "^6.1.9",
+    "@fullcalendar/react": "^6.1.9",
+    "@fullcalendar/timegrid": "^6.1.9",
     "@mui/icons-material": "^5.14.15",
-
-    "@mui/x-charts": "^6.18.1",
-
     "@mui/material": "^5.14.17",
     "@mui/styles": "^5.14.17",
-
+    "@mui/x-charts": "^6.18.1",
+    "@mui/x-date-pickers": "^5.0.12",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "@types/react-big-calendar": "^1.8.4",
     "bootstrap": "^5.3.2",
+    "chart.js": "^4.4.0",
+    "date-fns": "^2.30.0",
+    "fullcalendar": "^6.1.9",
     "react": "^18.2.0",
+    "react-big-calendar": "^1.8.2",
     "react-bootstrap": "^2.8.0",
     "react-bootstrap-calendar": "^0.0.3",
+    "react-chartjs-2": "^5.2.0",
+    "react-colorful": "^5.6.1",
+    "react-datepicker": "^4.21.0",
     "react-dom": "^18.2.0",
+    "react-modal": "^3.16.1",
     "react-notifications-menu": "^1.0.6",
     "react-router-dom": "^6.15.0",
     "react-scripts": "5.0.1",

diff --git a/front/public/assets/bootstrap/css/bootstrap.min.css b/front/public/assets/bootstrap/css/bootstrap.min.css
@@ -13089,3 +13089,5 @@ footer.sticky-footer .copyright {
 body.sidebar-toggled footer.sticky-footer {
   width: 100%;
 }
+
+
diff --git a/front/public/assets/css/styles.min.css b/front/public/assets/css/styles.min.css
@@ -76,3 +76,26 @@
   width: 60%;
   justify-content: end;
 }
+
+@media screen {
+  #printSection {
+    display: none;
+  }
+}
+
+@media print {
+  body * {
+    visibility: hidden;
+  }
+
+  #printSection,
+  #printSection * {
+    visibility: visible;
+  }
+
+  #printSection {
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
+}
diff --git a/front/public/index.html b/front/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
@@ -42,7 +42,8 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.bundle.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js"></script>
-  </head>
+
+</head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>

diff --git a/front/src/App.js b/front/src/App.js
@@ -1,46 +1,21 @@
-import LogIn_Page from './LogIn_Page';
+import LoginPage from "./LoginPage";
 function App() {
 
 
 
 
-<<<<<<< HEAD
-  useEffect(() => {
-    fetch("/api")
-    .then((res) => res.json())
-    .then((data) => {
-      setData(data);
-    })
-  },[])
-
-=======
->>>>>>> main
-
   return (
-    /* BODY CONTAINER */
-    <div id="page-top" class="overflow-hidden">
+   /* BODY CONTAINER */
+   <div id="page-top" class="overflow-hidden">
     <div id="wrapper">
+     {/* MAIN CONTENT */}
 
-
-
-  {/* MAIN CONTENT */}
-
-
-
-    <LogIn_Page/>
+     <LoginPage />
 
-<<<<<<< HEAD
-
-    </div>
-    </div>
-=======
-
->>>>>>> main
-
-    {/* END MAIN CONTENT */}
-    </div>
+     {/* END MAIN CONTENT */}
     </div>
-    /* END BODY CONTAINER */
+   </div>
+   /* END BODY CONTAINER */
   );
 }
 

diff --git a/front/src/Bills/Bills_Payments.js → front/src/Bills/BillsPayments.js b/front/src/Bills/Bills_Payments.js → front/src/Bills/BillsPayments.js
@@ -2,28 +2,30 @@ import Footer from "../Footer";
 import Header from "../Header";
 import Navbar from "../Navbar";
 
-var Bill_Payment = () => {
- function print_body() {
-  document.getElementById("btnPrint").onclick = function () {
-   printElement(document.getElementById("print_body"));
-  };
- }
+var BillPayment = () => {
+  // document.getElementById("btnPrint").onclick = function () {
+  //  printElement(document.getElementById("print_body"));
+  // };
 
- function printElement(elem) {
-  var domClone = elem.cloneNode(true);
+  function btnPrint() {
+    printElement(document.getElementById("printBody"))
+
+  }
 
-  var $printSection = document.getElementById("printSection");
+  function printElement(elem) {
+   var domClone = elem.cloneNode(true);
+   var $printSection = document.getElementById("printSection");
 
-  if (!$printSection) {
-   var $printSection = document.createElement("div");
-   $printSection.id = "printSection";
-   document.body.appendChild($printSection);
-  }
+   if (!$printSection) {
+    var $printSection = document.createElement("div");
+    $printSection.id = "printSection";
+    document.body.appendChild($printSection);
+   }
 
-  $printSection.innerHTML = "";
-  $printSection.appendChild(domClone);
-  window.print();
- }
+   $printSection.innerHTML = "";
+   $printSection.appendChild(domClone);
+   window.print();
+  }
 
  return (
   <div id="page-top" class="overflow-hidden">
@@ -67,11 +69,8 @@ var Bill_Payment = () => {
            <input
             type="date"
             style={{
-             height: "33px",
-             paddingTop: "0px",
-             marginTop: "0px",
-             paddingLeft: "0px",
-             marginLeft: "3px",
+             height: "2rem",
+             marginLeft: "0.2rem",
             }}
            />
            <a
@@ -87,7 +86,7 @@ var Bill_Payment = () => {
              marginRight: "-2px",
              marginLeft: "12px",
             }}
-            href="/List_of_Pricings">
+            href="/ListofPricings">
             List of Pricings
            </a>
           </div>
@@ -264,7 +263,7 @@ var Bill_Payment = () => {
          </div>
          <div
           className="modal-body"
-          id="print_body"
+          id="printBody"
           style={{ paddingLeft: "26px", paddingRight: "36px" }}>
           <div className="row">
            <div className="col-lg-7">
@@ -486,7 +485,7 @@ var Bill_Payment = () => {
           id="btnPrint"
           type="button"
           className="btn btn-outline-secondary m-4"
-          onclick={print_body}>
+          onClick={btnPrint}>
           Print Receipt
          </button>
          <div className="modal-footer">
@@ -1048,8 +1047,7 @@ var Bill_Payment = () => {
          <button
           id="btnPrint"
           type="button"
-          className="btn btn-outline-secondary m-4"
-          onclick={print_body}>
+          className="btn btn-outline-secondary m-4">
           Print Receipt
          </button>
         </div>
@@ -1068,4 +1066,4 @@ var Bill_Payment = () => {
  );
 };
 
-export default Bill_Payment;
+export default BillPayment;
diff --git a/front/src/Bills/List_of_Pricings.js → front/src/Bills/ListofPricings.js b/front/src/Bills/List_of_Pricings.js → front/src/Bills/ListofPricings.js
@@ -5,7 +5,7 @@ import { Button, Table } from "react-bootstrap";
 import "bootstrap/dist/css/bootstrap.min.css";
 import { Link, useNavigate } from "react-router-dom";
 import sample_cust from "../Cust_pages/Cust_list";
-var List_of_Pricings = () => {
+var ListofPricings = () => {
  const history = useNavigate(); //
 
  const handleEdit = (id, Name, Address, Email, Contact) => {
@@ -406,4 +406,4 @@ var List_of_Pricings = () => {
  );
 };
 
-export default List_of_Pricings;
+export default ListofPricings;
diff --git a/front/src/Cust_pages/Create_Customer.js → front/src/Cust_pages/CreateCustomer.js b/front/src/Cust_pages/Create_Customer.js → front/src/Cust_pages/CreateCustomer.js
@@ -7,7 +7,7 @@ import { Link, useNavigate } from "react-router-dom";
 import sample_cust from "./Cust_list";
 import { Tab, Tabs } from "react-bootstrap";
 
-var Create_customer = () => {
+var CreateCustomer = () => {
     const [activeStep, setActiveStep] = useState(0);
 
     const handleTabClick = (step) => {
@@ -161,4 +161,4 @@ var Create_customer = () => {
  );
 };
 
-export default Create_customer;
+export default CreateCustomer;
diff --git a/front/src/Cust_pages/Edit_Cust.js → front/src/Cust_pages/EditCust.js b/front/src/Cust_pages/Edit_Cust.js → front/src/Cust_pages/EditCust.js
@@ -7,7 +7,7 @@ import { Link, useNavigate } from "react-router-dom";
 import sample_cust from "./Cust_list";
 import { Tab, Tabs } from "react-bootstrap";
 
-var Create_customer = () => {
+var EditCustomer = () => {
  const [activeStep, setActiveStep] = useState(0);
 
  const handleTabClick = (step) => {
@@ -154,4 +154,4 @@ var Create_customer = () => {
  );
 };
 
-export default Create_customer;
+export default EditCustomer;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13089,3 +13089,5 @@ footer.sticky-footer .copyright {
		body.sidebar-toggled footer.sticky-footer {
		width: 100%;
		}