feat: update front layout

assets/App.tsx

@@ -7,12 +7,14 @@ import {
     FileSearchOutlined,
     InfoCircleOutlined,
     LineChartOutlined,
+    LoginOutlined,
+    LogoutOutlined,
     QuestionCircleOutlined,
     SearchOutlined,
     TeamOutlined,
     UserOutlined
 } from "@ant-design/icons";
-import {Navigate, Route, Routes, useNavigate} from "react-router-dom";
+import {Navigate, Route, Routes, useLocation, useNavigate} from "react-router-dom";
 import TextPage from "./pages/TextPage";
 import tos from "./content/tos.md";
 import privacy from "./content/privacy.md";
@@ -23,171 +25,204 @@ import TldPage from "./pages/info/TldPage";
 import StatisticsPage from "./pages/info/StatisticsPage";
 import WatchlistsPage from "./pages/tracking/WatchlistsPage";
 import UserPage from "./pages/UserPage";
-import LoginPage from "./pages/LoginPage";
+import React, {useCallback, useEffect, useMemo, useState} from "react";
-import React, {useEffect, useState} from "react";
 import {getUser} from "./utils/api";
+import FAQPage from "./pages/FAQPage";
+import LoginPage, {AuthenticatedContext} from "./pages/LoginPage";
+import ConnectorsPage from "./pages/tracking/ConnectorsPage";
+import NotFoundPage from "./pages/NotFoundPage";
 
 export default function App() {
-
     const {
         token: {colorBgContainer, borderRadiusLG},
     } = theme.useToken()
-    const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);
-    const navigate = useNavigate()
 
+    const navigate = useNavigate()
+    const [isAuthenticated, setIsAuthenticated] = useState(false)
+    const location = useLocation()
+
+    const authenticated = useCallback((authenticated: boolean) => {
+        setIsAuthenticated(authenticated)
+    }, []);
+
+    const contextValue = useMemo(() => ({
+        authenticated,
+        setIsAuthenticated
+    }), [authenticated, setIsAuthenticated]);
 
     useEffect(() => {
-        getUser().then(() => setIsAuthenticated(true)).catch(() => setIsAuthenticated(false))
+        getUser().then(() => {
+            setIsAuthenticated(true)
+            if (location.pathname === '/login') navigate('/search/domain')
+        }).catch(() => {
+            setIsAuthenticated(false)
+            if (location.pathname !== '/login') navigate('/login')
+        })
     }, []);
 
 
-    return <Layout hasSider style={{minHeight: '100vh'}}>
+    const menuItems = [
-        <Layout.Sider>
+        {
-            <Menu
+            key: '1',
-                defaultSelectedKeys={['1-1']}
+            label: 'Search',
-                defaultOpenKeys={['1', '2', '3']}
+            children: [
-                mode="inline"
+                {
-                theme="dark"
+                    key: '1-1',
-                items={[
+                    icon: <SearchOutlined/>,
-                    {
+                    label: 'Domain',
-                        key: '1',
+                    title: 'Domain Finder',
-                        label: 'Search',
+                    disabled: !isAuthenticated,
-                        children: [
+                    onClick: () => navigate('/search/domain')
-                            {
+                },
-                                key: '1-1',
+                {
-                                icon: <SearchOutlined/>,
+                    key: '1-2',
-                                label: 'Domain',
+                    icon: <TeamOutlined/>,
-                                title: 'Domain Finder',
+                    label: 'Entity',
-                                disabled: !isAuthenticated,
+                    title: 'Entity Finder',
-                                onClick: () => navigate('/search/domain')
+                    disabled: !isAuthenticated,
-                            },
+                    onClick: () => navigate('/search/entity')
-                            {
+                },
-                                key: '1-2',
+                {
-                                icon: <TeamOutlined/>,
+                    key: '1-3',
-                                label: 'Entity',
+                    icon: <CloudServerOutlined/>,
-                                title: 'Entity Finder',
+                    label: 'Nameserver',
-                                disabled: !isAuthenticated,
+                    title: 'Nameserver Finder',
-                                onClick: () => navigate('/search/entity')
+                    disabled: !isAuthenticated,
-                            },
+                    onClick: () => navigate('/search/nameserver')
-                            {
+                }
-                                key: '1-3',
+            ]
-                                icon: <CloudServerOutlined/>,
+        },
-                                label: 'Nameserver',
+        {
-                                title: 'Nameserver Finder',
+            key: '2',
-                                disabled: !isAuthenticated,
+            label: 'Information',
-                                onClick: () => navigate('/search/nameserver')
+            children: [
-                            }
+                {
-                        ]
+                    key: '2-1',
-                    },
+                    icon: <BankOutlined/>,
-                    {
+                    label: 'TLD',
-                        key: '2',
+                    disabled: !isAuthenticated,
-                        label: 'Information',
+                    onClick: () => navigate('/info/tld')
-                        children: [
+                },
-                            {
+                {
-                                key: '2-1',
+                    key: '2-2',
-                                icon: <BankOutlined/>,
+                    icon: <LineChartOutlined/>,
-                                label: 'TLD',
+                    label: 'Statistics',
-                                disabled: !isAuthenticated,
+                    disabled: !isAuthenticated,
-                                onClick: () => navigate('/info/tld')
+                    onClick: () => navigate('/info/stats')
-                            },
+                }
-                            {
+            ]
-                                key: '2-2',
+        },
-                                icon: <LineChartOutlined/>,
+        {
-                                label: 'Statistics',
+            key: '3',
-                                disabled: !isAuthenticated,
+            label: 'Tracking',
-                                onClick: () => navigate('/info/stats')
+            children: [
-                            }
+                {
-                        ]
+                    key: '3-1',
-                    },
+                    icon: <Badge count={0} size="small"><FileSearchOutlined
-                    {
+                        shape="square"/></Badge>,
-                        key: '3',
+                    label: 'My Watchlists',
-                        label: 'Tracking',
+                    disabled: !isAuthenticated,
-                        children: [
+                    onClick: () => navigate('/tracking/watchlist')
-                            {
+                },
-                                key: '3-1',
+                {
-                                icon: <Badge count={0} size="small"><FileSearchOutlined
+                    key: '3-2',
-                                    shape="square"/></Badge>,
+                    icon: <ApiOutlined/>,
-                                label: 'My Watchlists',
+                    label: 'My connectors',
-                                disabled: !isAuthenticated,
+                    disabled: !isAuthenticated,
-                                onClick: () => navigate('/tracking/watchlist')
+                    onClick: () => navigate('/tracking/connectors')
-                            },
+                }
-                            {
+            ]
-                                key: '3-2',
+        },
-                                icon: <ApiOutlined/>,
+        {
-                                label: 'My connectors',
+            key: '4',
-                                disabled: !isAuthenticated,
+            icon: <UserOutlined/>,
-                                onClick: () => navigate('/tracking/connectors')
+            label: 'My Account',
-                            }
+            disabled: !isAuthenticated,
-                        ]
+            onClick: () => navigate('/user')
-                    },
+        },
-                    {
+        {
-                        key: '4',
+            key: '5',
-                        icon: <UserOutlined/>,
+            icon: <QuestionCircleOutlined/>,
-                        label: 'My Account',
+            label: 'FAQ',
-                        disabled: !isAuthenticated,
+            onClick: () => navigate('/faq')
-                        onClick: () => navigate('/user')
+        },
-                    },
+        {
-                    {
+            key: '6',
-                        key: '5',
+            icon: <InfoCircleOutlined/>,
-                        icon: <QuestionCircleOutlined/>,
+            label: 'TOS',
-                        label: 'FAQ',
+            onClick: () => navigate('/tos')
-                        onClick: () => navigate('/faq')
+        },
-                    },
+        {
-                    {
+            key: '7',
-                        key: '6',
+            icon: <FileProtectOutlined/>,
-                        icon: <InfoCircleOutlined/>,
+            label: 'Privacy Policy',
-                        label: 'TOS',
+            onClick: () => navigate('/privacy')
-                        onClick: () => navigate('/tos')
+        }
-                    },
+    ]
-                    {
-                        key: '7',
-                        icon: <FileProtectOutlined/>,
-                        label: 'Privacy Policy',
-                        onClick: () => navigate('/privacy')
-                    }
-                ]}
-            />
-            <div className="demo-logo-vertical"></div>
-        </Layout.Sider>
-        <Layout>
-            <Layout.Header style={{padding: 0, background: colorBgContainer}}/>
-            <Layout.Content style={{margin: '24px 16px 0'}}>
-                <div style={{
-                    padding: 24,
-                    minHeight: 360,
-                    background: colorBgContainer,
-                    borderRadius: borderRadiusLG,
-                }}>
 
-                    <Routes>
-                        <Route path="/tos" element={<TextPage markdown={tos}/>}/>
-                        <Route path="/privacy" element={<TextPage markdown={privacy}/>}/>
 
-                        {isAuthenticated ?
+    return <AuthenticatedContext.Provider value={contextValue}>
-                            <>
+        <Layout hasSider style={{minHeight: '100vh'}}>
-                                <Route path="/" element={<Navigate to="/search/domain"/>}/>
+            <Layout.Sider>
+                <Menu
+                    defaultSelectedKeys={['1-1']}
+                    defaultOpenKeys={['1', '2', '3']}
+                    mode="inline"
+                    theme="dark"
+                    items={[...menuItems, isAuthenticated ? {
+                        key: '8',
+                        icon: <LogoutOutlined/>,
+                        label: 'Log out',
+                        danger: true,
+                        onClick: () => window.location.replace("/logout")
+                    } : {
+                        key: '8',
+                        icon: <LoginOutlined/>,
+                        label: 'Log in',
+                        onClick: () => navigate('/login')
+                    }]}
+                />
+                <div className="demo-logo-vertical"></div>
+            </Layout.Sider>
+            <Layout>
+                <Layout.Header style={{padding: 0, background: colorBgContainer}}/>
+                <Layout.Content style={{margin: '24px 16px 0'}}>
+                    <div style={{
+                        padding: 24,
+                        minHeight: 360,
+                        background: colorBgContainer,
+                        borderRadius: borderRadiusLG,
+                    }}>
 
-                                <Route path="/search/domain" element={<DomainSearchPage/>}/>
+                        <Routes>
-                                <Route path="/search/entity" element={<EntitySearchPage/>}/>
+                            <Route path="/" element={<Navigate to="/search/domain"/>}/>
-                                <Route path="/search/nameserver" element={<NameserverSearchPage/>}/>
 
-                                <Route path="/info/tld" element={<TldPage/>}/>
+                            <Route path="/search/domain" element={<DomainSearchPage/>}/>
-                                <Route path="/info/stats" element={<StatisticsPage/>}/>
+                            <Route path="/search/entity" element={<EntitySearchPage/>}/>
+                            <Route path="/search/nameserver" element={<NameserverSearchPage/>}/>
 
-                                <Route path="/tracking/watchlist" element={<WatchlistsPage/>}/>
+                            <Route path="/info/tld" element={<TldPage/>}/>
+                            <Route path="/info/stats" element={<StatisticsPage/>}/>
 
-                                <Route path="/user" element={<UserPage/>}/>
+                            <Route path="/tracking/watchlist" element={<WatchlistsPage/>}/>
-                            </>
+                            <Route path="/tracking/connectors" element={<ConnectorsPage/>}/>
-                            :
-                            <Route path="*" element={<LoginPage/>}/>
-                        }
 
-                    </Routes>
+                            <Route path="/user" element={<UserPage/>}/>
-                </div>
+
-            </Layout.Content>
+                            <Route path="/faq" element={<FAQPage/>}/>
-            <Layout.Footer style={{textAlign: 'center'}}>
+                            <Route path="/tos" element={<TextPage markdown={tos}/>}/>
-                Domain Watchdog ©{new Date().getFullYear()} Created by Maël Gangloff
+                            <Route path="/privacy" element={<TextPage markdown={privacy}/>}/>
-            </Layout.Footer>
+
+                            <Route path="/login" element={<LoginPage/>}/>
+
+                            <Route path="*" element={<NotFoundPage/>}/>
+                        </Routes>
+                    </div>
+                </Layout.Content>
+                <Layout.Footer style={{textAlign: 'center'}}>
+                    Domain Watchdog ©{new Date().getFullYear()} Created by Maël Gangloff
+                </Layout.Footer>
+            </Layout>
         </Layout>
-    </Layout>
+    </AuthenticatedContext.Provider>
 }

assets/index.tsx

@@ -14,7 +14,6 @@ function Index() {
         <HashRouter>
             <App/>
         </HashRouter>
-
     );
 }
 

assets/pages/FAQPage.tsx

@@ -0,0 +1,8 @@
+import React from "react";
+
+
+export default function FAQPage() {
+    return <p>
+        FAQ Page
+    </p>
+}

assets/pages/LoginPage.tsx

@@ -1,7 +1,74 @@
-import React from "react";
+import React, {createContext, useContext, useEffect, useState} from "react";
+import {Alert, Button, Card, Flex, Form, Input} from "antd";
+import {login} from "../utils/api";
+import {useNavigate} from "react-router-dom";
+
+type FieldType = {
+    username: string;
+    password: string;
+};
+
+export const AuthenticatedContext = createContext<any>(null)
 
 export default function Page() {
-    return <p>
+
-        Login Page
+    const [error, setError] = useState()
-    </p>
+    const navigate = useNavigate()
+    const {isAuthenticated, setIsAuthenticated} = useContext(AuthenticatedContext)
+
+    const onFinish = (data: FieldType) => {
+        login(data.username, data.password).then(() => {
+            setIsAuthenticated(true)
+            navigate('/search/domain')
+        }).catch((e) => {
+            setIsAuthenticated(false)
+            setError(e.response.data.message)
+        })
+    }
+
+    return <Flex gap="middle" align="center" justify="center" vertical><Card
+        title="Log in"
+        style={{width: 500}}
+    >
+        {error &&
+            <Alert
+                type='error'
+                message='Error'
+                banner={true}
+                role='role'
+                description={error}
+                style={{marginBottom: '1em'}}
+            />}
+        <Form
+            name="basic"
+            labelCol={{span: 8}}
+            wrapperCol={{span: 16}}
+            style={{maxWidth: 600}}
+            onFinish={onFinish}
+            autoComplete="off"
+        >
+            <Form.Item
+                label="Username"
+                name="username"
+                rules={[{required: true, message: 'Required'}]}
+            >
+                <Input/>
+            </Form.Item>
+
+            <Form.Item<FieldType>
+                label="Password"
+                name="password"
+                rules={[{required: true, message: 'Required'}]}
+            >
+                <Input.Password/>
+            </Form.Item>
+
+            <Form.Item wrapperCol={{offset: 8, span: 16}}>
+                <Button type="primary" htmlType="submit">
+                    Submit
+                </Button>
+            </Form.Item>
+        </Form>
+    </Card>
+    </Flex>
 }

assets/pages/NotFoundPage.tsx

@@ -1,4 +1,4 @@
-import {Button, Result} from "antd";
+import {Result} from "antd";
 import React from "react";
 
 
@@ -7,6 +7,5 @@ export default function NotFoundPage() {
         status="404"
         title="404"
         subTitle="Sorry, the page you visited does not exist."
-        extra={<Button type="primary">Back Home</Button>}
     />
 }

assets/pages/info/StatisticsPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function StatisticsPage() {
     return <p>
-        Tld
+        Statistics Page
     </p>
 }

assets/pages/info/TldPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function TldPage() {
     return <p>
-        Tld
+        Tld Page
     </p>
 }

assets/pages/search/DomainSearchPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function DomainSearchPage() {
     return <p>
-
+        Domain Search Page
     </p>
 }

assets/pages/search/EntitySearchPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function EntitySearchPage() {
     return <p>
-
+        Entity Search Page
     </p>
 }

assets/pages/search/NameserverSearchPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function NameserverSearchPage() {
     return <p>
-        NS Finder
+        NS Search Page
     </p>
 }

assets/pages/tracking/ConnectorsPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function ConnectorsPage() {
     return <p>
-
+        Connectors Page
     </p>
 }

assets/pages/tracking/WatchlistsPage.tsx

@@ -2,6 +2,6 @@ import React from "react";
 
 export default function WatchlistsPage() {
     return <p>
-
+        Watchlists Page
     </p>
 }

assets/utils/api/tld.ts

@@ -8,21 +8,8 @@ interface Tld {
 }
 
 export async function getTldList(params: object): Promise<Tld[]> {
-    let page = 1
+    return (await request<Tld[]>({
-    let response = (await request<Tld[]>({
         url: 'tld',
-        params: {...params, page},
+        params,
     })).data
-    const tldList: Tld[] = response;
-
-    while (response.length !== 0) {
-        page++
-        response = (await request<Tld[]>({
-            url: 'tld',
-            params: {...params, page},
-        })).data
-
-        tldList.push(...response)
-    }
-    return tldList
 }