From eaacd0c3d79c329d71e3149bcdefde998753aa1c Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Tue, 19 Nov 2024 22:44:00 +0100 Subject: [PATCH 01/11] update default text color --- src/app/index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/index.css b/src/app/index.css index 8e1c051..1760eb4 100644 --- a/src/app/index.css +++ b/src/app/index.css @@ -1,3 +1,4 @@ :root[data-mantine-color-scheme="light"] { --mantine-color-body: var(--mantine-color-cream-0) !important; + --mantine-color-text: var(--mantine-color-dark-5) !important; } From b55cf77485418f65b1b61af279b3072f3367363a Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Tue, 19 Nov 2024 22:45:35 +0100 Subject: [PATCH 02/11] update title size --- src/app/login/page.tsx | 6 +++--- src/app/signup/page.tsx | 4 ++-- src/app/theme.ts | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index d84877a..cf34717 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -4,8 +4,8 @@ import Link from "next/link"; export default function Login() { return ( - - + <Box py="2rem"> + <Title ta="center" mb="xl" fz={"h2"}> Welcome back! @@ -15,7 +15,7 @@ export default function Login() { Don't have an account?{" "} - Create one + Create one here diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx index 3bfe627..6411560 100644 --- a/src/app/signup/page.tsx +++ b/src/app/signup/page.tsx @@ -5,8 +5,8 @@ import Link from "next/link"; export default function SignUp() { return ( <> - - + <Box py="2rem"> + <Title ta="center" mb="xl" fz={"h2"}> Welcome to Recipe Declutter! diff --git a/src/app/theme.ts b/src/app/theme.ts index c143b89..ec99015 100644 --- a/src/app/theme.ts +++ b/src/app/theme.ts @@ -58,6 +58,12 @@ export const theme = createTheme({ headings: { fontFamily: `${poppins.style.fontFamily}, sans-serif`, + sizes: { + h1: { + fontSize: "48px", + }, + h2: { fontSize: "24px" }, + }, }, other: { From 74e6bdd435dc32f000996e13599a4062c49693a6 Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Tue, 19 Nov 2024 22:46:14 +0100 Subject: [PATCH 03/11] add padding to dropdown --- src/components/EditRecipeForm.tsx | 2 +- src/components/TagsFilter.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/EditRecipeForm.tsx b/src/components/EditRecipeForm.tsx index ee02828..89a3b40 100644 --- a/src/components/EditRecipeForm.tsx +++ b/src/components/EditRecipeForm.tsx @@ -293,7 +293,7 @@ export const EditRecipeForm = ({ recipe, userTags }: EditRecipeProps) => { data={allUserTags} onChange={setTags} mb="md" - styles={{ dropdown: { borderRadius: "24px" } }} + comboboxProps={{ dropdownPadding: 8 }} /> diff --git a/src/components/TagsFilter.tsx b/src/components/TagsFilter.tsx index bf6f359..04176b0 100644 --- a/src/components/TagsFilter.tsx +++ b/src/components/TagsFilter.tsx @@ -22,7 +22,8 @@ export default function TagsFilter({ onChange={onTagsChange} searchable clearable - style={{ width: "100%", dropdown: { borderRadius: "24px" } }} + style={{ width: "100%" }} + comboboxProps={{ dropdownPadding: 8 }} /> ); } From e2184d98f5e136c67213d6f6b9a189d29ddb4240 Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Tue, 19 Nov 2024 22:46:36 +0100 Subject: [PATCH 04/11] update bg color --- src/components/LoginForm.tsx | 1 + src/components/RecipeCard.tsx | 8 +++++++- src/components/SignUpForm.tsx | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/LoginForm.tsx b/src/components/LoginForm.tsx index a545c6c..7637ee6 100644 --- a/src/components/LoginForm.tsx +++ b/src/components/LoginForm.tsx @@ -84,6 +84,7 @@ export default function LoginForm() { return ( <> { return ( - + Date: Tue, 19 Nov 2024 22:46:46 +0100 Subject: [PATCH 05/11] update font family --- src/components/Navbar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 88e1c64..0d9b42f 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -76,7 +76,7 @@ export const Navbar = () => { > - + Recipe Declutter From 03b7b80ba179c4058b3832097447402876fd4887 Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Tue, 19 Nov 2024 22:47:07 +0100 Subject: [PATCH 06/11] add create account banner section --- src/app/page.tsx | 12 +++--- src/components/CreateAccountBanner.tsx | 52 ++++++++++++++++++++++++++ src/components/RecipeForm.tsx | 19 +++++++--- 3 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 src/components/CreateAccountBanner.tsx diff --git a/src/app/page.tsx b/src/app/page.tsx index e55efa0..1f4e9ac 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,24 +1,26 @@ +import { CreateAccountBanner } from "@/components/CreateAccountBanner"; import { RecipeForm } from "@/components/RecipeForm"; -import { Box, Flex, Space, Text, Title } from "@mantine/core"; +import { Box, Flex, Space, Stack, Text, Title } from "@mantine/core"; export default function Home() { return ( - + - - + <Stack gap="md"> + <Title fz={{ base: "48px", xs: "60px" }}> Welcome to <br /> Recipe Declutter! Paste, click, and get the essentials — your ingredients and instructions at your fingertips. - + + ); diff --git a/src/components/CreateAccountBanner.tsx b/src/components/CreateAccountBanner.tsx new file mode 100644 index 0000000..b0b34c2 --- /dev/null +++ b/src/components/CreateAccountBanner.tsx @@ -0,0 +1,52 @@ +import { Paper, Flex, Box, Title, Button, Stack, Text } from "@mantine/core"; +import { IconChefHat, IconCarrot, IconCheese } from "@tabler/icons-react"; +import Link from "next/link"; + +export const CreateAccountBanner = () => { + return ( + + + + + Save, Edit & Organize Recipes + + + Unlock the full experience by creating an account. Keep your recipes + saved, customized, and perfectly organized. + + + + + + + + + + + + + ); +}; diff --git a/src/components/RecipeForm.tsx b/src/components/RecipeForm.tsx index 0e80a85..b490b6e 100644 --- a/src/components/RecipeForm.tsx +++ b/src/components/RecipeForm.tsx @@ -12,6 +12,7 @@ import { Alert, Stack, Transition, + Space, } from "@mantine/core"; import { useField } from "@mantine/form"; import { useNotifications } from "@mantine/notifications"; @@ -141,6 +142,8 @@ export const RecipeForm = ({ session, userTags }: RecipeFormProps) => { } } + const hasResult = recipe?.ingredients && recipe.instructions.length > 0; + return ( { {/* recipe section */} {confetti && } - {recipe?.ingredients && recipe.instructions.length > 0 && ( - - + {!hasResult && } + {hasResult && ( + - + { {/* sign up banner */} {/* Only shown when there is no scraped recipe, user is not logged in and no notifications are on screen */} - { )} - + */} ); }; From c67c8c37a28c2a4df70672e5321801d510d7200b Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Wed, 20 Nov 2024 15:57:21 +0100 Subject: [PATCH 07/11] change name and font --- src/app/layout.tsx | 4 ++-- src/app/page.tsx | 5 ++--- src/app/theme.ts | 6 +++--- src/components/Navbar.tsx | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 0784fca..91d1045 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -11,8 +11,8 @@ import { ModalsProvider } from "@mantine/modals"; import "./index.css"; export const metadata: Metadata = { - title: "Recipe Declutter", - description: "Declutter your favorite recipes here!", + title: "Savorly", + description: "Declutter and save your favorite recipes here!", icons: [{ rel: "icon", url: Favicon.src }], }; diff --git a/src/app/page.tsx b/src/app/page.tsx index 1f4e9ac..8042402 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -7,8 +7,8 @@ export default function Home() { - - Welcome to <br /> Recipe Declutter! + <Title fz={{ base: "40px", xs: "60px" }}> + Declutter your recipes <br /> with Savorly! Paste, click, and get the essentials — your ingredients and @@ -20,7 +20,6 @@ export default function Home() { - ); diff --git a/src/app/theme.ts b/src/app/theme.ts index ec99015..5901ae7 100644 --- a/src/app/theme.ts +++ b/src/app/theme.ts @@ -1,12 +1,12 @@ import { createTheme } from "@mantine/core"; -import { Poppins, Grand_Hotel } from "next/font/google"; +import { Poppins, Galada } from "next/font/google"; const poppins = Poppins({ subsets: ["latin"], weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], }); -const grandHotel = Grand_Hotel({ subsets: ["latin"], weight: ["400"] }); +const galada = Galada({ subsets: ["latin"], weight: ["400"] }); export const theme = createTheme({ colors: { @@ -67,7 +67,7 @@ export const theme = createTheme({ }, other: { - fontFamily: `${grandHotel.style.fontFamily}, sans-serif`, + fontFamily: `${galada.style.fontFamily}, sans-serif`, fontSizes: { base: "18px", xs: "24px", diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 0d9b42f..e655a42 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -61,7 +61,7 @@ export const Navbar = () => { {/* Burger menu */} - + { - Recipe Declutter + Savorly @@ -103,7 +103,7 @@ export const Navbar = () => { fz={theme.other.fontSizes} pr={"lg"} > - Recipe Declutter + Savorly {/* Burger menu content if big screen */} From 770766bd4ce570a3ce1a4af366d66b18a901262c Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Wed, 20 Nov 2024 15:57:28 +0100 Subject: [PATCH 08/11] update banner --- src/components/RecipeForm.tsx | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/components/RecipeForm.tsx b/src/components/RecipeForm.tsx index b490b6e..a45ffaf 100644 --- a/src/components/RecipeForm.tsx +++ b/src/components/RecipeForm.tsx @@ -29,6 +29,7 @@ import { } from "@/lib/notifications"; import { ScreenAwakeToggle } from "./ScreenAwakeToggle"; import { Confetti } from "./Confetti"; +import { CreateAccountBanner } from "./CreateAccountBanner"; type RecipeFormProps = { session?: Session | null; @@ -225,7 +226,7 @@ export const RecipeForm = ({ session, userTags }: RecipeFormProps) => { {/* sign up banner */} {/* Only shown when there is no scraped recipe, user is not logged in and no notifications are on screen */} - {/* { > {(styles) => ( - } - > - - Unlock the full experience by creating an account. Keep your - recipes saved, customized, and perfectly organized. - - - + )} - */} + + {recipe && } ); }; From 67854d327a91140dc5aad6f225a61b12cdd4fa88 Mon Sep 17 00:00:00 2001 From: sirisayshello Date: Wed, 20 Nov 2024 16:03:29 +0100 Subject: [PATCH 09/11] update radius to sm every where --- src/components/CreateAccountBanner.tsx | 2 +- src/components/EditIngredientsList.tsx | 2 +- src/components/EditInstructionsList.tsx | 8 ++++---- src/components/EditRecipeForm.tsx | 8 ++++---- src/components/IngredientsAndInstructionsToggle.tsx | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/CreateAccountBanner.tsx b/src/components/CreateAccountBanner.tsx index b0b34c2..3f61f3f 100644 --- a/src/components/CreateAccountBanner.tsx +++ b/src/components/CreateAccountBanner.tsx @@ -8,7 +8,7 @@ export const CreateAccountBanner = () => { component="section" p="xl" bg={"var(--mantine-color-default)"} - radius={"xs"} + radius={"sm"} shadow="xs" > diff --git a/src/components/EditIngredientsList.tsx b/src/components/EditIngredientsList.tsx index ed3f193..25fa6a7 100644 --- a/src/components/EditIngredientsList.tsx +++ b/src/components/EditIngredientsList.tsx @@ -85,7 +85,7 @@ export const EditIngredientsList = ({ {sectionedInstructions.map((section, sectionIndex) => ( - +