Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
b27853c
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 Apr 3, 2025
1de7a0d
✨feat: 공개프로필 연결
Yhyun31 Apr 3, 2025
97a5e11
🎨style: 화면스타일 수정
Yhyun31 Apr 3, 2025
e67c845
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 Apr 3, 2025
9d0f883
Merge branch 'develop' of into feature/PublicProfile연결
Yhyun31 Apr 6, 2025
fbd63de
feat: 패키지 설치
Yhyun31 Apr 6, 2025
f2848a7
Resolve merge conflicts
Yhyun31 Apr 6, 2025
90892d6
Merge pull request #52 from ITDA-project/feature/PublicProfile연결
syuzzzi Apr 6, 2025
f098545
✨feat : 로그아웃 연결
syuzzzi Apr 8, 2025
fdba478
🎨style : accessToken 변수명 오타 수정
syuzzzi Apr 8, 2025
68f4426
Merge pull request #58 from ITDA-project/feature/SignOutConnect
syuzzzi Apr 8, 2025
d7f504f
✨feat: 메인,전체글 백연결
Yhyun31 Apr 8, 2025
3ee9eaa
✨feat : 이메일 로그인 후 앱종료 시, 재시동하면 자동 로그인되게 구현
syuzzzi Apr 8, 2025
ece44b9
Merge pull request #62 from ITDA-project/feature/accessToken_재발급
syuzzzi Apr 8, 2025
15a8bcb
Merge pull request #60 from ITDA-project/feature/mainPage
syuzzzi Apr 8, 2025
32c596a
feat: 마이페이지 백연결 (연결확인 필요)
Yhyun31 Apr 8, 2025
70f1f27
🐞bugfix : 중복 이메일로 소셜 로그인 시도 시, 경고창 띄우기
syuzzzi Apr 8, 2025
c59d66a
🎨style : 회원가입 중복 이메일 모달창 띄우기
syuzzzi Apr 8, 2025
813abc8
Merge pull request #64 from ITDA-project/bugfix/socialSignin
syuzzzi Apr 8, 2025
091c7ff
feat: 게시글상세 백연결(좋아요 수정 필요)
Yhyun31 Apr 8, 2025
d521419
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 Apr 9, 2025
5362bfd
✨feat: 상세게시글 백연결(좋아요 수정필요)
Yhyun31 Apr 9, 2025
e5d4f06
Merge pull request #66 from ITDA-project/feature/PostDetail
syuzzzi Apr 9, 2025
e76505e
🐞bugfix: useid 조건에 따른 상세 게시글로 이동 문제 수정
Yhyun31 Apr 10, 2025
d2cee89
🐞bugfix: 상세게시글 좋아요 기능 문제 수정(더 수정 필요)
Yhyun31 Apr 10, 2025
3fbff78
✨feat: 게시글 생성 백연결
Yhyun31 Apr 10, 2025
09d0e52
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 Apr 10, 2025
2688bf5
🐞bugfix: 좋아요 기능 최종 수정
Yhyun31 Apr 10, 2025
de53ecc
Merge pull request #68 from ITDA-project/feature/Postdetail
syuzzzi Apr 10, 2025
da312c4
Merge pull request #69 from ITDA-project/feature/CreatePost
syuzzzi Apr 10, 2025
4550e13
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 Apr 11, 2025
91ce112
🐞bugfix: 탭바 페이지 중복 문제 수정
Yhyun31 Apr 11, 2025
758d211
🐞bugfix: 카테고리 변수명 수정
Yhyun31 Apr 11, 2025
19392b4
🐞bugfix: useFoucusEffect로 수정해 탭 진입시 데이터 갱신
Yhyun31 Apr 11, 2025
0ef7d5d
✨feat: 마이페이지 백연결
Yhyun31 Apr 11, 2025
62ee765
Merge pull request #70 from ITDA-project/feature/myPage
syuzzzi Apr 11, 2025
ecc4794
🐞bugfix: 토큰만료 시 UI 화면, 화면 이동 오류 수정
Yhyun31 Apr 15, 2025
5997069
✨feat: 프로필/프로필 수정 백연결
Yhyun31 Apr 15, 2025
e4156ec
Merge pull request #72 from ITDA-project/feature/Profile
syuzzzi Apr 15, 2025
59a07a7
✨feat: 검색 화면 백연결
Yhyun31 Apr 17, 2025
7aa89a1
Merge pull request #73 from ITDA-project/feature/Search
syuzzzi Apr 17, 2025
c2142dc
🐞bugfix: 카테고리 요청 누락 수정
Yhyun31 Apr 17, 2025
1f7e2aa
✨feat: 모집시작 기간 표시 반영
Yhyun31 Apr 17, 2025
8041d1c
✨feat: 게시글 삭제, 수정 백연결
Yhyun31 Apr 25, 2025
e2a0264
✨feat: 게시글 수정 백연결
Yhyun31 Apr 25, 2025
dec7cbb
🐞bugfix : 빌드 오류 수정
syuzzzi Apr 29, 2025
cc40b12
✨feat : 로그아웃 살짝 수정
syuzzzi Apr 29, 2025
2580db5
✨feat: Chat->ChatList 변경
Yhyun31 Apr 29, 2025
0694e79
✨feat: Chat 화면 추가
Yhyun31 Apr 29, 2025
70a71f2
✨feat: ChatList 화면 추가
Yhyun31 Apr 29, 2025
b915b19
✨feat: 채팅방 화면 구현
Yhyun31 Apr 29, 2025
f0e78c9
✨feat: 채팅목록 화면 구현
Yhyun31 Apr 29, 2025
46a412c
Merge pull request #75 from ITDA-project/feature/Chat
syuzzzi Apr 30, 2025
8a33918
🐞bugfix : 소셜로그인 시, 엑세스 토큰이 넘어오지 않는 문제 수정
syuzzzi Apr 30, 2025
1d6a1f7
Merge remote-tracking branch 'origin/develop' into feature/review
syuzzzi Apr 30, 2025
7b6cd16
🎨style : 간단한 로그만 찍히게
syuzzzi May 1, 2025
dc9fc60
🐞bugfix : 게시글 상세 타입 변경
syuzzzi May 1, 2025
b42f0de
🎨style : 로그 추가
syuzzzi May 1, 2025
ac610e9
Merge pull request #76 from ITDA-project/test
syuzzzi May 1, 2025
a14f782
🐞bugfix: currentuserid 추출 및 변수명 수정
Yhyun31 May 1, 2025
cf24c29
Merge pull request #77 from ITDA-project/feature/PostDetail
syuzzzi May 1, 2025
769dc37
♻️refactor: useEffect>useFocusEffect 화면 포커스시 재로딩
Yhyun31 May 4, 2025
436f78c
✨feat: 알림 화면 구현
Yhyun31 May 4, 2025
aadcebb
Merge pull request #79 from ITDA-project/feature/Notification
syuzzzi May 5, 2025
1916656
🐞bugfix : 로그인 시 access토큰 안불러와지는 문제, 로그아웃 안되는 문제 수정
syuzzzi May 5, 2025
68d626f
✨feat : 탈퇴 로직 추가. 불완전
syuzzzi May 8, 2025
b5503f2
Merge branch 'develop' into bugfix/login,-logout
syuzzzi May 8, 2025
32ca849
Merge pull request #80 from ITDA-project/bugfix/login,-logout
syuzzzi May 8, 2025
824394e
✨feat : 신청서 제출 백 연결
syuzzzi May 8, 2025
f3dddc7
Merge pull request #82 from ITDA-project/feature/FormConnect
syuzzzi May 8, 2025
0b90549
🎨style: 모집시작 기간 날짜 형식 변경
Yhyun31 May 10, 2025
db05715
Merge pull request #84 from ITDA-project/feature/PostDetail
syuzzzi May 12, 2025
5fc3873
🐞bugfix : 탈퇴 로직 수정
syuzzzi May 13, 2025
b1aecfd
✨feat : 신청서 리스트, 상태 변경 기능 백과 연결
syuzzzi May 13, 2025
b388c1b
✨feat: 결제 요청 시 모달 화면 추가
Yhyun31 May 13, 2025
04e033b
🐞bugfix: 사진 수정시 앨범 안 열리는 오류 해결
Yhyun31 May 13, 2025
f19d8f4
✨feat: Android 사진 선택을 위한 READ_MEDIA_IMAGES 권한 추가
Yhyun31 May 13, 2025
5e379f0
Merge pull request #85 from ITDA-project/feature/FormConnect
syuzzzi May 13, 2025
c7b49ee
Merge pull request #86 from ITDA-project/feature/Notification
syuzzzi May 13, 2025
56154f4
✨feat: 모임참여 상태 여부 배지 추가
Yhyun31 May 13, 2025
3e1a6c0
✨feat: 모임참여 상태 여부 배지 추가
Yhyun31 May 13, 2025
ae232eb
Revert "✨feat: 모임참여 상태 여부 배지 추가"
Yhyun31 May 13, 2025
17aada1
♻️ refactor: 잘못 커밋된 Notification.js 복구
Yhyun31 May 13, 2025
2ca9f68
✨feat : kg이니시스로 결제창 구현. 추후 백 연결 필요
syuzzzi May 15, 2025
e54bc22
Merge pull request #89 from ITDA-project/feature/Payment
syuzzzi May 15, 2025
8240a90
Merge pull request #87 from ITDA-project/feature/Chat
syuzzzi May 15, 2025
15e1134
✨feat: 채팅방 나가기 버튼 추가
Yhyun31 May 15, 2025
a02e9ea
🎨style : 고객사 식별코드 수정
syuzzzi May 15, 2025
a653cac
✨ feat: FCM 연동을 위한 의존성 추가 및 .gitignore 설정
Yhyun31 May 15, 2025
a7f660e
Merge branch 'develop' of into feature/notifications-fcm
Yhyun31 May 15, 2025
20ed4ee
✨feat: 실체 참여자 선택 화면 구현
Yhyun31 May 15, 2025
1ac326f
Merge pull request #92 from ITDA-project/feature/CheckParticipants
syuzzzi May 17, 2025
cd1a9b6
Merge pull request #93 from ITDA-project/feature/notifications-fcm
syuzzzi May 17, 2025
f564ead
✨feat: 실제 참석자 필터링 및 비교 로직 추가
Yhyun31 May 19, 2025
1a802ca
✨feat : imp 변경, 미완성 백 연결 코드
syuzzzi May 20, 2025
e02e0e9
✨feat: 채팅방 UI 조건 분기를 위한 writerId, postId 전달 추가
Yhyun31 May 20, 2025
9379c5a
✨feat: UI 분기를 위한 userid 비교 로직 추가
Yhyun31 May 20, 2025
5bc953a
✨feat: 상세게시글 모집 마감시 상태 변경
Yhyun31 May 20, 2025
c9e82eb
✨feat: 모임재생성시 모집마감 필수조건 로직 추가
Yhyun31 May 20, 2025
ad7bcb8
Merge pull request #97 from ITDA-project/feature/PostDetail
syuzzzi May 21, 2025
a51b087
Merge branch 'develop' of https://github.com/ITDA-project/web into fe…
Yhyun31 May 21, 2025
068cf88
✨feat: 모임장이 채팅방 나갈시 채팅기능 정지
Yhyun31 May 21, 2025
34ecdfa
✨feat: 참가자들의 userId 추가
Yhyun31 May 21, 2025
6f4588d
✨feat : 오류 리다이렉트 설정
syuzzzi May 22, 2025
1f3c9c7
🎨style : 로그 삭제
syuzzzi May 22, 2025
07e6a83
🐞bugfix : warn 해결
syuzzzi May 22, 2025
5861c51
🐞bugfix : 결제 요청 서버 통신 성공
syuzzzi May 22, 2025
4038ada
Merge branch 'develop' into feature/Payment
syuzzzi May 22, 2025
5bee8e8
Merge pull request #95 from ITDA-project/feature/Payment
syuzzzi May 22, 2025
5088971
Merge pull request #98 from ITDA-project/feature/Chat
syuzzzi May 22, 2025
31bd7c2
✨feat : 리뷰 화면 구현, 백 연결
syuzzzi May 22, 2025
08fec22
Merge pull request #100 from ITDA-project/feature/ReviewConnect
syuzzzi May 22, 2025
fa83602
🎨style : 신청서 없을 시, 회색 글씨로 나타나게 스타일 변경
syuzzzi May 27, 2025
200dbb8
Merge pull request #101 from ITDA-project/feature/ReviewConnect
syuzzzi May 27, 2025
db1be83
🐞bugfix: 상세게시글로 이동 오류 수정
Yhyun31 May 29, 2025
186dcb6
🐞bugfix: 모임종료시 뒤로가기 버튼 미작동 오류 수정
Yhyun31 May 29, 2025
a0f9408
✨feat: 결제완료시 Alert 표시 추가
Yhyun31 May 29, 2025
5c2da67
🎨Style: 경력 수정 버튼 크기 고정 & Container 패딩 수정
Yhyun31 May 29, 2025
ecc3a23
Merge pull request #102 from ITDA-project/feature/Search
syuzzzi May 30, 2025
a440a82
Merge pull request #103 from ITDA-project/feature/Chat
syuzzzi May 30, 2025
001f0b1
🎨style : alert -> alertmodal
syuzzzi Jun 16, 2025
be54603
Merge pull request #104 from ITDA-project/style/modal
syuzzzi Jun 16, 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ android/.settings/
android/*.iml
android/captures/

# Firebase config (절대 올리면 안 됨)
android/app/google-services.json

# Keystore files (절대 올리면 안 됨!)
*.keystore

Expand Down
Binary file removed android/app/libs/oauth-5.10.0.aar
Binary file not shown.
48 changes: 43 additions & 5 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,21 +1,58 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.INTERNET"/>

<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<queries>
<intent>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="https"/>
</intent>
<package android:name="kvp.jjy.MispAndroid320" />
<package android:name="com.kftc.bankpay.android" />
<package android:name="com.kbstar.liivbank" />
<package android:name="com.nh.cashcardapp" />
<package android:name="kr.co.kfcc.mobilebank" />
<package android:name="com.knb.psb" />
<package android:name="com.kakao.talk" />
<package android:name="com.mysmilepay.app" />
<package android:name="finance.chai.app" />
<package android:name="com.nhnent.payapp" />
<package android:name="com.hyundaicard.appcard" />
<package android:name="viva.republica.toss" />
<package android:name="com.shcard.smartpay" />
<package android:name="com.shinhan.smartcaremgr" />
<package android:name="com.hanaskard.paycla" />
<package android:name="kr.co.samsungcard.mpocket" />
<package android:name="com.kbcard.cxh.appcard" />
<package android:name="nh.smart.nhallonepay" />
<package android:name="kr.co.citibank.citimobile" />
<package android:name="com.lcacApp" />
<package android:name="com.lotte.lpay" />
<package android:name="com.ssg.serviceapp.android.egiftcertificate" />
<package android:name="com.inicis.kpay" />
<package android:name="com.kbankwith.smartbank" />
<package android:name="com.lguplus.paynow" />
<package android:name="com.wooricard.smartapp" />
<package android:name="com.lottemembers.android" />
<package android:name="com.kt.ktauth" />
<package android:name="com.lguplus.smartotp" />
<package android:name="com.sktelecom.tauth" />
<package android:name="com.wooribank.smart.npib" />
<package android:name="com.kakaobank.channel" />
<package android:name="com.shinhan.sbanking" />
<intent>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
</intent>
</queries>
<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true">
<meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
Expand All @@ -32,6 +69,7 @@
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="moamoa"/>
<data android:scheme="com.csj1430.moamoa"/>
<data android:scheme="exp+moamoa"/>
</intent-filter>
</activity>
<activity android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity" android:exported="true">
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions android/app/src/main/res/drawable/splashscreen.xml

This file was deleted.

8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

buildscript {
ext {
buildToolsVersion = findProperty('android.buildToolsVersion') ?: '35.0.0'
buildToolsVersion = findProperty('android.buildToolsVersion') ?: '36.0.0'
minSdkVersion = Integer.parseInt(findProperty('android.minSdkVersion') ?: '24')
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '35')
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '34')
compileSdkVersion = Integer.parseInt(findProperty('android.compileSdkVersion') ?: '36')
targetSdkVersion = Integer.parseInt(findProperty('android.targetSdkVersion') ?: '36')
kotlinVersion = findProperty('android.kotlinVersion') ?: '1.9.25'

ndkVersion = "26.1.10909125"
Expand All @@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath('com.android.tools.build:gradle')
classpath('com.android.tools.build:gradle:8.9.1')
classpath('com.facebook.react:react-native-gradle-plugin')
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin')
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"bundleIdentifier": "com.csj1430.moamoa"
},
"android": {
"permissions": ["READ_MEDIA_IMAGES"],
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#1A4568"
Expand Down
4 changes: 2 additions & 2 deletions ios/moamoa.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
);
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
PRODUCT_BUNDLE_IDENTIFIER = com.csj1430.moamoa;
PRODUCT_NAME = moamoa;
PRODUCT_NAME = "moamoa";
SWIFT_OBJC_BRIDGING_HEADER = "moamoa/moamoa-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -411,7 +411,7 @@
);
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
PRODUCT_BUNDLE_IDENTIFIER = com.csj1430.moamoa;
PRODUCT_NAME = moamoa;
PRODUCT_NAME = "moamoa";
SWIFT_OBJC_BRIDGING_HEADER = "moamoa/moamoa-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Loading
Loading