onboard-github
diff --git a/‎.github/pull_request_template.md‎
Lines changed: 41 additions & 3 deletions b/‎.github/pull_request_template.md‎
Lines changed: 41 additions & 3 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 26 additions & 0 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 60 additions & 4 deletions b/‎README.md‎
Lines changed: 60 additions & 4 deletions
diff --git a/‎app/google-services.json‎
Lines changed: 0 additions & 47 deletions b/‎app/google-services.json‎
Lines changed: 0 additions & 47 deletions
diff --git a/‎app/src/main/java/com/yapp/bol/app/di/DataSourceModule.kt‎
Lines changed: 32 additions & 12 deletions b/‎app/src/main/java/com/yapp/bol/app/di/DataSourceModule.kt‎
Lines changed: 32 additions & 12 deletions
diff --git a/‎app/src/main/java/com/yapp/bol/app/di/NetworkModule.kt‎
Lines changed: 36 additions & 15 deletions b/‎app/src/main/java/com/yapp/bol/app/di/NetworkModule.kt‎
Lines changed: 36 additions & 15 deletions
@@ -1,10 +1,48 @@
-### Reference
-- [Jira Ticket](https://yapp22-aos2.atlassian.net/browse/BOL-)
+## Changes
+-
 
-### 참고 사항
+<br/>
+
+## 기타 참고 사항
+-
+
+<br/>
+
+## Reference
+- [Jira Ticket](https://onboardgame.atlassian.net/browse/ONB-)
+
+<br/>
+
+## 스크린샷/영상
+> 스크린샷, 영상이 없다면 ##스크린샷/영상부터 </table> 까지 모두 지워주세요.
+
+<table>
+<tr>
+<td>기능</td>
+<td>스크린샷/영상</td>
+</tr>
+
+<tr>
+<td>내용을 적어주세요</td>
+<td>
+
+스크린샷 및 영상 넣어주세요
+
+</td>
+</tr>
+</table>
+
+<br/>
+
+<details>
+<summary> <b> :page_facing_up: 리뷰 시 참고 사항 </b>  </summary>
+<div markdown="1">
 
 P1: 꼭 반영해주세요 (Request changes)
 P2: 적극적으로 고려해주세요 (Request changes)
 P3: 웬만하면 반영해 주세요 (Comment)
 P4: 반영해도 좋고 넘어가도 좋습니다 (Approve)
 P5: 그냥 사소한 의견입니다 (Approve)
+
+</div>
+</details>
@@ -7,6 +7,9 @@ on:
             - 'main'
             - 'develop'
 
+permissions:
+    pull-requests: write # for comments
+
 jobs:
     build:
 
@@ -61,6 +64,12 @@ jobs:
                     GOOGLE_LOGIN_API_KEY: ${{ secrets.GOOGLE_LOGIN_API_KEY }}
                     GOOGLE_LOGIN_API_KEY_SANDBOX: ${{ secrets.GOOGLE_LOGIN_API_KEY_SANDBOX }}
 
+            # google services json 생성
+            -   name: Write compile time google-services.json file
+                env:
+                    GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
+                run: echo $GOOGLE_SERVICES > app/google-services.json
+
             # gradle 캐싱 작업
             -   name: Cache Gradle packages
                 uses: actions/cache@v2
@@ -80,6 +89,7 @@ jobs:
 
             # ktlint test
             -   name: Run ktlint
+                id: ktlintCheck
                 run: ./gradlew ktlintCheck
 
             -   name: Upload build reports
@@ -95,3 +105,19 @@ jobs:
                 with:
                     name: outputs
                     path: app/build/outputs/
+
+            -   name: Comment when Lint was Failed
+                uses: peter-evans/create-or-update-comment@v2
+                if: failure() && steps.ktlintCheck.outcome == 'failure'
+                with:
+                    issue-number: ${{ github.event.pull_request.number }}
+                    body: |
+                        ❌ ktlint Failed
+
+            -   name: Comment When All Step Was Passed
+                uses: peter-evans/create-or-update-comment@v2
+                if: success()
+                with:
+                    issue-number: ${{ github.event.pull_request.number }}
+                    body: |
+                        🎉 CI Passed
@@ -1,10 +1,66 @@
 # 🎲 ONBOARD
+[Play Store](https://play.google.com/store/apps/details?id=com.yapp.bol.app&pcampaignid=web_share)
+[![Kotlin](https://img.shields.io/badge/Kotlin-1.7.20-blue.svg)](https://kotlinlang.org)
+[![Gradle](https://img.shields.io/badge/gradle-9.1-green.svg)](https://gradle.org/)
+[![minSdkVersion](https://img.shields.io/badge/minSdkVersion-21-red)](https://developer.android.com/distribute/best-practices/develop/target-sdk)
+[![targetSdkVersion](https://img.shields.io/badge/targetSdkVersion-32-orange)](https://developer.android.com/distribute/best-practices/develop/target-sdk)
 
 ### 보드게임 레이팅 서비스
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/cf95701e-f342-4266-8d31-d8cccf911890)
 
-### 구조
-<img width="1229" alt="스크린샷 2023-07-12 오전 9 09 05" src="https://github.com/YAPP-Github/22nd-Android-Team-2-Android/assets/83493143/ee578e57-fc3a-4670-a844-c2940de5fc44">
+<br/>
 
-### 기술 스택
+## Structure
+<img width="1229" alt="Project Structure" src="https://github.com/YAPP-Github/22nd-Android-Team-2-Android/assets/83493143/ee578e57-fc3a-4670-a844-c2940de5fc44">
 
-<img width="1042" alt="스크린샷 2023-07-12 오전 9 50 23" src="https://github.com/YAPP-Github/22nd-Android-Team-2-Android/assets/83493143/bf5f3cfe-366d-4671-99f9-d50891de1f64">
+<br/>
+
+## Rule
+1. 급한 merge가 아니면 CI 통과 후 한 명 이상의 approve를 받았을 시 merge할 것.
+2. code review - priority 1 ~ 5 맞춰서 리뷰, 리뷰 받은 것 고쳤다면 commit reply로 달아주기
+3. code convention - [PRND Android Style Guide](https://github.com/PRNDcompany/android-style-guide)
+4. 공유되어야 하는 지식 - Notion Dev Wiki 사용
+
+<br/>
+
+## Tech Stack
+
+| Archictecture | Clean Architecture, MVVM |
+| --- | --- |
+| CI | Github Actions |
+| DI | Hilt |
+| Network | Retrofit2, OkHttp3 |
+| Asynchronous | Coroutine, Flow |
+| AndroidX | Paging3, LiveData, DataStore, Navigation, ViewModel |
+| Collaboration Tools | GitFlow, Github, Jira, Notion, Figma |
+| Library | Glide, Lottie, Social Login(Naver, Kakao, Google), ktlint, Firebase Crashlytics, Firebase Analytics, OSS License, Shimmer |
+
+<br/>
+
+## 기능 (ver1.0.2)
+### 온보딩
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/37453981-ac66-427f-a90d-04a2dc1670b9)
+
+### 그룹 생성 & 검색 & 가입
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/32de7169-78f1-49c2-b7a7-e961d4394d84)
+
+### 랭킹 - 홈
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/5a66b461-8e84-4da1-a798-bc53b79a6082)
+
+### 게임 결과 기록
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/b4154870-e6ac-4369-bc82-912ce57108e0)
+![image](https://github.com/YAPP-Github/onboard-aos/assets/100047095/3a6b3acc-639b-4a51-98a6-23565c38717a)
+
+### 안내
+
+<br/>
+
+## Developer
+|[![](https://github.com/prk4224.png?size=100)](https://github.com/prk4224) |[![](https://github.com/eunjjungg.png?size=100)](https://github.com/eunjjungg) |[![](https://github.com/ckrudals.png?size=100)](https://github.com/ckrudals) |
+|:-:|:-:|:-:|
+|박재홍|정은정|차경민|
+
+<br/>
+
+## Refactoring
+1. [Data, Domain Module Package Refactoring](https://www.figma.com/file/05EWgiGjm4LCIq9y9WEgt7/package-refactoring?type=whiteboard&node-id=0%3A1&t=rhrzacia1cOJGYDM-1)
@@ -1,15 +1,23 @@
 package com.yapp.bol.app.di
 
-import com.yapp.bol.data.datasource.impl.RemoteDataSource
 import com.yapp.bol.data.datasource.auth.AuthDataSource
-import com.yapp.bol.data.datasource.auth.impl.AuthDataSourceImpl
+import com.yapp.bol.data.datasource.auth.AuthDataSourceImpl
+import com.yapp.bol.data.datasource.file.FileDataSource
+import com.yapp.bol.data.datasource.file.FileDataSourceImpl
+import com.yapp.bol.data.datasource.game.GameDataSource
+import com.yapp.bol.data.datasource.game.GameDataSourceImpl
 import com.yapp.bol.data.datasource.group.GroupDataSource
-import com.yapp.bol.data.datasource.group.impl.GroupDataSourceImpl
-import com.yapp.bol.data.datasource.impl.RemoteDataSourceImpl
-import com.yapp.bol.data.datasource.rank.RankDataSource
-import com.yapp.bol.data.datasource.rank.impl.RankDataSourceImpl
+import com.yapp.bol.data.datasource.group.GroupDataSourceImpl
+import com.yapp.bol.data.datasource.match.MatchDataSource
+import com.yapp.bol.data.datasource.match.MatchDataSourceImpl
+import com.yapp.bol.data.datasource.member.MemberDataSource
+import com.yapp.bol.data.datasource.member.MemberDataSourceImpl
 import com.yapp.bol.data.datasource.setting.SettingDataSource
-import com.yapp.bol.data.datasource.setting.impl.SettingDataSourceImpl
+import com.yapp.bol.data.datasource.setting.SettingDataSourceImpl
+import com.yapp.bol.data.datasource.terms.TermsDataSource
+import com.yapp.bol.data.datasource.terms.TermsDataSourceImpl
+import com.yapp.bol.data.datasource.user.UserDataSource
+import com.yapp.bol.data.datasource.user.UserDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -19,18 +27,30 @@ import dagger.hilt.components.SingletonComponent
 @InstallIn(SingletonComponent::class)
 interface DataSourceModule {
 
-    @Binds
-    fun bindsRemoteDataSource(remoteDataSourceImpl: RemoteDataSourceImpl): RemoteDataSource
-
     @Binds
     fun bindsAuthDatasource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
 
     @Binds
     fun bindsGroupDatasource(groupDataSourceImpl: GroupDataSourceImpl): GroupDataSource
 
     @Binds
-    fun bindsRankDatasource(rankDataSource: RankDataSourceImpl): RankDataSource
+    fun bindsSettingDatasource(settingDataSource: SettingDataSourceImpl): SettingDataSource
 
     @Binds
-    fun bindsSettingDatasource(settingDataSource: SettingDataSourceImpl): SettingDataSource
+    fun bindsFileDatasource(dataSource: FileDataSourceImpl): FileDataSource
+
+    @Binds
+    fun bindsGameDatasource(dataSource: GameDataSourceImpl): GameDataSource
+
+    @Binds
+    fun bindsMatchDatasource(dataSource: MatchDataSourceImpl): MatchDataSource
+
+    @Binds
+    fun bindsMemberDatasource(dataSource: MemberDataSourceImpl): MemberDataSource
+
+    @Binds
+    fun bindsTermsDatasource(dataSource: TermsDataSourceImpl): TermsDataSource
+
+    @Binds
+    fun bindsUserDatasource(dataSource: UserDataSourceImpl): UserDataSource
 }
@@ -1,12 +1,15 @@
 package com.yapp.bol.app.di
 
 import com.yapp.bol.app.BuildConfig
+import com.yapp.bol.data.remote.AuthApi
+import com.yapp.bol.data.remote.FileApi
+import com.yapp.bol.data.remote.GameApi
 import com.yapp.bol.data.remote.GroupApi
-import com.yapp.bol.data.remote.ImageFileApi
-import com.yapp.bol.data.remote.LoginApi
 import com.yapp.bol.data.remote.MatchApi
-import com.yapp.bol.data.remote.RankApi
+import com.yapp.bol.data.remote.MemberApi
 import com.yapp.bol.data.remote.SettingApi
+import com.yapp.bol.data.remote.TermsApi
+import com.yapp.bol.data.remote.UserApi
 import com.yapp.bol.data.utils.Utils.BASE_URL
 import dagger.Module
 import dagger.Provides
@@ -71,37 +74,55 @@ object NetworkModule {
 
     @Provides
     @Singleton
-    fun provideLoginApiService(retrofit: Retrofit): LoginApi {
-        return retrofit.create(LoginApi::class.java)
+    fun provideGroupApiService(retrofit: Retrofit): GroupApi {
+        return retrofit.create(GroupApi::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideRankApiService(retrofit: Retrofit): RankApi {
-        return retrofit.create(RankApi::class.java)
+    fun provideMatchApiService(retrofit: Retrofit): MatchApi {
+        return retrofit.create(MatchApi::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideGroupApiService(retrofit: Retrofit): GroupApi {
-        return retrofit.create(GroupApi::class.java)
+    fun provideSettingApiService(retrofit: Retrofit): SettingApi {
+        return retrofit.create(SettingApi::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideImageApiService(retrofit: Retrofit): ImageFileApi {
-        return retrofit.create(ImageFileApi::class.java)
+    fun provideAuthApiService(retrofit: Retrofit): AuthApi {
+        return retrofit.create(AuthApi::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideMatchApiService(retrofit: Retrofit): MatchApi {
-        return retrofit.create(MatchApi::class.java)
+    fun provideFileApiService(retrofit: Retrofit): FileApi {
+        return retrofit.create(FileApi::class.java)
     }
 
     @Provides
     @Singleton
-    fun provideSettingApiService(retrofit: Retrofit): SettingApi {
-        return retrofit.create(SettingApi::class.java)
+    fun provideGameApiService(retrofit: Retrofit): GameApi {
+        return retrofit.create(GameApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMemberApiService(retrofit: Retrofit): MemberApi {
+        return retrofit.create(MemberApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideTermsApiService(retrofit: Retrofit): TermsApi {
+        return retrofit.create(TermsApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserApiService(retrofit: Retrofit): UserApi {
+        return retrofit.create(UserApi::class.java)
     }
 }