UI Refactoring 4 (#90)

hakdang · Aug 3, 2024 · 3f27c93 · 3f27c93
1 parent 0461597
commit 3f27c93
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 35 deletions.
diff --git a/cassdio-web/src/main/webapp/src/pages/cassdio-home-page.js b/cassdio-web/src/main/webapp/src/pages/cassdio-home-page.js
@@ -1,11 +1,7 @@
-import {Link} from "react-router-dom";
+import {useEffect} from "react";
 
 import CassdioSidebar from "../components/layout/cassdio-sidebar";
-
 import ClusterList from "../components/cluster/cluster-list";
-import {useEffect} from "react";
-import {useCassdioDispatch, useCassdioState} from "../context/cassdioContext";
-import CassdioHelper from "../utils/cassdioHelper";
 import HomeSidebarLink from "../components/home-sidebar-link";
 
 const CassdioHomePage = () => {

diff --git a/cassdio-web/src/main/webapp/src/pages/cluster/cluster-dashboard-page.js b/cassdio-web/src/main/webapp/src/pages/cluster/cluster-dashboard-page.js
@@ -1,9 +1,9 @@
 import {Link, useParams} from "react-router-dom";
 import {useEffect, useState} from "react";
-import ClusterKeyspaceBreadcrumb from "../../components/cluster/cluster-keyspace-breadcrumb";
-import Spinner from "../../components/common/spinner";
+import ClusterKeyspaceBreadcrumb from "components/cluster/cluster-keyspace-breadcrumb";
+import Spinner from "components/common/spinner";
 import axios from "axios";
-import useCassdio from "../../hooks/useCassdio";
+import useCassdio from "hooks/useCassdio";
 
 const ClusterDashboardPage = ({}) => {
 

diff --git a/cassdio-web/src/main/webapp/src/remotes/bootstrapApi.js b/cassdio-web/src/main/webapp/src/remotes/bootstrapApi.js
@@ -1,7 +1,7 @@
 import axiosInstance from "utils/axiosUtils";
 
 export default async function bootstrapApi(
-    {}
+
 ) {
     try {
         const response = await axiosInstance({

diff --git a/cassdio-web/src/main/webapp/src/routers/router.js b/cassdio-web/src/main/webapp/src/routers/router.js
@@ -1,27 +1,32 @@
 import {createBrowserRouter} from "react-router-dom";
+
 import CassdioDefaultLayout from "components/layout/cassdio-default-layout";
-import bootstrapApi from "remotes/bootstrapApi";
-import CassdioHomePage from "pages/cassdio-home-page";
 import ClusterLayout from "components/cluster/cluster-layout";
+import AdminLayout from "components/admin/admin-layout";
+
+import CassdioHomePage from "pages/cassdio-home-page";
 import ClusterDashboardPage from "pages/cluster/cluster-dashboard-page";
 import ClusterNodesPage from "pages/cluster/cluster-nodes-page";
 import ClusterClientPage from "pages/cluster/cluster-client-page";
 import ClusterMetricsPage from "pages/cluster/cluster-metrics-page";
 import ClusterKeyspacePage from "pages/cluster/cluster-keyspace-page";
 import ClusterQueryPage from "pages/cluster/cluster-query-page";
 import ClusterKeyspaceCompactionPage from "pages/cluster/cluster-keyspace-comapction-page";
-import NotFound from "pages/not-found";
-import AdminLayout from "components/admin/admin-layout";
-import AdminHomePage from "pages/admin/admin-home-page";
 import ClusterTablePage from "pages/cluster/cluster-table-page";
 import ClusterMonitoringDashboardPage from "pages/cluster/cluster-monitoring-dashboard-page";
 
+import AdminHomePage from "pages/admin/admin-home-page";
+
+import NotFound from "pages/not-found";
+
+import bootstrapApi from "remotes/bootstrapApi";
+
 const Router = createBrowserRouter([
         {
             path: `/`,
             element: <CassdioDefaultLayout/>,
             loader: async () => {
-                const bootstrap = await bootstrapApi({});
+                const bootstrap = await bootstrapApi();
                 return {
                     bootstrap,
                 }
@@ -34,90 +39,71 @@ const Router = createBrowserRouter([
                     path: `cluster/:clusterId`,
                     element: <ClusterLayout/>,
                     loader: async ({params}) => {
-                        //const checkData = await bootstrapApi();
-                        console.log("cluster : ", params)
-
                         return {}
                     },
                     children: [
                         {
                             index: true,
                             element: <ClusterDashboardPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("cluster")
                                 return {}
                             },
                         }, {
                             path: `query`,
                             element: <ClusterQueryPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("query client")
                                 return {}
                             },
 
                         }, {
                             path: `keyspace/:keyspaceName`,
                             element: <ClusterKeyspacePage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("keyspace client")
                                 return {}
                             },
                         }, {
                             path: `keyspace/:keyspaceName/query`,
                             element: <ClusterQueryPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("keyspace query client")
                                 return {}
                             },
                         }, {
                             path: `keyspace/:keyspaceName/table/:tableName`,
                             element: <ClusterTablePage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("keyspace client")
                                 return {}
                             },
                         }, {
                             path: `keyspace/:keyspaceName/compaction`,
                             element: <ClusterKeyspaceCompactionPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
-                                console.log("keyspace client")
                                 return {}
                             },
                         }, {
                             path: `monitoring`,
                             element: <ClusterMonitoringDashboardPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
                                 return {
                                 }
                             },
                         }, {
                             path: `monitoring/nodes`,
                             element: <ClusterNodesPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
                                 return {
                                 }
                             },
                         }, {
                             path: `monitoring/client`,
                             element: <ClusterClientPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
                                 return {
                                 }
                             }
                         }, {
                             path: `monitoring/metrics`,
                             element: <ClusterMetricsPage/>,
                             loader: () => {
-                                //const checkData = await bootstrapApi();
                                 return {
                                 }
                             },
@@ -127,7 +113,6 @@ const Router = createBrowserRouter([
                     path: `admin`,
                     element: <AdminLayout/>,
                     loader: () => {
-                        console.log("admin")
                         return {}
                     },
                     children: [