Merge pull request #28 from Naetffy/Mateo

Mateo

Author: MateoSebF

.env

@@ -1 +1 @@
-REACT_APP_API_URL=https://clothcraft.azurewebsites.net
+REACT_APP_API_URL=https://clothcraft.azurewebsites.net

src/components/Navbar/NavBar.js

@@ -10,7 +10,7 @@ const NavBar = () => {
     const [selectedLink, setSelectedLink] = useState('');
     const location = useLocation();
     const isInitialMount = useRef(true);
-    
+
     const [username, setUsername] = useState('');
     const [profileImage, setProfileImage] = useState(null); // Modified to handle image loading
 
@@ -68,7 +68,7 @@ const NavBar = () => {
 
     return (
         <Navbar expand="md" className="my-navbar">
-            <Container>
+            <Container className="mt-1">
                 <Navbar.Brand href="/">
                     <div className="navbar-brand">
                         <img src="./images/logo.png" alt="" width="55" height="55" className="d-inline-block align-text-center" />

src/components/OutfitOfDay/Daily.js

@@ -28,15 +28,15 @@ const Daily = ({ day, handleSubmmit }) => {
 
     return (
         <div className='daily-container'>
-            <h3>Outfits for {day.toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' })}</h3>
+            
             <div className='outfit-list'>
                 {outfits.map((outfit, index) => (
                     <div
                         key={index}
                         className={`outfit-item ${index === selectedOutfitIndex ? 'selected' : ''}`}
                         onClick={() => handleSelectOutfit(index)}
                     >
-                        <img src={`data:image/jpeg;base64,${outfit.image}`} alt={`Outfit ${index + 1}`} />
+                        <img className={outfit.type} src={`data:image/jpeg;base64,${outfit.image}`} alt={`Outfit ${index + 1}`} />
                     </div>
                 ))}
             </div>

src/pages/Login/Login.js

@@ -46,7 +46,7 @@ function SignInSide() {
       }
     } catch (error) {
       if (error.response && error.response.status === 400) {
-        setErrorMessage('Incorrect email or password');
+        setErrorMessage(error.response.data);
       } else {
         setErrorMessage('Error en inicio de sesión');
       }

src/pages/Wardrobe/Wardrobe.css

@@ -0,0 +1,16 @@
+/* Botón de acción flotante */
+.fab {
+    position: fixed;
+    bottom: 20px;
+    right: 20px;
+    color: white;
+    background-color: #A4826D;
+    border-radius: 50%;
+    width: 56px;
+    height: 56px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3);
+    font-size: 24px;
+  }

src/pages/Wardrobe/Wardrobe.js

@@ -4,6 +4,7 @@ import Modal from '../../components/Wardrobe/modal';
 import ProductListing from '../../components/Wardrobe/productListing';
 import apiClient from '../../services/apiClient';
 import { FiPlus } from "react-icons/fi";
+import './Wardrobe.css';
 
 // This is the main page of the wardrobe. It will display the products in the wardrobe and allow the user to filter, sort and view the products.
 const Wardrobe = () => {
@@ -81,7 +82,7 @@ const Wardrobe = () => {
             <button className="btn btn-primary me-4" onClick={() => openModal('view')} style={{ backgroundColor: '#A4826D', borderColor: '#A4826D' }}>
               View
             </button>
-            <a href='/Wardrobe/FormGetClothing'><FiPlus size={35} style={{ color: '#A4826D' }} /></a>
+            <a href='/Wardrobe/FormGetClothing' className="fab"><FiPlus size={35} /></a>
           </div>
         </div>
         <div className="row">