Jiwon/profile

Uplift.xcodeproj/project.pbxproj

@@ -7,6 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		291433852D87387B00F913D5 /* UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433842D87387500F913D5 /* UserProfile.swift */; };
+		291433872D87388C00F913D5 /* WeeklyWorkoutData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433862D87388800F913D5 /* WeeklyWorkoutData.swift */; };
+		291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433882D8738A200F913D5 /* WorkoutHistory.swift */; };
+		293032572D7A8F64002E5484 /* WorkoutProgressArc.swift in Sources */ = {isa = PBXBuildFile; fileRef = 293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */; };
+		294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */; };
+		296A2DAE2D7A805300EF042F /* ProfileViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */; };
 		2CA97C8F2D8B852700EF48B3 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2CA97C8E2D8B852700EF48B3 /* UpliftAPI */; };
 		2E090EC52B12EF2600BAE982 /* Publishers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E090EC42B12EF2600BAE982 /* Publishers.swift */; };
 		2E090ECB2B12FF5900BAE982 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2E090ECA2B12FF5900BAE982 /* UpliftAPI */; };
@@ -123,6 +129,12 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		291433842D87387500F913D5 /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
+		291433862D87388800F913D5 /* WeeklyWorkoutData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutData.swift; sourceTree = "<group>"; };
+		291433882D8738A200F913D5 /* WorkoutHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutHistory.swift; sourceTree = "<group>"; };
+		293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutProgressArc.swift; sourceTree = "<group>"; };
+		294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeeklyWorkoutTrackerView.swift; sourceTree = "<group>"; };
+		296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileViewModel.swift; sourceTree = "<group>"; };
 		2E090EC42B12EF2600BAE982 /* Publishers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Publishers.swift; sourceTree = "<group>"; };
 		2E090ED52B13121600BAE982 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		2E1105BE2B13B0E100119F5B /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = "<group>"; };
@@ -261,6 +273,9 @@
 		2E090EC62B12FB9F00BAE982 /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				291433882D8738A200F913D5 /* WorkoutHistory.swift */,
+				291433862D87388800F913D5 /* WeeklyWorkoutData.swift */,
+				291433842D87387500F913D5 /* UserProfile.swift */,
 				2E15F4D92B39102A00414BEC /* Capacity.swift */,
 				2E6785C32B3A780600DD3ADA /* DayOfWeek.swift */,
 				63A7ABCE2B8C119A008D58FB /* Equipment.swift */,
@@ -317,6 +332,8 @@
 		2E090ED02B1308C900BAE982 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				294CC21C2D7E34D000EF6487 /* WeeklyWorkoutTrackerView.swift */,
+				293032562D7A8F64002E5484 /* WorkoutProgressArc.swift */,
 				89950D892B992E8400DFB007 /* ClassesView.swift */,
 				63CA15862C924B84001620B5 /* Onboarding */,
 				2E8FE3912B1278B700B3DC6A /* HomeView.swift */,
@@ -341,6 +358,7 @@
 				2E6785C12B3A5CE000DD3ADA /* GymDetailViewModel.swift */,
 				2E1105BE2B13B0E100119F5B /* HomeViewModel.swift */,
 				2E2748CE2BCD4D1F0023882E /* MainViewModel.swift */,
+				296A2DAD2D7A805300EF042F /* ProfileViewModel.swift */,
 			);
 			path = ViewModels;
 			sourceTree = "<group>";
@@ -756,6 +774,8 @@
 				2E6785B92B3A425E00DD3ADA /* GymDetailView.swift in Sources */,
 				893AD9152D59569600C0817B /* MuscleCategoryView.swift in Sources */,
 				89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */,
+				291433852D87387B00F913D5 /* UserProfile.swift in Sources */,
+				294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */,
 				2E1105BF2B13B0E100119F5B /* HomeViewModel.swift in Sources */,
 				893AD9172D595DC800C0817B /* MuscleGroupView.swift in Sources */,
 				89E4FAAA2CEFEC3C00A952B1 /* CapacitySemiCircleView.swift in Sources */,
@@ -764,6 +784,7 @@
 				2E8FE3922B1278B700B3DC6A /* HomeView.swift in Sources */,
 				2E6785C02B3A5CA300DD3ADA /* Haptics.swift in Sources */,
 				89950D8A2B992E8400DFB007 /* ClassesView.swift in Sources */,
+				296A2DAE2D7A805300EF042F /* ProfileViewModel.swift in Sources */,
 				2E15F50C2B3A0B2100414BEC /* CapacityCircleView.swift in Sources */,
 				2E090EC52B12EF2600BAE982 /* Publishers.swift in Sources */,
 				2E39D8222B3B631200AD238B /* DividerLine.swift in Sources */,
@@ -780,6 +801,7 @@
 				2E2748CF2BCD4D1F0023882E /* MainViewModel.swift in Sources */,
 				2E5726C72B4A63AE00D3DB36 /* ShimmerModifier.swift in Sources */,
 				2E15F5022B396EC500414BEC /* ShadowModifier.swift in Sources */,
+				291433872D87388C00F913D5 /* WeeklyWorkoutData.swift in Sources */,
 				2E15F4DA2B39102A00414BEC /* Capacity.swift in Sources */,
 				2ED53DCF2B3E06DC00FBDEAB /* Logger.swift in Sources */,
 				2E15F4E62B391E5300414BEC /* Array+Extension.swift in Sources */,
@@ -789,6 +811,7 @@
 				897703662BA2028D00F9992F /* ClassesViewModel.swift in Sources */,
 				2E1105C22B13D15100119F5B /* HomeGymCell.swift in Sources */,
 				2E15F4F92B3950F800414BEC /* Date+Extension.swift in Sources */,
+				293032572D7A8F64002E5484 /* WorkoutProgressArc.swift in Sources */,
 				2E8FE3902B1278B700B3DC6A /* UpliftApp.swift in Sources */,
 				2EE5F3C82B12E094008E0299 /* ApolloClientProtocol.swift in Sources */,
 				2E39D8262B3B6C6500AD238B /* SlidingTabBarView.swift in Sources */,
@@ -801,6 +824,7 @@
 				89A652F92D02B00000277A16 /* CapacityRemindersView.swift in Sources */,
 				89A652FA2D02B00000277A16 /* RemindersView.swift in Sources */,
 				2E39D81E2B3B610200AD238B /* UINavigationController+Extension.swift in Sources */,
+				291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */,
 				63001AD62CC9ACFF0082AFFA /* LoginViewModel.swift in Sources */,
 				2E15F4DC2B39117300414BEC /* OpenHours.swift in Sources */,
 				2E090ED62B13121600BAE982 /* Constants.swift in Sources */,

Uplift/Models/UserProfile.swift

@@ -0,0 +1,14 @@
+//
+//  UserProfile.swift
+//  Uplift
+//
+//  Created by jiwon jeong on 3/16/25.
+//  Copyright © 2025 Cornell AppDev. All rights reserved.
+//
+
+import Foundation
+
+struct UserProfile {
+    let id: String
+    let name: String
+}

Uplift/Models/WeeklyWorkoutData.swift

@@ -0,0 +1,19 @@
+//
+//  WeeklyWorkoutData.swift
+//  Uplift
+//
+//  Created by jiwon jeong on 3/16/25.
+//  Copyright © 2025 Cornell AppDev. All rights reserved.
+//
+
+import Foundation
+
+struct WeeklyWorkoutData {
+    var currentWeekWorkouts: Int
+    var weeklyGoal: Int
+    var weekDates: [Date]
+
+    var progressPercentage: Double {
+        Double(currentWeekWorkouts) / Double(weeklyGoal)
+    }
+}

Uplift/Models/WorkoutHistory.swift

@@ -0,0 +1,16 @@
+//
+//  WorkoutHistory.swift
+//  Uplift
+//
+//  Created by jiwon jeong on 3/16/25.
+//  Copyright © 2025 Cornell AppDev. All rights reserved.
+//
+
+import Foundation
+
+struct WorkoutHistory: Identifiable {
+    let id: String
+    let location: String
+    let time: String
+    let date: String
+}

Uplift/Resources/Assets.xcassets/profile_outline.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Profile.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Profile 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Profile 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Uplift/Resources/Assets.xcassets/profile_solid.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Profile.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Profile-2.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Profile-3.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Uplift/Resources/Assets.xcassets/settings.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "Settings.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Settings 1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Settings 2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Uplift/Utils/Constants.swift

@@ -92,6 +92,8 @@ struct Constants {
         static let labelMedium = Font.custom("Montserrat-Medium", size: 12)
         static let labelSemibold = Font.custom("Montserrat-SemiBold", size: 12)
         static let labelBold = Font.custom("Montserrat-Bold", size: 12)
+
+        static let p1 = Font.custom("Montserrat-Bold", size: 64)
     }
 
     /// Image components used in Uplift.
@@ -113,9 +115,11 @@ struct Constants {
         static let chest = Image("chest")
         static let clock = Image("clock")
         static let cross = Image("cross")
+        static let dumbbellSolid = Image("dumbbell_solid")
         static let dumbbellLarge = Image("dumbbell_large")
         static let dumbbellOutline = Image("dumbbell_outline")
-        static let dumbbellSolid = Image("dumbbell_solid")
+        static let profileOutline = Image("profile_outline")
+        static let profileSolid = Image("profile_solid")
         static let elevator = Image("elevator")
         static let greenTea = Image("green_tea")
         static let giveawayModalBackground = Image("giveaway_modal_bg")
@@ -136,6 +140,8 @@ struct Constants {
         static let vertEllipsis = Image("vert_ellipsis")
         static let whistleOutline = Image("whistle_outline")
         static let whistleSolid = Image("whistle_solid")
+        static let settings = Image("settings")
+        static let profileEmpty = Image("profile_empty")
     }
 
     /// Padding amounts used in Uplift.

Uplift/Utils/DummyData.swift

@@ -710,4 +710,67 @@ struct DummyData {
         ]
     ]
 
+    /// Dummy data for profile view.
+    struct ProfileViewData {
+
+        // Profile data
+        static let profile = UserProfile(
+            id: "user123",
+            name: "Jiwon Jeong"
+        )
+
+        static let totalWorkouts = 132
+        static let streaks = 14
+        static let badges = 6
+
+        // Create dates for the week
+        static let weekDates: [Date] = {
+            [25, 26, 27, 28, 29, 30, 31].map { day -> Date in
+                var components = DateComponents()
+                components.year = 2024
+                components.month = 3
+                components.day = day
+                return Calendar.current.date(from: components) ?? Date()
+            }
+        }()
+
+        static let weeklyWorkouts = WeeklyWorkoutData(
+            currentWeekWorkouts: 0,
+            weeklyGoal: 5,
+            weekDates: weekDates
+        )
+
+        static let workoutHistory: [WorkoutHistory] = [
+            WorkoutHistory(
+                id: "workout1",
+                location: "Helen Newman",
+                time: "6:30 PM",
+                date: "Fri Mar 29, 2024"
+            ),
+            WorkoutHistory(
+                id: "workout2",
+                location: "Teagle Up",
+                time: "7:15 PM",
+                date: "Thu Mar 28, 2024"
+            ),
+            WorkoutHistory(
+                id: "workout3",
+                location: "Helen Newman",
+                time: "6:32 PM",
+                date: "Tue Mar 26, 2024"
+            ),
+            WorkoutHistory(
+                id: "workout4",
+                location: "Toni Morrison",
+                time: "7:37 PM",
+                date: "Sun Mar 24, 2024"
+            ),
+            WorkoutHistory(
+                id: "workout5",
+                location: "Helen Newman",
+                time: "10:02 AM",
+                date: "Sat Mar 23, 2024"
+            )
+        ]
+    }
 }

Uplift/Utils/Extensions/Date+Extension.swift

@@ -85,4 +85,10 @@ extension Date {
         return thisDate.month == otherDate.month && thisDate.day == otherDate.day
     }
 
+    /// Creates a Date object from a string with the specified format.
+    static func fromString(_ dateString: String, format: String = "EEE MMM dd, yyyy") -> Date? {
+        let formatter = DateFormatter()
+        formatter.dateFormat = format
+        return formatter.date(from: dateString)
+    }
 }

Uplift/ViewModels/ProfileViewModel.swift

@@ -0,0 +1,44 @@
+//
+//  ProfileViewModel.swift
+//  Uplift
+//
+//  Created by jiwon jeong on 3/6/25.
+//  Copyright © 2025 Cornell AppDev. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - ViewModel
+extension ProfileView {
+    class ViewModel: ObservableObject {
+        @Published var profile: UserProfile?
+        @Published var showSettingsSheet = false
+        @Published var workoutHistory: [WorkoutHistory] = []
+        @Published var weeklyWorkouts: WeeklyWorkoutData = WeeklyWorkoutData(
+            currentWeekWorkouts: 0,
+            weeklyGoal: 5,
+            weekDates: []
+        )
+        @Published var totalWorkouts: Int = 0
+        @Published var streaks: Int = 14
+        @Published var badges: Int = 6
+
+        /// dummy data
+        func fetchUserProfile() {
+            self.profile = DummyData.ProfileViewData.profile
+            self.totalWorkouts = DummyData.ProfileViewData.totalWorkouts
+            self.streaks = DummyData.ProfileViewData.streaks
+            self.badges = DummyData.ProfileViewData.badges
+            self.weeklyWorkouts = DummyData.ProfileViewData.weeklyWorkouts
+            self.workoutHistory = DummyData.ProfileViewData.workoutHistory
+        }
+
+        private func createDate(day: Int) -> Date {
+            var components = DateComponents()
+            components.year = 2024
+            components.month = 3
+            components.day = day
+            return Calendar.current.date(from: components) ?? Date()
+        }
+    }
+}

Uplift/Views/MainView.swift

@@ -30,6 +30,7 @@ struct MainView: View {
                         .environmentObject(tabBarProp)
                 case .profile:
                     ProfileView()
+                        .environmentObject(tabBarProp)
                 }
             }
             .overlay(alignment: .bottom) {
@@ -116,7 +117,7 @@ struct MainView: View {
                 selectedTab = .profile
             } label: {
                 tabItemView(
-                    icon: selectedTab == .profile ? Constants.Images.whistleSolid : Constants.Images.whistleOutline,
+                    icon: selectedTab == .profile ? Constants.Images.profileSolid : Constants.Images.profileOutline,
                     name: "Profile"
                 )
             }