Feature/#144 curation

app/src/main/java/com/linku/MainApp.kt

@@ -79,6 +79,10 @@ fun MainApp(
         }
     }
 
+    // 닉네임 최상단 뒤치(사용하는 스크린)
+    val nickname by viewModel.nickname.collectAsStateWithLifecycle()
+
+
     // 앱 실행 시 실행하여 이전 계정 기록 삭제
     // FIXME : 지민님한테 여쭈어보기. 매번 앱 실행할 때마다 최근 기록을 지우는 것보다는 로그아웃 때 지우는건 어떤지
     LaunchedEffect(Unit) {
@@ -125,6 +129,14 @@ fun MainApp(
     val navBackStackEntry by navigator.currentBackStackEntryAsState()
     val currentRoute = navBackStackEntry?.destination?.route
 
+    LaunchedEffect(currentRoute) {
+        if (currentRoute == NavigationRoute.Home.route ||
+            currentRoute == "curation_list"
+        ) {
+            viewModel.fetchNickname()
+        }
+    }
+
     fun isTabRoute(current: String?, root: String): Boolean =
         current == root || current?.startsWith("$root/") == true || current?.startsWith("$root?") == true
 
@@ -348,15 +360,6 @@ fun MainApp(
                             showNavBar = true
                         }
 
-                        // 홈 탭 진입 및 복귀 할 때마다 닉네임 갱신
-                        LaunchedEffect(currentRoute) {
-                            if (currentRoute == NavigationRoute.Home.route) {
-                                viewModel.fetchNickname()
-                            }
-                        }
-
-                        val nickname by viewModel.nickname.collectAsStateWithLifecycle()
-
                         HomeApp(
                             viewModel = homeViewModel,
                             nickname = nickname.orEmpty().ifBlank { "링큐" },
@@ -392,7 +395,8 @@ fun MainApp(
                 // 큐레이션 파트 리팩토링 적용
                 curationGraph(
                     navigator = navigator,
-                    showNavBar = { showNavBar = it }
+                    showNavBar = { showNavBar = it },
+                    nickname = nickname.orEmpty().ifBlank { "링큐" }
                 )
 
 

core/src/main/java/com/linku/core/repository/CurationRepository.kt

@@ -1,22 +1,6 @@
 package com.linku.core.repository
 
-import com.linku.core.model.CurationDetail
-import com.linku.core.model.RecommendedLink
-
-
+/** princeHw 작업 공간  */
 interface CurationRepository {
-    //좋아요 기능 자체 삭제.
-     // 최근 큐레이션 불러오기
-//     suspend fun getMyRecentCuration(userId: Long): CurationItem
-
-     //추천(큐레이션 디테일)
-     suspend fun getRecommendedLinks(userId: Long, curationId: Long): List<RecommendedLink>
-
-     //사용자 디테일 정보 제공(큐레이션 디테일)
-     suspend fun getCurationDetail(curationId: Long): CurationDetail
-
-     //큐레이션 추천(기본 페이지)
-     suspend fun getHomeRecommendedLinksTop2(userId: Long, curationId: Long): List<RecommendedLink>
-
 
 }

data/src/main/java/com/linku/data/api/CurationApi.kt

@@ -1,40 +1,7 @@
 package com.linku.data.api
 
-import com.linku.data.api.dto.BaseResponse
-import com.linku.data.api.dto.server.CurationDetailResponse
-import com.linku.data.api.dto.server.RecommendLinkItemDto
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-import retrofit2.Response
-import okhttp3.ResponseBody
 
+/** princeHw 작업 공간  */
 interface CurationApi {
 
-     @GET("curations/latest/{userId}")
-     suspend fun getMyRecentCurationRaw(
-         @Path("userId") userId: Long
-     ): Response<ResponseBody>
-
-
-    @GET("curations/recommend-links")
-    suspend fun getRecommendLinks(
-        @Query("userId") userId: Long,
-        @Query("curationId") curationId: Long
-    ): BaseResponse<List<RecommendLinkItemDto>>
-
-    //큐레이션 디테일 -> 현재 화면에사 연동 뺌. ui 수정이 예정 되어 있음.
-    @GET("curations/detail/{curationId}")
-    suspend fun getCurationDetail(
-        @Path("curationId") curationId: Long
-    ): BaseResponse<CurationDetailResponse>
-
-
-    //큐레이션 기본 페이지 추천
-    @GET("curations/recommend-links/internal/top2")
-    suspend fun getInternalTop2(
-        @Query("userId") userId: Long,
-        @Query("curationId") curationId: Long
-    ): BaseResponse<List<RecommendLinkItemDto>>
-
 }

data/src/main/java/com/linku/data/di/repository/CurationRepositoryModule.kt

@@ -2,45 +2,25 @@ package com.linku.data.di.repository
 
 import com.linku.core.repository.CurationRepository
 import com.linku.data.api.CurationApi
-import com.linku.data.api.ServerApi
 import com.linku.data.implementation.repository.CurationRepositoryImpl
-import com.linku.data.preference.AuthPreference
-import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
-/* 미래의 제가 수정할겁니다. */
+
 @Module
 @InstallIn(SingletonComponent::class)
 object CurationRepositoryModule {
 
-
-//    @Provides
-//    @Singleton
-//    fun provideLinkuRepository(
-//        serverApi: ServerApi,
-//        authPreference: AuthPreference
-//    ): CurationRepository {
-//        return CurationRepositoryImpl(
-//            serverApi = serverApi,
-//            authPreference = authPreference
-//        )
-//    }
 @Provides
 @Singleton
-fun provideCurationRepository(                // 함수명도 의미 맞게 변경 권장
-    serverApi: ServerApi,
-    curationApi: CurationApi,                 // ★ 추가
-    authPreference: AuthPreference,
-    moshi: Moshi
+fun provideCurationRepository(
+    curationApi: CurationApi,
 ): CurationRepository {
     return CurationRepositoryImpl(
-        serverApi = serverApi,
         curationApi = curationApi,
-        moshi = moshi
     )
 }
 }

data/src/main/java/com/linku/data/implementation/repository/CurationRepositoryImpl.kt

@@ -1,159 +1,14 @@
 package com.linku.data.implementation.repository
 
-import com.linku.core.model.CurationDetail
-import com.linku.core.model.CurationItem
-import com.linku.core.model.RecommendedLink
 import com.linku.core.repository.CurationRepository
 import com.linku.data.api.CurationApi
-import com.linku.data.api.ServerApi
-import com.linku.data.api.dto.server.CurationLatestResponse
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.Moshi
-import okio.Buffer
 import javax.inject.Inject
 
 
-/* 여기 아직 아무것도 연동 안해서 일단은 패스. -미래의 나에게 부탁하겠음- */
+/** princeHw 작업 공간  */
 class CurationRepositoryImpl @Inject constructor(
-    private val serverApi: ServerApi,
-    private val curationApi: CurationApi,
-    private val moshi: Moshi,
+    private val curationApi: CurationApi
 ) : CurationRepository {
 
 
-//    override suspend fun getMyRecentCuration(userId: Long): CurationItem {
-//        Log.d("CurationRepo", "getMyRecentCuration() via RAW path")  // ✅ 추가
-//        // ✅ Raw 호출
-//        val resp = curationApi.getMyRecentCurationRaw(userId)
-//        if (!resp.isSuccessful) throw HttpException(resp)
-//
-//        val bodyStr = resp.body()?.string() ?: throw IllegalStateException("빈 응답")
-//
-//        Log.d("CurationApi", "response body = $bodyStr")
-//
-//        // ✅ result 키 존재 여부 먼저 확인
-//        return if (hasResultKey(bodyStr)) {
-//            val type = Types.newParameterizedType(
-//                BaseResponse::class.java,
-//                CurationLatestResponse::class.java
-//            )
-//            val adapter = moshi.adapter<BaseResponse<CurationLatestResponse>>(type)
-//            val base = adapter.fromJson(bodyStr)
-//                ?: throw IllegalStateException("파싱 실패(BaseResponse)")
-//            val dto = base.result // 팀 규칙상 non-null
-//            CurationItem(
-//                id = dto.curationId,
-//                month = dto.month,
-//                thumbnailUrl = dto.thumbnailUrl
-//            )
-//        } else {
-//            val emptyAdapter = moshi.adapter(BaseEmptyResponse::class.java)
-//            val empty = emptyAdapter.fromJson(bodyStr)
-//                ?: throw IllegalStateException("파싱 실패(BaseEmptyResponse)")
-//            if (!empty.isSuccess) {
-//                throw IllegalStateException("최근 큐레이션 호출 실패: ${empty.code}/${empty.message}")
-//            }
-//            // 최신 없음 → VM에서 생성 플로우로 넘기기
-//            throw NoSuchElementException("최근 큐레이션이 없습니다.")
-//        }
-//    }
-
-    private fun hasResultKey(json: String): Boolean {
-        val reader = JsonReader.of(Buffer().writeUtf8(json))
-        if (reader.peek() != JsonReader.Token.BEGIN_OBJECT) return false
-        reader.beginObject()
-        var found = false
-        while (reader.hasNext()) {
-            val name = reader.nextName()
-            if (name == "result") { found = true; reader.skipValue(); break }
-            else reader.skipValue()
-        }
-        while (reader.hasNext()) reader.skipValue()
-        reader.endObject()
-        return found
-    }
-
-
-    private fun CurationLatestResponse.toDomain(): CurationItem {
-        return CurationItem(
-            id = this.curationId,
-            month = this.month,
-            thumbnailUrl = this.thumbnailUrl
-        )
-    }
-
-    override suspend fun getRecommendedLinks(
-        userId: Long,
-        curationId: Long
-    ): List<RecommendedLink> {
-        val res = curationApi.getRecommendLinks(userId, curationId) // BaseResponse< List<...> >
-        if (!res.isSuccess) throw IllegalStateException(res.message ?: "추천 링크 호출 실패")
-        val dtos = res.result ?: emptyList()
-
-        return dtos.mapNotNull { dto ->
-            val title = dto.title?.trim().orEmpty()
-            val url = dto.url?.trim().orEmpty()
-            if (title.isBlank() || url.isBlank()) return@mapNotNull null
-            val normalizedDomain = dto.domain
-                ?.takeIf { it.isNotBlank() && it.lowercase() !in setOf("invalid", "unknown") }
-                ?: runCatching { java.net.URL(url).host }.getOrNull()
-
-            RecommendedLink(
-                isInternal = dto.userLinkuId != null,
-                userLinkuId = dto.userLinkuId,
-                title = title,
-                url = url,
-                imageUrl = dto.imageUrl?.takeIf { it.isNotBlank() },
-                domain = normalizedDomain,
-                domainImageUrl = dto.domainImageUrl?.takeIf { it.isNotBlank() },
-                categories = dto.categories?.filter { it.isNotBlank() }
-            )
-        }.take(9)
-    }
-
-    //큐레이션 디테일 사용자 정보 제공
-    override suspend fun getCurationDetail(curationId: Long): CurationDetail {
-        val res = curationApi.getCurationDetail(curationId) // BaseResponse<CurationDetailResponse>
-        if (!res.isSuccess) throw IllegalStateException(res.message ?: "큐레이션 상세 조회 실패")
-        val dto = res.result
-        return CurationDetail(
-            curationId = dto.curationId,
-            month = dto.month,
-            topTags = dto.topTags.orEmpty().take(3),
-            headerMent = dto.headerMent,
-            footerMent = dto.footerMent
-        )
-    }
-
-
-    //큐레이션 기본 페이지 추천
-    override suspend fun getHomeRecommendedLinksTop2(
-        userId: Long, curationId: Long
-    ): List<RecommendedLink> {
-        val res = curationApi.getInternalTop2(userId, curationId) // BaseResponse<List<...>>
-        if (!res.isSuccess) throw IllegalStateException(res.message ?: "홈 추천 링크 호출 실패")
-        val dtos = res.result ?: emptyList()
-        return dtos.mapNotNull { dto ->
-            val title = dto.title?.trim().orEmpty()
-            val url = dto.url?.trim().orEmpty()
-            if (title.isBlank() || url.isBlank()) return@mapNotNull null
-            val normalizedDomain = dto.domain
-                ?.takeIf { it.isNotBlank() && it.lowercase() !in setOf("invalid", "unknown") }
-                ?: runCatching { java.net.URL(url).host }.getOrNull()
-
-            RecommendedLink(
-                isInternal = true,
-                userLinkuId = dto.userLinkuId,
-                title = title,
-                url = url,
-                imageUrl = dto.imageUrl?.takeIf { it.isNotBlank() },
-                domain = normalizedDomain,
-                domainImageUrl = dto.domainImageUrl?.takeIf { it.isNotBlank() },
-                categories = dto.categories?.filter { it.isNotBlank() }
-            )
-        }.take(2)
-    }
-
-
-
 }

data/src/main/java/com/linku/data/mapper/SocialProfileMapper.kt

@@ -1,6 +1,9 @@
 package com.linku.data.mapper
 
-import com.linku.core.model.auth.*
+import com.linku.core.model.auth.Gender
+import com.linku.core.model.auth.Interest
+import com.linku.core.model.auth.Job
+import com.linku.core.model.auth.Purpose
 import com.linku.data.api.dto.auth.signup.social.SocialProfileRequestDTO
 
 object SocialProfileMapper {

design/src/main/java/com/linku/design/theme/color/ThemeColorScheme.kt

@@ -63,6 +63,29 @@ sealed class ThemeColorScheme(
     //구글 로그인 버튼 컬러용
     val googleLoginColor: Color = Color(0xFF1F1F1F),
     //구글 로그인 보더 컬러용
-    val googleLoginBorderColor: Color = Color(0xFF747775)
+    val googleLoginBorderColor: Color = Color(0xFF747775),
 
+    //큐레이션 전용 그라데이션
+    val curationGradient: Brush = Brush.horizontalGradient(
+        listOf(Color(0xFF1451D5), Color(0xFF000208))
+    ),
+
+    //큐레이션 캘린더 박스 컬러
+    val curationCalendarBoxColor: Color = Color(0xFFEFF4FF),
+
+    //큐레이션 카드 배경 (이미지 로딩 전 fallback)
+    val curationCardBackground: Color = Color(0xFFF2F2F2),
+
+    //큐레이션 카드 이미지 위 오버레이 그라데이션
+    val curationCardOverlayGradient: Brush = Brush.verticalGradient(
+        colorStops = arrayOf(
+            0.0f to Color(0x00000000),
+            1.0f to Color(0x66000000)
+        )
+    ),
+
+    //큐레이션 감정 분석 섹션 타이틀 그라데이션
+    val emotionTitleGradient: Brush = Brush.horizontalGradient(
+        listOf(Color(0xFF2C6FFF), Color(0xFF000208))
+    ),
 )