diff --git a/app/login/page.jsx b/app/login/page.jsx
index 82d015c..b1efa6f 100644
--- a/app/login/page.jsx
+++ b/app/login/page.jsx
@@ -20,8 +20,8 @@ const LoginPage = () => {
if (res.ok) {
const data = await res.json();
- alert("Login successful!");
// 사용자 정보를 저장하고 필요한 페이지로 이동
+ window.location.href = "/mypage"; // 로그인 성공 시 마이페이지로 이동
} else {
const data = await res.json();
alert(data.message);
diff --git a/app/modal/page.jsx b/app/modal/page.jsx
index cabc51d..7b4f07a 100644
--- a/app/modal/page.jsx
+++ b/app/modal/page.jsx
@@ -2,6 +2,7 @@
import React, { useState, useEffect } from "react";
import ModalComponent from '../../components/modal/modal-component';
+import {Bell, Settings} from "lucide-react";
export default function ModalPage() {
const [isMounted, setIsMounted] = useState(false);
@@ -13,8 +14,20 @@ export default function ModalPage() {
if (!isMounted) return null;
return (
-
-
+
);
}
\ No newline at end of file
diff --git a/app/mypage/page.jsx b/app/mypage/page.jsx
index 052b617..fdbc94a 100644
--- a/app/mypage/page.jsx
+++ b/app/mypage/page.jsx
@@ -1,101 +1,9 @@
import React from 'react';
-import {
- User, Settings, Bell, Edit, BarChart2,
- ListChecks, Calendar, CheckCircle, Heart,
- ChevronLeft, ChevronRight
-} from 'lucide-react';
-import { Card, CardContent } from '@/components/ui/card';
-import { Button } from '@/components/ui/bottom';
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
-
-const StudyCalendar = () => {
- const studiedDays = [1, 3, 5, 7, 8, 9, 10, 12, 15, 16, 20, 21, 22, 23];
- const days = Array.from({ length: 31 }, (_, i) => i + 1);
- const today = new Date(); // 현재 날짜에서 일자를 추출
-
- const year = 2025;
- const month = 0; // 1월은 0
- const firstDayOfMonth = new Date(year, month, 1).getDay(); // 2025년 1월 1일의 요일 (0: 일요일, 1: 월요일, ...)
-
- return (
-
-
-
-
2025년 1월
- 학습 캘린더
-
-
-
-
-
-
-
-
-
- {['일', '월', '화', '수', '목', '금', '토'].map((day, idx) => (
-
- {day}
-
- ))}
-
-
-
- {Array.from({ length: firstDayOfMonth }).map((_, idx) => (
-
- ))}
- {days.map((day) => {
- const isStudied = studiedDays.includes(day);
- const isToday = day === today;
-
- return (
-
-
- {day}
-
- {isStudied && (
-
- )}
-
- );
- })}
-
-
-
-
-
-
- 학습 완료
-
-
- 이번 달 학습:
- {studiedDays.length}일
-
-
-
- );
-};
+import { Bell, Settings } from 'lucide-react';
+import ProfileSection from '@/components/mypage/profileSection';
+import StudyCalendar from '@/components/mypage/study-calendar';
+import QuickStats from '@/components/mypage/quock-stats';
+import RecentActivity from '@/components/mypage/recent-activity';
const Page = () => {
return (
@@ -115,133 +23,14 @@ const Page = () => {
{/* Main Content */}
- {/* Profile Section */}
-
-
-
-
-
-
-
-
-
-
-
-
-
사용자님
-
상태 메시지를 입력해주세요
-
-
-
-
-
-
-
-
-
- {/* Calendar and Features Grid */}
+
- {/* Study Calendar */}
-
-
-
-
-
-
- {/* Quick Stats */}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
- {/* Recent Activity */}
-
-
-
-
최근 활동
-
-
-
- {[
- { action: "오늘의 문제를 해결했습니다", time: "2시간 전" },
- { action: "3일 연속 학습 달성!", time: "어제" },
- { action: "2일 전 모든 문제을 맞췄습니다!", time: "2일 전" }
- ].map((item, index) => (
-
-
-
-
{item.action}
-
{item.time}
-
-
- ))}
-
-
-
+
);
diff --git a/app/problem-list/page.jsx b/app/problem-list/page.jsx
index 7c7ec5b..89d2241 100644
--- a/app/problem-list/page.jsx
+++ b/app/problem-list/page.jsx
@@ -5,6 +5,7 @@ import SearchBar from '../../components/problem-list/searchBar';
import FilterBar from '../../components/problem-list/filterBar';
import ProblemList from '../../components/problem-list/problemList';
import Title from '../../components/landing/Title';
+import {Bell, Settings} from "lucide-react";
const ProblemListPage = () => {
// 초기 더미 데이터
@@ -57,12 +58,25 @@ const ProblemListPage = () => {
};
return (
-
-
+
+ {/* Header */}
+
+
-
{}} />
-
- {/* 필터링된 문제 전달 */}
+ {
+ }}/>
+
+ {/* 필터링된 문제 전달 */}
);
diff --git a/app/signup/page.jsx b/app/signup/page.jsx
index 2468039..cec71e1 100644
--- a/app/signup/page.jsx
+++ b/app/signup/page.jsx
@@ -9,6 +9,11 @@ const SignupPage = () => {
const [password, setPassword] = useState('');
const [confirmPassword, setConfirmPassword] = useState('');
+ const handleCardClick = (path) => {
+ console.log(`Navigating to ${path}`);
+ window.location.href = path;
+ };
+
const handleSignup = async (event) => {
event.preventDefault();
if (password !== confirmPassword) {
@@ -27,7 +32,7 @@ const SignupPage = () => {
});
if (res.ok) {
- alert("Signup successful!");
+ handleCardClick('../modal');
} else {
const data = await res.json();
alert(data.message);
diff --git a/app/statistics/page.js b/app/statistics/page.js
index 0e356ba..652a6bb 100644
--- a/app/statistics/page.js
+++ b/app/statistics/page.js
@@ -31,6 +31,7 @@ import CategorySolvedChart from "@/components/statistics/category/category-solve
import CategoryAccuracyChart from "@/components/statistics/category/category-accuracy";
import WeeklyTrendChart from "@/components/statistics/weekly/weekly-trend";
import { statisticUtils } from "@/utils/statisticUtils";
+import {Bell, Settings} from "lucide-react";
const ResponsiveGridLayout = WidthProvider(Responsive);
@@ -77,77 +78,92 @@ export default function StatisticsPage() {
};
return (
-
-
- 나의 학습 통계
-
+
+ {/* Header */}
+
-
{
- setLayouts(allLayouts);
- }}
- >
-
-
-
+
+ {/**/}
+ {/* 나의 학습 통계*/}
+ {/**/}
-
-
-
+ {
+ setLayouts(allLayouts);
+ }}
+ >
+
+
+
-
-
- 총 해결한 문제
-
-
- {mockSummaryStatisticsData.data.user.totalSolved}문제
-
-
-
-
- 나의 정답률
-
-
- {mockSummaryStatisticsData.data.user.correctRate}%
-
-
-
-
- 평균 풀이 시간
-
-
- {statisticUtils.formatters.timeInSeconds(
- mockSummaryStatisticsData.data.user.timeStats.averageTime
- )}
-
-
+
+
+
-
-
-
+
+
+ 총 해결한 문제
+
+
+ {mockSummaryStatisticsData.data.user.totalSolved}문제
+
+
+
+
+ 나의 정답률
+
+
+ {mockSummaryStatisticsData.data.user.correctRate}%
+
+
+
+
+ 평균 풀이 시간
+
+
+ {statisticUtils.formatters.timeInSeconds(
+ mockSummaryStatisticsData.data.user.timeStats.averageTime
+ )}
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
- );
-}
+
+
+
+
+
+
+
+
+
+
+ );
+ }
diff --git a/components/modal/modal-component.jsx b/components/modal/modal-component.jsx
index dc01b37..05735a6 100644
--- a/components/modal/modal-component.jsx
+++ b/components/modal/modal-component.jsx
@@ -22,6 +22,11 @@ export default function ModalComponent() {
setSelectedCategories((prev) => prev.filter((c) => c.id !== category.id));
};
+ const handleCardClick = (path) => {
+ console.log(`Navigating to ${path}`);
+ window.location.href = path;
+ };
+
const handleSubmit = async () => {
const formData = {
categories: selectedCategories.map((c) => c.id),
@@ -41,7 +46,8 @@ export default function ModalComponent() {
if (response.ok) {
const result = await response.json();
console.log("Server Response:", result);
- } else {
+ handleCardClick('/mypage');
+ }else {
console.error("Failed to send data:", response.status, response.statusText);
}
} catch (error) {
@@ -61,7 +67,7 @@ export default function ModalComponent() {