Merge remote-tracking branch 'origin/main' into load-canvas-backup

Author: atyrode

src/backend/db.py

@@ -7,6 +7,7 @@
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.future import select
+from urllib.parse import quote_plus as urlquote
 
 load_dotenv()
 
@@ -18,7 +19,7 @@
 DB_PORT = os.getenv('POSTGRES_PORT', '5432')
 
 # SQLAlchemy async database URL
-DATABASE_URL = f"postgresql+asyncpg://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
+DATABASE_URL = f"postgresql+asyncpg://{DB_USER}:{urlquote(DB_PASSWORD)}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
 
 # Create async engine
 engine = create_async_engine(DATABASE_URL, echo=False)

src/frontend/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "@atyrode/excalidraw": "^0.18.0-1",
+    "@atyrode/excalidraw": "^0.18.0-2",
     "@monaco-editor/react": "^4.7.0",
     "@tanstack/react-query": "^5.74.3",
     "@tanstack/react-query-devtools": "^5.74.3",

src/frontend/src/App.tsx

@@ -123,6 +123,8 @@ export default function App({
         setExcalidrawAPI={setExcalidrawAPI}
         onChange={debouncedLogChange}
         MainMenu={MainMenu}
+        isAuthenticated={isAuthenticated}
+        isAuthLoading={isAuthLoading}
       >
         {children}
       </ExcalidrawWrapper>

src/frontend/src/AuthGate.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useRef, useState } from "react";
 import { useAuthCheck } from "./api/hooks";
-import AuthModal from "./ui/AuthModal";
 
 /**
  * If unauthenticated, it shows the AuthModal as an overlay, but still renders the app behind it.
@@ -50,37 +49,6 @@ export default function AuthGate({ children }: { children: React.ReactNode }) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isAuthenticated, coderAuthDone]);
 
-  // State to control modal visibility and exit animation
-  const [showAuthModal, setShowAuthModal] = useState(false);
-  const [isExiting, setIsExiting] = useState(false);
-  
-  // Update showAuthModal when authentication status changes
-  useEffect(() => {
-    if (isAuthenticated === false) {
-      setShowAuthModal(true);
-      setIsExiting(false);
-    } else if (isAuthenticated === true && showAuthModal) {
-      // Start exit animation when user becomes authenticated
-      setIsExiting(true);
-      // Modal will be removed after animation completes via onExitComplete
-    }
-  }, [isAuthenticated, showAuthModal]);
-  
-  // Handle exit animation completion
-  const handleExitComplete = () => {
-    setShowAuthModal(false);
-  };
-
-  // Always render children; overlay AuthModal if not authenticated
-  return (
-    <>
-      {children}
-      {showAuthModal && (
-        <AuthModal 
-          isExiting={isExiting} 
-          onExitComplete={handleExitComplete} 
-        />
-      )}
-    </>
-  );
+  // Just render children - AuthModal is now handled by ExcalidrawWrapper
+  return <>{children}</>;
 }

src/frontend/src/ExcalidrawWrapper.tsx

@@ -1,11 +1,12 @@
-import React, { Children, cloneElement } from 'react';
+import React, { Children, cloneElement, useState, useEffect } from 'react';
 import DiscordButton from './ui/DiscordButton';
 import FeedbackButton from './ui/FeedbackButton';
 import type { ExcalidrawImperativeAPI } from '@atyrode/excalidraw/types';
 import type { NonDeletedExcalidrawElement } from '@atyrode/excalidraw/element/types';
 import type { AppState } from '@atyrode/excalidraw/types';
 import { MainMenuConfig } from './ui/MainMenu';
 import { renderCustomEmbeddable } from './CustomEmbeddableRenderer';
+import AuthDialog from './ui/AuthDialog';
 
 const defaultInitialData = {
   elements: [],
@@ -25,6 +26,8 @@ interface ExcalidrawWrapperProps {
   onChange: (elements: NonDeletedExcalidrawElement[], state: AppState) => void;
   MainMenu: any;
   renderTopRightUI?: () => React.ReactNode;
+  isAuthenticated?: boolean | null;
+  isAuthLoading?: boolean;
 }
 
 export const ExcalidrawWrapper: React.FC<ExcalidrawWrapperProps> = ({
@@ -35,7 +38,19 @@ export const ExcalidrawWrapper: React.FC<ExcalidrawWrapperProps> = ({
   onChange,
   MainMenu,
   renderTopRightUI,
+  isAuthenticated = null,
+  isAuthLoading = false,
 }) => {
+  // Add state for modal animation
+  const [isExiting, setIsExiting] = useState(false);
+  
+  // Handle auth state changes
+  useEffect(() => {
+    if (isAuthenticated === true) {
+      setIsExiting(true);
+    }
+  }, [isAuthenticated]);
+  
   const renderExcalidraw = (children: React.ReactNode) => {
     const Excalidraw = Children.toArray(children).find(
       (child: any) =>
@@ -65,7 +80,14 @@ export const ExcalidrawWrapper: React.FC<ExcalidrawWrapperProps> = ({
           </div>
         )),
       },
-      <MainMenuConfig MainMenu={MainMenu} excalidrawAPI={excalidrawAPI} />
+      <>
+        <MainMenuConfig MainMenu={MainMenu} excalidrawAPI={excalidrawAPI} />
+        {!isAuthLoading && isAuthenticated === false && (
+          <AuthDialog 
+            onClose={() => {}}
+          />
+        )}
+      </>
     );
   };
 

src/frontend/src/icons/DiscordIcon.tsx

@@ -0,0 +1,33 @@
+import React from "react";
+
+interface DiscordIconProps {
+  className?: string;
+  width?: number;
+  height?: number;
+  fill?: string;
+}
+
+export const DiscordIcon: React.FC<DiscordIconProps> = ({
+  className = "",
+  width = 20,
+  height = 20,
+  fill = "currentColor",
+}) => {
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 71 55"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <path
+        d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z"
+        fill={fill}
+      />
+    </svg>
+  );
+};
+
+export default DiscordIcon;

src/frontend/src/icons/GithubIcon.tsx

@@ -0,0 +1,37 @@
+import React from "react";
+
+interface GithubIconProps {
+  className?: string;
+  width?: number;
+  height?: number;
+  stroke?: string;
+  strokeWidth?: number;
+}
+
+export const GithubIcon: React.FC<GithubIconProps> = ({
+  className = "",
+  width = 20,
+  height = 20,
+  stroke = "currentColor",
+  strokeWidth = 2,
+}) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width={width}
+      height={height}
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke={stroke}
+      strokeWidth={strokeWidth}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className={className}
+    >
+      <path d="M15 22v-4a4.8 4.8 0 0 0-1-3.5c3 0 6-2 6-5.5.08-1.25-.27-2.48-1-3.5.28-1.15.28-2.35 0-3.5 0 0-1 0-3 1.5-2.64-.5-5.36-.5-8 0C6 2 5 2 5 2c-.3 1.15-.3 2.35 0 3.5A5.403 5.403 0 0 0 4 9c0 3.5 3 5.5 6 5.5-.39.49-.68 1.05-.85 1.65-.17.6-.22 1.23-.15 1.85v4" />
+      <path d="M9 18c-4.51 2-5-2-7-2" />
+    </svg>
+  );
+};
+
+export default GithubIcon;

src/frontend/src/icons/GoogleIcon.tsx

@@ -0,0 +1,43 @@
+import React from "react";
+
+interface GoogleIconProps {
+  className?: string;
+  width?: number;
+  height?: number;
+}
+
+export const GoogleIcon: React.FC<GoogleIconProps> = ({
+  className = "",
+  width = 20,
+  height = 20,
+}) => {
+  return (
+    <svg
+      className={className}
+      width={width}
+      height={height}
+      viewBox="0 0 24 24"
+      fill="currentColor"
+    >
+      <path
+        d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
+        fill="#4285F4"
+      />
+      <path
+        d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
+        fill="#34A853"
+      />
+      <path
+        d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
+        fill="#FBBC05"
+      />
+      <path
+        d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
+        fill="#EA4335"
+      />
+      <path d="M1 1h22v22H1z" fill="none" />
+    </svg>
+  );
+};
+
+export default GoogleIcon;

src/frontend/src/icons/index.ts

@@ -0,0 +1,3 @@
+export { default as GoogleIcon } from './GoogleIcon';
+export { default as GithubIcon } from './GithubIcon';
+export { default as DiscordIcon } from './DiscordIcon';