From 59fe60c5b66a66dffa8816f52c47c86bef186732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=84=9D=EC=B0=AC=20=EC=9C=A4?= <ysc0731@ajou.ac.kr>
Date: Sun, 8 Dec 2024 21:24:44 +0900
Subject: [PATCH] Revert "Merge branch 'feat/#14' into 'main'"
This reverts merge request !25
---
src/App.js | 2 --
src/api/auth.js | 11 +----------
src/pages/NotFoundPage.jsx | 28 ----------------------------
3 files changed, 1 insertion(+), 40 deletions(-)
delete mode 100644 src/pages/NotFoundPage.jsx
diff --git a/src/App.js b/src/App.js
index ced6082..5cc4e04 100644
--- a/src/App.js
+++ b/src/App.js
@@ -11,7 +11,6 @@ import Footer from "./components/layout/Footer";
import BodyLayout from "./components/layout/BodyLayout";
import HeaderLogoBar from "./components/layout/HeaderLogoBar";
import SchedulePage from "./pages/SchedulePage";
-import NotFoundPage from "./pages/NotFoundPage";
const App = () => {
return (
@@ -30,7 +29,6 @@ const App = () => {
/>
<Route path="/mypage" element={<MyPage />} />
<Route path="/login" element={<LoginPage />} />
- <Route path="*" element={<NotFoundPage />} />
</Routes>
</BodyLayout>
<Footer />
diff --git a/src/api/auth.js b/src/api/auth.js
index fe57b12..df4042f 100644
--- a/src/api/auth.js
+++ b/src/api/auth.js
@@ -5,16 +5,7 @@
* @returns {string} 로그인 엔드포인트 URL
*/
export const getLoginUrl = () => {
- const baseUrl = process.env.REACT_APP_BASE_URL;
- const fcmToken = localStorage.getItem("fcmToken");
-
- // fcmToken이 있을 경우 파라미터에 추가
- const params = new URLSearchParams();
- if (fcmToken) {
- params.append("fcmToken", fcmToken);
- }
-
- return `${baseUrl}/api/auth/login?${params.toString()}`;
+ return `${process.env.REACT_APP_BASE_URL}/api/auth/login`;
};
/**
diff --git a/src/pages/NotFoundPage.jsx b/src/pages/NotFoundPage.jsx
deleted file mode 100644
index 1612743..0000000
--- a/src/pages/NotFoundPage.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router-dom";
-import Button from "../components/Button"; // 기존 디자인 시스템의 버튼 컴포넌트
-
-const NotFoundPage = () => {
- const navigate = useNavigate();
-
- const handleGoHome = () => {
- navigate("/");
- };
-
- return (
- <div className="flex flex-col items-center justify-center min-h-screen text-center bg-gray-50">
- <h1 className="text-6xl font-bold text-primary-500">404</h1>
- <p className="mt-4 text-lg text-gray-700">
- 페이지를 찾을 수 없습니다. 잘못된 URL을 입력했거나 페이지가 삭제되었을
- 수 있습니다.
- </p>
- <div className="mt-6">
- <Button size="lg" theme="indigo" onClick={handleGoHome}>
- 홈으로 이동
- </Button>
- </div>
- </div>
- );
-};
-
-export default NotFoundPage;
--
GitLab