Improved authentication; added fallbacks to 3D; cleaner dashboard charts

2025-10-22 21:28:10 +03:00
parent 34e84213c7
commit 932b16d4f4
18 changed files with 478 additions and 171 deletions
--- a/frontend/app/(protected)/layout.tsx
+++ b/frontend/app/(protected)/layout.tsx
@@ -1,4 +1,5 @@
 import React from 'react'
+import AuthGuard from '@/components/auth/AuthGuard'

 export default function ProtectedLayout({
  children,
@@ -6,8 +7,10 @@ export default function ProtectedLayout({
  children: React.ReactNode
 }) {
  return (
-    <div className="protected-layout">
-      {children}
-    </div>
+    <AuthGuard>
+      <div className="protected-layout">
+        {children}
+      </div>
+    </AuthGuard>
  )
 }
--- a/frontend/app/(protected)/navigation/page.tsx
+++ b/frontend/app/(protected)/navigation/page.tsx
@@ -79,6 +79,8 @@ const NavigationPage: React.FC = () => {
  
  const [detectorsData, setDetectorsData] = useState<{ detectors: Record<string, DetectorType> }>({ detectors: {} })
  const [detectorsError, setDetectorsError] = useState<string | null>(null)
+  const [modelError, setModelError] = useState<string | null>(null)
+  const [isModelReady, setIsModelReady] = useState(false)
  
  const urlObjectId = searchParams.get('objectId')
  const urlObjectTitle = searchParams.get('objectTitle')
@@ -86,10 +88,14 @@ const NavigationPage: React.FC = () => {
  const objectTitle = currentObject.title || urlObjectTitle
 
  const handleModelLoaded = useCallback(() => { 
+    setIsModelReady(true)
+    setModelError(null)
  }, [])

  const handleModelError = useCallback((error: string) => {
    console.error('Model loading error:', error)
+    setModelError(error)
+    setIsModelReady(false)
  }, [])

  useEffect(() => {
@@ -131,6 +137,12 @@ const NavigationPage: React.FC = () => {
      serial_number: detector.serial_number,
    })

+    // Проверяем, что детектор имеет необходимые данные
+    if (!detector || !detector.detector_id || !detector.serial_number) {
+      console.warn('[NavigationPage] Invalid detector data, skipping menu display:', detector)
+      return
+    }
+
    if (selectedDetector?.detector_id === detector.detector_id && showDetectorMenu) {
      setShowDetectorMenu(false)
      setSelectedDetector(null)
@@ -197,6 +209,7 @@ const NavigationPage: React.FC = () => {
                detectorsData={detectorsData}
                onDetectorMenuClick={handleDetectorMenuClick}
                onClose={closeFloorNavigation}
+                is3DReady={isModelReady && !modelError}
              />
            </div>
          </div>
@@ -263,24 +276,40 @@ const NavigationPage: React.FC = () => {
        
        <div className="flex-1 overflow-hidden">
          <div className="h-full">
-            <ModelViewer 
-              modelPath='/static-models/AerBIM_Monitor_ASM_HT_Viewer_Expo2017Astana_Level_+1430_custom_prop.glb'
-              onModelLoaded={handleModelLoaded}
-              onError={handleModelError}
-              focusSensorId={selectedDetector?.serial_number ?? null}
-              renderOverlay={({ anchor }) => (
-                selectedDetector && showDetectorMenu && anchor ? (
-                  <DetectorMenu
-                    detector={selectedDetector}
-                    isOpen={true}
-                    onClose={closeDetectorMenu}
-                    getStatusText={getStatusText}
-                    compact={true}
-                    anchor={anchor}
-                  />
-                ) : null
-              )}
-            />
+            {modelError ? (
+              <div className="h-full flex items-center justify-center bg-[#0e111a]">
+                <div className="text-center p-8 bg-[#161824] rounded-lg border border-gray-700 max-w-md">
+                  <div className="text-red-400 text-lg font-semibold mb-4">
+                    Ошибка загрузки 3D модели
+                  </div>
+                  <div className="text-gray-300 mb-4">
+                    {modelError}
+                  </div>
+                  <div className="text-sm text-gray-400">
+                    Используйте навигацию по этажам для просмотра детекторов
+                  </div>
+                </div>
+              </div>
+            ) : (
+              <ModelViewer 
+                modelPath='/static-models/AerBIM_Monitor_ASM_HT_Viewer_Expo2017Astana_Level_+1430_custom_prop.glb'
+                onModelLoaded={handleModelLoaded}
+                onError={handleModelError}
+                focusSensorId={selectedDetector?.serial_number ?? null}
+                renderOverlay={({ anchor }) => (
+                  selectedDetector && showDetectorMenu && anchor ? (
+                    <DetectorMenu
+                      detector={selectedDetector}
+                      isOpen={true}
+                      onClose={closeDetectorMenu}
+                      getStatusText={getStatusText}
+                      compact={true}
+                      anchor={anchor}
+                    />
+                  ) : null
+                )}
+              />
+            )}
          </div>
        </div>
      </div>
--- a/frontend/app/(protected)/objects/page.tsx
+++ b/frontend/app/(protected)/objects/page.tsx
@@ -93,14 +93,9 @@ const ObjectsPage: React.FC = () => {
              <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z" />
            </svg>
          </div>
-          <h3 className="text-lg font-medium text-white mb-2">Ошибка загрузки</h3>
+          <h3 className="text-lg font-medium text-white mb-2">Ошибка загрузки данных</h3>
          <p className="text-[#71717a] mb-4">{error}</p>
-          <button
-            onClick={() => window.location.reload()}
-            className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-[#3193f5] hover:bg-[#2563eb] focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-opacity-50 transition-colors duration-200"
-          >
-            Попробовать снова
-          </button>
+          <p className="text-sm text-gray-500">Если проблема повторяется, обратитесь к администратору</p>
        </div>
      </div>
    )
--- a/frontend/app/api/auth/logout/route.ts
+++ b/frontend/app/api/auth/logout/route.ts
@@ -0,0 +1,53 @@
+import { getServerSession } from 'next-auth'
+import { authOptions } from '@/lib/auth'
+import { NextRequest } from 'next/server'
+import { getToken } from 'next-auth/jwt'
+
+export async function POST(req: NextRequest) {
+  try {
+    const session = await getServerSession(authOptions)
+    const secret = process.env.NEXTAUTH_SECRET
+    const token = await getToken({ req, secret }).catch(() => null)
+
+    const accessToken = (session as any)?.accessToken || (token as any)?.accessToken
+    const refreshToken = (session as any)?.refreshToken || (token as any)?.refreshToken
+
+    const backendUrl = process.env.BACKEND_URL
+    if (!backendUrl) {
+      return new Response(JSON.stringify({ success: false, error: 'BACKEND_URL is not configured' }), {
+        status: 500,
+        headers: { 'Content-Type': 'application/json' },
+      })
+    }
+
+    if (!refreshToken && !accessToken) {
+      return new Response(JSON.stringify({ success: false, error: 'Unauthorized' }), {
+        status: 401,
+        headers: { 'Content-Type': 'application/json' },
+      })
+    }
+
+    const payload = refreshToken ? { refresh: refreshToken } : {}
+    const headers: Record<string, string> = { 'Content-Type': 'application/json' }
+    if (accessToken) headers['Authorization'] = `Bearer ${accessToken}`
+
+    const res = await fetch(`${backendUrl}/auth/logout/`, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify(payload),
+    })
+
+    const text = await res.text().catch(() => '')
+    const contentType = res.headers.get('Content-Type') || 'application/json'
+    return new Response(text || JSON.stringify({ success: res.ok }), {
+      status: res.status,
+      headers: { 'Content-Type': contentType },
+    })
+  } catch (error) {
+    console.error('Error in logout route:', error)
+    return new Response(JSON.stringify({ success: false, error: 'Failed to logout' }), {
+      status: 500,
+      headers: { 'Content-Type': 'application/json' },
+    })
+  }
+}
--- a/frontend/app/providers/AuthProvider.tsx
+++ b/frontend/app/providers/AuthProvider.tsx
@@ -50,7 +50,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
          email: userData.email || session.user.email || '',
          image: userData.imageURL || userData.image,
          account_type: userData.account_type,
-          login: userData.login,
+          login: userData.login ?? session.user.name ?? '',
          uuid: userData.uuid,
        })
        setAuthenticated(true)
--- a/frontend/app/store/userStore.ts
+++ b/frontend/app/store/userStore.ts
@@ -1,5 +1,4 @@
 import { create } from 'zustand'
-import { persist } from 'zustand/middleware'
 import { User, UserState } from '../types'

 interface UserStore extends UserState {
@@ -16,28 +15,19 @@ interface UserStore extends UserState {
  //!  что пользователь может делать асинхронно?
 }

-const useUserStore = create<UserStore>()(
-  persist(
-    set => ({
-      // начальное состояние
-      isAuthenticated: false,
-      user: null,
-      favorites: [],
+const useUserStore = create<UserStore>(set => ({
+  // начальное состояние
+  isAuthenticated: false,
+  user: null,
+  favorites: [],

-      // синхронные действия
-      setUser: user => set({ user }),
-      setAuthenticated: isAuthenticated => set({ isAuthenticated }),
-      logout: () =>
-        set({
-          isAuthenticated: false,
-          user: null,
-        }),
-    }),
-
-    //! асинхронщина?
-    { name: 'user-store' }
-  )
-)
+  // синхронные действия
+  setUser: user => set({ user }),
+  setAuthenticated: isAuthenticated => set({ isAuthenticated }),
+  logout: () => {
+    set({ isAuthenticated: false, user: null })
+  },
+}))

 export default useUserStore

--- a/frontend/app/types.ts
+++ b/frontend/app/types.ts
@@ -1,9 +1,2 @@
- export interface ValidationRules {
-  required?: boolean
-  minLength?: number
-  pattern?: RegExp 
-}
-export type ValidationErrors = Record<string, string>
-
-export type User = object
-export type UserState = object
+import type { ValidationRules, ValidationErrors, User, UserState } from './types/index'
+export type { ValidationRules, ValidationErrors, User, UserState }