Merge pull request #77 from faustogenga/Fausto-Genga-Updates

logged
faustogenga · Jan 10, 2024 · 1f98860 · 1f98860
2 parents 1c2e5d8 + 25fa3bb
commit 1f98860
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/.firebase/hosting.YnVpbGQ.cache b/.firebase/hosting.YnVpbGQ.cache
@@ -1,17 +1,17 @@
 assets/Banner.png,1703638785713,38dccb0454c885acfa69367ead05525de000c17bc2e030a6772e942705e61fb1
 assets/Main1.png,1700450183617,471a50f9f276fcfcb5908bde034e00da1de8b4a586092149e8a87693f363a447
-asset-manifest.json,1703882091226,7115b983d08c77161faa66a3d7189f3f797dae77594726bf412513d40589161e
-index.html,1703882091216,79afe6722c71cb13674b1d787d60e5fde41c3596127b5173160392c7ae208554
-static/js/main.b8962747.js.LICENSE.txt,1703882091256,96624f7e9892500b3e031c9040b9f823269d63cf6c3cec81df57e8d6d659b7f8
-static/js/reactPlayerPreview.96f45903.chunk.js,1703882091256,d979e678b8806b44cade3b40f624de5532ee905979d5b81257d49f04e3315811
-static/js/reactPlayerPreview.96f45903.chunk.js.map,1703882091256,5e4f91a79965758e3bb251cb8a1a10132988531e4f1f188e2ea3fc0f5571f269
-static/media/bootstrap-icons.64ed46b247405068ca60.woff2,1703882091256,6983d7ac579e11aec931af63b84528623dbf57f0acfd1fc65032e9f3d62ea068
-static/media/bootstrap-icons.66b7720f4a230f1b0341.woff,1703882091256,68ed67de91796a0a2e65156d14b19411ecfe7aaa112ffc94e6112c95cee384aa
-static/css/main.9397bc22.css,1703882091256,78ba4c5c98d08ef2bb4d05fcb5dac6a213cc7bb2ea2a88eaddccd46db27dc161
-static/media/orders_cover.5c91ccee8725ee58a592.jpeg,1703882091256,18e692a7792e4ec1cab01cfcbc3fe96dd045e22c22acf2325cda4ada17beda2e
-static/media/stadiumIage.f21c59172d493ac4f548.jpg,1703882091256,23c582478f59184202b789f762099e642ae1e39caab1e07e62d3de6abedd39a8
-static/css/main.9397bc22.css.map,1703882091256,f12141ae6e9620907ff858269f054884ebe3fdcec54f364c39c608ca1b868ec5
-static/media/Main1.83e854a6bd71459ec53e.png,1703882091256,471a50f9f276fcfcb5908bde034e00da1de8b4a586092149e8a87693f363a447
-static/js/main.b8962747.js,1703882091256,cea05a1477f538eeeb59703a4b4d91199c1a7b4efe629e911afc047fec6ed3a8
-static/media/cart_cover.26f36dff1134d6c55be6.png,1703882091256,f940cb716c27b2bc5f4dfac98991d366d397f5774d0d22eb7f48f37ed757bbe6
-static/js/main.b8962747.js.map,1703882091266,c1d3c4c906a70697a9b8eeae4710b81e05a51a9da97b443f9cff9c9a1745e09d
+asset-manifest.json,1704910782951,9bda537572b2fdcbe7996d9d0900050a302699c2032c613459fcc657c89a6348
+index.html,1704910782949,426666ec92f4a404dd57fd4cab2498d0f9bf9d1769112a76f93a42b1c2e6fe38
+static/js/reactPlayerPreview.96f45903.chunk.js,1704910782984,d979e678b8806b44cade3b40f624de5532ee905979d5b81257d49f04e3315811
+static/js/reactPlayerPreview.96f45903.chunk.js.map,1704910782985,5e4f91a79965758e3bb251cb8a1a10132988531e4f1f188e2ea3fc0f5571f269
+static/js/main.f4e57865.js.LICENSE.txt,1704910782984,96624f7e9892500b3e031c9040b9f823269d63cf6c3cec81df57e8d6d659b7f8
+static/media/bootstrap-icons.64ed46b247405068ca60.woff2,1704910782984,6983d7ac579e11aec931af63b84528623dbf57f0acfd1fc65032e9f3d62ea068
+static/media/bootstrap-icons.66b7720f4a230f1b0341.woff,1704910782984,68ed67de91796a0a2e65156d14b19411ecfe7aaa112ffc94e6112c95cee384aa
+static/css/main.a7c9a791.css,1704910782984,0ea134fef79ee75497e9843976ac8cefc144b7b6c90c43b33293e9dac68674fd
+static/media/orders_cover.5c91ccee8725ee58a592.jpeg,1704910782984,18e692a7792e4ec1cab01cfcbc3fe96dd045e22c22acf2325cda4ada17beda2e
+static/media/stadiumIage.f21c59172d493ac4f548.jpg,1704910782984,23c582478f59184202b789f762099e642ae1e39caab1e07e62d3de6abedd39a8
+static/css/main.a7c9a791.css.map,1704910782985,57e2a5e0449cf7877e35855199236608fd045cf30693718095ad11317eac97aa
+static/media/Main1.83e854a6bd71459ec53e.png,1704910782984,471a50f9f276fcfcb5908bde034e00da1de8b4a586092149e8a87693f363a447
+static/js/main.f4e57865.js,1704910782985,6b6e2cba4498f286f981693e3ea1f610baddbb0be42c5c2444d19426eb9c8776
+static/media/cart_cover.26f36dff1134d6c55be6.png,1704910782986,f940cb716c27b2bc5f4dfac98991d366d397f5774d0d22eb7f48f37ed757bbe6
+static/js/main.f4e57865.js.map,1704910782988,f31bcc5d705740bc4fa3c1ddecc7f90653b315f17b1a4238b46fa639eba472cc
diff --git a/src/CSS/Responsive.css b/src/CSS/Responsive.css
@@ -206,6 +206,10 @@
       width: 100% !important;
     }
 
+    .ordersResponsive tbody tr td button {
+      margin: 3% !important;
+      font-size: xx-small !important;
+    }
 
   }
 
diff --git a/src/components/Catalogsidebar.jsx b/src/components/Catalogsidebar.jsx
@@ -3,12 +3,13 @@ import { Catalogcategories } from './Catalogcategories'
 import { Catalogprices } from './Catalogprices'
 import '../CSS/Catalogsidebar.css'
 
-export const Catalogsidebar = ({ handleClickPrice, handleClickCategory, categoryClicked, priceClicked }) => {
+export const Catalogsidebar = ({ handleClickPrice, handleClickCategory, categoryClicked, priceClicked, loggedIn }) => {
     return (
         <>
             <section className="responsiveCategory sidebar col-2">
                 <div className="logo-container justify-content-left d-flex">
-                    <a href='/cart' style={{textDecoration: 'none'}}>
+                    <a
+                        href={loggedIn ? '/cart' : '/'} style={{ textDecoration: 'none' }}>
                         <h1 className='d-flex'>🛒</h1>
                     </a>
                 </div>

diff --git a/src/components/Orders.jsx b/src/components/Orders.jsx
@@ -180,13 +180,11 @@ export const Orders = ({ user }) => {
                                         </td>
                                         <td className='text-center'> {item.orderDate} {item.orderTime}</td>
                                         <td className='text-center'>
-                                            <h6>
                                                 {item.status === 'Pendiente' ? (
                                                     <button type="button" className="btn btn-primary p-1" onClick={() => openShippingStatus(item)}>{item.status}🕑</button>
                                                 ) : (
                                                     <button type="button" className="btn btn-success p-1" onClick={() => openShippingStatus(item)}>{item.status}📫</button>
                                                 )}
-                                            </h6>
                                         </td>
                                         <td className='text-center'>
                                             <Button className="btn btn-primary mb-1" onClick={() => showOrderDetails(item.orderId)}>Ver más detalles 📃</Button>

diff --git a/src/pages/ProductsCatalog.jsx b/src/pages/ProductsCatalog.jsx
@@ -96,7 +96,7 @@ export const ProductsCatalog = ({ user, loggedIn, logOut, isCatalog, setIsCatalo
             <Navbar loggedIn={loggedIn} user={user} logOut={logOut} isVendor={isVendor} />
 
             <div className='responsiveCategory d-flex'>
-                <Catalogsidebar handleClickCategory={handleClickCategory} handleClickPrice={handleClickPrice} categoryClicked={categoryClicked} priceClicked={priceClicked} />
+                <Catalogsidebar handleClickCategory={handleClickCategory} handleClickPrice={handleClickPrice} categoryClicked={categoryClicked} priceClicked={priceClicked} loggedIn={loggedIn} />
                 <div className='container'>
                     <div>
                         <Catalognavigation handleSearchInput={handleSearchInput} />