ucamp-greenmap · Ryuyena0305 · Nov 8, 2025 · Nov 8, 2025
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { setActiveTab } from './store/slices/appSlice';
+import { fetchMyPageData } from './store/slices/userSlice';
 import {
     BrowserRouter,
     Routes,
@@ -57,6 +58,13 @@ export default function App() {
     const dispatch = useDispatch();
     // removed top-level navigate; navigation is handled inside AppContent via react-router
 
+    useEffect(() => {
+        const token = localStorage.getItem('token');
+        if (token) {
+            dispatch(fetchMyPageData());
+        }
+    }, [dispatch]);
+
     if (appState === 'splash') return <SplashScreen />;
     if (appState === 'onboarding') return <OnboardingScreen />;
 

diff --git a/src/components/screens/EditProfileScreen.jsx b/src/components/screens/EditProfileScreen.jsx
@@ -219,9 +219,11 @@ export default function EditProfileScreen({ onBack }) {
         </div>
 
         {/* 상태 메시지 */}
-        {nicknameValid && nickname === originNickname ? (
-          <span style={{ color: "#d33b3b" }}>현재 닉네임입니다</span>
-        ) : nicknameValid && nickAvailable === true ? (
+        {
+        // nicknameValid && nickname === originNickname ? (
+        //   <span style={{ color: "#d33b3b" }}>현재 닉네임입니다</span>
+        // ) :
+         nicknameValid && nickAvailable === true ? (
           <span style={{ color: "#3fa14a" }}>사용 가능한 닉네임입니다</span>
         ) : nicknameValid && nickAvailable === false ? (
           <span style={{ color: "#d33b3b" }}>이미 존재하는 닉네임입니다</span>

diff --git a/src/components/screens/HomeScreen.jsx b/src/components/screens/HomeScreen.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { setActiveTab } from '../../store/slices/appSlice';
-import { fetchPointInfo } from '../../store/slices/userSlice';
+import { fetchPointInfo, fetchMyPageData } from '../../store/slices/userSlice';
 import EcoNewsList from '../screens/EcoNewsList';
 import { TrophyIcon } from '@heroicons/react/24/solid';
 import { useMemo } from 'react';
@@ -66,7 +66,7 @@ export default function HomeScreen({ onNavigate }) {
     }, [currentLocation, isLocationLoading, fetchCurrentLocation]);
 
     useEffect(() => {
-        const onFocus = () => dispatch(fetchPointInfo());
+        const onFocus = () => dispatch( fetchMyPageData());
         window.addEventListener('focus', onFocus);
         return () => window.removeEventListener('focus', onFocus);
     }, [dispatch]);
@@ -310,18 +310,8 @@ export default function HomeScreen({ onNavigate }) {
                         <div className='bg-gradient-to-br from-[#4CAF50] to-[#8BC34A] rounded-3xl p-6 text-white shadow-xl border-0'>
                             {/* 사용자 이름 표시 */}
                             <div className='flex items-center gap-2 mb-4'>
-                                {profile.avatar && (
-                                    <img
-                                        src={profile.avatar}
-                                        alt='프로필'
-                                        className='w-10 h-10 rounded-full'
-                                    />
-                                )}
-                                <p className='text-white/90 text-sm'>
-                                    {profile.nickname || profile.name}님의 그린
-                                    활동
-                                </p>
-                            </div>
+                                 {profile.avatar && ( <img src={profile.avatar} alt='프로필' className='w-10 h-10 rounded-full' /> )}
+                                  <p className='text-white font-medium text-base sm:text-lg tracking-wide'>{profile.nickname || profile.name}님의 그린 활동</p> </div>
 
                             <div className='flex items-center justify-between mb-4'>
                                 <div>
@@ -365,11 +355,13 @@ export default function HomeScreen({ onNavigate }) {
                             </div>
 
                             <button
-                                onClick={() => navigate('cert')}
-                                className='w-full bg-white text-[#4CAF50] py-3 rounded-[20px] text-center transition-transform hover:scale-105'
-                            >
-                                활동 인증하고 포인트 받기
-                            </button>
+  onClick={() => navigate('cert')}
+  className='w-full bg-white text-[#4CAF50] py-3 rounded-[20px] text-center font-semibold 
+             shadow-md border border-[#4CAF50]/20 transition-transform duration-200 
+             hover:scale-[1.01] hover:shadow-lg active:scale-[0.99]'
+>
+  활동 인증하고 포인트 받기
+</button>
                         </div>
                     </div>
                 )}

diff --git a/src/components/screens/LoginSignupScreen.jsx b/src/components/screens/LoginSignupScreen.jsx
@@ -3,6 +3,7 @@ import api from '../../api/axios';
 // ↓ redux 안 쓰면 이 부분 제거해도됨
 import { useDispatch } from 'react-redux';
 import { updateProfile } from '../../store/slices/userSlice';
+import { useNavigate } from 'react-router-dom';
 import kakaoBtn from '../../assets/kakao_login_medium_wide.png';
 import HomeScreen from './HomeScreen';
 
@@ -20,6 +21,7 @@ const kakaoLogin = () => {
   }/oauth2/authorization/kakao`;
 };
 
+
 //  전역 스타일 그대로 유지
 const styles = `
   :root { --brand: ${themeColor}; }
@@ -198,6 +200,7 @@ export default function LoginSignupScreen() {
 
 /* ------------------ 로그인 ------------------ */
 function LoginForm({ setUserInfo, setModal }) {
+  const navigate = useNavigate();
   const [email, setEmail] = useState('');
   const [tEmail, setTEmail] = useState(false);
   const [password, setPassword] = useState('');
@@ -217,8 +220,7 @@ function LoginForm({ setUserInfo, setModal }) {
         headers: { Authorization: `Bearer ${res.data.data.accessToken}` },
       });
       setUserInfo(info.data.data);
-      setModal({ message: '로그인 성공!', type: 'success' });
-      setTimeout(() => (window.location.href = '/'), 800);
+      setTimeout(() => navigate('/'));
     } catch {
       setModal({
         message: '이메일 또는 비밀번호를 확인해주세요.',

diff --git a/src/store/slices/userSlice.js b/src/store/slices/userSlice.js
@@ -349,16 +349,27 @@ const userSlice = createSlice({
                 state.loading = true;
                 state.error = null;
             })
-            .addCase(fetchPointInfo.fulfilled, (state, action) => {
-                state.loading = false;
-                state.isLoggedIn = true;
-
-                state.stats = {
-                    point: action.payload.point,
-                    totalPoint: action.payload.totalPoint || 0,
-                    carbonReduction: action.payload.carbon_save,
-                };
-            })
+           .addCase(fetchPointInfo.fulfilled, (state, action) => {
+    state.loading = false;
+    state.isLoggedIn = true;
+
+    state.stats = {
+        point: action.payload.point,
+        totalPoint: action.payload.totalPoint || 0,
+        carbonReduction: action.payload.carbon_save,
+    };
+
+    if (action.payload.member) {
+        const member = action.payload.member;
+        state.profile = {
+            memberId: member.memberId,
+            name: member.nickname,
+            email: member.email,
+            avatar: member.imageUrl,
+            nickname: member.nickname,
+        };
+    }
+})
             .addCase(fetchPointInfo.rejected, (state, action) => {
                 state.loading = false;
                 state.error = action.payload;