Merge pull request #28 from 8JP8/fix-frontend-ux-routing-5747148903053641978

8JP8 · web-flow · commit 433652fbd0fa · 2026-01-03T12:33:13.000Z
Fix frontend UX, routing, and mobile interactions
diff --git a/frontend/components/ChatRoom/ChatRoomContainer.tsx b/frontend/components/ChatRoom/ChatRoomContainer.tsx
@@ -990,18 +990,6 @@ const ChatRoomContainer: React.FC<ChatRoomContainerProps> = ({
 
               {/* Action Buttons */}
               <div className="flex flex-wrap sm:flex-nowrap items-center gap-2 mt-2 sm:mt-0 w-full sm:w-auto">
-                <button
-                  onClick={() => handleFollowChat(room.id)}
-                  disabled={followLoading}
-                  className={`p-2 rounded-lg transition-colors ${isFollowing
-                    ? 'text-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/30'
-                    : 'text-gray-400 hover:text-blue-500 hover:bg-gray-100 dark:hover:bg-gray-700'
-                    }`}
-                  title={isFollowing ? (t('chat.unfollow') || 'Unfollow') : (t('chat.follow') || 'Follow')}
-                >
-                  {isFollowing ? <BellOff size={20} /> : <Bell size={20} />}
-                </button>
-
                 {/* VOIP Button */}
                 {!room.is_public && (roomData?.voip_enabled ?? room.voip_enabled) && (
                   <div className="flex-1 sm:flex-none">
@@ -1015,34 +1003,49 @@ const ChatRoomContainer: React.FC<ChatRoomContainerProps> = ({
                     />
                   </div>
                 )}
-                <div className="flex flex-col min-[925px]:flex-row gap-2 flex-1 sm:flex-none">
-                  {isOwner && (
-                    <button
-                      onClick={() => {
-                        setMembersModalMode('manage');
-                        setShowMembersModal(true);
-                      }}
-                      className="flex-1 px-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center justify-center gap-2 transition-colors whitespace-nowrap min-w-fit"
-                      title={t('chat.manageChat') || 'Manage Chat'}
-                    >
-                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                      </svg>
-                      <span className="truncate hidden min-[1050px]:inline">{t('chat.manageChat') || 'Manage'}</span>
-                    </button>
-                  )}
-                  {onBack && (
-                    <button
-                      onClick={onBack}
-                      className="flex-1 px-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center justify-center gap-2 transition-colors whitespace-nowrap min-w-fit"
-                    >
-                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 19l-7-7m0 0l7-7m-7 7h18" />
-                      </svg>
-                      <span className="hidden min-[1050px]:inline">{t('common.back')}</span>
-                    </button>
-                  )}
+
+                <div className="flex items-center gap-2 flex-1 sm:flex-none w-full sm:w-auto">
+                  <button
+                    onClick={() => handleFollowChat(room.id)}
+                    disabled={followLoading}
+                    className={`p-2 rounded-lg transition-colors flex-none ${isFollowing
+                      ? 'text-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/30'
+                      : 'text-gray-400 hover:text-blue-500 hover:bg-gray-100 dark:hover:bg-gray-700'
+                      }`}
+                    title={isFollowing ? (t('chat.unfollow') || 'Unfollow') : (t('chat.follow') || 'Follow')}
+                  >
+                    {isFollowing ? <BellOff size={20} /> : <Bell size={20} />}
+                  </button>
+
+                  <div className="flex flex-row gap-2 flex-1 min-w-0">
+                    {isOwner && (
+                      <button
+                        onClick={() => {
+                          setMembersModalMode('manage');
+                          setShowMembersModal(true);
+                        }}
+                        className="flex-1 px-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center justify-center gap-2 transition-colors whitespace-nowrap min-w-fit"
+                        title={t('chat.manageChat') || 'Manage Chat'}
+                      >
+                        <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                        </svg>
+                        <span className="truncate hidden min-[1050px]:inline">{t('chat.manageChat') || 'Manage'}</span>
+                      </button>
+                    )}
+                    {onBack && (
+                      <button
+                        onClick={onBack}
+                        className="flex-1 px-4 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded-lg text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 flex items-center justify-center gap-2 transition-colors whitespace-nowrap min-w-fit"
+                      >
+                        <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10 19l-7-7m0 0l7-7m-7 7h18" />
+                        </svg>
+                        <span className="hidden min-[1050px]:inline">{t('common.back')}</span>
+                      </button>
+                    )}
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/frontend/components/Post/PostDetail.tsx b/frontend/components/Post/PostDetail.tsx
@@ -45,6 +45,7 @@ const PostDetail: React.FC<PostDetailProps> = ({ postId }) => {
   const { t, language } = useLanguage();
   const [post, setPost] = useState<Post | null>(null);
   const [loading, setLoading] = useState(true);
+  const [notFound, setNotFound] = useState(false);
   const [isFollowing, setIsFollowing] = useState(false);
   const [followLoading, setFollowLoading] = useState(false);
   const [contextMenu, setContextMenu] = useState<{ x: number, y: number } | null>(null);
@@ -136,13 +137,11 @@ const PostDetail: React.FC<PostDetailProps> = ({ postId }) => {
       if (response.data.success) {
         setPost(response.data.data);
       } else {
-        toast.error(t('errors.postNotFound') || 'Post not found');
-        router.push('/');
+        setNotFound(true);
       }
     } catch (error) {
       console.error('Error fetching post:', error);
-      toast.error(t('errors.loadingFailed') || 'Failed to load post');
-      router.push('/');
+      setNotFound(true);
     } finally {
       setLoading(false);
     }
@@ -231,6 +230,20 @@ const PostDetail: React.FC<PostDetailProps> = ({ postId }) => {
     );
   }
 
+  if (notFound) {
+    return (
+      <div className="flex flex-col items-center justify-center min-h-[50vh] text-center p-8">
+        <h2 className="text-2xl font-bold theme-text-primary mb-4">{t('errors.postNotFound') || 'Post Not Found'}</h2>
+        <button
+          onClick={() => router.push('/')}
+          className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors"
+        >
+          {t('settings.backToDashboard') || 'Back to Dashboard'}
+        </button>
+      </div>
+    );
+  }
+
   if (!post) {
     return null;
   }
diff --git a/frontend/components/UI/ContextMenu.tsx b/frontend/components/UI/ContextMenu.tsx
@@ -108,6 +108,10 @@ const ContextMenu: React.FC<ContextMenuProps> = ({ items, onClose, x, y }) => {
 
   return (
     <>
+      <div
+        className="fixed inset-0 z-40"
+        onClick={onClose}
+      />
       <div
         ref={menuRef}
         className="fixed z-50 theme-bg-secondary border theme-border rounded-lg shadow-xl py-1 min-w-[180px]"
diff --git a/frontend/components/UI/GlobeBackground.tsx b/frontend/components/UI/GlobeBackground.tsx
@@ -284,7 +284,10 @@ function GlobeBackgroundInner({ className = '' }: GlobeBackgroundProps) {
     return (
         <div
             className={`fixed inset-0 flex items-center justify-center overflow-hidden pointer-events-none ${className}`}
-            style={{ transform: `translateY(${scrollY * 0.15}px)` }}
+            style={{
+                transform: `translateY(${scrollY * 0.15}px)`,
+                touchAction: 'pan-y'
+            }}
         >
             <div className="relative" style={{ width: 600, height: 600 }}>
                 <canvas
@@ -301,6 +304,10 @@ function GlobeBackgroundInner({ className = '' }: GlobeBackgroundProps) {
                         pointerInteracting.current = null;
                         if (canvasRef.current) canvasRef.current.style.cursor = 'grab';
                     }}
+                    onPointerCancel={() => {
+                        pointerInteracting.current = null;
+                        if (canvasRef.current) canvasRef.current.style.cursor = 'grab';
+                    }}
                     onMouseMove={(e) => {
                         if (pointerInteracting.current !== null) {
                             const delta = e.clientX - pointerInteracting.current;
diff --git a/frontend/pages/about.tsx b/frontend/pages/about.tsx
@@ -122,12 +122,6 @@ export default function About() {
                                     >
                                         {t('auth.login')} / {t('auth.register')}
                                     </Link>
-                                    <Link
-                                        href="/?startTour=true"
-                                        className="px-8 py-4 bg-slate-800/80 hover:bg-slate-700 text-slate-200 rounded-full font-bold text-lg transition-all border border-slate-600 hover:border-slate-500 backdrop-blur-sm shadow-xl no-underline hover:no-underline hover:scale-105"
-                                    >
-                                        {t('about.takeATour') || 'Take the Tour'}
-                                    </Link>
                                 </>
                             )}
                         </div>
diff --git a/frontend/pages/chat-room/[id].tsx b/frontend/pages/chat-room/[id].tsx
@@ -1,20 +1,99 @@
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { useRouter } from 'next/router';
+import Layout from '@/components/Layout/Layout';
+import ChatRoomContainer from '@/components/ChatRoom/ChatRoomContainer';
 import LoadingSpinner from '@/components/UI/LoadingSpinner';
+import { api, API_ENDPOINTS } from '@/utils/api';
+import { toast } from 'react-hot-toast';
 
-export default function ChatRoomRedirect() {
+interface ChatRoom {
+    id: string;
+    name: string;
+    description: string;
+    topic_id: string;
+    owner_id: string;
+    owner?: {
+      id: string;
+      username: string;
+    };
+    tags: string[];
+    is_public: boolean;
+    member_count: number;
+    message_count: number;
+    last_activity: string;
+    user_is_member?: boolean;
+    background_picture?: string;
+}
+
+export default function ChatRoomPage() {
     const router = useRouter();
     const { id } = router.query;
+    const [room, setRoom] = useState<ChatRoom | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState(false);
 
     useEffect(() => {
-        if (id) {
-            router.replace(`/?chatRoomId=${id}`);
+        if (id && typeof id === 'string') {
+            fetchRoom(id);
+        } else if (router.isReady && !id) {
+             // If ready but no ID? 404
+             setError(true);
+             setLoading(false);
+        }
+    }, [id, router.isReady]);
+
+    const fetchRoom = async (roomId: string) => {
+        try {
+            setLoading(true);
+            const response = await api.get(API_ENDPOINTS.CHAT_ROOMS.GET(roomId));
+            if (response.data.success) {
+                setRoom(response.data.data);
+            } else {
+                setError(true);
+            }
+        } catch (error) {
+            console.error('Error fetching chat room:', error);
+            setError(true);
+        } finally {
+            setLoading(false);
         }
-    }, [id, router]);
+    };
+
+    if (error) {
+        return (
+            <Layout>
+                <div className="flex flex-col items-center justify-center min-h-[60vh] text-center px-4">
+                    <h1 className="text-2xl font-bold mb-4 theme-text-primary">Chat Room Not Found</h1>
+                    <p className="theme-text-secondary mb-6">The chat room you are looking for does not exist or you do not have permission to view it.</p>
+                    <button
+                        onClick={() => router.push('/')}
+                        className="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors"
+                    >
+                        Go to Dashboard
+                    </button>
+                </div>
+            </Layout>
+        );
+    }
+
+    if (loading || !room) {
+        return (
+            <Layout>
+                <div className="flex items-center justify-center min-h-screen">
+                    <LoadingSpinner size="lg" />
+                </div>
+            </Layout>
+        );
+    }
 
     return (
-        <div className="min-h-screen flex items-center justify-center theme-bg-primary">
-            <LoadingSpinner size="lg" />
-        </div>
+        <Layout>
+            <div className="h-[calc(100vh-64px)] flex flex-col">
+                 <ChatRoomContainer
+                    room={room}
+                    onBack={() => router.push('/')}
+                 />
+            </div>
+        </Layout>
     );
 }
diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx
@@ -636,11 +636,9 @@ export default function Home() {
     const isRightSwipe = distance < -minSwipeDistance;
 
     if (isLeftSwipe) {
-      // Swipe Left (Move Right in flow): Sidebar -> Content -> Profile
+      // Swipe Left (Move Right in flow): Sidebar -> Content
       if (mobileView === 'sidebar') {
         setMobileView('content');
-      } else if (mobileView === 'content') {
-        router.push('/profile');
       }
     }
 
diff --git a/frontend/pages/settings.tsx b/frontend/pages/settings.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { useRouter } from 'next/router';
 import { useAuth } from '@/contexts/AuthContext';
 import { useLanguage } from '@/contexts/LanguageContext';
@@ -52,6 +52,44 @@ const Settings: React.FC = () => {
   const [loadingIdentities, setLoadingIdentities] = useState(false);
   const [deletingIdentityId, setDeletingIdentityId] = useState<string | null>(null);
 
+  // Swipe handlers
+  const touchStart = useRef<number | null>(null);
+  const touchEnd = useRef<number | null>(null);
+  const minSwipeDistance = 50;
+
+  const onTouchStart = (e: React.TouchEvent) => {
+    touchEnd.current = null;
+    touchStart.current = e.targetTouches[0].clientX;
+  };
+
+  const onTouchMove = (e: React.TouchEvent) => {
+    touchEnd.current = e.targetTouches[0].clientX;
+  };
+
+  const onTouchEnd = () => {
+    if (!touchStart.current || !touchEnd.current) return;
+    const distance = touchStart.current - touchEnd.current;
+    const isLeftSwipe = distance > minSwipeDistance;
+    const isRightSwipe = distance < -minSwipeDistance;
+
+    const tabs: ('preferences' | 'account' | 'privacy' | 'anonymous-identities')[] = ['preferences', 'account', 'privacy', 'anonymous-identities'];
+    const currentIndex = tabs.indexOf(activeTab);
+
+    if (isLeftSwipe) {
+      // Swipe Left -> Move to Next Tab
+      if (currentIndex < tabs.length - 1) {
+        updateTab(tabs[currentIndex + 1]);
+      }
+    }
+
+    if (isRightSwipe) {
+      // Swipe Right -> Move to Prev Tab
+      if (currentIndex > 0) {
+        updateTab(tabs[currentIndex - 1]);
+      }
+    }
+  };
+
   // Listen for tour events
   useEffect(() => {
     const handleSwitchTab = (e: CustomEvent) => {
@@ -295,7 +333,12 @@ const Settings: React.FC = () => {
 
   return (
     <Layout>
-      <div className="max-w-4xl mx-auto py-8 px-4">
+      <div
+        className="max-w-4xl mx-auto py-8 px-4"
+        onTouchStart={onTouchStart}
+        onTouchMove={onTouchMove}
+        onTouchEnd={onTouchEnd}
+      >
         <div className="mb-8">
           <button
             id="back-to-dashboard-btn"

Original file line number	Diff line number	Diff line change
`@@ -636,11 +636,9 @@ export default function Home() {`
`636`	`636`	`const isRightSwipe = distance < -minSwipeDistance;`
`637`	`637`
`638`	`638`	`if (isLeftSwipe) {`
`639`		`- // Swipe Left (Move Right in flow): Sidebar -> Content -> Profile`
	`639`	`+ // Swipe Left (Move Right in flow): Sidebar -> Content`
`640`	`640`	`if (mobileView === 'sidebar') {`
`641`	`641`	`setMobileView('content');`
`642`		`- } else if (mobileView === 'content') {`
`643`		`- router.push('/profile');`
`644`	`642`	`}`
`645`	`643`	`}`
`646`	`644`