Add Product, list Product added, Some bug fixing and structure changes applied.

Author: WebDeveloperGuide

web_admin/public/assets/js/dashboard.js

@@ -81,7 +81,6 @@
             var text = [];
             text.push('<div class="chartjs-legend"><ul>');
             for (var i = 0; i < chart.data.datasets.length; i++) {
-              console.log(chart.data.datasets[i]); // see what's inside the obj.
               text.push('<li>');
               text.push('<span style="background-color:' + chart.data.datasets[i].borderColor + '">' + '</span>');
               text.push(chart.data.datasets[i].label);

web_admin/src/App.css

@@ -33,4 +33,22 @@
   color:#dc3545;
   font-size: 14px;
   padding-top:2px;
-}
+}
+
+textarea.form-control, select.form-control{
+	height: auto;
+}
+
+.fa {
+	font-size: 20px;    
+	padding: 5px;
+	cursor: pointer;
+}
+
+.fa-edit{
+	color: #0088cc;	
+}
+
+.fa-trash{
+	color: #d2322d;	
+}

web_admin/src/components/Header.js

@@ -1,15 +1,16 @@
 import {Link,useHistory} from 'react-router-dom';
 import { logout } from "../redux/actions/userActions";
 import { useDispatch } from "react-redux";
+import logo from "../images/logo.svg";
+import minilogo from "../images/logo-mini.svg";
+import profilePic from "../images/faces/face8.jpg";
 
 
 const Header = () => {
-  const dispatch = useDispatch();
-  const history = useHistory();
+  const dispatch = useDispatch();  
 
   const logoutHandler = () => {
-    dispatch(logout());
-    history.push("/login");
+    dispatch(logout());    
   };
 
 	return(
@@ -22,10 +23,10 @@ const Header = () => {
             </div>
             <div>
               <Link className="navbar-brand brand-logo" to="/dashboard">
-                <img src="assets/images/logo.svg" alt="logo" />
+                <img src={logo} alt="logo" />
               </Link>
               <Link className="navbar-brand brand-logo-mini" to="/dashboard">
-                <img src="assets/images/logo-mini.svg" alt="logo" />
+                <img src={minilogo} alt="logo" />
               </Link>
             </div>
           </div>
@@ -164,10 +165,10 @@ const Header = () => {
               </li>
               <li className="nav-item dropdown d-none d-lg-block user-dropdown">
                 <a className="nav-link" id="UserDropdown" href="#" data-bs-toggle="dropdown" aria-expanded="false">
-                  <img className="img-xs rounded-circle" src="assets/images/faces/face8.jpg" alt="Profile image" /> </a>
+                  <img className="img-xs rounded-circle" src={profilePic} alt="Profile image" /> </a>
                 <div className="dropdown-menu dropdown-menu-right navbar-dropdown" aria-labelledby="UserDropdown">
                   <div className="dropdown-header text-center">
-                    <img className="img-md rounded-circle" src="assets/images/faces/face8.jpg" alt="Profile image" />
+                    <img className="img-md rounded-circle" src={profilePic} alt="Profile image" />
                     <p className="mb-1 mt-3 font-weight-semibold">Allen Moreno</p>
                     <p className="fw-light text-muted mb-0">[email protected]</p>
                   </div>

web_admin/src/components/pages/Login.js

@@ -1,17 +1,15 @@
 import { Link } from "react-router-dom";
 import {useState, useEffect} from 'react';
 import { useDispatch, useSelector } from "react-redux";
-import Loading from "../LoadingError/Loading";
 import { Login } from "../../redux/actions/userActions";
-import Message from "./../LoadingError/Error";
 
 const LoginPage = ({history}) =>{
 
   const [submitted, setSubmitted] = useState(false);  
   const dispatch = useDispatch();
 
   const userLogin = useSelector((state) => state.userLogin);
-  const { error, loading, userInfo } = userLogin;
+  const { userInfo } = userLogin;
 
   const [formState,setFormState] = useState({
         values:{}       

web_admin/src/components/pages/Register.js

@@ -1,10 +1,7 @@
 import { Link } from "react-router-dom";
 import {useState, useEffect} from 'react';
 import { useDispatch, useSelector } from "react-redux";
-import Loading from "../LoadingError/Loading";
-import Toast from "../LoadingError/Toast";
 import { Register, RegisterReset } from "../../redux/actions/userActions";
-import Message from "./../LoadingError/Error";
 
 
 const RegisterPage = ({history}) =>{
@@ -13,7 +10,7 @@ const RegisterPage = ({history}) =>{
   const dispatch = useDispatch();
 
   const userRegister = useSelector((state) => state.userRegister);
-  const { error, loading, register_status } = userRegister;
+  const { register_status } = userRegister;
 
 
   const [formState,setFormState] = useState({
@@ -54,10 +51,7 @@ const RegisterPage = ({history}) =>{
 
 	return(
         <>
-          <Toast />
-              {error && <Message variant="alert-danger">{error}</Message>}
-              {loading && <Loading />}
-    		  <div className="container-scroller">
+          <div className="container-scroller">
             <div className="container-fluid page-body-wrapper full-page-wrapper">
               <div className="content-wrapper d-flex align-items-center auth px-0">
                 <div className="row w-100 mx-0">