Skip to content

refactor: simplify main menu #63

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 2, 2025
Merged

refactor: simplify main menu #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
474b039
feat: implement restore tutorial canvas functionality in SettingsDialog
atyrode Apr 29, 2025
fb032c3
style: update SettingsDialog styles and button text
atyrode Apr 29, 2025
a5f5d5e
refactor: remove grid, zen, and view mode toggle functions from MainMenu
atyrode Apr 29, 2025
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
53 changes: 0 additions & 53 deletions src/frontend/src/ui/MainMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,35 +137,6 @@ export const MainMenuConfig: React.FC<MainMenuConfigProps> = ({
setShowAccountModal(true);
};

const handleGridToggle = () => {
if (!excalidrawAPI) return;
const appState = excalidrawAPI.getAppState();
appState.gridModeEnabled = !appState.gridModeEnabled;
appState.gridSize = 20;
appState.gridStep = 5;
excalidrawAPI.updateScene({
appState: appState
});
};

const handleZenModeToggle = () => {
if (!excalidrawAPI) return;
const appState = excalidrawAPI.getAppState();
appState.zenModeEnabled = !appState.zenModeEnabled;
excalidrawAPI.updateScene({
appState: appState
});
};

const handleViewModeToggle = () => {
if (!excalidrawAPI) return;
const appState = excalidrawAPI.getAppState();
appState.viewModeEnabled = !appState.viewModeEnabled;
excalidrawAPI.updateScene({
appState: appState
});
};

const handleLogout = async () => {
capture('logout_clicked');

Expand Down Expand Up @@ -302,30 +273,6 @@ export const MainMenuConfig: React.FC<MainMenuConfigProps> = ({
Action Button
</MainMenu.Item>
</MainMenu.Group>

<MainMenu.Separator />

<MainMenu.Group title="View">
<MainMenu.Item
icon={<Grid2x2 />}
onClick={handleGridToggle}
>
Toggle grid
</MainMenu.Item>
<MainMenu.Item
icon={<Eye />}
onClick={handleViewModeToggle}
>
View mode
</MainMenu.Item>
<MainMenu.Item
icon={<Coffee />}
onClick={handleZenModeToggle}
>
Zen mode
</MainMenu.Item>

</MainMenu.Group>

<MainMenu.Separator />

Expand Down
75 changes: 74 additions & 1 deletion src/frontend/src/ui/SettingsDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
}

&__setting {
margin-bottom: 1rem;
padding: 0.5rem;
border-radius: 4px;
background-color: var(--dialog-bg-color);
Expand All @@ -59,4 +58,78 @@
margin: 1rem 0;
}

&__restore-button {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 16px;
background-color: var(--button-bg-color, #cc6d24);
border: 1px solid var(--button-border-color, #ddd);
border-radius: 4px;
color: var(--text-primary-color);
cursor: pointer;
font-size: 0.9rem;
transition: background-color 0.2s ease;

&:hover {
background-color: var(--button-hover-bg-color, #a4571b);
}
}

&__confirmation {
padding: 1rem;
border-radius: 4px;
background-color: var(--dialog-bg-color);
border: 1px solid var(--warning-color, #f0ad4e);
}

&__warning {
color: var(--warning-color, #f0ad4e);
font-weight: bold;
margin: 1rem 0;
}

&__actions {
display: flex;
gap: 8px;
margin-top: 1rem;
}

&__button {
padding: 8px 16px;
border-radius: 4px;
cursor: pointer;
font-size: 0.9rem;
border: none;
transition: background-color 0.2s ease;

&--restore {
background-color: var(--danger-color, #d9534f);
color: white;

&:hover {
background-color: var(--danger-hover-color, #c9302c);
}

&:disabled {
background-color: var(--disabled-color, #cccccc);
cursor: not-allowed;
}
}

&--cancel {
background-color: var(--button-bg-color, #cc6d24);
border: 1px solid var(--button-border-color, #ddd);
color: var(--text-primary-color);

&:hover {
background-color: var(--button-hover-bg-color, #a4571b);
}

&:disabled {
background-color: var(--disabled-color, #cccccc);
cursor: not-allowed;
}
}
}
}
78 changes: 78 additions & 0 deletions src/frontend/src/ui/SettingsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import React, { useState, useCallback, useEffect } from "react";
import { Dialog } from "@atyrode/excalidraw";
import { Range } from "./Range";
import { UserSettings, DEFAULT_SETTINGS } from "../types/settings";
import { RefreshCw } from "lucide-react";
import { normalizeCanvasData } from "../utils/canvasUtils";
import { capture } from "../utils/posthog";
import "./SettingsDialog.scss";

interface SettingsDialogProps {
Expand All @@ -15,6 +18,8 @@ const SettingsDialog: React.FC<SettingsDialogProps> = ({
}) => {
const [modalIsShown, setModalIsShown] = useState(true);
const [settings, setSettings] = useState<UserSettings>(DEFAULT_SETTINGS);
const [showRestoreConfirmation, setShowRestoreConfirmation] = useState(false);
const [isRestoring, setIsRestoring] = useState(false);

// Get current settings from excalidrawAPI when component mounts
useEffect(() => {
Expand All @@ -35,6 +40,43 @@ const SettingsDialog: React.FC<SettingsDialogProps> = ({
}
}, [onClose]);

const handleRestoreTutorialCanvas = async () => {
if (!excalidrawAPI) return;

try {
setIsRestoring(true);
capture('restore_tutorial_canvas_clicked');

// Fetch the default canvas data from the backend
const response = await fetch('/api/canvas/default', {
method: 'GET',
credentials: 'include'
});

if (!response.ok) {
throw new Error(`Failed to fetch default canvas: ${response.statusText}`);
}

const defaultCanvasData = await response.json();

// Normalize the canvas data before updating the scene
const normalizedData = normalizeCanvasData(defaultCanvasData);

// Update the canvas with the normalized default data
excalidrawAPI.updateScene(normalizedData);

console.log("Canvas reset to default successfully");

// Close the dialog after successful restore
handleClose();
} catch (error) {
console.error("Failed to reset canvas:", error);
} finally {
setIsRestoring(false);
setShowRestoreConfirmation(false);
}
};

/**
* Updates a specific setting and syncs it with the excalidraw app state
* @param key The setting key to update
Expand Down Expand Up @@ -92,6 +134,42 @@ const SettingsDialog: React.FC<SettingsDialogProps> = ({
</div>
</div>
</div>

<div className="settings-dialog__section">
<h3 className="settings-dialog__section-title">Canvas Management</h3>
{showRestoreConfirmation ? (
<div className="settings-dialog__confirmation">
<p>Are you sure you want to restore the tutorial canvas?</p>
<p className="settings-dialog__warning">This will replace your current canvas and cannot be undone!</p>
<div className="settings-dialog__actions">
<button
className="settings-dialog__button settings-dialog__button--restore"
onClick={handleRestoreTutorialCanvas}
disabled={isRestoring}
>
{isRestoring ? "Restoring..." : "I'm sure"}
</button>
<button
className="settings-dialog__button settings-dialog__button--cancel"
onClick={() => setShowRestoreConfirmation(false)}
disabled={isRestoring}
>
Cancel
</button>
</div>
</div>
) : (
<div className="settings-dialog__setting">
<button
className="settings-dialog__restore-button"
onClick={() => setShowRestoreConfirmation(true)}
>
<RefreshCw size={16} />
<span>Restore Tutorial Canvas</span>
</button>
</div>
)}
</div>
</div>
);

Expand Down