Skip to content

Commit

Permalink
Merge pull request #218 from InternAcademy/dev
Browse files Browse the repository at this point in the history
UI update
  • Loading branch information
dpS1lence authored Aug 22, 2024
2 parents 52cc9f7 + 111a526 commit 4da12e1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
Binary file added src/client/CookingAppReact/public/chefimg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default function UserMessage({ message }) {
return (
<li className="w-4/5 flex justify-end">
{message.type === "Text" && (
<p className="bg-active text-primaryText rounded-full px-6 py-3 text-lg font-normal">
<p className="bg-active text-primaryText rounded-3xl px-6 py-3 text-lg font-normal">
{message.content}
</p>
)}
Expand Down
9 changes: 9 additions & 0 deletions src/client/CookingAppReact/src/pages/recipe/Recipe.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import useRecipeDetails from "@/hooks/useRecipeDetails";
import { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux";
import toast from "react-hot-toast";
import chefImage from "../../../public/chefimg.png";

export default function Recipe() {
const iconImports = import.meta.glob("../../assets/stepsimages/*.png", {
Expand All @@ -15,6 +16,10 @@ export default function Recipe() {
const icons = Object.values(iconImports).map((mod) => mod.default);
const isOpenRecipes = useSelector((state) => state.ui.recipesOpen);
const isOpenSideBar = useSelector((state) => state.ui.sidebarOpen);

function freepik(){
window.open('https://www.freepik.com/');
}

function getFormattedDate(datetime) {
const date = new Date(datetime);
Expand Down Expand Up @@ -79,6 +84,10 @@ export default function Recipe() {
</p>
</div>
))}
<div className={`hidden lg:block ${isOpenRecipes || isOpenSideBar ? "w-full" : "w-5/5 xl:w-4/5"} flex flex-col items-center text-center`}>
<img src={chefImage} alt="" />
<button onClick={freepik} className="text-xs text-primaryText cursor-pointer">Designed by Freepik</button>
</div>
</div>
</div>
<div className="w-full rounded-2xl px-6 py-4 flex flex-col items-start gap-4">
Expand Down

0 comments on commit 4da12e1

Please sign in to comment.