Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cb184f5
feat: 로그아웃 즉시 메인화면으로 이동
Programmeryeongtaek Sep 9, 2025
007f35b
feat: 회원가입 - 이메일, 닉네임 중복 검사 기능
Programmeryeongtaek Sep 9, 2025
c88f999
feat: 로그인 정보 불일치 시 메시지 나타남
Programmeryeongtaek Sep 9, 2025
a0dec94
style: 로그인, 회원가입 스타일링
Programmeryeongtaek Sep 9, 2025
5c0f3a9
feat: 로그인&회원가입 페이지에 메인화면으로 돌아가기 추가
Programmeryeongtaek Sep 9, 2025
ad182c2
임시
Programmeryeongtaek Sep 9, 2025
bb3edd3
Merge branch 'main' into develop
Programmeryeongtaek Sep 10, 2025
06f2ca2
Merge branch 'develop' into feat/auth
Programmeryeongtaek Sep 10, 2025
e388436
fix: YAML 문법 오류 수장
Programmeryeongtaek Sep 10, 2025
199a40d
style: 코드 포맷팅 적용
Programmeryeongtaek Sep 10, 2025
e0012f5
fix: GitHub Actions 워크플로우 설정 오류 수정
Programmeryeongtaek Sep 10, 2025
85b30af
style: 코드 포맷팅 적용
Programmeryeongtaek Sep 10, 2025
f112488
Merge branch 'main' into develop
Programmeryeongtaek Sep 10, 2025
3e24c8b
Merge branch 'main' into develop
Programmeryeongtaek Sep 10, 2025
423e428
remove: 불필요한 파일 삭제
Programmeryeongtaek Sep 10, 2025
42114bb
feat: 회원가입과 로그인 페이지에 메인 화면 돌아가는 버튼 추가 및 메시지 수정
Programmeryeongtaek Sep 10, 2025
1e9a5c3
fix: 로딩 시 session 체크 로직 수정
Programmeryeongtaek Sep 10, 2025
f22db56
style: 포맷팅 설정
Programmeryeongtaek Sep 10, 2025
a3208d7
style: 로그인&회원가입 페이지 스타일링 및 버튼 추가 (#5)
Programmeryeongtaek Sep 10, 2025
1d3b8e3
fix: 배포환경에서 로그아웃 세션유지 문제 해결
Programmeryeongtaek Sep 11, 2025
40c5265
refactor: login 페이지 suspense 제거 및 통합, 스타일링
Programmeryeongtaek Sep 11, 2025
eeed61c
style: 포매팃 적용
Programmeryeongtaek Sep 11, 2025
d95cb79
Merge branch 'feat/auth' into develop
Programmeryeongtaek Sep 11, 2025
94e884f
style: 포맷팅 적용
Programmeryeongtaek Sep 11, 2025
42e84ed
feat & style: 이웃기능 및 마이페이지, 회고 도메인 스타일링 (#8)
Programmeryeongtaek Sep 14, 2025
649727b
feat: 목표 도메인 기능구현 및 오류 해결, 스타일링 (#10)
Programmeryeongtaek Sep 17, 2025
1ffd943
Merge branch 'main' into develop
Programmeryeongtaek Sep 17, 2025
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
28 changes: 20 additions & 8 deletions src/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { format } from "date-fns";
import { ko } from "date-fns/locale";
import {
ArrowRight,
BarChart3,
Calendar,
Plus,
Target,
Expand All @@ -27,6 +26,7 @@ import DashboardReflectionWidget from "@/components/reflections/DashboardReflect
import DashboardBudgetWidget from "@/components/budget/DashboardBudgetWidget";
import Modal from "@/components/common/Modal";
import QuestionForm from "@/components/questions/QuestionForm";
import { getDaysLeft, getGoalProgress } from "@/utils/goals/goalsHelpers";

const DashboardPage = () => {
const { user, profile, isLoading: isAuthLoading } = useAuth();
Expand Down Expand Up @@ -76,14 +76,15 @@ const DashboardPage = () => {
// 곧 마감되는 목표들 (7일 이내)
const soonDueGoals = activeGoals.filter((goal) => {
if (!goal.target_date) return false;
const daysLeft = goal.progress.daysLeft;
return daysLeft <= 7 && daysLeft > 0;
const daysLeft = getDaysLeft(goal.target_date);
return daysLeft !== null && daysLeft <= 7 && daysLeft > 0;
});

// 달성률이 80% 이상인 목표들
const nearCompletionGoals = activeGoals.filter(
(goal) => goal.progress.overallProgress >= 80,
);
const nearCompletionGoals = activeGoals.filter((goal) => {
const progress = getGoalProgress(goal);
return progress.overallProgress >= 80;
});

return {
total: totalGoals,
Expand Down Expand Up @@ -156,6 +157,17 @@ const DashboardPage = () => {
// 상위 목표들 (진행률 기준)
const topProgressGoals = useMemo(() => {
return activeGoals
.map((goal) => ({
...goal,
progress: {
...getGoalProgress(goal),
daysLeft: getDaysLeft(goal.target_date),
progressText: `진행률 ${getGoalProgress(goal).overallProgress}%`,
isComplete:
goal.status === "completed" ||
getGoalProgress(goal).overallProgress >= 100,
},
}))
.sort((a, b) => b.progress.overallProgress - a.progress.overallProgress)
.slice(0, 3);
}, [activeGoals]);
Expand Down Expand Up @@ -302,7 +314,7 @@ const DashboardPage = () => {
</div>

{/* 이번 주 활동 요약 */}
<div className="bg-white rounded-lg p-6 shadow-sm border">
{/* <div className="bg-white rounded-lg p-6 shadow-sm border">
<div className="flex items-center justify-between">
<div className="flex-1">
<p className="text-sm font-medium text-gray-600">
Expand All @@ -327,7 +339,7 @@ const DashboardPage = () => {
<BarChart3 className="w-6 h-6 text-purple-600" />
</div>
</div>
</div>
</div> */}
</div>

{/* 위젯 그리드 */}
Expand Down
Loading
Loading