Skip to content

Commit 138f736

Browse files
committed
refactor: remove unused components and fix canvas clearing issue on mobile
1 parent 4ed0019 commit 138f736

File tree

4 files changed

+21
-30
lines changed

4 files changed

+21
-30
lines changed

apps/collabydraw/components/AppSidebar.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
Upload,
2020
Linkedin,
2121
Share2,
22+
Star,
2223
} from "lucide-react"
2324
import { Button, buttonVariants } from "@/components/ui/button"
2425
import { Separator } from "@/components/ui/separator"
@@ -132,9 +133,20 @@ export function AppSidebar({ isOpen, onClose, canvasColor, setCanvasColor, isMob
132133
)}
133134

134135
<Separator className="my-4 dark:bg-default-border-color-dark" />
135-
<SidebarLinkItem icon={Github} label="GitHub" url="https://github.com/coderomm" />
136+
<Link
137+
className={cn(
138+
buttonVariants({ variant: "ghost" }),
139+
"flex flex-row items-center justify-start gap-2 h-10 w-auto rounded-md px-3 text-sm font-medium transition-colors text-color-on-surface hover:text-color-on-surface bg-transparent hover:bg-button-hover-bg focus-visible:shadow-brand-color-shadow focus-visible:outline-none focus-visible:ring-0 active:bg-button-hover-bg active:border active:border-brand-active dark:hover:bg-w-button-hover-bg border border-[#705400] bg-[#FFE599]"
140+
)}
141+
href="https://github.com/coderomm/CollabyDraw"
142+
target="_blank"
143+
rel="noopener noreferrer"
144+
title="GitHub"
145+
>
146+
<Github className="h-4 w-4" />GitHub - <span className="flex items-center justify-start gap-1">7<Star className="h-4 w-4" /></span>
147+
</Link>
136148
<SidebarLinkItem icon={Twitter} label="Twitter / X" url="https://x.com/1omsharma" />
137-
<SidebarLinkItem icon={Linkedin} label="Linkedin" url="https://www.linkedin.com/in/1omsharma/" />
149+
<SidebarLinkItem icon={Linkedin} label="Linkedin" url="https://www.linkedin.com/in/1omsharma" />
138150
</nav>
139151
</div>
140152

apps/collabydraw/components/MobileCommandBar.tsx

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
import type React from "react"
44

55
import { useState } from "react"
6-
import { Menu, Plus, Minus, Share2 } from "lucide-react"
6+
import { Menu, Plus, Minus } from "lucide-react"
77
import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet"
88
import { cn } from "@/lib/utils"
99
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
1010
import { Button } from "./ui/button"
1111
import { PaletteFilled } from "./SvgIcons"
1212
import { BgFill, FillStyle, FontFamily, FontSize, RoughStyle, StrokeEdge, StrokeFill, StrokeStyle, StrokeWidth, TextAlign, ToolType } from "@/types/canvas"
13-
import { UserRoomsListDialog } from "./UserRoomsListDialog"
14-
import { RoomSharingDialog } from "./RoomSharingDialog"
15-
import { BASE_URL } from "@/config/constants"
1613
import { AppSidebar } from "./AppSidebar"
1714
import { StyleConfigurator } from "./StyleConfigurator"
1815

@@ -86,7 +83,6 @@ export function MobileCommandBar({ canvasColor,
8683
onImportCanvas,
8784
}: MobileCommandBarProps) {
8885
const [colorPickerOpen, setColorPickerOpen] = useState(false);
89-
const [roomsListOpen, setRoomsListOpen] = useState(false);
9086

9187
const handleMenuButton = () => {
9288
setSidebarOpen(!sidebarOpen);
@@ -101,17 +97,16 @@ export function MobileCommandBar({ canvasColor,
10197
{activeTool !== 'grab' && activeTool !== 'eraser' && (
10298
<NavbarButton icon={PaletteFilled} label="Colors" onClick={() => setColorPickerOpen(true)} active={colorPickerOpen} />
10399
)}
104-
<NavbarButton icon={Share2} label="Rooms" onClick={() => setRoomsListOpen(true)} active={roomsListOpen} />
105100
<ScaleWidget scale={scale} setScale={setScale} />
106101
</div>
107102
</div>
108103
</footer>
109104

110105
{sidebarOpen && (
111106
<Sheet open={sidebarOpen} onOpenChange={setSidebarOpen}>
112-
<SheetContent side="bottom" className="h-auto max-h-[80vh] rounded-t-[20px] px-4 py-4 overflow-auto custom-scrollbar Island">
107+
<SheetContent side="bottom" className="h-auto max-h-[80vh] w-full rounded-t-[20px] px-4 py-4 overflow-auto overflow-x-hiddenustom-scrollbar Island">
113108
<SheetHeader className="mb-5">
114-
<SheetTitle>Settings</SheetTitle>
109+
<SheetTitle>App Menu</SheetTitle>
115110
</SheetHeader>
116111
<AppSidebar
117112
isOpen={sidebarOpen}
@@ -129,9 +124,9 @@ export function MobileCommandBar({ canvasColor,
129124
</Sheet>
130125
)}
131126
<Sheet open={colorPickerOpen} onOpenChange={setColorPickerOpen}>
132-
<SheetContent side="bottom" className="h-auto max-h-[80vh] rounded-t-[20px] px-4 py-4 overflow-auto custom-scrollbar Island">
127+
<SheetContent side="bottom" className="h-auto max-h-[80vh] w-full rounded-t-[20px] px-4 py-4 overflow-auto overflow-x-hidden custom-scrollbar Island">
133128
<SheetHeader className="mb-5">
134-
<SheetTitle>Canvas Settings</SheetTitle>
129+
<SheetTitle>Canvas Styles</SheetTitle>
135130
</SheetHeader>
136131
<StyleConfigurator
137132
isMobile={true}
@@ -164,23 +159,6 @@ export function MobileCommandBar({ canvasColor,
164159
/>
165160
</SheetContent>
166161
</Sheet>
167-
168-
{roomName ? (
169-
<RoomSharingDialog open={roomsListOpen} onOpenChange={setRoomsListOpen} link={`${BASE_URL}/${roomName}`} />
170-
) : (
171-
<Sheet open={roomsListOpen} onOpenChange={setRoomsListOpen}>
172-
<SheetContent side="bottom" className="h-auto max-h-[80vh] min-h-[50vh] rounded-t-[20px] px-6 py-6 Island">
173-
<SheetHeader className="mb-5">
174-
<SheetTitle>All Your Rooms</SheetTitle>
175-
</SheetHeader>
176-
<UserRoomsListDialog
177-
open={roomsListOpen}
178-
onOpenChange={setRoomsListOpen}
179-
isMobile={true}
180-
/>
181-
</SheetContent>
182-
</Sheet>
183-
)}
184162
</>
185163
)
186164
}

apps/collabydraw/components/canvas/CanvasBoard.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ export default function CanvasBoard() {
440440
setCanvasEngineState(prev => ({ ...prev, textAlign: typeof newTextAlign === 'function' ? newTextAlign(prev.textAlign) : newTextAlign }))
441441
}
442442
isStandalone={mode === 'room' ? false : true}
443+
onClearCanvas={clearCanvas}
443444
/>
444445

445446
)}

apps/collabydraw/components/welcome-screen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function HomeWelcome() {
4040
</div>
4141
<div className="welcome-screen-center__heading welcome-screen-decor font-excalifont">All your data is saved locally in your browser.</div>
4242
<div className="welcome-screen-menu">
43-
<button type="button" className="welcome-screen-menu-item ">
43+
<button type="button" className="welcome-screen-menu-item !hidden">
4444
<div className="welcome-screen-menu-item__icon">
4545
<svg aria-hidden="true" focusable="false" role="img" viewBox="0 0 20 20" className="" fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round">
4646
<path d="m9.257 6.351.183.183H15.819c.34 0 .727.182 1.051.506.323.323.505.708.505 1.05v5.819c0 .316-.183.7-.52 1.035-.337.338-.723.522-1.037.522H4.182c-.352 0-.74-.181-1.058-.5-.318-.318-.499-.705-.499-1.057V5.182c0-.351.181-.736.5-1.054.32-.321.71-.503 1.057-.503H6.53l2.726 2.726Z" strokeWidth="1.25"></path>

0 commit comments

Comments
 (0)