Revize 06d1aa21

Refactoring

webapp/pages/_app.tsx

@@ -1 +1 @@
 // @ts-nocheck
 import '../styles/globals.css';
 import 'bootstrap/dist/css/bootstrap.css';
+import '@fortawesome/fontawesome-svg-core/styles.css';
 
 import type { AppProps } from 'next/app';
 import Head from 'next/head';

webapp/pages/classes/index.tsx

@@ -15 +15 @@
     const router = useRouter();
 
     useEffect(() => {
-        if (role !== 'ADMINISTRATOR') {
-            logout();
-            router.push('/login');
-        }
-
-        if (!redirecting) {
+        if (!redirecting && role === 'ADMINISTRATOR') {
             // TODO load classes
         }
     }, [redirecting, role, router]);

webapp/pages/documents/admin/index.tsx

@@ -9 +9 @@
 import { LoggedUserContext } from '../../../contexts/LoggedUserContext';
 import { MainLayout } from '../../../layouts/MainLayout';
 
-
 function AdminDocumentPage() {
     const redirecting = useUnauthRedirect('/login');
     const { logout, role } = useContext(LoggedUserContext);
     const router = useRouter();
-    useEffect(() => {
-        console.log(role);
-        if (role !== 'ADMINISTRATOR') {
-            logout();
-            router.push('/login');
-        }
 
-        if (!redirecting) {
+    useEffect(() => {
+        if (!redirecting && role === 'ADMINISTRATOR') {
             // TODO load documents
         }
     }, [logout, redirecting, role, router]);

webapp/pages/documents/annotator/index.tsx

@@ -15 +15 @@
     const redirecting = useUnauthRedirect('/login');
     const { logout, role } = useContext(LoggedUserContext);
     const router = useRouter();
-    const [documents, setDocuments] = useState<AnnotationListInfo[] | null | undefined>(
-        []
-    );
+    const [documents, setDocuments] = useState<AnnotationListInfo[]>([]);
 
     useEffect(() => {
-        console.log(role);
-        if (role !== 'ANNOTATOR') {
-            logout();
-            router.push('/login');
-        }
-
         async function fetchData() {
             let docs = (await userController.userAnnotationsGet()).data.annotations;
-            console.log(docs);
-            setDocuments(docs);
+            if (!docs) {
+                setDocuments([]);
+            } else {
+                setDocuments(docs);
+            }
         }
-        if (!redirecting) {
+        if (!redirecting && role === 'ANNOTATOR') {
             fetchData();
         }
     }, [logout, redirecting, role, router]);
@@ -69 +64 @@
             key: 'action',
             dataIndex: 'annotationId',
             render: (anotationId: number) => (
-                <Button onClick={() => router.push('/annotation/' + anotationId)}>
+                <Button
+                    key={anotationId}
+                    type={'primary'}
+                    onClick={() => router.push('/annotation/' + anotationId)}
+                >
                     Anotovat
                 </Button>
             ),
         },
     ];
 
-    // TODO switch to REAL data from Controller
-    const data = [];
-    for (let i = 0; i < 100; i++) {
-        let state = 'DONE';
-        if (i % 3 === 1) {
-            state = 'IN_PROGRESS';
-        }
-        if (i % 3 === 2) {
-            state = 'NEW';
-        }
-
-        data.push({
-            key: i,
-            documentName: `Dokument ${i}`,
-            state: state,
-            annotationId: i,
-        });
-    }
-
     return redirecting || role !== 'ANNOTATOR' ? null : (
         <MainLayout>
             <Typography.Title level={2}>
                 <FontAwesomeIcon icon={faFileLines} /> Dokumenty
             </Typography.Title>
-            <Table columns={columns} dataSource={data} size="small" scroll={{ y: 500 }} />
+            <Table
+                columns={columns}
+                dataSource={documents}
+                size="small"
+                scroll={{ y: 500 }}
+            />
         </MainLayout>
     );
 }

webapp/pages/export/index.tsx

@@ -14 +14 @@
     const { logout, role } = useContext(LoggedUserContext);
     const router = useRouter();
 
-    useEffect(() => {
-        if (role !== 'ADMINISTRATOR') {
-            logout();
-            router.push('/login');
-        }
-    }, [logout, redirecting, role, router]);
-
     return redirecting || role !== 'ADMINISTRATOR' ? null : (
         <MainLayout>
             <Typography.Title level={2}>

webapp/pages/tags/index.tsx

@@ -15 +15 @@
     const router = useRouter();
 
     useEffect(() => {
-        if (role !== 'ADMINISTRATOR') {
-            logout();
-            router.push('/login');
+        if (!redirecting && role === 'ADMINISTRATOR') {
+            // TODO load tags
         }
     }, [logout, redirecting, role, router]);
 

webapp/pages/users/index.tsx

@@ -15 +15 @@
     const router = useRouter();
 
     useEffect(() => {
-        if (role !== 'ADMINISTRATOR') {
-            logout();
-            router.push('/login');
+        if (!redirecting && role === 'ADMINISTRATOR') {
+            // TODO load users
         }
     }, [logout, redirecting, role, router]);
 

webapp/styles/MainLayout.module.scss

@@ -1 +1 @@
 .layoutWrapper {
-    background-color: lightgray;
+    background-color: #ffffff;
     display: grid;
 
     grid: