v1.2.0(스프린트 3 구현)

.github/workflows/be-ci.yml

@@ -39,4 +39,4 @@ jobs:
       - name: Build and analyze (SpringBoot)
         run: |
           cd uniro_backend
-          ./gradlew clean build -x test
+          ./gradlew clean build

uniro_admin_frontend/package.json

@@ -13,6 +13,7 @@
     "@googlemaps/js-api-loader": "^1.16.8",
     "@tailwindcss/vite": "^4.0.0",
     "@tanstack/react-query": "^5.66.0",
+    "@tanstack/react-query-devtools": "^5.66.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router": "^7.1.3",

uniro_admin_frontend/src/App.tsx

@@ -1,17 +1,14 @@
+import { Outlet } from "react-router";
 import "./App.css";
 import NavBar from "./components/navBar";
-import LogListContainer from "./container/logListContainer";
-import MainContainer from "./container/mainContainer";
-import MapContainer from "./container/mapContainer";
+import SubNavBar from "./components/subNavBar";
 
 function App() {
   return (
     <div className="w-full h-screen flex flex-col items-center justify-center space-y-1">
       <NavBar />
-      <MainContainer>
-        <LogListContainer />
-        <MapContainer />
-      </MainContainer>
+      <SubNavBar />
+      <Outlet />
     </div>
   );
 }

uniro_admin_frontend/src/AppRouter.tsx

@@ -0,0 +1,29 @@
+import { BrowserRouter, Route, Routes } from "react-router";
+import App from "./App";
+import LogPage from "./page/logPage";
+import BuildingPage from "./page/buildingPage";
+import SimulationPage from "./page/simulationPage";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+
+const queryClient = new QueryClient();
+
+function AppRouter() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <BrowserRouter>
+        <Routes>
+          <Route path="/" element={<App />}>
+            <Route index element={<LogPage />} />
+            <Route path="logs" element={<LogPage />} />
+            <Route path="buildings" element={<BuildingPage />} />
+            <Route path="simulation" element={<SimulationPage />} />
+          </Route>
+        </Routes>
+      </BrowserRouter>
+      <ReactQueryDevtools initialIsOpen={false} />
+    </QueryClientProvider>
+  );
+}
+
+export default AppRouter;

uniro_admin_frontend/src/api/nodes.ts

@@ -0,0 +1,34 @@
+import { Building } from "../data/types/node";
+import { getFetch, postFetch } from "../utils/fetch/fetch";
+
+export const getAllBuildings = (
+  univId: number,
+  params: {
+    leftUpLng: number;
+    leftUpLat: number;
+    rightDownLng: number;
+    rightDownLat: number;
+  }
+): Promise<Building[]> => {
+  return getFetch<Building[]>(`/${univId}/nodes/buildings`, {
+    "left-up-lng": params.leftUpLng,
+    "left-up-lat": params.leftUpLat,
+    "right-down-lng": params.rightDownLng,
+    "right-down-lat": params.rightDownLat,
+  });
+};
+
+export const postBuilding = (
+  univId: number,
+  body: {
+    buildingName: string;
+    buildingImageUrl: string;
+    phoneNumber: string;
+    address: string;
+    lat: number;
+    lng: number;
+    level: number;
+  }
+): Promise<boolean> => {
+  return postFetch(`/${univId}/nodes/building`, body);
+};

uniro_admin_frontend/src/api/route.ts

@@ -0,0 +1,74 @@
+import { IssueTypeKey } from "../constant/enum/reportEnum";
+import { Coord } from "../data/types/coord";
+import { CautionIssueType, DangerIssueType } from "../data/types/enum";
+import { NodeId } from "../data/types/node";
+
+import {
+  CoreRoutesList,
+  NavigationRouteList,
+  RouteId,
+} from "../data/types/route";
+import { getFetch, postFetch } from "../utils/fetch/fetch";
+import { transformAllRoutes } from "./transformer/route";
+import { GetAllRouteRepsonse } from "./type/response/route";
+
+export const getNavigationResult = (
+  univId: number,
+  startNodeId: NodeId,
+  endNodeId: NodeId
+): Promise<NavigationRouteList> => {
+  return getFetch<NavigationRouteList>(`/${univId}/routes/fastest`, {
+    "start-node-id": startNodeId,
+    "end-node-id": endNodeId,
+  });
+};
+
+export const getAllRoutes = (univId: number): Promise<CoreRoutesList> => {
+  return getFetch<GetAllRouteRepsonse>(`/${univId}/routes`).then((data) =>
+    transformAllRoutes(data)
+  );
+};
+
+export const getSingleRouteRisk = (
+  univId: number,
+  routeId: RouteId
+): Promise<{
+  routeId: NodeId;
+  dangerTypes: IssueTypeKey[];
+  cautionTypes: IssueTypeKey[];
+}> => {
+  return getFetch<{
+    routeId: NodeId;
+    dangerTypes: IssueTypeKey[];
+    cautionTypes: IssueTypeKey[];
+  }>(`/${univId}/routes/${routeId}/risk`);
+};
+
+export const postReport = (
+  univId: number,
+  routeId: RouteId,
+  body: { dangerTypes: DangerIssueType[]; cautionTypes: CautionIssueType[] }
+): Promise<boolean> => {
+  return postFetch<void, string>(`/${univId}/route/risk/${routeId}`, body);
+};
+
+export const postReportRoute = (
+  univId: number,
+  body: {
+    startNodeId: NodeId;
+    endNodeId: NodeId | null;
+    coordinates: Coord[];
+  }
+): Promise<boolean> => {
+  return postFetch<void, Coord[] | NodeId | null>(`/${univId}/route`, body);
+};
+
+export const postBuildingRoute = (
+  univId: number,
+  body: {
+    buildingNodeId: NodeId;
+    nodeId: NodeId;
+  }
+): Promise<boolean> => {
+  return postFetch(`/${univId}/routes/building`, body);
+};

uniro_admin_frontend/src/api/routes.ts

@@ -0,0 +1,8 @@
+import { CautionRoute, DangerRoute } from "../data/types/route";
+import { getFetch } from "../utils/fetch/fetch";
+
+export const getAllRisks = (
+	univId: number,
+): Promise<{ dangerRoutes: DangerRoute[]; cautionRoutes: CautionRoute[] }> => {
+	return getFetch<{ dangerRoutes: DangerRoute[]; cautionRoutes: CautionRoute[] }>(`/${univId}/routes/risks`);
+};

uniro_admin_frontend/src/api/search.ts

@@ -0,0 +1,8 @@
+import { University } from "../data/types/university";
+import { getFetch } from "../utils/fetch/fetch";
+import { transformGetUniversityList } from "./transformer/search";
+import { GetUniversityListResponse } from "./type/response/search";
+
+export const getUniversityList = (): Promise<University[]> => {
+	return getFetch<GetUniversityListResponse>("/univ/search").then(transformGetUniversityList);
+};

uniro_admin_frontend/src/api/transformer/route.ts

@@ -0,0 +1,31 @@
+import { DangerIssueType } from "../../constant/enum/reportEnum";
+import { CoreRoutesList } from "../../data/types/route";
+import { GetAllRouteRepsonse, GetSingleRouteRiskResponse } from "../type/response/route";
+
+export const transformAllRoutes = (data: GetAllRouteRepsonse): CoreRoutesList => {
+	const { nodeInfos, coreRoutes } = data;
+	const nodeInfoMap = new Map(nodeInfos.map((node) => [node.nodeId, node]));
+
+	return coreRoutes.map((coreRoute) => {
+		return {
+			...coreRoute,
+			routes: coreRoute.routes.map((route) => {
+				const node1 = nodeInfoMap.get(route.startNodeId);
+				const node2 = nodeInfoMap.get(route.endNodeId);
+
+				if (!node1) {
+					throw new Error(`Node not found: ${route.startNodeId}`);
+				}
+				if (!node2) {
+					throw new Error(`Node not found: ${route.endNodeId}`);
+				}
+
+				return {
+					routeId: route.routeId,
+					node1,
+					node2,
+				};
+			}),
+		};
+	});
+};

uniro_admin_frontend/src/api/transformer/search.ts

@@ -0,0 +1,6 @@
+import { University } from "../../data/types/university";
+import { GetUniversityListResponse } from "../type/response/search";
+
+export const transformGetUniversityList = (res: GetUniversityListResponse): University[] => {
+	return res.data;
+};

uniro_admin_frontend/src/api/type/request/route.d.ts

@@ -0,0 +1,3 @@
+export type getAllRouteRequest = {
+	univId: number;
+};

uniro_admin_frontend/src/api/type/response/route.d.ts

@@ -0,0 +1,23 @@
+import { IssueTypeKey } from "../../../constant/enum/reportEnum";
+import { Node, NodeId } from "../../../data/types/node";
+
+type CoreRoutesResponse = {
+	coreNode1Id: NodeId;
+	coreNode2Id: NodeId;
+	routes: {
+		routeId: NodeId;
+		startNodeId: NodeId;
+		endNodeId: NodeId;
+	}[];
+};
+
+export type GetAllRouteRepsonse = {
+	nodeInfos: Node[];
+	coreRoutes: CoreRoutesResponse[];
+};
+
+export type GetSingleRouteRiskResponse = {
+	routeId: NodeId;
+	dangerTypes?: IssueTypeKey[];
+	cautionTypes?: IssueTypeKey[];
+};

uniro_admin_frontend/src/api/type/response/search.d.ts

@@ -0,0 +1,5 @@
+export type GetUniversityListResponse = {
+	data: University[];
+	nextCursor: number | null;
+	hasNext: boolean;
+};