From 6a367ac555e6afdecb0f650e2d18f144695a9f37 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 00:11:16 +0900
Subject: [PATCH 01/16] =?UTF-8?q?[Feat]=20FSCalendar=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Calendar/TCalendarCell.swift   | 174 ++++++++++++++++++
 .../Components/Calendar/TCalendarView.swift   | 123 +++++++++++++
 TnT/Tuist/Package.resolved                    |   9 +
 TnT/Tuist/Package.swift                       |   3 +-
 .../Configuration+Templates.swift             |   4 +
 .../Dependency/DependencyInformation.swift    |   3 +-
 .../Dependency/ExternalDependency.swift       |   3 +-
 7 files changed, 316 insertions(+), 3 deletions(-)
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
new file mode 100644
index 00000000..b5b5996a
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
@@ -0,0 +1,174 @@
+//
+//  CustumCalendarCell.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/1/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import FSCalendar
+
+class FSCustomCalendarCell: FSCalendarCell {
+    
+    static let identifier: String = "CustomCalendarCell"
+    static let cellSize: CGSize = CGSize(width: 51, height: 54)
+    
+    var customDate: Date?
+    var isCustomSelected: Bool = false
+    var style: Style = .default
+    var eventCount: Int = 0
+    var isWeekMode: Bool = false
+
+    private let dayLabel = UILabel()
+    private let eventStackView = UIStackView()
+    private let eventIcon = UIImageView()
+    private let eventCountLabel = UILabel()
+    private let backgroundContainer = UIView()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    
+    required init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        contentView.addSubview(backgroundContainer)
+        backgroundContainer.layer.cornerRadius = 8
+        
+        // 📌 날짜 라벨 설정
+        dayLabel.font = Typography.FontStyle.body2Medium.uiFont
+        dayLabel.textAlignment = .center
+        
+        // 📌 이벤트 스택뷰 설정
+        eventStackView.axis = .horizontal
+        eventStackView.spacing = 2
+        eventStackView.alignment = .center
+        
+        // 📌 이벤트 아이콘 설정
+        eventIcon.image = UIImage(resource: .icnStar).withRenderingMode(.alwaysTemplate)
+        eventIcon.tintColor = UIColor(.red300)
+        eventIcon.contentMode = .scaleAspectFit
+        eventIcon.frame = CGRect(x: 0, y: 0, width: 12, height: 12)
+        
+        // 📌 이벤트 카운트 라벨 설정
+        eventCountLabel.font = Typography.FontStyle.label2Medium.uiFont
+        eventCountLabel.textColor = UIColor(.neutral400)
+
+        eventStackView.addArrangedSubview(eventIcon)
+        eventStackView.addArrangedSubview(eventCountLabel)
+        
+        contentView.addSubview(dayLabel)
+        contentView.addSubview(eventStackView)
+
+        // 📌 오토레이아웃 설정
+        dayLabel.translatesAutoresizingMaskIntoConstraints = false
+        eventStackView.translatesAutoresizingMaskIntoConstraints = false
+        backgroundContainer.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            dayLabel.centerXAnchor.constraint(equalTo: contentView.centerXAnchor),
+            dayLabel.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 5),
+            dayLabel.widthAnchor.constraint(equalToConstant: 32),
+            dayLabel.heightAnchor.constraint(equalToConstant: 32),
+
+            backgroundContainer.centerXAnchor.constraint(equalTo: dayLabel.centerXAnchor),
+            backgroundContainer.centerYAnchor.constraint(equalTo: dayLabel.centerYAnchor),
+            backgroundContainer.widthAnchor.constraint(equalTo: dayLabel.widthAnchor),
+            backgroundContainer.heightAnchor.constraint(equalTo: dayLabel.heightAnchor),
+            
+            eventStackView.centerXAnchor.constraint(equalTo: contentView.centerXAnchor),
+            eventStackView.topAnchor.constraint(equalTo: dayLabel.bottomAnchor, constant: 4)
+        ])
+    }
+    
+    /// 📌 스타일 및 이벤트 표시 업데이트
+    private func updateAppearance() {
+        dayLabel.textColor = style.textColor
+        backgroundContainer.backgroundColor = style.backgroundColor
+    }
+    
+    private func updateEventDisplay() {
+        eventCountLabel.text = "\(eventCount)"
+        let eventExists: Bool = eventCount > 0
+        eventStackView.isHidden = !eventExists
+        let presentCount = !isWeekMode && eventExists
+        eventCountLabel.isHidden = !presentCount
+    }
+    
+    /// 📌 날짜 설정
+    func configure(
+        with date: Date,
+        isSelected: Bool,
+        eventCount: Int = 0,
+        isWeekMode: Bool = false
+    ) {
+        self.customDate = date
+        self.isCustomSelected = isSelected
+        self.eventCount = eventCount
+        self.isWeekMode = isWeekMode
+        
+        // 🔹 현재 날짜 및 선택 상태를 반영하여 동적으로 Style 설정
+        if isSelected {
+            self.style = .selected
+        } else if Calendar.current.isDateInToday(date) {
+            self.style = .today
+        } else {
+            self.style = .default
+        }
+        
+        dayLabel.text = "\(Calendar.current.component(.day, from: date))"
+        self.updateAppearance()
+        self.updateEventDisplay()
+    }
+    
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        // ✅ 날짜 및 선택 상태 초기화
+        customDate = nil
+        isCustomSelected = false
+        isWeekMode = false
+        
+        // ✅ 이벤트 관련 초기화
+        eventCount = 0
+        eventStackView.isHidden = true
+        eventCountLabel.text = nil
+        
+        // ✅ 스타일 초기화
+        style = .default
+        updateAppearance()
+        updateEventDisplay()
+    }
+    
+}
+
+// MARK: - 스타일 설정
+extension FSCustomCalendarCell {
+    enum Style {
+        case `default`
+        case today
+        case selected
+        
+        var textColor: UIColor {
+            switch self {
+            case .default, .today:
+                return UIColor(.neutral600)
+            case .selected:
+                return UIColor(.common0)
+            }
+        }
+        
+        var backgroundColor: UIColor {
+            switch self {
+            case .default:
+                return .clear
+            case .today:
+                return UIColor(.neutral200)
+            case .selected:
+                return UIColor(.neutral900)
+            }
+        }
+    }
+}
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
new file mode 100644
index 00000000..39c60f29
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
@@ -0,0 +1,123 @@
+//
+//  ScrollCalendarView.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 1/31/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+import FSCalendar
+
+public struct FSCalendarView: UIViewRepresentable {
+    @Binding var selectedDate: Date
+    @Binding var currentPage: Date
+    var isWeekMode: Bool
+    var events: [Date: Int]
+    
+    public init(
+        selectedDate: Binding<Date>,
+        currentPage: Binding<Date>,
+        isWeekMode: Bool = false,
+        events: [Date: Int] = [:]
+    ) {
+        self._selectedDate = selectedDate
+        self._currentPage = currentPage
+        self.isWeekMode = isWeekMode
+        self.events = events
+    }
+    
+    public class Coordinator: NSObject, FSCalendarDelegate, FSCalendarDataSource, FSCalendarDelegateAppearance {
+        var parent: FSCalendarView
+        
+        init(_ parent: FSCalendarView) {
+            self.parent = parent
+        }
+        
+        // 날짜 선택 이벤트
+        public func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
+            DispatchQueue.main.async {
+                self.parent.selectedDate = date
+                calendar.reloadData()
+            }
+        }
+        
+        public func calendarCurrentPageDidChange(_ calendar: FSCalendar) {
+            DispatchQueue.main.async {
+                self.parent.currentPage = calendar.currentPage
+            }
+        }
+        
+        public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
+            
+            guard let cell = calendar.dequeueReusableCell(withIdentifier: FSCustomCalendarCell.identifier, for: date, at: position) as? FSCustomCalendarCell else {
+                return FSCalendarCell()
+            }
+            
+            let isSelected = Calendar.current.isDate(parent.selectedDate, inSameDayAs: date)
+            let eventCount = parent.events[date] ?? 0
+            cell.configure(
+                with: date,
+                isSelected: isSelected,
+                eventCount: eventCount,
+                isWeekMode: parent.isWeekMode
+            )
+            
+            return cell
+        }
+    }
+    
+    public func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+    public func makeUIView(context: Context) -> FSCalendar {
+        let calendar = FSCalendar()
+        calendar.register(FSCustomCalendarCell.self, forCellReuseIdentifier: FSCustomCalendarCell.identifier)
+        
+        // 기본 설정
+        calendar.delegate = context.coordinator
+        calendar.dataSource = context.coordinator
+        
+        calendar.locale = Locale(identifier: "ko_KR")
+        calendar.placeholderType = .none
+        
+        // 📌 FSCalendar 기본 설정
+        calendar.headerHeight = 0
+        // Weekday
+        calendar.appearance.weekdayTextColor = UIColor(.neutral400)
+        calendar.appearance.weekdayFont = Typography.FontStyle.label2Medium.uiFont
+        // Today
+        
+        // Selected
+        
+        calendar.collectionView.contentSize = FSCustomCalendarCell.cellSize
+        
+        // Additional
+        calendar.appearance.selectionColor = .clear
+        calendar.appearance.todayColor = .clear
+        calendar.appearance.titleSelectionColor = .clear
+        calendar.appearance.titleDefaultColor = .clear
+        calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
+        
+        print("너는 되니(\(events)")
+        return calendar
+    }
+    
+    public func updateUIView(_ uiView: FSCalendar, context: Context) {
+        // 선택된 날짜 반영
+        uiView.select(selectedDate)
+        
+        // ✅ SwiftUI에서 `currentMonth`가 바뀌었을 때만 `currentPage` 업데이트
+        if uiView.currentPage != currentPage {
+            uiView.setCurrentPage(currentPage, animated: true)
+        }
+        
+        // ✅ 주간/월간 모드 변경
+        let targetScope: FSCalendarScope = isWeekMode ? .week : .month
+        if uiView.scope != targetScope {
+            uiView.scope = targetScope
+            uiView.reloadData()
+        }
+    }
+}
diff --git a/TnT/Tuist/Package.resolved b/TnT/Tuist/Package.resolved
index 14c7aa10..4e5346f2 100644
--- a/TnT/Tuist/Package.resolved
+++ b/TnT/Tuist/Package.resolved
@@ -18,6 +18,15 @@
         "version" : "1.0.3"
       }
     },
+    {
+      "identity" : "fscalendar",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/WenchaoD/FSCalendar.git",
+      "state" : {
+        "revision" : "0fbdec5172fccb90f707472eeaea4ffe095278f6",
+        "version" : "2.8.4"
+      }
+    },
     {
       "identity" : "kakao-ios-sdk",
       "kind" : "remoteSourceControl",
diff --git a/TnT/Tuist/Package.swift b/TnT/Tuist/Package.swift
index 492314c3..9ab78b00 100644
--- a/TnT/Tuist/Package.swift
+++ b/TnT/Tuist/Package.swift
@@ -17,6 +17,7 @@ let package = Package(
         .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.17.0"),
         .package(url: "https://github.com/airbnb/lottie-ios", from: "4.5.0"),
         .package(url: "https://github.com/kakao/kakao-ios-sdk.git", from: "2.20.0"),
-        .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.3")
+        .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.6.3"),
+        .package(url: "https://github.com/WenchaoD/FSCalendar.git", from: "2.8.4")
     ]
 )
diff --git a/TnT/Tuist/ProjectDescriptionHelpers/Configuration/Configuration+Templates.swift b/TnT/Tuist/ProjectDescriptionHelpers/Configuration/Configuration+Templates.swift
index 0fcc5b3d..8cf74630 100644
--- a/TnT/Tuist/ProjectDescriptionHelpers/Configuration/Configuration+Templates.swift
+++ b/TnT/Tuist/ProjectDescriptionHelpers/Configuration/Configuration+Templates.swift
@@ -10,6 +10,10 @@
 public extension Configuration {
     static func defaultSettings() -> Settings {
         return Settings.settings(
+            base: [
+                "OTHER_LDFLAGS": "$(inherited) -ObjC",
+                "CODE_SIGN_STYLE": "Manual"
+            ],
             configurations: [
                 .debug(name: .debug, xcconfig: .relativeToRoot("Tuist/Config/Secrets.xcconfig")),
                 .release(name: .release, xcconfig: .relativeToRoot("Tuist/Config/Secrets.xcconfig")),
diff --git a/TnT/Tuist/ProjectDescriptionHelpers/Dependency/DependencyInformation.swift b/TnT/Tuist/ProjectDescriptionHelpers/Dependency/DependencyInformation.swift
index 7da5ee1c..6af5c9b2 100644
--- a/TnT/Tuist/ProjectDescriptionHelpers/Dependency/DependencyInformation.swift
+++ b/TnT/Tuist/ProjectDescriptionHelpers/Dependency/DependencyInformation.swift
@@ -12,7 +12,7 @@ let dependencyInfo: [DependencyInformation: [DependencyInformation]] = [
     .Presentation: [.DIContainer, .DesignSystem, .Domain, .ComposableArchitecture],
     .Domain: [.SwiftDepedencies],
     .Data: [.Domain, .KakaoSDKUser, .SwiftDepedencies],
-    .DesignSystem: [.Lottie],
+    .DesignSystem: [.Lottie, .FSCalendar],
     .DIContainer: [.Domain, .Data]
 ]
 
@@ -27,6 +27,7 @@ public enum DependencyInformation: String, CaseIterable, Sendable {
     case ComposableArchitecture = "ComposableArchitecture"
     case KakaoSDKUser = "KakaoSDKUser"
     case SwiftDepedencies = "Dependencies"
+    case FSCalendar = "FSCalendar"
 }
 
 public extension DependencyInformation {
diff --git a/TnT/Tuist/ProjectDescriptionHelpers/Dependency/ExternalDependency.swift b/TnT/Tuist/ProjectDescriptionHelpers/Dependency/ExternalDependency.swift
index 32da25b8..3ee6f572 100644
--- a/TnT/Tuist/ProjectDescriptionHelpers/Dependency/ExternalDependency.swift
+++ b/TnT/Tuist/ProjectDescriptionHelpers/Dependency/ExternalDependency.swift
@@ -11,5 +11,6 @@ let externalDependency: [DependencyInformation] = [
     .KakaoSDKUser,
     .Lottie,
     .ComposableArchitecture,
-    .SwiftDepedencies
+    .SwiftDepedencies,
+    .FSCalendar
 ]

From f11183f21e03e0daa85e6e377e22d31999267f48 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 00:11:51 +0900
Subject: [PATCH 02/16] =?UTF-8?q?[Feat]=20TCalendar=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Calendar/TCalendarCell.swift   | 109 ++++++++-------
 .../Components/Calendar/TCalendarView.swift   | 129 +++++++++---------
 2 files changed, 125 insertions(+), 113 deletions(-)

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
index b5b5996a..4bb84927 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarCell.swift
@@ -1,5 +1,5 @@
 //
-//  CustumCalendarCell.swift
+//  TCalendarCell.swift
 //  DesignSystem
 //
 //  Created by 박민서 on 2/1/25.
@@ -8,26 +8,35 @@
 
 import FSCalendar
 
-class FSCustomCalendarCell: FSCalendarCell {
-    
-    static let identifier: String = "CustomCalendarCell"
+/// TCalendar에 사용되는 Cell 입니다
+final class TCalendarCell: FSCalendarCell {
+    // MARK: Properties
+    static let identifier: String = "TCalendarCell"
     static let cellSize: CGSize = CGSize(width: 51, height: 54)
     
-    var customDate: Date?
-    var isCustomSelected: Bool = false
-    var style: Style = .default
-    var eventCount: Int = 0
-    var isWeekMode: Bool = false
+    /// Cell에 표시되는 날짜
+    private var customDate: Date?
+    /// Cell 이 선택되었는지 표시
+    private var isCellSelected: Bool = false
+    /// Cell 스타일
+    private var style: Style = .default
+    /// Cell에 표시되는 일정 카운트
+    private var eventCount: Int = 0
+    /// 주간/월간 모드인지 표시
+    private var isWeekMode: Bool = false
 
-    private let dayLabel = UILabel()
-    private let eventStackView = UIStackView()
-    private let eventIcon = UIImageView()
-    private let eventCountLabel = UILabel()
-    private let backgroundContainer = UIView()
+    // MARK: UI Elements
+    private let dayLabel: UILabel = UILabel()
+    private let eventStackView: UIStackView = UIStackView()
+    private let eventIcon: UIImageView = UIImageView()
+    private let eventCountLabel: UILabel = UILabel()
+    private let backgroundContainer: UIView = UIView()
     
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()
+        setUpHierarchy()
+        setUpConstraint()
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -35,35 +44,34 @@ class FSCustomCalendarCell: FSCalendarCell {
     }
     
     private func setupUI() {
-        contentView.addSubview(backgroundContainer)
         backgroundContainer.layer.cornerRadius = 8
         
-        // 📌 날짜 라벨 설정
         dayLabel.font = Typography.FontStyle.body2Medium.uiFont
         dayLabel.textAlignment = .center
         
-        // 📌 이벤트 스택뷰 설정
         eventStackView.axis = .horizontal
         eventStackView.spacing = 2
         eventStackView.alignment = .center
         
-        // 📌 이벤트 아이콘 설정
         eventIcon.image = UIImage(resource: .icnStar).withRenderingMode(.alwaysTemplate)
         eventIcon.tintColor = UIColor(.red300)
         eventIcon.contentMode = .scaleAspectFit
         eventIcon.frame = CGRect(x: 0, y: 0, width: 12, height: 12)
         
-        // 📌 이벤트 카운트 라벨 설정
         eventCountLabel.font = Typography.FontStyle.label2Medium.uiFont
         eventCountLabel.textColor = UIColor(.neutral400)
-
+    }
+    
+    private func setUpHierarchy() {
         eventStackView.addArrangedSubview(eventIcon)
         eventStackView.addArrangedSubview(eventCountLabel)
         
+        contentView.addSubview(backgroundContainer)
         contentView.addSubview(dayLabel)
         contentView.addSubview(eventStackView)
-
-        // 📌 오토레이아웃 설정
+    }
+    
+    private func setUpConstraint() {
         dayLabel.translatesAutoresizingMaskIntoConstraints = false
         eventStackView.translatesAutoresizingMaskIntoConstraints = false
         backgroundContainer.translatesAutoresizingMaskIntoConstraints = false
@@ -84,34 +92,55 @@ class FSCustomCalendarCell: FSCalendarCell {
         ])
     }
     
-    /// 📌 스타일 및 이벤트 표시 업데이트
+    /// 셀 스타일 표시 업데이트
     private func updateAppearance() {
         dayLabel.textColor = style.textColor
         backgroundContainer.backgroundColor = style.backgroundColor
     }
     
+    /// 일정 카운트 표시 업데이트
     private func updateEventDisplay() {
         eventCountLabel.text = "\(eventCount)"
         let eventExists: Bool = eventCount > 0
         eventStackView.isHidden = !eventExists
-        let presentCount = !isWeekMode && eventExists
+        let presentCount: Bool = !isWeekMode && eventExists
         eventCountLabel.isHidden = !presentCount
     }
     
-    /// 📌 날짜 설정
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        // 날짜 및 선택 상태 초기화
+        customDate = nil
+        isCellSelected = false
+        isWeekMode = false
+        
+        // 일정 관련 초기화
+        eventCount = 0
+        eventStackView.isHidden = true
+        eventCountLabel.text = nil
+        
+        // 스타일 초기화
+        style = .default
+        updateAppearance()
+        updateEventDisplay()
+    }
+}
+
+extension TCalendarCell {
+    /// 셀 설정
     func configure(
         with date: Date,
-        isSelected: Bool,
+        isCellSelected: Bool,
         eventCount: Int = 0,
         isWeekMode: Bool = false
     ) {
         self.customDate = date
-        self.isCustomSelected = isSelected
+        self.isCellSelected = isCellSelected
         self.eventCount = eventCount
         self.isWeekMode = isWeekMode
         
-        // 🔹 현재 날짜 및 선택 상태를 반영하여 동적으로 Style 설정
-        if isSelected {
+        // 현재 날짜 및 선택 상태를 반영, Style 설정
+        if isCellSelected {
             self.style = .selected
         } else if Calendar.current.isDateInToday(date) {
             self.style = .today
@@ -123,29 +152,9 @@ class FSCustomCalendarCell: FSCalendarCell {
         self.updateAppearance()
         self.updateEventDisplay()
     }
-    
-    override func prepareForReuse() {
-        super.prepareForReuse()
-        // ✅ 날짜 및 선택 상태 초기화
-        customDate = nil
-        isCustomSelected = false
-        isWeekMode = false
-        
-        // ✅ 이벤트 관련 초기화
-        eventCount = 0
-        eventStackView.isHidden = true
-        eventCountLabel.text = nil
-        
-        // ✅ 스타일 초기화
-        style = .default
-        updateAppearance()
-        updateEventDisplay()
-    }
-    
 }
 
-// MARK: - 스타일 설정
-extension FSCustomCalendarCell {
+extension TCalendarCell {
     enum Style {
         case `default`
         case today
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
index 39c60f29..3e35928c 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
@@ -9,11 +9,17 @@
 import SwiftUI
 import FSCalendar
 
-public struct FSCalendarView: UIViewRepresentable {
-    @Binding var selectedDate: Date
-    @Binding var currentPage: Date
-    var isWeekMode: Bool
-    var events: [Date: Int]
+/// 앱 전반적으로 사용되는 캘린더입니다.
+/// 주간/월간 표시를 포함합니다.
+public struct TCalendarView: UIViewRepresentable {
+    /// 선택한 날짜
+    @Binding private var selectedDate: Date
+    /// 현재 페이지
+    @Binding private var currentPage: Date
+    /// 주간/월간 표시 여부
+    private var isWeekMode: Bool
+    /// 캘린더 표시 이벤트 딕셔너리
+    private var events: [Date: Int]
     
     public init(
         selectedDate: Binding<Date>,
@@ -27,97 +33,94 @@ public struct FSCalendarView: UIViewRepresentable {
         self.events = events
     }
     
-    public class Coordinator: NSObject, FSCalendarDelegate, FSCalendarDataSource, FSCalendarDelegateAppearance {
-        var parent: FSCalendarView
-        
-        init(_ parent: FSCalendarView) {
-            self.parent = parent
-        }
-        
-        // 날짜 선택 이벤트
-        public func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
-            DispatchQueue.main.async {
-                self.parent.selectedDate = date
-                calendar.reloadData()
-            }
-        }
-        
-        public func calendarCurrentPageDidChange(_ calendar: FSCalendar) {
-            DispatchQueue.main.async {
-                self.parent.currentPage = calendar.currentPage
-            }
-        }
-        
-        public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
-            
-            guard let cell = calendar.dequeueReusableCell(withIdentifier: FSCustomCalendarCell.identifier, for: date, at: position) as? FSCustomCalendarCell else {
-                return FSCalendarCell()
-            }
-            
-            let isSelected = Calendar.current.isDate(parent.selectedDate, inSameDayAs: date)
-            let eventCount = parent.events[date] ?? 0
-            cell.configure(
-                with: date,
-                isSelected: isSelected,
-                eventCount: eventCount,
-                isWeekMode: parent.isWeekMode
-            )
-            
-            return cell
-        }
-    }
-    
     public func makeCoordinator() -> Coordinator {
         Coordinator(self)
     }
     
     public func makeUIView(context: Context) -> FSCalendar {
-        let calendar = FSCalendar()
-        calendar.register(FSCustomCalendarCell.self, forCellReuseIdentifier: FSCustomCalendarCell.identifier)
+        let calendar: FSCalendar = FSCalendar()
+        // Cell 설정
+        calendar.register(TCalendarCell.self, forCellReuseIdentifier: TCalendarCell.identifier)
+        calendar.collectionView.contentSize = TCalendarCell.cellSize
         
         // 기본 설정
         calendar.delegate = context.coordinator
         calendar.dataSource = context.coordinator
-        
         calendar.locale = Locale(identifier: "ko_KR")
-        calendar.placeholderType = .none
         
-        // 📌 FSCalendar 기본 설정
+        // UI 설정
+        calendar.placeholderType = .none
         calendar.headerHeight = 0
-        // Weekday
         calendar.appearance.weekdayTextColor = UIColor(.neutral400)
         calendar.appearance.weekdayFont = Typography.FontStyle.label2Medium.uiFont
-        // Today
-        
-        // Selected
-        
-        calendar.collectionView.contentSize = FSCustomCalendarCell.cellSize
-        
-        // Additional
         calendar.appearance.selectionColor = .clear
         calendar.appearance.todayColor = .clear
         calendar.appearance.titleSelectionColor = .clear
         calendar.appearance.titleDefaultColor = .clear
         calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
         
-        print("너는 되니(\(events)")
         return calendar
     }
     
     public func updateUIView(_ uiView: FSCalendar, context: Context) {
-        // 선택된 날짜 반영
+        // `selectedDate` 반영
         uiView.select(selectedDate)
         
-        // ✅ SwiftUI에서 `currentMonth`가 바뀌었을 때만 `currentPage` 업데이트
+        // `currentPage` 반영
         if uiView.currentPage != currentPage {
             uiView.setCurrentPage(currentPage, animated: true)
         }
         
-        // ✅ 주간/월간 모드 변경
+        // `isWeekMode` 반영
         let targetScope: FSCalendarScope = isWeekMode ? .week : .month
         if uiView.scope != targetScope {
             uiView.scope = targetScope
-            uiView.reloadData()
+        }
+        
+        uiView.reloadData()
+    }
+}
+
+public extension TCalendarView {
+    final class Coordinator: NSObject, FSCalendarDelegate, FSCalendarDataSource, FSCalendarDelegateAppearance {
+        var parent: TCalendarView
+        
+        init(_ parent: TCalendarView) {
+            self.parent = parent
+        }
+        
+        // 날짜 선택 이벤트
+        public func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
+            DispatchQueue.main.async {
+                self.parent.selectedDate = date
+                calendar.reloadData()
+            }
+        }
+        
+        // 현재 페이지 전환 이벤트
+        public func calendarCurrentPageDidChange(_ calendar: FSCalendar) {
+            DispatchQueue.main.async {
+                self.parent.currentPage = calendar.currentPage
+            }
+        }
+        
+        // 캘린더 셀 주입
+        public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
+            
+            guard let cell = calendar.dequeueReusableCell(withIdentifier: TCalendarCell.identifier, for: date, at: position) as? TCalendarCell else {
+                return FSCalendarCell()
+            }
+            
+            let isSelected: Bool = Calendar.current.isDate(parent.selectedDate, inSameDayAs: date)
+            let eventCount: Int = parent.events[date] ?? 0
+            cell.configure(
+                with: date,
+                isCellSelected: isSelected,
+                eventCount: eventCount,
+                isWeekMode: parent.isWeekMode
+            )
+            
+            return cell
         }
     }
 }

From 35deca3fe7450c98b7b1e2f3b67e0b66978a503d Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 02:05:53 +0900
Subject: [PATCH 03/16] =?UTF-8?q?[Feat]=20TCalendar=20=EA=B5=AC=EC=A1=B0?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Calendar/TCalendarRepresentable.swift     | 125 ++++++++++++++++++
 .../Components/Calendar/TCalendarView.swift   | 120 ++++-------------
 2 files changed, 148 insertions(+), 97 deletions(-)
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
new file mode 100644
index 00000000..29f9604c
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
@@ -0,0 +1,125 @@
+//
+//  TCalendarRepresentable.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 1/31/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+import FSCalendar
+
+
+public struct TCalendarRepresentable: UIViewRepresentable {
+    /// 선택한 날짜
+    @Binding private var selectedDate: Date
+    /// 현재 페이지
+    @Binding private var currentPage: Date
+    /// 주간/월간 표시 여부
+    private var isWeekMode: Bool
+    /// 캘린더 표시 이벤트 딕셔너리
+    private var events: [Date: Int]
+    
+    public init(
+        selectedDate: Binding<Date>,
+        currentPage: Binding<Date>,
+        isWeekMode: Bool = false,
+        events: [Date: Int] = [:]
+    ) {
+        self._selectedDate = selectedDate
+        self._currentPage = currentPage
+        self.isWeekMode = isWeekMode
+        self.events = events
+    }
+    
+    public func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+    
+    public func makeUIView(context: Context) -> FSCalendar {
+        let calendar: FSCalendar = FSCalendar()
+        // Cell 설정
+        calendar.register(TCalendarCell.self, forCellReuseIdentifier: TCalendarCell.identifier)
+        calendar.collectionView.contentSize = TCalendarCell.cellSize
+        
+        // 기본 설정
+        calendar.delegate = context.coordinator
+        calendar.dataSource = context.coordinator
+        calendar.locale = Locale(identifier: "ko_KR")
+        
+        // UI 설정
+        calendar.placeholderType = .none
+        calendar.headerHeight = 0
+        calendar.appearance.weekdayTextColor = UIColor(.neutral400)
+        calendar.appearance.weekdayFont = Typography.FontStyle.label2Medium.uiFont
+        calendar.appearance.selectionColor = .clear
+        calendar.appearance.todayColor = .clear
+        calendar.appearance.titleSelectionColor = .clear
+        calendar.appearance.titleDefaultColor = .clear
+        calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
+        
+        return calendar
+    }
+    
+    public func updateUIView(_ uiView: FSCalendar, context: Context) {
+        // `selectedDate` 반영
+        uiView.select(selectedDate)
+        
+        // `currentPage` 반영
+        if uiView.currentPage != currentPage {
+            uiView.setCurrentPage(currentPage, animated: true)
+        }
+        
+        // `isWeekMode` 반영
+        let targetScope: FSCalendarScope = isWeekMode ? .week : .month
+        if uiView.scope != targetScope {
+            uiView.scope = targetScope
+        }
+        
+        uiView.reloadData()
+    }
+}
+
+public extension TCalendarRepresentable {
+    final class Coordinator: NSObject, FSCalendarDelegate, FSCalendarDataSource, FSCalendarDelegateAppearance {
+        var parent: TCalendarRepresentable
+        
+        init(_ parent: TCalendarRepresentable) {
+            self.parent = parent
+        }
+        
+        // 날짜 선택 이벤트
+        public func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
+            DispatchQueue.main.async {
+                self.parent.selectedDate = date
+                calendar.reloadData()
+            }
+        }
+        
+        // 현재 페이지 전환 이벤트
+        public func calendarCurrentPageDidChange(_ calendar: FSCalendar) {
+            DispatchQueue.main.async {
+                self.parent.currentPage = calendar.currentPage
+            }
+        }
+        
+        // 캘린더 셀 주입
+        public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
+            
+            guard let cell = calendar.dequeueReusableCell(withIdentifier: TCalendarCell.identifier, for: date, at: position) as? TCalendarCell else {
+                return FSCalendarCell()
+            }
+            
+            let isSelected: Bool = Calendar.current.isDate(parent.selectedDate, inSameDayAs: date)
+            let eventCount: Int = parent.events[date] ?? 0
+            cell.configure(
+                with: date,
+                isCellSelected: isSelected,
+                eventCount: eventCount,
+                isWeekMode: parent.isWeekMode
+            )
+            
+            return cell
+        }
+    }
+}
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
index 3e35928c..6d8ffd60 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
@@ -1,21 +1,23 @@
 //
-//  ScrollCalendarView.swift
+//  TCalendarView.swift
 //  DesignSystem
 //
-//  Created by 박민서 on 1/31/25.
+//  Created by 박민서 on 2/2/25.
 //  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
 //
 
 import SwiftUI
-import FSCalendar
 
 /// 앱 전반적으로 사용되는 캘린더입니다.
 /// 주간/월간 표시를 포함합니다.
-public struct TCalendarView: UIViewRepresentable {
+public struct TCalendarView: View {
+    
     /// 선택한 날짜
-    @Binding private var selectedDate: Date
+    @Binding var selectedDate: Date
     /// 현재 페이지
-    @Binding private var currentPage: Date
+    @Binding var currentPage: Date
+    /// 업데이트 플래그
+    @State private var forceUpdate: UUID = UUID()
     /// 주간/월간 표시 여부
     private var isWeekMode: Bool
     /// 캘린더 표시 이벤트 딕셔너리
@@ -24,103 +26,27 @@ public struct TCalendarView: UIViewRepresentable {
     public init(
         selectedDate: Binding<Date>,
         currentPage: Binding<Date>,
-        isWeekMode: Bool = false,
-        events: [Date: Int] = [:]
+        forceUpdate: UUID = UUID(),
+        events: [Date: Int],
+        isWeekMode: Bool = false
     ) {
         self._selectedDate = selectedDate
         self._currentPage = currentPage
-        self.isWeekMode = isWeekMode
         self.events = events
+        self.forceUpdate = forceUpdate
+        self.isWeekMode = isWeekMode
     }
-    
-    public func makeCoordinator() -> Coordinator {
-        Coordinator(self)
-    }
-    
-    public func makeUIView(context: Context) -> FSCalendar {
-        let calendar: FSCalendar = FSCalendar()
-        // Cell 설정
-        calendar.register(TCalendarCell.self, forCellReuseIdentifier: TCalendarCell.identifier)
-        calendar.collectionView.contentSize = TCalendarCell.cellSize
-        
-        // 기본 설정
-        calendar.delegate = context.coordinator
-        calendar.dataSource = context.coordinator
-        calendar.locale = Locale(identifier: "ko_KR")
-        
-        // UI 설정
-        calendar.placeholderType = .none
-        calendar.headerHeight = 0
-        calendar.appearance.weekdayTextColor = UIColor(.neutral400)
-        calendar.appearance.weekdayFont = Typography.FontStyle.label2Medium.uiFont
-        calendar.appearance.selectionColor = .clear
-        calendar.appearance.todayColor = .clear
-        calendar.appearance.titleSelectionColor = .clear
-        calendar.appearance.titleDefaultColor = .clear
-        calendar.calendarWeekdayView.weekdayLabels[0].textColor = UIColor(.red500)
-        
-        return calendar
-    }
-    
-    public func updateUIView(_ uiView: FSCalendar, context: Context) {
-        // `selectedDate` 반영
-        uiView.select(selectedDate)
-        
-        // `currentPage` 반영
-        if uiView.currentPage != currentPage {
-            uiView.setCurrentPage(currentPage, animated: true)
-        }
-        
-        // `isWeekMode` 반영
-        let targetScope: FSCalendarScope = isWeekMode ? .week : .month
-        if uiView.scope != targetScope {
-            uiView.scope = targetScope
-        }
-        
-        uiView.reloadData()
-    }
-}
 
-public extension TCalendarView {
-    final class Coordinator: NSObject, FSCalendarDelegate, FSCalendarDataSource, FSCalendarDelegateAppearance {
-        var parent: TCalendarView
-        
-        init(_ parent: TCalendarView) {
-            self.parent = parent
-        }
-        
-        // 날짜 선택 이벤트
-        public func calendar(_ calendar: FSCalendar, didSelect date: Date, at monthPosition: FSCalendarMonthPosition) {
-            DispatchQueue.main.async {
-                self.parent.selectedDate = date
-                calendar.reloadData()
-            }
-        }
-        
-        // 현재 페이지 전환 이벤트
-        public func calendarCurrentPageDidChange(_ calendar: FSCalendar) {
-            DispatchQueue.main.async {
-                self.parent.currentPage = calendar.currentPage
-            }
-        }
-        
-        // 캘린더 셀 주입
-        public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
-            
-            guard let cell = calendar.dequeueReusableCell(withIdentifier: TCalendarCell.identifier, for: date, at: position) as? TCalendarCell else {
-                return FSCalendarCell()
-            }
-            
-            let isSelected: Bool = Calendar.current.isDate(parent.selectedDate, inSameDayAs: date)
-            let eventCount: Int = parent.events[date] ?? 0
-            cell.configure(
-                with: date,
-                isCellSelected: isSelected,
-                eventCount: eventCount,
-                isWeekMode: parent.isWeekMode
-            )
-            
-            return cell
+    public var body: some View {
+        TCalendarRepresentable(
+            selectedDate: $selectedDate,
+            currentPage: $currentPage,
+            isWeekMode: isWeekMode,
+            events: events
+        )
+        .id(forceUpdate)
+        .onChange(of: events) {
+            forceUpdate = UUID()
         }
     }
 }

From 02e6d4b30d46bcbf8f16d59ce773767cf2091ba7 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 02:17:46 +0900
Subject: [PATCH 04/16] =?UTF-8?q?[Feat]=20TCalendarHeader=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Calendar/TCalendarHeader.swift | 51 +++++++++++++++++++
 .../DesignSystem/Image+DesignSystem.swift     |  2 +-
 .../Sources/Utility/TDateFormatUtility.swift  |  4 +-
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
new file mode 100644
index 00000000..03d0bcda
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
@@ -0,0 +1,51 @@
+//
+//  TCalendarHeader.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+/// TCalendarView의 헤더입니다
+/// 월 이동 로직을 추가합니다
+public struct TCalendarHeader: View {
+    
+    @Binding private var currentPage: Date
+    private var formatter: (Date) -> String
+    
+    public init(currentPage: Binding<Date>, formatter: @escaping (Date) -> String) {
+            self._currentPage = currentPage
+            self.formatter = formatter
+        }
+    
+    public var body: some View {
+        HStack {
+            Button(action: {
+                movePage(-1)
+            }, label: {
+                Image(.icnTriangleLeft32px)
+                    .resizable()
+                    .frame(width: 32, height: 32)
+            })
+            
+            Text("\(formatter(currentPage))")
+                .typographyStyle(.heading3, with: .neutral900)
+            
+            Button(action: {
+                movePage(1)
+            }, label: {
+                Image(.icnTriangleRight32px)
+                    .resizable()
+                    .frame(width: 32, height: 32)
+            })
+        }
+    }
+    
+    private func movePage(_ direction: Int) {
+        if let nextPage = Calendar.current.date(byAdding: .month, value: direction, to: currentPage) {
+            currentPage = nextPage
+        }
+    }
+}
diff --git a/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift b/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
index 2ac9953e..293f3ab6 100644
--- a/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
+++ b/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
@@ -64,7 +64,7 @@ public extension ImageResource {
     static let icnArrowRight: ImageResource = DesignSystemAsset.icnArrowRight.imageResource
     static let icnArrowUp: ImageResource = DesignSystemAsset.icnArrowUp.imageResource
     static let icnTriangleLeft32px: ImageResource = DesignSystemAsset.icnTriangleLeft32.imageResource
-    static let icnTrianleRight32px: ImageResource = DesignSystemAsset.icnTriangleRight32.imageResource
+    static let icnTriangleRight32px: ImageResource = DesignSystemAsset.icnTriangleRight32.imageResource
     static let icnWarning: ImageResource = DesignSystemAsset.icnWarning.imageResource
 }
 
diff --git a/TnT/Projects/Domain/Sources/Utility/TDateFormatUtility.swift b/TnT/Projects/Domain/Sources/Utility/TDateFormatUtility.swift
index aec01a04..56926f7c 100644
--- a/TnT/Projects/Domain/Sources/Utility/TDateFormatUtility.swift
+++ b/TnT/Projects/Domain/Sources/Utility/TDateFormatUtility.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-enum TDateFormatUtility {
+public enum TDateFormatUtility {
     /// `NSCache`를 활용한 포맷별 `DateFormatter` 캐싱
     private static let cache: NSCache<NSString, DateFormatter> = {
         let cache: NSCache = NSCache<NSString, DateFormatter>()
@@ -16,7 +16,7 @@ enum TDateFormatUtility {
     }()
     
     /// 포맷에 맞는 `DateFormatter` 반환 (캐싱된 인스턴스 재사용)
-    static func formatter(for format: TDateFormat) -> DateFormatter {
+    public static func formatter(for format: TDateFormat) -> DateFormatter {
         // 캐시된 DateFormatter가 있으면 반환, 없으면 생성 후 저장
         if let cachedFormatter = cache.object(forKey: format.rawValue as NSString) {
             return cachedFormatter

From 648522c4e92c113a5c068beda9a03360db0f7e4c Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 02:29:31 +0900
Subject: [PATCH 05/16] =?UTF-8?q?[Feat]=20Header=20rightView=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Calendar/TCalendarHeader.swift | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
index 03d0bcda..4436b30a 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
@@ -10,18 +10,24 @@ import SwiftUI
 
 /// TCalendarView의 헤더입니다
 /// 월 이동 로직을 추가합니다
-public struct TCalendarHeader: View {
+public struct TCalendarHeader<RightView: View>: View {
     
     @Binding private var currentPage: Date
     private var formatter: (Date) -> String
+    private var rightView: (() -> RightView)?
     
-    public init(currentPage: Binding<Date>, formatter: @escaping (Date) -> String) {
-            self._currentPage = currentPage
-            self.formatter = formatter
-        }
+    public init(
+        currentPage: Binding<Date>,
+        formatter: @escaping (Date) -> String,
+        rightView: (() -> RightView)? = nil
+    ) {
+        self._currentPage = currentPage
+        self.formatter = formatter
+        self.rightView = rightView
+    }
     
     public var body: some View {
-        HStack {
+        HStack(spacing: 0) {
             Button(action: {
                 movePage(-1)
             }, label: {
@@ -41,6 +47,11 @@ public struct TCalendarHeader: View {
                     .frame(width: 32, height: 32)
             })
         }
+        .frame(maxWidth: .infinity)
+        .overlay(alignment: .trailing) {
+            rightView?()
+                .padding(.trailing, 20)
+        }
     }
     
     private func movePage(_ direction: Int) {

From 25c663ce4542e48e4260278533fad155f8e64485 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 03:32:21 +0900
Subject: [PATCH 06/16] =?UTF-8?q?[Feat[=20AutoResizingBottomSheet=20Modifi?=
 =?UTF-8?q?er=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoSizingBottomSheetModifier.swift       | 48 +++++++++++++++++++
 .../Home/Trainee/TraineeHomeView.swift        |  9 ++++
 .../Home/Trainee/TraineeRecordStartView.swift |  9 ++++
 3 files changed, 66 insertions(+)
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/BottomSheet/AutoSizingBottomSheetModifier.swift
 create mode 100644 TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
 create mode 100644 TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift

diff --git a/TnT/Projects/DesignSystem/Sources/Components/BottomSheet/AutoSizingBottomSheetModifier.swift b/TnT/Projects/DesignSystem/Sources/Components/BottomSheet/AutoSizingBottomSheetModifier.swift
new file mode 100644
index 00000000..cedb76e0
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/BottomSheet/AutoSizingBottomSheetModifier.swift
@@ -0,0 +1,48 @@
+//
+//  AutoSizingBottomSheetModifier.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+/// 바텀시트의 높이를 자동 조정하는 ViewModifier
+/// 내부 컨텐츠의 크기를 측정하여 적절한 높이를 설정합니다
+struct AutoSizingBottomSheetModifier: ViewModifier {
+    /// 바텀시트 상단의 그래버 표시
+    let presentationDragIndicator: Visibility
+    /// 측정된 컨텐츠의 높이 (초기값 300)
+    @State private var contentHeight: CGFloat = 300
+
+    init(presentationDragIndicator: Visibility = .visible) {
+        self.presentationDragIndicator = presentationDragIndicator
+    }
+
+    func body(content: Content) -> some View {
+        content
+            .background(
+                GeometryReader { proxy in
+                    Color.clear
+                        .onAppear {
+                            contentHeight = proxy.size.height + 50
+                        }
+                        .onChange(of: proxy.size.height) { _, newHeight in
+                            contentHeight = newHeight + 50
+                        }
+                }
+            )
+            .presentationDetents([.height(contentHeight)])
+            .presentationDragIndicator(presentationDragIndicator)
+    }
+}
+
+public extension View {
+    /// 뷰에 자동 크기 조정 바텀시트를 적용하는 Modifier
+    /// - Parameter presentationDragIndicator: 바텀시트 상단 Grabber의 가시성 설정 (기본값: .visible)
+    /// - Returns: 자동 크기 조정 바텀시트가 적용된 뷰
+    func autoSizingBottomSheet(presentationDragIndicator: Visibility = .visible) -> some View {
+        self.modifier(AutoSizingBottomSheetModifier(presentationDragIndicator: presentationDragIndicator))
+    }
+}
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
new file mode 100644
index 00000000..bad6cce0
--- /dev/null
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
@@ -0,0 +1,9 @@
+//
+//  TraineeHomeView.swift
+//  Presentation
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift
new file mode 100644
index 00000000..157d4569
--- /dev/null
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift
@@ -0,0 +1,9 @@
+//
+//  TraineeRecordStartVeiw.swift
+//  Presentation
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation

From 887491253186c855590f79ac16ac33c27a748af3 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 03:32:42 +0900
Subject: [PATCH 07/16] =?UTF-8?q?[Feat]=20TraineeRecordStartView=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Trainee/TraineeRecordStartView.swift | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift
index 157d4569..63de2ab6 100644
--- a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeRecordStartView.swift
@@ -6,4 +6,64 @@
 //  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
 //
 
-import Foundation
+import SwiftUI
+
+import DesignSystem
+
+/// TraineeHomeView에서 사용하는 기록 선택용 바텀 시트 뷰
+struct TraineeRecordStartView: View {
+    /// 버튼 아이템 리스트
+    var itemContents: [(emoji: String, title: String, action: () -> Void)]
+    /// 바텀시트 높이
+    @State private var contentHeight: CGFloat = 300
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            Text("어떤 기록을 하시겠어요?")
+                .typographyStyle(.heading3, with: .neutral900)
+                .padding(20)
+            
+            VStack(spacing: 12) {
+                ForEach(itemContents.indices, id: \.self) { index in
+                    let item = itemContents[index]
+                    RecordStartButton(action: item.action, emoji: item.emoji, title: item.title)
+                }
+            }
+        }
+        .background(
+            GeometryReader { proxy in
+                Color.clear
+                    .onAppear {
+                        contentHeight = proxy.size.height + 50  // ✅ 내부 높이를 측정하여 저장
+                    }
+                    .onChange(of: proxy.size.height) { _, newHeight in
+                        contentHeight = newHeight + 50  // ✅ 높이 변경 감지 시 업데이트
+                    }
+            }
+        )
+        .presentationDetents([.height(contentHeight)])  // ✅ 측정한 높이 적용
+        .presentationDragIndicator(.visible)
+    }
+}
+
+private extension TraineeRecordStartView {
+    struct RecordStartButton: View {
+        let action: () -> Void
+        let emoji: String
+        let title: String
+        
+        var body: some View {
+            Button(action: action, label: {
+                HStack(spacing: 4) {
+                    Text(emoji)
+                        .typographyStyle(.heading3)
+                    Text(title)
+                        .typographyStyle(.body1Semibold, with: .neutral600)
+                    Spacer()
+                }
+                .padding(.horizontal, 20)
+                .padding(.vertical, 4)
+            })
+        }
+    }
+}

From c14b526f2483464c3e51741a51f22e38537c076c Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 05:06:57 +0900
Subject: [PATCH 08/16] =?UTF-8?q?[Feat]=20TWorkoutCard=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Card/TWorkoutCard.swift        | 141 ++++++++++++++++++
 .../Components/Card/TimeIndicator.swift       |  32 ++++
 2 files changed, 173 insertions(+)
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
 create mode 100644 TnT/Projects/DesignSystem/Sources/Components/Card/TimeIndicator.swift

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
new file mode 100644
index 00000000..fd452527
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
@@ -0,0 +1,141 @@
+//
+//  TWorkoutCard.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+/// 트레이니 - PT 운동 카드
+public struct TWorkoutCard: View {
+    private let chipUIInfo: TChip.UIInfo
+    private let timeText: String
+    private let title: String
+    private let imgURL: URL?
+    private let hasRecord: Bool
+    private let footerTapAction: (() -> Void)?
+    
+    public init(
+        chipUIInfo: TChip.UIInfo,
+        timeText: String,
+        title: String,
+        imgURL: URL?,
+        hasRecord: Bool,
+        footerTapAction: (() -> Void)? = nil
+    ) {
+        self.chipUIInfo = chipUIInfo
+        self.timeText = timeText
+        self.title = title
+        self.imgURL = imgURL
+        self.hasRecord = hasRecord
+        self.footerTapAction = footerTapAction
+    }
+    
+    public var body: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Header()
+            
+            MainBody()
+            
+            if hasRecord {
+                Footer()
+            }
+        }
+        .padding(.horizontal, 12)
+        .padding(.vertical, 16)
+        .background(Color.common0)
+        .clipShape(.rect(cornerRadius: 12))
+    }
+    
+    // MARK: Section
+    @ViewBuilder
+    public func Header() -> some View {
+        HStack {
+            TChip(uiInfo: chipUIInfo)
+            Spacer()
+            TimeIndicator(timeText: timeText)
+        }
+    }
+    
+    @ViewBuilder
+    public func MainBody() -> some View {
+        HStack(spacing: 6) {
+            if let imgURL {
+                TrainerImage(imgURL: imgURL)
+            } else {
+                Image(.imgDefaultTrainerImage)
+                    .resizable()
+                    .frame(width: 24, height: 24)
+                    .scaledToFill()
+                    .clipShape(Circle())
+            }
+            
+            Text(title)
+                .typographyStyle(.body1Bold, with: .neutral800)
+            
+            Spacer()
+        }
+    }
+    
+    @ViewBuilder
+    public func Footer() -> some View {
+        HStack {
+            Button(action: {
+                footerTapAction?()
+            }, label: {
+                HStack(spacing: 2) {
+                    Image(.icnStarSmile)
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                    Text("수업 기록 보기")
+                        .typographyStyle(.label2Medium)
+                }
+            })
+            Spacer()
+        }
+    }
+}
+
+private extension TWorkoutCard {
+    struct TrainerImage: View {
+        let imgURL: URL
+        
+        init(imgURL: URL) {
+            self.imgURL = imgURL
+        }
+        
+        var body: some View {
+            AsyncImage(url: imgURL) { phase in
+                switch phase {
+                case .empty:
+                    ProgressView()
+                        .tint(.red500)
+                        .frame(width: 24, height: 24)
+                    
+                case .success(let image):
+                    image
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                        .scaledToFill()
+                        .clipShape(Circle())
+                    
+                case .failure(let error):
+                    Image(.imgDefaultTrainerImage)
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                        .scaledToFill()
+                        .clipShape(Circle())
+                    
+                @unknown default:
+                    Image(.imgDefaultTrainerImage)
+                        .resizable()
+                        .frame(width: 24, height: 24)
+                        .scaledToFill()
+                        .clipShape(Circle())
+                }
+            }
+        }
+    }
+}
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TimeIndicator.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TimeIndicator.swift
new file mode 100644
index 00000000..2f024caa
--- /dev/null
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TimeIndicator.swift
@@ -0,0 +1,32 @@
+//
+//  TimeIndicator.swift
+//  DesignSystem
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+/// Card 우측 상단 - 이모지 + 오후 16:00 ~ 오후 18:00
+struct TimeIndicator: View {
+    private let timeText: String
+    
+    init(timeText: String) {
+        self.timeText = timeText
+    }
+    
+    var body: some View {
+        HStack {
+            Spacer()
+            HStack(spacing: 4) {
+                Image(.icnClock)
+                    .resizable()
+                    .scaledToFill()
+                    .frame(width: 16, height: 16)
+                Text(timeText)
+                    .typographyStyle(.label2Medium, with: .neutral500)
+            }
+        }
+    }
+}

From 3abc8a40042fd74ff9b0760b1d4f8e62e3703e7b Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 05:07:26 +0900
Subject: [PATCH 09/16] =?UTF-8?q?[Feat]=20TRecordCard=20=EB=94=94=EC=9E=90?=
 =?UTF-8?q?=EC=9D=B8=20=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sources/Components/Card/TRecordCard.swift | 61 +++++++------------
 1 file changed, 22 insertions(+), 39 deletions(-)

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
index c6e2c7b5..eccb3fa0 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
@@ -8,25 +8,29 @@
 
 import SwiftUI
 
+/// 트레이니 - 운동/식단 카드
 public struct TRecordCard: View {
     private let chipUIInfo: TChip.UIInfo
     private let timeText: String
     private let title: String
     private let imgURL: URL?
-    private let feedbackCount: Int?
+    private let hasFeedback: Bool
+    private let footerTapAction: (() -> Void)?
     
     public init(
         chipUIInfo: TChip.UIInfo,
         timeText: String,
         title: String,
         imgURL: URL?,
-        feedbackCount: Int?
+        hasFeedback: Bool,
+        footerTapAction: (() -> Void)?
     ) {
         self.chipUIInfo = chipUIInfo
         self.timeText = timeText
         self.title = title
         self.imgURL = imgURL
-        self.feedbackCount = feedbackCount
+        self.hasFeedback = hasFeedback
+        self.footerTapAction = footerTapAction
     }
     
     public var body: some View {
@@ -34,7 +38,6 @@ public struct TRecordCard: View {
             HStack(alignment: .top, spacing: 0) {
                 if let imgURL {
                     ImageSection(imgURL: imgURL)
-                        
                 }
                 
                 VStack(alignment: .leading, spacing: 12) {
@@ -48,12 +51,14 @@ public struct TRecordCard: View {
                 .padding(.bottom, imgURL == nil ? 20 : 16)
             }
             
-            if let feedbackCount {
-                Footer(feedbackCount: feedbackCount)
+            if hasFeedback {
+                Footer()
                     .padding(.horizontal, 16)
                     .padding(.bottom, 12)
             }
         }
+        .background(Color.common0)
+        .clipShape(.rect(cornerRadius: 12))
     }
     
     // MARK: Section
@@ -96,42 +101,20 @@ public struct TRecordCard: View {
     }
     
     @ViewBuilder
-    public func Footer(feedbackCount: Int) -> some View {
+    public func Footer() -> some View {
         HStack {
-            HStack(spacing: 2) {
-                Image(.icnStarSmile)
-                    .resizable()
-                    .frame(width: 24, height: 24)
-                Text("받은 피드백")
-                    .typographyStyle(.label2Medium)
-                Text("\(feedbackCount)")
-                    .typographyStyle(.label2Bold, with: .neutral500)
-            }
-            Spacer()
-        }
-    }
-}
-
-private extension TRecordCard {
-    struct TimeIndicator: View {
-        private let timeText: String
-        
-        init(timeText: String) {
-            self.timeText = timeText
-        }
-        
-        var body: some View {
-            HStack {
-                Spacer()
-                HStack(spacing: 4) {
-                    Image(.icnClock)
+            Button(action: {
+                footerTapAction?()
+            }, label: {
+                HStack(spacing: 2) {
+                    Image(.icnStarSmile)
                         .resizable()
-                        .scaledToFill()
-                        .frame(width: 16, height: 16)
-                    Text(timeText)
-                        .typographyStyle(.label2Medium, with: .neutral500)
+                        .frame(width: 24, height: 24)
+                    Text("받은 피드백")
+                        .typographyStyle(.label2Medium)
                 }
-            }
+            })
+            Spacer()
         }
     }
 }

From 845709b1f7f67665043446d1a6d1232c3cc88920 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 07:37:25 +0900
Subject: [PATCH 10/16] =?UTF-8?q?[Feat]=20Record,Workout=20ListItem=20Enti?=
 =?UTF-8?q?ty=20=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sources/Entity/RecordListItemEntity.swift | 37 +++++++++++++++++
 .../Entity/WorkoutListItemEntity.swift        | 41 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
 create mode 100644 TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift

diff --git a/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift b/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
new file mode 100644
index 00000000..2f9f0ddf
--- /dev/null
+++ b/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
@@ -0,0 +1,37 @@
+//
+//  RecordListItemEntity.swift
+//  Domain
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+
+/// 트레이니 기록 목록 아이템 모델
+public struct RecordListItemEntity {
+    /// 기록 타입
+    public let type: RecordType
+    /// 기록 시간
+    public let date: Date
+    /// 기록 제목
+    public let title: String
+    /// 피드백 여부
+    public let hasFeedBack: Bool
+    /// 기록 이미지 URL
+    public let imageUrl: String?
+    
+    public init(
+        type: RecordType,
+        date: Date,
+        title: String,
+        hasFeedBack: Bool,
+        imageUrl: String?
+    ) {
+        self.type = type
+        self.date = date
+        self.title = title
+        self.hasFeedBack = hasFeedBack
+        self.imageUrl = imageUrl
+    }
+}
diff --git a/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift b/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift
new file mode 100644
index 00000000..17172907
--- /dev/null
+++ b/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift
@@ -0,0 +1,41 @@
+//
+//  WorkoutListItemEntity.swift
+//  Domain
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+
+/// 트레이니 PT 운동 목록 아이템 모델
+public struct WorkoutListItemEntity {
+    /// 현재 수업 차수
+    public let currentCount: Int
+    /// 수업 시작 시간
+    public let startDate: Date
+    /// 수업 종료 시간
+    public let endDate: Date
+    /// 트레이너 프로필 사진 URL
+    public let trainerProfileImageUrl: String?
+    /// 트레이너 이름
+    public let trainerName: String
+    /// 기록 여부
+    public let hasRecord: Bool
+    
+    public init(
+        currentCount: Int,
+        startDate: Date,
+        endDate: Date,
+        trainerProfileImageUrl: String?,
+        trainerName: String,
+        hasRecord: Bool
+    ) {
+        self.currentCount = currentCount
+        self.startDate = startDate
+        self.endDate = endDate
+        self.trainerProfileImageUrl = trainerProfileImageUrl
+        self.trainerName = trainerName
+        self.hasRecord = hasRecord
+    }
+}

From 25e39ad609430333dd5f69e488ee4dcfef9274a9 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 07:37:44 +0900
Subject: [PATCH 11/16] =?UTF-8?q?[Feat]=20TDateFormat=20=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=20=ED=8F=AC=EB=A7=B7=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TnT/Projects/Domain/Sources/Policy/TDateFormat.swift | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/TnT/Projects/Domain/Sources/Policy/TDateFormat.swift b/TnT/Projects/Domain/Sources/Policy/TDateFormat.swift
index c8c1b664..9a9f72b6 100644
--- a/TnT/Projects/Domain/Sources/Policy/TDateFormat.swift
+++ b/TnT/Projects/Domain/Sources/Policy/TDateFormat.swift
@@ -14,12 +14,18 @@ public enum TDateFormat: String {
     case yyyyMMdd = "yyyy-MM-dd"
     /// "yyyy-MM"
     case yyyyMM = "yyyy-MM"
+    /// "yyyy년 MM월"
+    case yyyy년_MM월 = "yyyy년 MM월"
     /// "MM-dd"
     case MMdd = "MM-dd"
     /// "yyyy/MM/dd"
     case yyyyMMddSlash = "yyyy/MM/dd"
     /// "yyyy.MM.dd"
     case yyyyMMddDot = "yyyy.MM.dd"
+    /// "01월 10일 화요일"
+    case MM월_dd일_EEEE = "MM월 dd일 EEEE"
     /// "EE"
     case EE = "EE"
+    /// "오후 17:00" (시간 포맷)
+    case a_HHmm = "a HH:mm"
 }

From 9a897ef8276a857026176c293cbd38e893c8887e Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 07:38:57 +0900
Subject: [PATCH 12/16] =?UTF-8?q?[Chore]=20TWorkoutCard=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20UI=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignSystem/Sources/Components/Card/TWorkoutCard.swift  | 2 +-
 .../DesignSystem/Sources/Components/Chip/TChip.swift         | 4 ++--
 .../Sources/PresentationSupport/RecordType.swift             | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
index fd452527..09b08c63 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
@@ -45,7 +45,7 @@ public struct TWorkoutCard: View {
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 16)
-        .background(Color.common0)
+        .background(Color.neutral100)
         .clipShape(.rect(cornerRadius: 12))
     }
     
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Chip/TChip.swift b/TnT/Projects/DesignSystem/Sources/Components/Chip/TChip.swift
index 703d85c2..3ba8d794 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Chip/TChip.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Chip/TChip.swift
@@ -46,9 +46,9 @@ public struct TChip: View {
                     .typographyStyle(.label1Bold)
             }
             Text(title)
-                .typographyStyle(.label1Bold, with: style.textColor)
+                .typographyStyle(.label2Bold, with: style.textColor)
         }
-        .padding(.horizontal, 8)
+        .padding(.horizontal, 10)
         .padding(.vertical, 6)
         .background(style.backgroundColor)
         .clipShape(.capsule)
diff --git a/TnT/Projects/Presentation/Sources/PresentationSupport/RecordType.swift b/TnT/Projects/Presentation/Sources/PresentationSupport/RecordType.swift
index 6ed9a3ad..4ba83b59 100644
--- a/TnT/Projects/Presentation/Sources/PresentationSupport/RecordType.swift
+++ b/TnT/Projects/Presentation/Sources/PresentationSupport/RecordType.swift
@@ -31,4 +31,9 @@ extension RecordType {
             return type.emoji
         }
     }
+    
+    /// 앱에서 사용되는 Chip에 연결되는 전체 UI 정보 입니다
+    var chipInfo: TChip.UIInfo {
+        return .init(leadingEmoji: self.emoji, title: self.koreanName, style: self.chipStyle)
+    }
 }

From 94a4dd173aaeb5c65c375f86bf95ad44b3d44794 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 07:39:27 +0900
Subject: [PATCH 13/16] =?UTF-8?q?[Fix]=20TCalendarView=20=EB=8F=99?=
 =?UTF-8?q?=EC=A0=81=20=EB=86=92=EC=9D=B4=20=EA=B4=80=EB=A0=A8=20UI=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Calendar/TCalendarHeader.swift |  3 +-
 .../Calendar/TCalendarRepresentable.swift     | 23 ++++++++++-
 .../Components/Calendar/TCalendarView.swift   | 40 ++++++++++++++-----
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
index 4436b30a..d3887687 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarHeader.swift
@@ -50,8 +50,9 @@ public struct TCalendarHeader<RightView: View>: View {
         .frame(maxWidth: .infinity)
         .overlay(alignment: .trailing) {
             rightView?()
-                .padding(.trailing, 20)
         }
+        .padding(.vertical, 8)
+        .padding(.horizontal, 20)
     }
     
     private func movePage(_ direction: Int) {
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
index 29f9604c..9d9beddc 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarRepresentable.swift
@@ -9,12 +9,13 @@
 import SwiftUI
 import FSCalendar
 
-
 public struct TCalendarRepresentable: UIViewRepresentable {
     /// 선택한 날짜
     @Binding private var selectedDate: Date
     /// 현재 페이지
     @Binding private var currentPage: Date
+    /// 캘린더 높이
+    @Binding var calendarHeight: CGFloat
     /// 주간/월간 표시 여부
     private var isWeekMode: Bool
     /// 캘린더 표시 이벤트 딕셔너리
@@ -23,11 +24,13 @@ public struct TCalendarRepresentable: UIViewRepresentable {
     public init(
         selectedDate: Binding<Date>,
         currentPage: Binding<Date>,
+        calendarHeight: Binding<CGFloat>,
         isWeekMode: Bool = false,
         events: [Date: Int] = [:]
     ) {
         self._selectedDate = selectedDate
         self._currentPage = currentPage
+        self._calendarHeight = calendarHeight
         self.isWeekMode = isWeekMode
         self.events = events
     }
@@ -38,6 +41,7 @@ public struct TCalendarRepresentable: UIViewRepresentable {
     
     public func makeUIView(context: Context) -> FSCalendar {
         let calendar: FSCalendar = FSCalendar()
+        
         // Cell 설정
         calendar.register(TCalendarCell.self, forCellReuseIdentifier: TCalendarCell.identifier)
         calendar.collectionView.contentSize = TCalendarCell.cellSize
@@ -50,6 +54,8 @@ public struct TCalendarRepresentable: UIViewRepresentable {
         // UI 설정
         calendar.placeholderType = .none
         calendar.headerHeight = 0
+        calendar.weekdayHeight = 18
+        calendar.rowHeight = TCalendarCell.cellSize.height
         calendar.appearance.weekdayTextColor = UIColor(.neutral400)
         calendar.appearance.weekdayFont = Typography.FontStyle.label2Medium.uiFont
         calendar.appearance.selectionColor = .clear
@@ -76,6 +82,11 @@ public struct TCalendarRepresentable: UIViewRepresentable {
             uiView.scope = targetScope
         }
         
+        DispatchQueue.main.async {
+            uiView.bounds.size.height = self.calendarHeight
+            uiView.frame.size.height = self.calendarHeight
+        }
+        
         uiView.reloadData()
     }
 }
@@ -103,6 +114,16 @@ public extension TCalendarRepresentable {
             }
         }
         
+        // Week/Month 모드 전환
+        public func calendar(_ calendar: FSCalendar, boundingRectWillChange bounds: CGRect, animated: Bool) {
+            DispatchQueue.main.async {
+                calendar.bounds.size.height = bounds.height
+                calendar.frame.size.height = bounds.height
+                calendar.setNeedsLayout()
+                calendar.layoutIfNeeded()
+            }
+        }
+        
         // 캘린더 셀 주입
         public func calendar(_ calendar: FSCalendar, cellFor date: Date, at position: FSCalendarMonthPosition) -> FSCalendarCell {
             
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
index 6d8ffd60..c41c71e8 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Calendar/TCalendarView.swift
@@ -12,12 +12,18 @@ import SwiftUI
 /// 주간/월간 표시를 포함합니다.
 public struct TCalendarView: View {
     
+    /// 주간 캘린더 높이
+    static let weeklyCalendarHeight: CGFloat = 80
+    /// 월간 캘린더 높이
+    static let monthlyCalendarHeight: CGFloat = 340
     /// 선택한 날짜
     @Binding var selectedDate: Date
     /// 현재 페이지
     @Binding var currentPage: Date
     /// 업데이트 플래그
     @State private var forceUpdate: UUID = UUID()
+    /// 캘린더 높이
+    @State private var calendarHeight: CGFloat = monthlyCalendarHeight
     /// 주간/월간 표시 여부
     private var isWeekMode: Bool
     /// 캘린더 표시 이벤트 딕셔너리
@@ -38,15 +44,31 @@ public struct TCalendarView: View {
     }
 
     public var body: some View {
-        TCalendarRepresentable(
-            selectedDate: $selectedDate,
-            currentPage: $currentPage,
-            isWeekMode: isWeekMode,
-            events: events
-        )
-        .id(forceUpdate)
-        .onChange(of: events) {
-            forceUpdate = UUID()
+        GeometryReader { proxy in
+            TCalendarRepresentable(
+                selectedDate: $selectedDate,
+                currentPage: $currentPage,
+                calendarHeight: $calendarHeight,
+                isWeekMode: isWeekMode,
+                events: events
+            )
+            .frame(width: proxy.size.width, height: TCalendarView.monthlyCalendarHeight)
+            .id(forceUpdate)
+            .onChange(of: events) {
+                forceUpdate = UUID()
+            }
+            .onAppear {
+                calendarHeight = isWeekMode
+                ? TCalendarView.weeklyCalendarHeight
+                : TCalendarView.monthlyCalendarHeight
+            }
+            .onChange(of: isWeekMode) {
+                calendarHeight = isWeekMode
+                ? TCalendarView.weeklyCalendarHeight
+                : TCalendarView.monthlyCalendarHeight
+            }
         }
+        .frame(height: calendarHeight)
+        .clipped()
     }
 }

From 538f8a30275d30f99cb3efe501fdab4b1acf1c9b Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Sun, 2 Feb 2025 07:39:45 +0900
Subject: [PATCH 14/16] =?UTF-8?q?[Feat]=20TraineeHomeView=20UI=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Trainee/TraineeHomeView.swift        | 181 +++++++++++++++++-
 1 file changed, 180 insertions(+), 1 deletion(-)

diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
index bad6cce0..896d42d3 100644
--- a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
@@ -6,4 +6,183 @@
 //  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
 //
 
-import Foundation
+import SwiftUI
+import ComposableArchitecture
+
+import Domain
+import DesignSystem
+
+/// 트레이니의 메인 홈 뷰입니다
+public struct TraineeHomeView: View {
+    
+    // MARK: 임시 State
+    @State var ispresented: Bool = false
+    @State var selectedDate: Date = Date()
+    @State var currentPage: Date = Date()
+    @State var events: [Date: Int] = [:]
+    @State var todaysSessionInfo: WorkoutListItemEntity? = .init(currentCount: 8, startDate: .now, endDate: .now, trainerProfileImageUrl: nil, trainerName: "김민수", hasRecord: true)
+    @State var records: [RecordListItemEntity] = [
+        .init(type: .meal(type: .lunch), date: .now, title: "자고싶다", hasFeedBack: true, imageUrl: nil),
+        .init(type: .meal(type: .dinner), date: .now, title: "자고싶다", hasFeedBack: false, imageUrl: "https://images.genius.com/8e0b15e4847f8e59db7dfda22b4db4ec.1000x1000x1.png"),
+        .init(type: .meal(type: .morning), date: .now, title: "자고싶다", hasFeedBack: true, imageUrl: nil)
+    ]
+    @State var toggleMode: Bool = true
+    
+    
+    public init() {}
+    
+    public var body: some View {
+        ScrollView {
+            VStack(spacing: 0) {
+                CalendarSection()
+                
+                RecordListSection()
+                    .background(Color.neutral100)
+                
+                Spacer()
+            }
+        }
+        .overlay(alignment: .bottomTrailing) {
+            Button(action: {
+                // TODO: STORE
+                ispresented = true
+            }, label: {
+                Image(.icnPlus)
+                    .renderingMode(.template)
+                    .resizable()
+                    .tint(Color.common0)
+                    .frame(width: 24, height: 24)
+                    .padding(16)
+                    .background(Color.neutral900)
+                    .clipShape(.rect(cornerRadius: 16))
+            })
+            .padding(.bottom, 20)
+            .padding(.trailing, 12)
+        }
+        .navigationBarBackButtonHidden()
+        .sheet(isPresented: $ispresented) {
+            TraineeRecordStartView(itemContents: [
+                ("🏋🏻‍♀️", "개인 운동", {
+                    // TODO: Store 연결
+                    print("pop")
+                }),
+                ("🥗", "식단", {
+                    // TODO: Store 연결
+                    print("pop")
+                })
+            ])
+            .autoSizingBottomSheet()
+        }
+    }
+    
+    // MARK: - Sections
+    @ViewBuilder
+    private func CalendarSection() -> some View {
+        VStack(spacing: 16) {
+            TCalendarHeader(
+                currentPage: $currentPage,
+                formatter: { TDateFormatUtility.formatter(for: .yyyy년_MM월).string(from: $0) },
+                rightView: {
+                    Button(action: {
+                        // TODO: Store 연결
+                        print("pop")
+                        toggleMode.toggle()
+                    }, label: {
+                        Image(.icnAlarm)
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: 24, height: 24)
+                    })
+                }
+            )
+            
+            // Calendar + 금일 수업 카드
+            VStack(spacing: 12) {
+                TCalendarView(
+                    selectedDate: $selectedDate,
+                    currentPage: $currentPage,
+                    events: events,
+                    isWeekMode: toggleMode
+                )
+                .padding(.horizontal, 20)
+                
+                if let todaysSessionInfo {
+                    TWorkoutCard(
+                        chipUIInfo: RecordType.session(count: todaysSessionInfo.currentCount).chipInfo,
+                        timeText: "\(TDateFormatUtility.formatter(for: .a_HHmm).string(from: todaysSessionInfo.startDate)) ~ \(TDateFormatUtility.formatter(for: .a_HHmm).string(from: todaysSessionInfo.endDate))",
+                        title: "\(todaysSessionInfo.trainerName) 트레이너",
+                        imgURL: .init(string: todaysSessionInfo.trainerProfileImageUrl ?? ""),
+                        hasRecord: todaysSessionInfo.hasRecord,
+                        footerTapAction: {
+                            // TODO: STORe
+                            print("얍ㅂ삐")
+                        }
+                    )
+                    .padding(.horizontal, 20)
+                    .padding(.bottom, 16)
+                } else {
+                    SessionEmptyView()
+                        .padding(.horizontal, 20)
+                        .padding(.vertical, 16)
+                }
+            }
+            
+        }
+        .padding(.vertical, 12)
+        
+    }
+    
+    @ViewBuilder
+    private func RecordListSection() -> some View {
+        VStack(alignment: .leading, spacing: 0) {
+            Text(TDateFormatUtility.formatter(for: .MM월_dd일_EEEE).string(from: selectedDate))
+                .typographyStyle(.heading3, with: .neutral800)
+                .padding(20)
+            
+            VStack(spacing: 12) {
+                ForEach(records.indices, id: \.self) { index in
+                    let item = records[index]
+                    TRecordCard(
+                        chipUIInfo: item.type.chipInfo,
+                        timeText: TDateFormatUtility.formatter(for: .a_HHmm).string(from: item.date),
+                        title: "자고 싶어요 진짜로 ㄴㅇㅁㄹㅁㄴㅇ래ㅣㅑㅕㅗㅁㅈㄷ;ㅐㅓㅑㅗㅁㅈㄷ래ㅑ;ㅗㅓㅁㄷㄹㅈ;ㅐㅗㅕㅑㄷㄹㅁㅈ",
+                        imgURL: URL(string: item.imageUrl ?? ""),
+                        hasFeedback: item.hasFeedBack,
+                        footerTapAction: {
+                            // TODO: STORE
+                            print("pop\(index)")
+                        }
+                    )
+                }
+            }
+            .padding(.horizontal, 16)
+        }
+    }
+}
+
+private extension TraineeHomeView {
+    /// 예정된 수업이 없어요
+    struct SessionEmptyView: View {
+        var body: some View {
+            Text("예정된 수업이 없어요")
+                .typographyStyle(.label1Medium, with: .neutral400)
+                .frame(maxWidth: .infinity)
+                .padding(.vertical, 12)
+        }
+    }
+    
+    /// 아직 기록이 없어요
+    struct RecordEmptyView: View {
+        var body: some View {
+            VStack(spacing: 4) {
+                Text("추가 버튼을 눌러 식사와 운동을 기록해보세요")
+                    .typographyStyle(.body2Bold, with: .neutral600)
+                    .frame(maxWidth: .infinity)
+                
+                Text("추가 버튼을 눌러 식사와 운동을 기록해보세요")
+                    .typographyStyle(.label1Medium, with: .neutral400)
+                    .frame(maxWidth: .infinity)
+            }
+        }
+    }
+}

From 0a87542638c220805b60997452eefcef081aaa5d Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Mon, 3 Feb 2025 01:50:14 +0900
Subject: [PATCH 15/16] =?UTF-8?q?[Feat]=20TraineeHomeFeature=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sources/Entity/RecordListItemEntity.swift |   6 +-
 .../Domain/Sources/Entity/RecordType.swift    |   2 +-
 .../Entity/WorkoutListItemEntity.swift        |   6 +-
 .../Sources/Extension/CGFloat+.swift          |  31 ++++
 .../Home/Trainee/TraineeHomeFeature.swift     | 132 ++++++++++++++++++
 5 files changed, 174 insertions(+), 3 deletions(-)
 create mode 100644 TnT/Projects/Presentation/Sources/Extension/CGFloat+.swift
 create mode 100644 TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift

diff --git a/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift b/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
index 2f9f0ddf..e3a76870 100644
--- a/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
+++ b/TnT/Projects/Domain/Sources/Entity/RecordListItemEntity.swift
@@ -9,7 +9,9 @@
 import Foundation
 
 /// 트레이니 기록 목록 아이템 모델
-public struct RecordListItemEntity {
+public struct RecordListItemEntity: Equatable {
+    /// 기록 id
+    public let id: Int
     /// 기록 타입
     public let type: RecordType
     /// 기록 시간
@@ -22,12 +24,14 @@ public struct RecordListItemEntity {
     public let imageUrl: String?
     
     public init(
+        id: Int,
         type: RecordType,
         date: Date,
         title: String,
         hasFeedBack: Bool,
         imageUrl: String?
     ) {
+        self.id = id
         self.type = type
         self.date = date
         self.title = title
diff --git a/TnT/Projects/Domain/Sources/Entity/RecordType.swift b/TnT/Projects/Domain/Sources/Entity/RecordType.swift
index ed0c1a46..bf052fe3 100644
--- a/TnT/Projects/Domain/Sources/Entity/RecordType.swift
+++ b/TnT/Projects/Domain/Sources/Entity/RecordType.swift
@@ -7,7 +7,7 @@
 //
 
 /// 앱에서 존재하는 기록 유형을 정의한 열거형
-public enum RecordType: Sendable {
+public enum RecordType: Sendable, Equatable {
     /// n회차 수업
     case session(count: Int)
     /// 운동
diff --git a/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift b/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift
index 17172907..d9d93d76 100644
--- a/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift
+++ b/TnT/Projects/Domain/Sources/Entity/WorkoutListItemEntity.swift
@@ -9,7 +9,9 @@
 import Foundation
 
 /// 트레이니 PT 운동 목록 아이템 모델
-public struct WorkoutListItemEntity {
+public struct WorkoutListItemEntity: Equatable {
+    /// 수업 Id
+    public let id: Int
     /// 현재 수업 차수
     public let currentCount: Int
     /// 수업 시작 시간
@@ -24,6 +26,7 @@ public struct WorkoutListItemEntity {
     public let hasRecord: Bool
     
     public init(
+        id: Int,
         currentCount: Int,
         startDate: Date,
         endDate: Date,
@@ -31,6 +34,7 @@ public struct WorkoutListItemEntity {
         trainerName: String,
         hasRecord: Bool
     ) {
+        self.id = id
         self.currentCount = currentCount
         self.startDate = startDate
         self.endDate = endDate
diff --git a/TnT/Projects/Presentation/Sources/Extension/CGFloat+.swift b/TnT/Projects/Presentation/Sources/Extension/CGFloat+.swift
new file mode 100644
index 00000000..f998ab28
--- /dev/null
+++ b/TnT/Projects/Presentation/Sources/Extension/CGFloat+.swift
@@ -0,0 +1,31 @@
+//
+//  CGFloat+.swift
+//  Presentation
+//
+//  Created by 박민서 on 2/3/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import SwiftUI
+
+public extension CGFloat {
+    /// 상단 safeArea
+    static var safeAreaTop: CGFloat {
+        guard let window = UIApplication.shared.connectedScenes
+            .compactMap({ ($0 as? UIWindowScene)?.keyWindow })
+            .first else { return 44 }
+        
+        let topInset = window.safeAreaInsets.top
+        return topInset > 0 ? topInset : 0
+    }
+    
+    /// 하단 safeArea
+    static var safeAreaBottom: CGFloat {
+        guard let window = UIApplication.shared.connectedScenes
+            .compactMap({ ($0 as? UIWindowScene)?.keyWindow })
+            .first else { return 34 }
+        
+        let bottomInset = window.safeAreaInsets.bottom
+        return bottomInset > 0 ? bottomInset : 34
+    }
+}
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift
new file mode 100644
index 00000000..08e603b7
--- /dev/null
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeFeature.swift
@@ -0,0 +1,132 @@
+//
+//  TraineeHomeFeature.swift
+//  Presentation
+//
+//  Created by 박민서 on 2/2/25.
+//  Copyright © 2025 yapp25thTeamTnT. All rights reserved.
+//
+
+import Foundation
+import ComposableArchitecture
+
+import Domain
+
+@Reducer
+public struct TraineeHomeFeature {
+    
+    @ObservableState
+    public struct State: Equatable {
+        // MARK: Data related state
+        /// 선택된 날짜
+        var selectedDate: Date
+        /// 캘린더 이벤트
+        var events: [Date: Int]
+        /// 수업 정보
+        var sessionInfo: WorkoutListItemEntity?
+        /// 기록 정보 목록
+        var records: [RecordListItemEntity]
+        
+        // MARK: UI related state
+        /// 캘린더 표시 페이지
+        var view_currentPage: Date
+        /// 수업 카드 시간 표시
+        var view_sessionCardTimeString: String {
+            guard let sessionInfo else { return "" }
+            return "\(TDateFormatUtility.formatter(for: .a_HHmm).string(from: sessionInfo.startDate)) ~ \(TDateFormatUtility.formatter(for: .a_HHmm).string(from: sessionInfo.endDate))"
+        }
+        /// 기록 제목 표시
+        var view_recordTitleString: String {
+            return TDateFormatUtility.formatter(for: .MM월_dd일_EEEE).string(from: selectedDate)
+        }
+        /// 선택 바텀 시트 표시
+        var view_isBottomSheetPresented: Bool
+        
+        public init(
+            selectedDate: Date = .now,
+            events: [Date: Int] = [:],
+            sessionInfo: WorkoutListItemEntity? = nil,
+            records: [RecordListItemEntity] = [],
+            view_currentPage: Date = .now,
+            view_isBottomSheetPresented: Bool = false
+        ) {
+            self.selectedDate = selectedDate
+            self.events = events
+            self.sessionInfo = sessionInfo
+            self.records = records
+            self.view_currentPage = view_currentPage
+            self.view_isBottomSheetPresented = view_isBottomSheetPresented
+        }
+    }
+    
+    @Dependency(\.traineeUseCase) private var traineeUseCase: TraineeUseCase
+    
+    public enum Action: Sendable, ViewAction {
+        /// 뷰에서 발생한 액션을 처리합니다.
+        case view(View)
+        /// 네비게이션 여부 설정
+        case setNavigating
+        
+        @CasePathable
+        public enum View: Sendable, BindableAction {
+            /// 바인딩할 액션을 처리
+            case binding(BindingAction<State>)
+            /// 우측 상단 알림 페이지 보기 버튼 탭
+            case tapAlarmPageButton
+            /// 상단 수업 기록 보기 버튼 탭
+            case tapShowSessionRecordButton(id: Int)
+            /// 기록 목록 피드백 보기 버튼 탭
+            case tapShowRecordFeedbackButton(id: Int)
+            /// 우측 하단 기록 추가 버튼 탭
+            case tapAddRecordButton
+            /// 개인 운동 기록 추가 버튼 탭
+            case tapAddWorkoutRecordButton
+            /// 식단 기록 추가 버튼 탭
+            case tapAddMealRecordButton
+        }
+    }
+    
+    public init() {}
+    
+    public var body: some ReducerOf<Self> {
+        BindingReducer(action: \.view)
+        
+        Reduce { state, action in
+            switch action {
+                
+            case .view(let action):
+                switch action {
+                case .binding(\.selectedDate):
+                    print(state.events[state.selectedDate])
+                    return .none
+                case .binding:
+                    return .none
+                case .tapAlarmPageButton:
+                    // TODO: 네비게이션 연결 시 추가
+                    print("tapAlarmPageButton")
+                    return .none
+                case .tapShowSessionRecordButton(let id):
+                    // TODO: 네비게이션 연결 시 추가
+                    print("tapShowSessionRecordButton \(id)")
+                    return .none
+                case .tapShowRecordFeedbackButton(let id):
+                    // TODO: 네비게이션 연결 시 추가
+                    print("tapShowRecordFeedbackButton \(id)")
+                    return .none
+                case .tapAddRecordButton:
+                    state.view_isBottomSheetPresented = true
+                    return .none
+                case .tapAddWorkoutRecordButton:
+                    // TODO: 네비게이션 연결 시 추가
+                    print("tapAddWorkoutRecordButton")
+                    return .none
+                case .tapAddMealRecordButton:
+                    // TODO: 네비게이션 연결 시 추가
+                    print("tapAddMealRecordButton")
+                    return .none
+                }
+            case .setNavigating:
+                return .none
+            }
+        }
+    }
+}

From e27737ce9e8df3a7abe7e46ba43d0427c1c29b83 Mon Sep 17 00:00:00 2001
From: Minseo Park <125115284+FpRaArNkK@users.noreply.github.com>
Date: Mon, 3 Feb 2025 01:55:00 +0900
Subject: [PATCH 16/16] =?UTF-8?q?[Feat]=20TraineeHomeView=20UI=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Size=16, Type=clock.svg                   |   4 +-
 .../Contents.json                             |   0
 .../Size=16, Type=star.svg                    |   2 +-
 .../icn_star_smile.imageset/Contents.json     |  11 +-
 .../Size=24, Type=smile.svg                   |   8 +-
 .../Sources/Components/Card/TRecordCard.swift |   2 +-
 .../Components/Card/TWorkoutCard.swift        |   2 +-
 .../DesignSystem/Image+DesignSystem.swift     |   2 +-
 .../Home/Trainee/TraineeHomeView.swift        | 116 +++++++++---------
 9 files changed, 68 insertions(+), 79 deletions(-)
 rename TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/{icn_start_empty.imageset => icn_star.imageset}/Contents.json (100%)
 rename TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/{icn_start_empty.imageset => icn_star.imageset}/Size=16, Type=star.svg (98%)

diff --git a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_clock.imageset/Size=16, Type=clock.svg b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_clock.imageset/Size=16, Type=clock.svg
index 25a289bd..c9d9bce5 100644
--- a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_clock.imageset/Size=16, Type=clock.svg	
+++ b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_clock.imageset/Size=16, Type=clock.svg	
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1099_27342)">
-<circle cx="8" cy="8" r="8" fill="#F5F5F5"/>
-<path d="M8 4V8L11.5 10.5" stroke="#D4D4D4" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="8" cy="8" r="8" fill="#E5E5E5"/>
+<path d="M8 4V8L11.5 10.5" stroke="#A3A3A3" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
 <defs>
 <clipPath id="clip0_1099_27342">
diff --git a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_start_empty.imageset/Contents.json b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star.imageset/Contents.json
similarity index 100%
rename from TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_start_empty.imageset/Contents.json
rename to TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star.imageset/Contents.json
diff --git a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_start_empty.imageset/Size=16, Type=star.svg b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star.imageset/Size=16, Type=star.svg
similarity index 98%
rename from TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_start_empty.imageset/Size=16, Type=star.svg
rename to TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star.imageset/Size=16, Type=star.svg
index 6a817248..131d69da 100644
--- a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_start_empty.imageset/Size=16, Type=star.svg	
+++ b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star.imageset/Size=16, Type=star.svg	
@@ -1,6 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_952_17090)">
-<path d="M7.0578 2.64949C7.37309 1.76291 8.62691 1.76291 8.9422 2.64949L9.15961 3.26086C9.35815 3.81918 9.99593 4.08335 10.5311 3.82895L11.1171 3.55039C11.967 3.14641 12.8536 4.033 12.4496 4.88286L12.171 5.46888C11.9166 6.00408 12.1808 6.64185 12.7391 6.84039L13.3505 7.0578C14.2371 7.37309 14.2371 8.62691 13.3505 8.9422L12.7391 9.15961C12.1808 9.35815 11.9166 9.99593 12.171 10.5311L12.4496 11.1171C12.8536 11.967 11.967 12.8536 11.1171 12.4496L10.5311 12.171C9.99592 11.9166 9.35815 12.1808 9.15961 12.7391L8.9422 13.3505C8.62691 14.2371 7.37309 14.2371 7.0578 13.3505L6.84039 12.7391C6.64185 12.1808 6.00408 11.9166 5.46888 12.171L4.88286 12.4496C4.033 12.8536 3.14641 11.967 3.55039 11.1171L3.82895 10.5311C4.08335 9.99592 3.81918 9.35815 3.26086 9.15961L2.64949 8.9422C1.76291 8.62691 1.76291 7.37309 2.64949 7.0578L3.26086 6.84039C3.81918 6.64185 4.08335 6.00408 3.82895 5.46888L3.55039 4.88286C3.14641 4.033 4.033 3.14641 4.88286 3.55039L5.46888 3.82895C6.00408 4.08335 6.64185 3.81918 6.84039 3.26086L7.0578 2.64949Z" fill="#FF472F"/>
+<path d="M7.0578 2.64949C7.37309 1.76291 8.62691 1.76291 8.9422 2.64949L9.15961 3.26086C9.35815 3.81918 9.99593 4.08335 10.5311 3.82895L11.1171 3.55039C11.967 3.14641 12.8536 4.033 12.4496 4.88286L12.171 5.46888C11.9166 6.00408 12.1808 6.64185 12.7391 6.84039L13.3505 7.0578C14.2371 7.37309 14.2371 8.62691 13.3505 8.9422L12.7391 9.15961C12.1808 9.35815 11.9166 9.99593 12.171 10.5311L12.4496 11.1171C12.8536 11.967 11.967 12.8536 11.1171 12.4496L10.5311 12.171C9.99592 11.9166 9.35815 12.1808 9.15961 12.7391L8.9422 13.3505C8.62691 14.2371 7.37309 14.2371 7.0578 13.3505L6.84039 12.7391C6.64185 12.1808 6.00408 11.9166 5.46888 12.171L4.88286 12.4496C4.033 12.8536 3.14641 11.967 3.55039 11.1171L3.82895 10.5311C4.08335 9.99592 3.81918 9.35815 3.26086 9.15961L2.64949 8.9422C1.76291 8.62691 1.76291 7.37309 2.64949 7.0578L3.26086 6.84039C3.81918 6.64185 4.08335 6.00408 3.82895 5.46888L3.55039 4.88286C3.14641 4.033 4.033 3.14641 4.88286 3.55039L5.46888 3.82895C6.00408 4.08335 6.64185 3.81918 6.84039 3.26086L7.0578 2.64949Z" fill="#FCA5A5"/>
 </g>
 <defs>
 <clipPath id="clip0_952_17090">
diff --git a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Contents.json b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Contents.json
index 9c542589..bc24cf7d 100644
--- a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Contents.json
+++ b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "Size=24, Type=smile.svg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {
diff --git a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Size=24, Type=smile.svg b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Size=24, Type=smile.svg
index c2a8eb55..8e3849de 100644
--- a/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Size=24, Type=smile.svg	
+++ b/TnT/Projects/DesignSystem/Resources/Assets.xcassets/Icons/icn_star_smile.imageset/Size=24, Type=smile.svg	
@@ -1,9 +1,9 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_1663_21028)">
-<path d="M10.5867 3.97424C11.0596 2.64436 12.9404 2.64436 13.4133 3.97424L13.7394 4.89128C14.0372 5.72877 14.9939 6.12503 15.7967 5.74343L16.6757 5.32558C17.9505 4.71962 19.2804 6.04951 18.6744 7.32428L18.2566 8.20333C17.875 9.00611 18.2712 9.96277 19.1087 10.2606L20.0258 10.5867C21.3556 11.0596 21.3556 12.9404 20.0258 13.4133L19.1087 13.7394C18.2712 14.0372 17.875 14.9939 18.2566 15.7967L18.6744 16.6757C19.2804 17.9505 17.9505 19.2804 16.6757 18.6744L15.7967 18.2566C14.9939 17.875 14.0372 18.2712 13.7394 19.1087L13.4133 20.0258C12.9404 21.3556 11.0596 21.3556 10.5867 20.0258L10.2606 19.1087C9.96277 18.2712 9.00611 17.875 8.20333 18.2566L7.32429 18.6744C6.04951 19.2804 4.71962 17.9505 5.32558 16.6757L5.74343 15.7967C6.12503 14.9939 5.72877 14.0372 4.89128 13.7394L3.97424 13.4133C2.64436 12.9404 2.64436 11.0596 3.97424 10.5867L4.89128 10.2606C5.72877 9.96277 6.12503 9.00611 5.74343 8.20333L5.32558 7.32429C4.71962 6.04951 6.04951 4.71962 7.32428 5.32558L8.20333 5.74343C9.00611 6.12503 9.96277 5.72877 10.2606 4.89128L10.5867 3.97424Z" fill="#FF5D58"/>
-<path d="M10.2498 10V11" stroke="#450A0A" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M13.7498 10V11" stroke="#450A0A" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M8 12.75C8.22222 13.75 9.33333 15.75 12 15.75C14.6667 15.75 15.7778 13.75 16 12.75" stroke="#450A0A" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M10.5867 3.97424C11.0596 2.64436 12.9404 2.64436 13.4133 3.97424L13.7394 4.89128C14.0372 5.72877 14.9939 6.12503 15.7967 5.74343L16.6757 5.32558C17.9505 4.71962 19.2804 6.04951 18.6744 7.32428L18.2566 8.20333C17.875 9.00611 18.2712 9.96277 19.1087 10.2606L20.0258 10.5867C21.3556 11.0596 21.3556 12.9404 20.0258 13.4133L19.1087 13.7394C18.2712 14.0372 17.875 14.9939 18.2566 15.7967L18.6744 16.6757C19.2804 17.9505 17.9505 19.2804 16.6757 18.6744L15.7967 18.2566C14.9939 17.875 14.0372 18.2712 13.7394 19.1087L13.4133 20.0258C12.9404 21.3556 11.0596 21.3556 10.5867 20.0258L10.2606 19.1087C9.96277 18.2712 9.00611 17.875 8.20333 18.2566L7.32429 18.6744C6.04951 19.2804 4.71962 17.9505 5.32558 16.6757L5.74343 15.7967C6.12503 14.9939 5.72877 14.0372 4.89128 13.7394L3.97424 13.4133C2.64436 12.9404 2.64436 11.0596 3.97424 10.5867L4.89128 10.2606C5.72877 9.96277 6.12503 9.00611 5.74343 8.20333L5.32558 7.32429C4.71962 6.04951 6.04951 4.71962 7.32428 5.32558L8.20333 5.74343C9.00611 6.12503 9.96277 5.72877 10.2606 4.89128L10.5867 3.97424Z" fill="#FCA5A5"/>
+<path d="M10.2498 10V11" stroke="#991B1B" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M13.7498 10V11" stroke="#991B1B" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8 12.75C8.22222 13.75 9.33333 15.75 12 15.75C14.6667 15.75 15.7778 13.75 16 12.75" stroke="#991B1B" stroke-width="1.5" stroke-linecap="round"/>
 </g>
 <defs>
 <clipPath id="clip0_1663_21028">
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
index eccb3fa0..597f7fc9 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TRecordCard.swift
@@ -76,8 +76,8 @@ public struct TRecordCard: View {
             case .success(let image):
                 image
                     .resizable()
+                    .aspectRatio(contentMode: .fill)
                     .frame(width: 140, height: 140)
-                    .scaledToFill()
                     .clipShape(.rect(cornerRadius: 16))
                     .padding(.leading, 12)
                     .padding(.vertical, 12)
diff --git a/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
index 09b08c63..6df3d13c 100644
--- a/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
+++ b/TnT/Projects/DesignSystem/Sources/Components/Card/TWorkoutCard.swift
@@ -117,8 +117,8 @@ private extension TWorkoutCard {
                 case .success(let image):
                     image
                         .resizable()
+                        .aspectRatio(contentMode: .fill)
                         .frame(width: 24, height: 24)
-                        .scaledToFill()
                         .clipShape(Circle())
                     
                 case .failure(let error):
diff --git a/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift b/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
index 293f3ab6..97d6c646 100644
--- a/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
+++ b/TnT/Projects/DesignSystem/Sources/DesignSystem/Image+DesignSystem.swift
@@ -44,7 +44,7 @@ public extension ImageResource {
     static let icnTriangleDown: ImageResource = DesignSystemAsset.icnTriangleDown.imageResource
     static let icnTriangleRight: ImageResource = DesignSystemAsset.icnTriangleRight.imageResource
     static let icnClock: ImageResource = DesignSystemAsset.icnClock.imageResource
-    static let icnStar: ImageResource = DesignSystemAsset.icnStartEmpty.imageResource
+    static let icnStar: ImageResource = DesignSystemAsset.icnStar.imageResource
     static let icnStarSmile: ImageResource = DesignSystemAsset.icnStarSmile.imageResource
     static let icnWriteBlackFilled: ImageResource = DesignSystemAsset.icnWriteBlackFilled.imageResource
     static let icnPlus: ImageResource = DesignSystemAsset.icnPlus.imageResource
diff --git a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
index 896d42d3..9ebbf554 100644
--- a/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
+++ b/TnT/Projects/Presentation/Sources/Home/Trainee/TraineeHomeView.swift
@@ -13,39 +13,37 @@ import Domain
 import DesignSystem
 
 /// 트레이니의 메인 홈 뷰입니다
+@ViewAction(for: TraineeHomeFeature.self)
 public struct TraineeHomeView: View {
     
-    // MARK: 임시 State
-    @State var ispresented: Bool = false
-    @State var selectedDate: Date = Date()
-    @State var currentPage: Date = Date()
-    @State var events: [Date: Int] = [:]
-    @State var todaysSessionInfo: WorkoutListItemEntity? = .init(currentCount: 8, startDate: .now, endDate: .now, trainerProfileImageUrl: nil, trainerName: "김민수", hasRecord: true)
-    @State var records: [RecordListItemEntity] = [
-        .init(type: .meal(type: .lunch), date: .now, title: "자고싶다", hasFeedBack: true, imageUrl: nil),
-        .init(type: .meal(type: .dinner), date: .now, title: "자고싶다", hasFeedBack: false, imageUrl: "https://images.genius.com/8e0b15e4847f8e59db7dfda22b4db4ec.1000x1000x1.png"),
-        .init(type: .meal(type: .morning), date: .now, title: "자고싶다", hasFeedBack: true, imageUrl: nil)
-    ]
-    @State var toggleMode: Bool = true
+    @Bindable public var store: StoreOf<TraineeHomeFeature>
     
-    
-    public init() {}
+    public init(store: StoreOf<TraineeHomeFeature>) {
+        self.store = store
+    }
     
     public var body: some View {
         ScrollView {
             VStack(spacing: 0) {
                 CalendarSection()
+                    .background(Color.common0)
                 
                 RecordListSection()
+                    .frame(maxWidth: .infinity)
                     .background(Color.neutral100)
-                
+                    
                 Spacer()
             }
         }
+        .background(
+            VStack {
+                Color.common0
+                Color.neutral100
+            }
+        )
         .overlay(alignment: .bottomTrailing) {
             Button(action: {
-                // TODO: STORE
-                ispresented = true
+                send(.tapAddRecordButton)
             }, label: {
                 Image(.icnPlus)
                     .renderingMode(.template)
@@ -60,16 +58,10 @@ public struct TraineeHomeView: View {
             .padding(.trailing, 12)
         }
         .navigationBarBackButtonHidden()
-        .sheet(isPresented: $ispresented) {
+        .sheet(isPresented: $store.view_isBottomSheetPresented) {
             TraineeRecordStartView(itemContents: [
-                ("🏋🏻‍♀️", "개인 운동", {
-                    // TODO: Store 연결
-                    print("pop")
-                }),
-                ("🥗", "식단", {
-                    // TODO: Store 연결
-                    print("pop")
-                })
+                ("🏋🏻‍♀️", "개인 운동", { send(.tapAddWorkoutRecordButton) }),
+                ("🥗", "식단", { send(.tapAddMealRecordButton) })
             ])
             .autoSizingBottomSheet()
         }
@@ -80,13 +72,11 @@ public struct TraineeHomeView: View {
     private func CalendarSection() -> some View {
         VStack(spacing: 16) {
             TCalendarHeader(
-                currentPage: $currentPage,
+                currentPage: $store.view_currentPage,
                 formatter: { TDateFormatUtility.formatter(for: .yyyy년_MM월).string(from: $0) },
                 rightView: {
                     Button(action: {
-                        // TODO: Store 연결
-                        print("pop")
-                        toggleMode.toggle()
+                        send(.tapAlarmPageButton)
                     }, label: {
                         Image(.icnAlarm)
                             .resizable()
@@ -99,23 +89,22 @@ public struct TraineeHomeView: View {
             // Calendar + 금일 수업 카드
             VStack(spacing: 12) {
                 TCalendarView(
-                    selectedDate: $selectedDate,
-                    currentPage: $currentPage,
-                    events: events,
-                    isWeekMode: toggleMode
+                    selectedDate: $store.selectedDate,
+                    currentPage: $store.view_currentPage,
+                    events: store.events,
+                    isWeekMode: true
                 )
                 .padding(.horizontal, 20)
                 
-                if let todaysSessionInfo {
+                if let sessionInfo = store.sessionInfo {
                     TWorkoutCard(
-                        chipUIInfo: RecordType.session(count: todaysSessionInfo.currentCount).chipInfo,
-                        timeText: "\(TDateFormatUtility.formatter(for: .a_HHmm).string(from: todaysSessionInfo.startDate)) ~ \(TDateFormatUtility.formatter(for: .a_HHmm).string(from: todaysSessionInfo.endDate))",
-                        title: "\(todaysSessionInfo.trainerName) 트레이너",
-                        imgURL: .init(string: todaysSessionInfo.trainerProfileImageUrl ?? ""),
-                        hasRecord: todaysSessionInfo.hasRecord,
+                        chipUIInfo: RecordType.session(count: sessionInfo.currentCount).chipInfo,
+                        timeText: store.view_sessionCardTimeString,
+                        title: "\(sessionInfo.trainerName) 트레이너",
+                        imgURL: .init(string: sessionInfo.trainerProfileImageUrl ?? ""),
+                        hasRecord: sessionInfo.hasRecord,
                         footerTapAction: {
-                            // TODO: STORe
-                            print("얍ㅂ삐")
+                            send(.tapShowSessionRecordButton(id: sessionInfo.id))
                         }
                     )
                     .padding(.horizontal, 20)
@@ -135,27 +124,36 @@ public struct TraineeHomeView: View {
     @ViewBuilder
     private func RecordListSection() -> some View {
         VStack(alignment: .leading, spacing: 0) {
-            Text(TDateFormatUtility.formatter(for: .MM월_dd일_EEEE).string(from: selectedDate))
-                .typographyStyle(.heading3, with: .neutral800)
-                .padding(20)
+            HStack {
+                Text(store.view_recordTitleString)
+                    .typographyStyle(.heading3, with: .neutral800)
+                    .padding(20)
+                Spacer()
+            }
             
             VStack(spacing: 12) {
-                ForEach(records.indices, id: \.self) { index in
-                    let item = records[index]
-                    TRecordCard(
-                        chipUIInfo: item.type.chipInfo,
-                        timeText: TDateFormatUtility.formatter(for: .a_HHmm).string(from: item.date),
-                        title: "자고 싶어요 진짜로 ㄴㅇㅁㄹㅁㄴㅇ래ㅣㅑㅕㅗㅁㅈㄷ;ㅐㅓㅑㅗㅁㅈㄷ래ㅑ;ㅗㅓㅁㄷㄹㅈ;ㅐㅗㅕㅑㄷㄹㅁㅈ",
-                        imgURL: URL(string: item.imageUrl ?? ""),
-                        hasFeedback: item.hasFeedBack,
-                        footerTapAction: {
-                            // TODO: STORE
-                            print("pop\(index)")
-                        }
-                    )
+                if !store.records.isEmpty {
+                    ForEach(store.records, id: \.id) { item in
+                        TRecordCard(
+                            chipUIInfo: item.type.chipInfo,
+                            timeText: TDateFormatUtility.formatter(for: .a_HHmm).string(from: item.date),
+                            title: item.title,
+                            imgURL: URL(string: item.imageUrl ?? ""),
+                            hasFeedback: item.hasFeedBack,
+                            footerTapAction: {
+                                send(.tapShowRecordFeedbackButton(id: item.id))
+                            }
+                        )
+                    }
+                } else {
+                    RecordEmptyView()
+                        .padding(.top, 80)
+                        .padding(.bottom, 100)
                 }
             }
             .padding(.horizontal, 16)
+            
+            Spacer()
         }
     }
 }
@@ -175,7 +173,7 @@ private extension TraineeHomeView {
     struct RecordEmptyView: View {
         var body: some View {
             VStack(spacing: 4) {
-                Text("추가 버튼을 눌러 식사와 운동을 기록해보세요")
+                Text("아직 기록이 없어요")
                     .typographyStyle(.body2Bold, with: .neutral600)
                     .frame(maxWidth: .infinity)