From 162cc43ed331f31e0f39660123e726a37832d15d Mon Sep 17 00:00:00 2001 From: Yash Date: Sat, 6 Apr 2024 12:59:01 +0000 Subject: [PATCH] better phone ui --- apps/web/src/app/globals.css | 10 ++++++++++ apps/web/src/app/page.tsx | 17 +++++++++++++++++ apps/web/src/components/Main.tsx | 2 +- apps/web/src/components/MemoryDrawer.tsx | 14 ++++++++++---- apps/web/src/components/Sidebar/MemoriesBar.tsx | 10 +++++++--- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/apps/web/src/app/globals.css b/apps/web/src/app/globals.css index ea526495..307c4d10 100644 --- a/apps/web/src/app/globals.css +++ b/apps/web/src/app/globals.css @@ -45,4 +45,14 @@ body { height: 100dvh; max-height: 100vh; max-height: 100dvh; +} + +.DrawerContent { + padding-top: 5vh; + padding-top: 5dvh; +} + +.main-hidden { + padding-bottom: 20vh; + padding-bottom: 15dvh; } \ No newline at end of file diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index 52dff4fa..7f125abd 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -59,6 +59,23 @@ export default async function Home() { const collectedSpaces = contents.length > 0 ? await transformContent(contents) : []; + collectedSpaces.push({ + id: 1, + title: "Test", + content: [ + { + id: 1, + content: "Test", + title: "Vscode", + description: "Test", + url: "https://vscode-remake.vercel.app/", + savedAt: new Date(), + baseUrl: "https://vscode-remake.vercel.app/", + image: "https://vscode-remake.vercel.app/favicon.svg", + }, + ], + }); + return ( diff --git a/apps/web/src/components/Main.tsx b/apps/web/src/components/Main.tsx index e9a7071d..0bfd76a5 100644 --- a/apps/web/src/components/Main.tsx +++ b/apps/web/src/components/Main.tsx @@ -51,7 +51,7 @@ export default function Main({ sidebarOpen }: { sidebarOpen: boolean }) { ref={main} className={cn( "sidebar flex w-full flex-col items-end justify-center gap-5 px-5 pt-5 transition-[padding-left,padding-top,padding-right] delay-200 duration-200 md:items-center md:gap-10 md:px-72 [&[data-sidebar-open='true']]:pr-10 [&[data-sidebar-open='true']]:delay-0 md:[&[data-sidebar-open='true']]:pl-[calc(2.5rem+30vw)]", - hide ? "pb-5" : supportsDVH() ? "pb-[13vh]" : "pb-[20vh]", + hide ? "" : "main-hidden", )} >

diff --git a/apps/web/src/components/MemoryDrawer.tsx b/apps/web/src/components/MemoryDrawer.tsx index e4d2e5db..61fa5e96 100644 --- a/apps/web/src/components/MemoryDrawer.tsx +++ b/apps/web/src/components/MemoryDrawer.tsx @@ -2,6 +2,7 @@ import { useRef, useState } from "react"; import { Drawer, DrawerContent, DrawerOverlay } from "./ui/drawer"; import { MemoryIcon } from "@/assets/Memories"; import { cn } from "@/lib/utils"; +import { MemoriesBar } from "./Sidebar/MemoriesBar"; export interface Props extends React.ButtonHTMLAttributes { hide?: boolean; @@ -25,16 +26,21 @@ export function MemoryDrawer({ className, hide = false, ...props }: Props) { -
+
- Hello + +
diff --git a/apps/web/src/components/Sidebar/MemoriesBar.tsx b/apps/web/src/components/Sidebar/MemoriesBar.tsx index 290dd623..47916baa 100644 --- a/apps/web/src/components/Sidebar/MemoriesBar.tsx +++ b/apps/web/src/components/Sidebar/MemoriesBar.tsx @@ -36,7 +36,7 @@ import { DialogClose, } from "../ui/dialog"; import { Label } from "../ui/label"; -import { DialogTrigger } from "@radix-ui/react-dialog"; +import useViewport from "@/hooks/useViewport"; export function MemoriesBar() { const [parent, enableAnimations] = useAutoAnimate(); @@ -123,6 +123,7 @@ export function SpaceItem({ onDelete, }: CollectedSpaces & { onDelete: () => void }) { const [itemRef, animateItem] = useAnimate(); + const { width } = useViewport(); return ( { - if (!itemRef.current) return; + if (!itemRef.current || width < 768) { + onDelete(); + return; + } const trash = document.querySelector("#trash")! as HTMLDivElement; const trashBin = document.querySelector("#trash-button")!; const trashRect = trashBin.getBoundingClientRect(); @@ -242,7 +246,7 @@ export function SpaceMoreButton({ onDelete }: { onDelete?: () => void }) {