Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions uniro_frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import BuildingSearchPage from "./pages/buildingSearch";
import NavigationResultPage from "./pages/navigationResult";
import ReportRoutePage from "./pages/reportRoute";
import ReportForm from "./pages/reportForm";
import ReportHazardPage from "./pages/reportHazard";
import ReportRiskPage from "./pages/reportRisk";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { useDynamicSuspense } from "./hooks/useDynamicSuspense";
import OfflinePage from "./pages/offline";
Expand All @@ -34,7 +34,7 @@ function App() {
<Route path="/form" element={<ReportForm />} />
<Route path="/result" element={<NavigationResultPage />} />
<Route path="/report/route" element={<ReportRoutePage />} />
<Route path="/report/hazard" element={<ReportHazardPage />} />
<Route path="/report/risk" element={<ReportRiskPage />} />
/** 에러 페이지 */
<Route path="/error" element={<ErrorPage />} />
<Route path="/error/offline" element={<OfflinePage />} />
Expand Down
12 changes: 12 additions & 0 deletions uniro_frontend/src/api/route.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
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";

Expand Down Expand Up @@ -44,3 +45,14 @@ export const postReport = (
): 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);
};
2 changes: 1 addition & 1 deletion uniro_frontend/src/constant/enum/messageEnum.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum ReportHazardMessage {
export enum ReportRiskMessage {
DEFAULT = "선 위를 눌러 제보할 지점을 선택하세요",
CREATE = "이 지점으로 새로운 제보를 진행할까요?",
UPDATE = "이 지점에 제보된 기존 정보를 바꿀까요?",
Expand Down
22 changes: 0 additions & 22 deletions uniro_frontend/src/hooks/useReportHazard.ts

This file was deleted.

14 changes: 14 additions & 0 deletions uniro_frontend/src/hooks/useReportRisk.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { create } from "zustand";
import { RouteId } from "../data/types/route";

interface ReportedRiskRoute {
reportRouteId: RouteId | undefined;
setReportRouteId: (selectedRouteId: RouteId) => void;
}

const useReportRisk = create<ReportedRiskRoute>((set) => ({
reportRouteId: undefined,
setReportRouteId: (newRouteId: RouteId) => set({ reportRouteId: newRouteId }),
}));

export default useReportRisk;
9 changes: 7 additions & 2 deletions uniro_frontend/src/pages/reportForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { useMutation, useQueryClient, useSuspenseQuery } from "@tanstack/react-q
import { getSingleRouteRisk, postReport } from "../api/route";
import { University } from "../data/types/university";
import { useNavigate } from "react-router";
import useReportRisk from "../hooks/useReportRisk";
import { RouteId } from "../data/types/route";

const ReportForm = () => {
useScrollControl();
Expand All @@ -33,10 +35,13 @@ const ReportForm = () => {
const [errorTitle, setErrorTitle] = useState<string>("");

const { university } = useUniversityInfo();
const { reportRouteId: routeId } = useReportRisk();

useRedirectUndefined<University | undefined>([university]);
useRedirectUndefined<University | RouteId | undefined>([university, routeId]);

const routeId = 1;
console.log(routeId)

if (!routeId) return;

const { data } = useSuspenseQuery({
queryKey: ["report", university?.id ?? 1001, routeId],
Expand Down
229 changes: 0 additions & 229 deletions uniro_frontend/src/pages/reportHazard.tsx

This file was deleted.

Loading