Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 배포 관련 수정 사항 #42

Merged
merged 3 commits into from
Feb 2, 2025
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
11 changes: 4 additions & 7 deletions src/api/axiosInstance.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import axios from "axios";
import { setToken } from "../utils/jwt";
import { setToken, removeToken } from "../utils/jwt";

const API_URL = "https://keunsori-api.everdu.com/";

Expand Down Expand Up @@ -44,19 +44,16 @@ axiosInstance.interceptors.response.use(
{ headers: { "Refresh-Token": refreshToken } }
);

console.log("성공했다잉:", data);

setToken(data);

console.log("이제 다시 요청할게");
console.log("악쎄스 토큰 여기: ", localStorage.getItem("accessToken"));
const newAccessToken = localStorage.getItem("accessToken");

originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;

return axiosInstance(originalRequest);
} catch (refreshError) {
console.error("토큰 갱신 실패", refreshError);
localStorage.removeItem("accessToken");
localStorage.removeItem("refreshToken");
removeToken();
window.location.href = "/login";
return Promise.reject(refreshError);
}
Expand Down
5 changes: 0 additions & 5 deletions src/api/register.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ export const registerUser = async (data: {
passwordConfirm: string;
}) => {
try {
console.log("request content: ", data);
const response = await axiosInstance.post("/signup", data);

//test code
console.log("이게 status 임: ", response.status);

return response.data;
} catch (error) {
console.error("error: ", error);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Book/Application/DropBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const TeamDropBox: React.FC<DropBoxProps> = ({ onClick }) => {
</Container>
);
};
const ArrowButton = styled.button`
const ArrowButton = styled.div`
font-size: 10px;
color: #000;
background-color: transparent;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Book/Application/Reservation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const Reservation: React.FC<ReservationProps> = ({
<TimeContainer>
<TimeSlots>
{selectedSlots.map((slot, index) => (
<>
<div key={index}>
<div
className={css`
display: flex;
Expand Down Expand Up @@ -227,7 +227,7 @@ const Reservation: React.FC<ReservationProps> = ({
}
></SlotButton>
</div>
</>
</div>
))}
</TimeSlots>
</TimeContainer>
Expand Down
1 change: 0 additions & 1 deletion src/components/Book/CurrentBook.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ const CurrentBook: React.FC = () => {

async function fetchData() {
const token = localStorage.getItem("accessToken");
console.log(`Token: ${token}`);
try {
const response = await axiosInstance.get(
`/reservation/list?month=${formatDate(date)}`,
Expand Down
18 changes: 10 additions & 8 deletions src/components/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { Navigate, Outlet } from "react-router-dom";
import { useContext } from "react";
import {AuthContext} from "../contexts/AuthContext";
import { AuthContext } from "../contexts/AuthContext";

const ProtectedRoute = () => {
const { user } = useContext(AuthContext);
const { user, isLoading } = useContext(AuthContext);

if (!user?.isLoggedIn) {
return <Navigate to="/login" replace />;
}
// ✅ 로딩 중이면 아무것도 렌더링하지 않음 (or 로딩 UI 표시 가능)
if (isLoading) {
return null; // 👈 로딩 중에는 리디렉트 X
}

return <Outlet />;
}
// ✅ 로그인 상태 확인 후 접근 허용 또는 리디렉트
return user.isLoggedIn ? <Outlet /> : <Navigate to="/login" replace />;
};

export default ProtectedRoute;
export default ProtectedRoute;
13 changes: 6 additions & 7 deletions src/contexts/AuthContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import axios from "axios";

interface AuthContextProps {
user: User;
isLoading: boolean;
loginUser: (
studentId: string,
password: string
Expand All @@ -22,22 +23,21 @@ interface User {

export const AuthContext = createContext<AuthContextProps>({
user: { isLoggedIn: false },
isLoading: true,
loginUser: async () => ({ success: false, message: "초기값" }),
logoutUser: () => {},
});

export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
const [user, setUser] = useState<User>({ isLoggedIn: false });
const [isLoading, setIsLoading] = useState(true);

useEffect(() => {
const token = getToken();

if (token) {
setUser({ isLoggedIn: false });

// getUserData(token)
// .then(setUser)
// .catch(() => removeToken());
setUser({ isLoggedIn: true });
setIsLoading(false);
}
}, []);

Expand All @@ -51,7 +51,6 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
setUser({ isLoggedIn: true });
return { success: true };
} catch (error) {
console.log(" 일단 에러 받았어~ ");
if (axios.isAxiosError(error)) {
console.error("login failed:", error.response?.data || error.message);

Expand All @@ -72,7 +71,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
};

return (
<AuthContext.Provider value={{ user, loginUser, logoutUser }}>
<AuthContext.Provider value={{ user, isLoading, loginUser, logoutUser }}>
{children}
</AuthContext.Provider>
);
Expand Down