Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
bdd9471
Feat : 챌린지 인증
arisue2002 Nov 6, 2025
033a6d3
Merge pull request #95 from ucamp-greenmap/feat/challenge
paul-lee-dev Nov 6, 2025
114ad71
Feat: CarbonInfoScreen 및 CertificationHistoryScreen에서 navigation 지원 추…
yeni0727 Nov 6, 2025
97d04fe
Merge pull request #96 from ucamp-greenmap/feat/news
arisue2002 Nov 6, 2025
857af87
Feat: 인증 화면에서 로그인 상태에 따른 인증 내역 및 통계 표시 로직 추가
yeni0727 Nov 6, 2025
18158cc
Merge pull request #97 from ucamp-greenmap/feat/news
arisue2002 Nov 6, 2025
5481662
feat: 프로필 편집 화면 및 navigate
Ryuyena0305 Nov 6, 2025
cb858c5
Merge pull request #98 from ucamp-greenmap/feat/edit-profile
yeni0727 Nov 6, 2025
82b9741
Feat: 뉴스 목록 불러오기 및 읽기 처리 로직 개선, 남은 포인트 횟수 관리 추가
yeni0727 Nov 6, 2025
30da1eb
Merge pull request #99 from ucamp-greenmap/feat/news
arisue2002 Nov 6, 2025
3afd890
feat: 회원가입 폼 개선 및 유효성 검사 추가
Ryuyena0305 Nov 6, 2025
ad5b277
Feat: 뱃지 기능 추가 및 관련 화면 개선, 사용자 포인트 관리 로직 업데이트
yeni0727 Nov 6, 2025
8591180
Merge pull request #100 from ucamp-greenmap/feat/edit-profile
yeni0727 Nov 6, 2025
7909317
Merge pull request #101 from ucamp-greenmap/feat/news
arisue2002 Nov 6, 2025
3ad5e59
refactor: 랭킹, 포인트 내역 뒤로가기 수정
sai06266 Nov 6, 2025
cb53239
Merge pull request #102 from ucamp-greenmap/refactor/mypage-navigate
sai06266 Nov 6, 2025
634a366
fixed UIs
ipcarepi Nov 6, 2025
5222755
Merge pull request #103 from ucamp-greenmap/fix/uis
yeni0727 Nov 6, 2025
2d55752
회원정보 수정 뒤로가기 버튼 활성화
ipcarepi Nov 6, 2025
837cde7
Merge branch 'dev' of https://github.com/ucamp-greenmap/greenmap-fron…
ipcarepi Nov 6, 2025
06a01b8
Merge pull request #104 from ucamp-greenmap/fix/uis
sai06266 Nov 6, 2025
4535105
홈페이지 뉴스 조회시 포인트 즉시 반영
sai06266 Nov 6, 2025
23941ed
Merge pull request #105 from ucamp-greenmap/refactor/homepage-news
sai06266 Nov 6, 2025
a1eae6d
최근 인증 내역 EVCAR -> 전기차 충전
ipcarepi Nov 6, 2025
f4540e6
Feat : 챌린지 저장 1106
arisue2002 Nov 6, 2025
6727b2d
Merge pull request #106 from ucamp-greenmap/feat/challenge
paul-lee-dev Nov 6, 2025
748aaf2
Merge branch 'dev' of https://github.com/ucamp-greenmap/greenmap-fron…
ipcarepi Nov 6, 2025
7bbdb2b
HCAR -> 수소차 충전
ipcarepi Nov 6, 2025
20135a6
Merge pull request #107 from ucamp-greenmap/fix/uis
yeni0727 Nov 6, 2025
594df07
회원정보 수정 모달창으로 변경
sai06266 Nov 6, 2025
ac8bfbc
Merge pull request #108 from ucamp-greenmap/refactor/EditProfile
ipcarepi Nov 6, 2025
6381e6c
fix: 인증 요청 핸들러에 로그인 체크 추가, 유저 메세지 수정
yeni0727 Nov 6, 2025
cd0c27f
Merge pull request #109 from ucamp-greenmap/feat/news
arisue2002 Nov 6, 2025
9c9f2ea
fix: radius 공백 제거 완료
yeni0727 Nov 6, 2025
d95ca76
Merge pull request #110 from ucamp-greenmap/feat/news
sai06266 Nov 6, 2025
e58ff5b
포인트 교환소 날짜 왼쪽 정렬
ipcarepi Nov 6, 2025
b6a9938
fix: appSlice.js에서 completeOnboarding 리듀서의 문법 오류 수정
yeni0727 Nov 6, 2025
44b4f31
Merge pull request #111 from ucamp-greenmap/fix/pointExchange
yeni0727 Nov 6, 2025
8d54d3e
fix: 포인트 표시를 천 단위 구분 기호로 포맷팅
yeni0727 Nov 6, 2025
d0afc6c
Merge pull request #112 from ucamp-greenmap/fix/ui
ipcarepi Nov 6, 2025
165c14f
Feat : 1.챌린지화면 버튼 추가 2.챌린지추가 화면 연결 및 틀 구성
arisue2002 Nov 6, 2025
7206ec7
refactor : 중복 및 모달
Ryuyena0305 Nov 6, 2025
15e7234
뒤로가기 색 수정
sai06266 Nov 6, 2025
925371d
Merge pull request #114 from ucamp-greenmap/refactor/back-color
sai06266 Nov 6, 2025
186f116
Merge branch 'dev' into feat/challenge
arisue2002 Nov 6, 2025
a23d0d8
Feat: 검색 기능 추가 및 캐시된 장소 데이터 처리 개선
paul-lee-dev Nov 6, 2025
e8ee7a5
Feat: 거리 계산 및 표시 기능 추가, 시설 목록 정렬 개선
paul-lee-dev Nov 6, 2025
571d6d8
Feat: BottomSheet 컴포넌트에 드래그 및 높이 조정 기능 추가, 마커 클릭 시 선택된 마커 애니메이션 효과 적용
paul-lee-dev Nov 6, 2025
b6da49c
Refactor: getMarkerImage 함수의 코드 정리 및 가독성 향상
paul-lee-dev Nov 6, 2025
68045a7
Feat: 시설 이미지 표시 기능 개선 및 더미 이미지 추가
paul-lee-dev Nov 6, 2025
7c07848
Refactor: getDummyImage 함수의 코드 정리 및 가독성 향상
paul-lee-dev Nov 6, 2025
5bb4439
Design: 챌린지 페이지 디자인 수정
paul-lee-dev Nov 6, 2025
9191fe6
Fix: 챌린지 추가 버튼 툴팁 위치 및 화살표 방향 수정
paul-lee-dev Nov 6, 2025
5f484ef
Merge pull request #113 from ucamp-greenmap/feat/challenge
paul-lee-dev Nov 6, 2025
fa2ef55
Feat: 장소 검색
paul-lee-dev Nov 6, 2025
cbde8bd
Feat: 챌린지 추가 화면 기능 구현
arisue2002 Nov 7, 2025
52441f4
Feat: 관리자 권한 확인 및 챌린지 추가 버튼 기능 구현
paul-lee-dev Nov 7, 2025
54e4668
feat: 프로필 수정 화면에 모달 기능 추가
Ryuyena0305 Nov 7, 2025
48bf9e4
Refactor: 불필요한 로그 및 주석 제거, 토스트 메시지 표시 시간 조정
yeni0727 Nov 7, 2025
266643f
Merge pull request #116 from ucamp-greenmap/feat/challenge
paul-lee-dev Nov 7, 2025
869badf
Merge pull request #118 from ucamp-greenmap/fix/ui
sai06266 Nov 7, 2025
0052069
Merge pull request #119 from ucamp-greenmap/feat/admin-login
yeni0727 Nov 7, 2025
5cf9d0b
Merge branch 'dev' of https://github.com/ucamp-greenmap/greenmap-fron…
Ryuyena0305 Nov 7, 2025
1359aea
Merge branch 'dev' of https://github.com/ucamp-greenmap/greenmap-fron…
Ryuyena0305 Nov 7, 2025
b8ac210
Merge pull request #117 from ucamp-greenmap/refactor/modal
yeni0727 Nov 7, 2025
d7bac95
마이페이지 왼쪽 정렬
ipcarepi Nov 7, 2025
7b5810e
Merge pull request #120 from ucamp-greenmap/fix/mypage
yeni0727 Nov 7, 2025
8783e8e
Feat: 로그인 시 memberId를 로컬 스토리지에 저장
paul-lee-dev Nov 7, 2025
5f73bed
회원정보수정 뒤로가기 활성화
ipcarepi Nov 7, 2025
e694bfb
Merge pull request #121 from ucamp-greenmap/fix/mypage
yeni0727 Nov 7, 2025
032c423
Feat: 로그아웃 시 memberId를 로컬 스토리지에서 제거
paul-lee-dev Nov 7, 2025
fdfa1a2
feat:뉴스 목록 읽기 처리 시 제목 정리 로직 추가 및 마이페이지 스타일 일관성 개선
yeni0727 Nov 7, 2025
7a5a42f
Merge pull request #122 from ucamp-greenmap/feat/admin
sai06266 Nov 7, 2025
96aa2c6
Merge pull request #123 from ucamp-greenmap/fix/ui
sai06266 Nov 7, 2025
82bfe6e
fix: CertModal에서 오류 메시지 및 스타일 일관성 개선
yeni0727 Nov 7, 2025
9105cf9
Feat: 챌린지 추가 화면 개선 및 설명 유효성 검사 추가
paul-lee-dev Nov 7, 2025
bc3872e
Refactor: AddChallengeScreen 경로 요소 간소화 및 404 리디렉션 정리
paul-lee-dev Nov 7, 2025
f4dda3d
Merge pull request #125 from ucamp-greenmap/fix/map-loading
arisue2002 Nov 7, 2025
c4f131c
Merge pull request #124 from ucamp-greenmap/fix/ui
paul-lee-dev Nov 7, 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
18,972 changes: 9,486 additions & 9,486 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 22 additions & 8 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ import PointExchangeScreen from './components/screens/PointExchangeScreen';
import RankingScreen from './components/screens/RankingScreen';
import LoginSignupScreen from './components/screens/LoginSignupScreen';
import LoginSuccess from './components/screens/LoginSuccess';
// import BadgeScreen from './components/screens/BadgeScreen';
import EditProfile from './components/screens/EditProfileScreen';
import BadgeScreen from './components/screens/BadgeScreen';
import './App.css';
import FaqScreen from './components/screens/FaqScreen';
import CertificationHistoryScreen from './components/screens/CertificationHistoryScreen';
import CarbonInfoScreen from './components/screens/CarbonInfoScreen';
import AddChallengeScreen from './components/screens/AddChallengeScreen';

// Onboarding, Home, Map, Certification components live in src/components/screens

Expand All @@ -35,7 +37,7 @@ const TAB_TO_PATH = {
map: '/map',
cert: '/verification',
challenge: '/challenge',

'edit-profile': '/edit-profile',
mypage: '/mypage',
points: '/points',
'point-exchange': '/point-exchange',
Expand All @@ -45,6 +47,7 @@ const TAB_TO_PATH = {
FAQ: '/FAQ',
'cert-history': '/cert-history',
'carbon-info': '/carbon-info',
addChal: '/addChallenge',
};

export default function App() {
Expand Down Expand Up @@ -119,11 +122,15 @@ export default function App() {
path='/login'
element={<LoginSignupScreen onNavigate={navigate} />}
/>
<Route
path='/edit-profile'
element={<EditProfile onNavigate={navigate} />}
/>
<Route path='/login/success' element={<LoginSuccess />} />
{/* <Route
<Route
path='/badge'
element={<BadgeScreen onNavigate={navigate} />}
/> */}
/>
<Route
path='/carbon-info'
element={<CarbonInfoScreen onNavigate={navigate} />}
Expand All @@ -138,14 +145,21 @@ export default function App() {
path='/FAQ'
element={<FaqScreen onNavigate={navigate} />}
/>
<Route
path='/addChallenge'
element={<AddChallengeScreen onNavigate={navigate} />}
/>
{/* 404: 알 수 없는 경로는 홈으로 리디렉션 */}
<Route path='*' element={<Navigate to='/' replace />} />
</Routes>

<BottomNavigation
active={activeTab}
onChange={(tab) => navigate(tab)}
/>
{/* 하단 네비게이션 바 - addChallenge 페이지에서는 숨김 */}
{location.pathname !== '/addChallenge' && (
<BottomNavigation
active={activeTab}
onChange={(tab) => navigate(tab)}
/>
)}
</div>
);
}
Expand Down
Binary file added src/assets/lv0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/lv1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/lv2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/lv3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/lv4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading