diff --git a/Werkout_ios/AccountView/AccountView.swift b/Werkout_ios/AccountView/AccountView.swift index 8dd6861..4f56f30 100644 --- a/Werkout_ios/AccountView/AccountView.swift +++ b/Werkout_ios/AccountView/AccountView.swift @@ -13,32 +13,48 @@ struct AccountView: View { @ObservedObject var userStore = UserStore.shared var body: some View { - VStack { + VStack(alignment: .leading) { if let registeredUser = userStore.registeredUser { - VStack(spacing: 10) { - if let nickName = registeredUser.nickName { - Text(nickName) - .font(.title) - } - - HStack { - Text(registeredUser.firstName ?? "-") - Text(registeredUser.lastName ?? "-") - } - - if let email = registeredUser.email { - Text(email) - } + if let nickName = registeredUser.nickName { + Text(nickName) + .font(.title) + } + + HStack { + Text(registeredUser.firstName ?? "-") + Text(registeredUser.lastName ?? "-") + } + + if let email = registeredUser.email { + Text(email) } } if let completedWorkouts = completedWorkouts { - Text("\(completedWorkouts.count)") + VStack(alignment: .leading) { + Divider() + Text("Workout History:") + HStack { + Text("Number of workouts:") + Text("\(completedWorkouts.count)") + } + + if let lastWorkout = completedWorkouts.last { + HStack { + Text("Last workout:") + Text(lastWorkout.workoutStartTime) + } + } + + } } Spacer() } + .padding() .onAppear{ -// fetchCompletedWorkouts() + if completedWorkouts == nil { + fetchCompletedWorkouts() + } } }