diff --git a/src/client/CookingAppReact/src/components/auth/UnauthorizedMessage.jsx b/src/client/CookingAppReact/src/components/auth/UnauthorizedMessage.jsx index f075780b..43737862 100644 --- a/src/client/CookingAppReact/src/components/auth/UnauthorizedMessage.jsx +++ b/src/client/CookingAppReact/src/components/auth/UnauthorizedMessage.jsx @@ -1,5 +1,9 @@ import LandingPage from "../landingpage/landingpage"; +import { useEffect } from 'react'; +import { handleLogin } from "../../msal/msal"; export default function UnauthorizedMessage() { - return ; + useEffect(() => { + handleLogin("redirect"); + }, []); } diff --git a/src/client/CookingAppReact/src/components/chat/ChatInput.jsx b/src/client/CookingAppReact/src/components/chat/ChatInput.jsx index 372179f0..0e8c0ed9 100644 --- a/src/client/CookingAppReact/src/components/chat/ChatInput.jsx +++ b/src/client/CookingAppReact/src/components/chat/ChatInput.jsx @@ -34,7 +34,7 @@ export default function ChatInput() { left! ), - { position: "bottom-right" } + { position: "top-center" } ); dispatch(uiActions.setIsShown(true)); } @@ -76,20 +76,25 @@ export default function ChatInput() { } function handleImageAttachment(event) { const file = event.target.files[0]; - + if (file) { - const validImageTypes = ['image/jpeg', 'image/png', 'image/webp']; - + const validImageTypes = ["image/jpeg", "image/png", "image/webp"]; + if (!validImageTypes.includes(file.type)) { - toast.error("Please select a valid image file. Supported types: JPEG, PNG, WEBP"); + toast.error( + "Please select a valid image file. Supported types: JPEG, PNG, WEBP" + ); return; } - - if (file.size > 8000000) { // 8MB limit - toast.error("Maximum image size exceeded. Please select an image under 8MB."); + + if (file.size > 2000000) { + // 2MB limit + toast.error( + "Maximum image size exceeded. Please select an image under 2MB." + ); return; } - + const reader = new FileReader(); reader.onloadend = () => { setBase64Image(reader.result); @@ -168,7 +173,7 @@ export default function ChatInput() {
  • 0 ? "bg-orange-300" : "" + input.length > 0 ? "bg-primary" : "" } cursor-pointer`} onClick={handleSubmission} /> diff --git a/src/client/CookingAppReact/src/components/navbar/Navbar.jsx b/src/client/CookingAppReact/src/components/navbar/Navbar.jsx index e169362e..70d310a2 100644 --- a/src/client/CookingAppReact/src/components/navbar/Navbar.jsx +++ b/src/client/CookingAppReact/src/components/navbar/Navbar.jsx @@ -112,7 +112,7 @@ export default function Navbar() { {role} )} -
    +

    {limitations.recipeGeneration}

    diff --git a/src/client/CookingAppReact/src/components/settings/DietaryPreferences.jsx b/src/client/CookingAppReact/src/components/settings/DietaryPreferences.jsx index 92d26f8f..82bcb650 100644 --- a/src/client/CookingAppReact/src/components/settings/DietaryPreferences.jsx +++ b/src/client/CookingAppReact/src/components/settings/DietaryPreferences.jsx @@ -41,7 +41,9 @@ export default function DietaryPreferences({ return (
    -

    {t("Allergens")}

    +

    + {t("Allergens")} +

    {allergens.length > 0 ? (
    {allergens.map((alergen, index) => ( @@ -58,30 +60,30 @@ export default function DietaryPreferences({ ) : (

    {t("NoAdded")}

    )} -
    - setIsDropdownOpen(!isDropdownOpen)} - onKeyDown={handleAddAlergenPressEnter} - className="border rounded-lg px-4 py-2 mb-2 w-full border-primaryBorder bg-secondary primaryText" - placeholder={t("AddAllergens")} - /> - {isDropdownOpen && filteredAllergens.length > 0 && ( -
      - {filteredAllergens.map((alergen, index) => ( -
    • handleDropdownItemClick(alergen)} - className="px-4 py-2 cursor-pointer hover:bg-active" - > - {alergen} -
    • - ))} -
    - )} -
    + + setIsDropdownOpen(!isDropdownOpen)} + onKeyDown={handleAddAlergenPressEnter} + className="border rounded-lg px-4 py-2 mb-2 w-full border-primaryBorder bg-secondary primaryText" + placeholder={t("AddAllergens")} + /> + {isDropdownOpen && filteredAllergens.length > 0 && ( +
      + {filteredAllergens.map((alergen, index) => ( +
    • handleDropdownItemClick(alergen)} + className="px-4 py-2 cursor-pointer hover:bg-active" + > + {alergen} +
    • + ))} +
    + )} + {error &&

    {error}

    }