Skip to content

Commit

Permalink
Delete saved (#63)
Browse files Browse the repository at this point in the history
# *Delete unused code. and improve testing.*

## ✅ Testing
*Please ensure that the PR meets the testing requirements set by CodeCov
and that new functionality is appropriately tested.*
We currently are at 65% testing. I haven't been able to figure out how
to interact with datePickers inside the account details As it is we need
more testing for the workoutVideoView, FoodClassifierApp and some of
inputForm.


## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
terribilis authored Mar 14, 2024
1 parent c965c51 commit d059a47
Show file tree
Hide file tree
Showing 32 changed files with 338 additions and 1,361 deletions.
43 changes: 42 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,54 @@ The CS342 2024 Stronger application is using the [Spezi](https://github.com/Stan

*Provide a comprehensive description of your application, including figures showing the application. You can learn more on how to structure a README in the [Stanford Spezi Documentation Guide](https://swiftpackageindex.com/stanfordspezi/spezi/documentation/spezi/documentation-guide)*


The Stronger App consists of three main screens.



Home, Workout, and Food Tracking.

### Home
#### Daily Protein
#### Weekly Fitness Progress
The bottom half of the *Home* page is the weekly fitness progress.
It shows the current week and last week's progress. If it is the first week for the participant, only one week will be shown.
THe three buttons will navigate to workout selection.
Each button has a text below that will show if the exercise day was on average "Easy", "Medium", "Hard" or of it is incomplete.



### Workout

#### Workout selection
For week selection We use the account information. See Account info for more details.
To determine the exercise it queries the firestore to see what exercises are there. THere must be exercises for all workouts of a day for it to move onto the next exercise.
For example, if Day 1 consists of Squats, Pushups, Lunge Left and Lunge Right, there must be all 4 exercises for the workout to move onto the next date.

#### Workout Input


#### Workout Makeup Selection.
If the user wants to submit a workout for a particular week or exercise day, They can navigate here and select the exact week and day.


### Foodtracking


## Account details
Account has been augmented to include a startdate, weight, and height.

THe current week is determined by the amount of weeks from the Monday of the startdate selected. i.e. Monday is considered the start of a week.

> [!NOTE]
> Do you want to learn more about the Stanford Spezi Template Application and how to use, extend, and modify this application? Check out the [Stanford Spezi Template Application documentation](https://stanfordspezi.github.io/SpeziTemplateApplication)

## Contributing

*Ensure that you add an adequate contribution section to this README.*
Theo: Augmenting Account. Weekly summary on Home Page. Workout Selection, Workout day and week selection.
Logic for determining current week and curreent exercise day.



## License
Expand Down
132 changes: 12 additions & 120 deletions Stronger.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

74 changes: 0 additions & 74 deletions Stronger/Account/GoalResist.swift

This file was deleted.

111 changes: 0 additions & 111 deletions Stronger/Contacts/Contacts.swift

This file was deleted.

6 changes: 0 additions & 6 deletions Stronger/Exercise/WorkoutSelection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,6 @@ extension String {
}
}

extension String {
func removingNonAlphabeticCharacters3() -> String {
self.filter { $0.isLetter }
}
}

struct ContentView_Previews: PreviewProvider {
static var previews: some View {
WorkoutSelection(presentingAccount: .constant(false), selectedWeek: nil)
Expand Down
20 changes: 0 additions & 20 deletions Stronger/Helper/NavButton.swift

This file was deleted.

8 changes: 4 additions & 4 deletions Stronger/Home.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ struct HomeView: View {

return HomeView()
.previewWith(standard: StrongerStandard()) {
StrongerScheduler()
MockWebService()
// StrongerScheduler()
// MockWebService()
AccountConfiguration(building: details, active: MockUserIdPasswordAccountService())
}
}
Expand All @@ -93,8 +93,8 @@ struct HomeView: View {
CommandLine.arguments.append("--disableFirebase") // make sure the MockWebService is displayed
return HomeView()
.previewWith(standard: StrongerStandard()) {
StrongerScheduler()
MockWebService()
// StrongerScheduler()
// MockWebService()
AccountConfiguration {
MockUserIdPasswordAccountService()
}
Expand Down
88 changes: 0 additions & 88 deletions Stronger/HomeReal.swift

This file was deleted.

Loading

0 comments on commit d059a47

Please sign in to comment.