Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: cleanup v1 #18

Merged
merged 4 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logoBW.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 12 additions & 7 deletions public/sitemap.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<xml version="1.0" encoding="UTF-8">
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://easy-menu-one.vercel.app/builder</loc>
<lastmod>2024-07-03</lastmod>
</url>
</urlset>
</xml>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://easy-menu-one.vercel.app/</loc>
<lastmod>2024-08-05</lastmod>
</url>

<url>
<loc>https://easy-menu-one.vercel.app/builder</loc>
<lastmod>2024-08-05</lastmod>
</url>
</urlset>
</xml>
9 changes: 4 additions & 5 deletions src/components/LandingPage/FeatureList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@ const FeatureList = () => {
<p>Intuitive interface for </p>
<p>quick and easy list creation.</p>
</Feature>
<Feature title="PDF Preview">
<p>Preview your list before downloading.</p>
</Feature>
<Feature title="Simple Design">
<p>Clean, user-friendly design.</p>
</Feature>
<Feature title="Alpha Version">
<p>Early access with the latest</p>
<p>features and updates.</p>
</Feature>
<Feature title="Multi Categories">
<p>Categorize items for better organization.</p>
</Feature>
<Feature title="Manage Items">
<Feature title="Drag & Drop">
<p>Easily add, edit, delete </p>
<p>and organize your items.</p>
</Feature>
Expand Down
8 changes: 7 additions & 1 deletion src/components/LandingPage/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import Image from 'next/image';
import Link from 'next/link';
import { Footer as DaisyFooter } from 'react-daisyui';

const Footer = () => {
return (
<DaisyFooter className="relative p-10 bg-neutral text-neutral-content">
<div>
{/* LOGO HERE */}
<Image
src="/images/logo.png"
alt="Website Logo"
width={32}
height={32}
/>
<p>
Easy Menu
<br />© Copyright 2024 | Easy Menu
Expand Down
2 changes: 1 addition & 1 deletion src/components/LandingPage/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const Hero = () => {
className="font-bold text-sm text-white"
size="lg"
color="primary">
Alpha now Available!
Alpha v.2.0 now Available!
</Badge>
<div className="flex flex-col items-center gap-4">
<h1 className="text-4xl sm:text-5xl font-bold">
Expand Down
7 changes: 7 additions & 0 deletions src/components/LandingPage/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Image from 'next/image';
import { Badge, Button, Navbar as DaisyNavbar, Indicator } from 'react-daisyui';
import { FiBell } from 'react-icons/fi';

Expand All @@ -7,6 +8,12 @@ const Navbar = () => {
<DaisyNavbar.Start></DaisyNavbar.Start>
<DaisyNavbar.Center>
<Button color="ghost" className="normal-case text-xl">
<Image
src="/images/logo.png"
alt="Website Logo"
width={24}
height={24}
/>
Easy-Menu
</Button>
</DaisyNavbar.Center>
Expand Down
20 changes: 11 additions & 9 deletions src/components/MenuBuilder/MenuItems/MenuItem/MenuItemOptions.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { cn } from '@/utils/cn';
import { DraggableProvidedDragHandleProps } from '@hello-pangea/dnd';
import { Button } from 'react-daisyui';
import { FiMove, FiPlus, FiTrash2 } from 'react-icons/fi';
Expand Down Expand Up @@ -27,15 +28,16 @@ const MenuItemOptions = ({
onClick={() => insertItem(itemIndex + 1)}>
<FiPlus size={16} />
</Button>
<Button
type="button"
size="xs"
shape="square"
color="error"
disabled={itemAmount <= 1}
onClick={() => removeItem(itemIndex)}>
<FiTrash2 size={16} />
</Button>
{itemAmount > 1 && (
<Button
type="button"
size="xs"
shape="square"
color="error"
onClick={() => removeItem(itemIndex)}>
<FiTrash2 size={16} />
</Button>
)}
<Button
type="button"
size="xs"
Expand Down
26 changes: 21 additions & 5 deletions src/components/MenuBuilder/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { useSetAtom } from 'jotai';
import { menuAtom, previewAtom } from '@/store/menu.atom';
import { SubmitHandler, useFormContext } from 'react-hook-form';
import { MenuFormInputs } from '@/schemas/menuForm';
import Image from 'next/image';
import { FiChevronRight } from 'react-icons/fi';

const Navbar = () => {
const setMenuAtom = useSetAtom(menuAtom);
Expand All @@ -19,11 +21,25 @@ const Navbar = () => {

return (
<nav className="fixed top-0 right-0 left-0 flex items-center justify-between bg-white px-3 py-2 z-50">
<Link href="/">
<Button color="ghost" size="sm">
Easy-Menu
</Button>
</Link>
<div className="flex flex-row items-center">
<Link href="/">
<Button color="ghost" size="sm">
<Image
src="/images/logoBW.png"
alt="Website Logo"
width={24}
height={24}
/>
</Button>
</Link>
<FiChevronRight />
<Link href="/">
<Button color="ghost" size="sm">
Easy-Menu
</Button>
</Link>
</div>

<div className="flex items-center gap-2">
<Button
type="button"
Expand Down