Merge pull request #26 from Edwardb11/refactor/fix

Refactor FIX
Edwardb11 · Oct 4, 2022 · 1c914d3 · 1c914d3
2 parents eb78e45 + eda0afe
commit 1c914d3
Show file tree

Hide file tree

Showing 24 changed files with 255 additions and 99 deletions.
diff --git a/src/admin/AdminPackage.js b/src/admin/AdminPackage.js
@@ -0,0 +1,24 @@
+import React from 'react'
+import Footer from '../components/Footer'
+import NavBar from '../components/NavBar'
+
+const AdminPackage = () => {
+  return (
+    <>
+      <NavBar />
+      <div className="py-10 mt-10">
+        <div className="flex flex-col px-8 mx-auto space-y-12 max-w-7xl xl:px-12">
+          <div className="relative">
+            <h2 className="w-full text-3xl font-bold text-center sm:text-4xl md:text-5xl">
+              {" "}
+              Acciones permitidas
+            </h2>
+          </div>
+        </div>
+      </div>
+      <Footer />
+    </>
+  )
+}
+
+export default AdminPackage
diff --git a/src/admin/Staff.js → src/admin/AdminStaff.js b/src/admin/Staff.js → src/admin/AdminStaff.js
@@ -3,7 +3,7 @@ import StaffCards from "../components/admin/StaffCards";
 import Footer from "../components/Footer";
 import NavBar from "../components/NavBar";
 
-const Staff = () => {
+const AdminStaff = () => {
   return (
     <>
       <NavBar />
@@ -23,4 +23,4 @@ const Staff = () => {
   );
 };
 
-export default Staff;
+export default AdminStaff;
diff --git a/src/admin/AdminView.js b/src/admin/AdminView.js
@@ -4,9 +4,9 @@ import NavBar from "../components/NavBar";
 
 const AdminView = () => {
   return (
-    <div>
+    <div >
       <NavBar />
-      <div>Hola</div>
+      <div className="mt-20">Admin</div>
       <Footer />
     </div>
   );

diff --git a/src/admin/Dashboard.js b/src/admin/Dashboard.js
@@ -0,0 +1,15 @@
+import React from "react";
+import Footer from "../components/Footer";
+import NavBar from "../components/NavBar";
+
+const Dashboard = () => {
+  return (
+    <div>
+      <NavBar />
+      <div lassName="mt-20">Dashboard</div>
+      <Footer />
+    </div>
+  );
+};
+
+export default Dashboard;
diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -1,73 +1,155 @@
-import React from "react";
+import React, { useContext } from "react";
 import { Link } from "react-router-dom";
+import User from "../context/userContext";
 
 const Footer = () => {
-  return (
-    <footer className="footer bg-gray-100 relative pt-1 border-b-2 border-blue-700">
-      <div className="container mx-auto px-6">
-        <div className="sm:flex sm:mt-8">
-          <div className="mt-8 sm:mt-0 sm:w-full sm:px-8 flex flex-col md:flex-row justify-between">
-            <div className="flex flex-col">
-              <span className="font-bold text-gray-700 uppercase mb-2">
-                Seguimiento de paquetes
-              </span>
-              <span className="my-2">
-                <Link to="/tracking" className="text-blue-700  text-md hover:text-blue-500">
-                  Seguimiento
-                </Link>
-              </span>
-              <span className="my-2">
-                <Link to="/package" className="text-blue-700  text-md hover:text-blue-500">
-                  Agregar
-                </Link>
-              </span>
-            </div>
-            <div className="flex flex-col">
-              <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
-                FAQ
-              </span>
+  const { user } = useContext(User);
+  const rol = user?.rol;
+  if (rol === undefined) {
+    return (
+      <footer className="footer bg-gray-100 relative pt-1 border-b-2 border-blue-700">
+        <div className="container mx-auto px-6">
+          <div className="sm:flex sm:mt-8">
+            <div className="mt-8 sm:mt-0 sm:w-full sm:px-8 flex flex-col md:flex-row justify-between">
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mb-2">
+                  Seguimiento de paquetes
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/tracking"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Seguimiento
+                  </Link>
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/package"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Agregar
+                  </Link>
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
+                  FAQ
+                </span>
 
-              <span className="my-2">
-                <Link to="/faq" className="text-blue-700  text-md hover:text-blue-500"> 
-                  Preguntas frecuentes
-                </Link>
-              </span>
-              <span className="my-2">
-                <Link className="text-blue-700  text-md hover:text-blue-500">
-                  Soporte
-                </Link>
-              </span>
+                <span className="my-2">
+                  <Link
+                    to="/faq"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Preguntas frecuentes
+                  </Link>
+                </span>
+                <span className="my-2">
+                  <Link className="text-blue-700  text-md hover:text-blue-500">
+                    Soporte
+                  </Link>
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
+                  Acerca de nosotros
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/about"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    ¿Quiénes somos?
+                  </Link>
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/NoFound"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    404
+                  </Link>
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="container mx-auto px-6">
+          <div className="mt-16 border-t-2 border-gray-300 flex flex-col items-center">
+            <div className="sm:w-2/3 text-center py-6">
+              <p className="text-sm  font-bold mb-2">
+                © 2022 Todos los derechos reservados.
+              </p>
             </div>
-            <div className="flex flex-col">
-              <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
-                Acerca de nosotros
-              </span>
-              <span className="my-2">
-                <Link to="/about" className="text-blue-700  text-md hover:text-blue-500">
-                ¿Quiénes somos?
-                </Link>
-              </span>
-              <span className="my-2">
-                <Link to="/NoFound" className="text-blue-700  text-md hover:text-blue-500">
-                404
-                </Link>
-              </span>
+          </div>
+        </div>
+      </footer>
+    );
+  } else {
+    return (
+      <footer className="footer bg-gray-100 relative pt-1 border-b-2 border-blue-700">
+        <div className="container mx-auto px-6">
+          <div className="sm:flex sm:mt-8">
+            <div className="mt-8 sm:mt-0 sm:w-full sm:px-8 flex flex-col md:flex-row justify-between">
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mb-2">
+                  Seguimiento de paquetes
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/tracking"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Seguimiento UPS
+                  </Link>
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/admin/package"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Administrar Paquetes
+                  </Link>
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
+                  FAQ
+                </span>
 
+                <span className="my-2">
+                  <Link
+                    to="/faq"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    Preguntas frecuentes
+                  </Link>
+                </span>
+                <span className="my-2">
+                  <Link className="text-blue-700  text-md hover:text-blue-500">
+                    Soporte
+                  </Link>
+                </span>
+              </div>
+              <div className="flex flex-col">
+                <span className="font-bold text-gray-700 uppercase mt-4 md:mt-0 mb-2">
+                  Acerca de nosotros
+                </span>
+                <span className="my-2">
+                  <Link
+                    to="/about"
+                    className="text-blue-700  text-md hover:text-blue-500">
+                    ¿Quiénes somos?
+                  </Link>
+                </span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div className="container mx-auto px-6">
-        <div className="mt-16 border-t-2 border-gray-300 flex flex-col items-center">
-          <div className="sm:w-2/3 text-center py-6">
-            <p className="text-sm  font-bold mb-2">
-              © 2022 Todos los derechos reservados.
-            </p>
+        <div className="container mx-auto px-6">
+          <div className="mt-16 border-t-2 border-gray-300 flex flex-col items-center">
+            <div className="sm:w-2/3 text-center py-6">
+              <p className="text-sm  font-bold mb-2">
+                © 2022 Todos los derechos reservados.
+              </p>
+            </div>
           </div>
         </div>
-      </div>
-    </footer>
-  );
+      </footer>
+    );
+  }
 };
-
 export default Footer;
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
@@ -25,7 +25,7 @@ export default function NavBar() {
   const navigation = useNavigation(user);
 
   // Close session of normal user or of the employee according to the one that is connected
-  const logout = () => {
+  const Logout = () => {
     if (user.staffId !== undefined) {
       logoutStaff(user, setLog, setUser);
     }
@@ -123,7 +123,7 @@ export default function NavBar() {
                       <Menu.Item>
                         {({ active }) => (
                           <div
-                            onClick={() => logout()}
+                            onClick={() => Logout()}
                             className={classNames(
                               active ? "bg-gray-100" : "",
                               "block px-4 py-2 text-sm text-gray-700 cursor-pointer	 "

diff --git a/src/components/admin/PackageCards.js b/src/components/admin/PackageCards.js
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const PackageCards = () => {
+  return (
+    <div>PackageCards</div>
+  )
+}
+
+export default PackageCards
diff --git a/src/components/admin/StaffCards.js b/src/components/admin/StaffCards.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { cardData } from "../../utils/cardData.js";
+import { staffCardData } from "../../utils/staffCardData.js";
 import Card from "./Card.js";
 const StaffCards = () => {
   return (
@@ -11,7 +11,7 @@ const StaffCards = () => {
       <section className="pt-10">
         <div className="container shadow-xl ">
           <div className="flex flex-wrap justify-evenly -mx-4">
-            {cardData.map((items) => {
+            {staffCardData.map((items) => {
               return <Card key={items.id} {...items} />;
             })}
           </div>

diff --git a/src/components/LandingPage.js → src/components/client/LandingPage.js b/src/components/LandingPage.js → src/components/client/LandingPage.js
diff --git a/src/components/PackageForms.js → src/components/client/PackageForms.js b/src/components/PackageForms.js → src/components/client/PackageForms.js
@@ -1,6 +1,6 @@
 import React, { useState, useContext } from "react";
-import AddPackage from "../utils/AddPackage";
-import User from "../context/userContext";
+import AddPackage from "../../utils/AddPackage";
+import User from "../../context/userContext";
 
 const PackageForms = () => {
   const Quantitys = [];

diff --git a/src/components/PackagePayment.js → src/components/client/PackagePayment.js b/src/components/PackagePayment.js → src/components/client/PackagePayment.js
@@ -1,8 +1,8 @@
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { useHistory, useParams } from "react-router-dom";
-import { url } from "../api/api";
-import PayBill from "../utils/PayBill";
+import { url } from "../../api/api";
+import PayBill from "../../utils/PayBill";
 
 const PackagePayment = () => {
   const history = useHistory();

diff --git a/src/components/PackagesTable.js → src/components/client/PackagesTable.js b/src/components/PackagesTable.js → src/components/client/PackagesTable.js
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
-import User from "../context/userContext";
-import { url } from "../api/api";
+import User from "../../context/userContext";
+import { url } from "../../api/api";
 import { Link } from "react-router-dom";
 
 const PackagesTable = () => {

diff --git a/src/components/ShowInvoice.js → src/components/client/ShowInvoice.js b/src/components/ShowInvoice.js → src/components/client/ShowInvoice.js
@@ -1,8 +1,8 @@
 import axios from "axios";
 import React, { useEffect, useState } from "react";
 import { Link, useParams } from "react-router-dom";
-import { url } from "../api/api";
-import convertDate from "../utils/convertDate";
+import { url } from "../../api/api";
+import convertDate from "../../utils/convertDate";
 
 const ShowInvoice = () => {
   const { id } = useParams();

diff --git a/src/components/TrackingCard.js → src/components/client/TrackingCard.js b/src/components/TrackingCard.js → src/components/client/TrackingCard.js
diff --git a/src/components/UserFinalForms.js → src/components/client/UserFinalForms.js b/src/components/UserFinalForms.js → src/components/client/UserFinalForms.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import React, { useState } from "react";
 import Swal from "sweetalert2";
-import { url } from "../api/api";
+import { url } from "../../api/api";
 
 const UserFinalForms = () => {
   const [name, setName] = useState("");

diff --git a/src/hooks/useNavigation.js b/src/hooks/useNavigation.js
@@ -18,9 +18,9 @@ const useNavigation = (user) => {
       ]);
     } else if (rol[0].id_roles === 1) {
       return setNavigation([
-        { name: "Inicio", href: "/", current: true },
-        { name: "Resumen", href: "/admin", current: false },
-        { name: "Paquetes", href: "/", current: false },
+        { name: "Inicio", href: "/admin", current: true },
+        { name: "Dashboard", href: "/admin/dashboard", current: false },
+        { name: "Paquetes", href: "/admin/package", current: false },
         { name: "Personal", href: "/admin/staff", current: false },
       ]);
     }