Skip to content

Commit 43f61f1

Browse files
JiwonJeong414JiwonJeong414
committed
Revert "Merge branch 'main' into jiwon/profile"
This reverts commit 77dfcee, reversing changes made to cff62ca.
1 parent 77dfcee commit 43f61f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+148
-1196
lines changed

‎Uplift.xcodeproj/project.pbxproj

+9-41
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2CA97C8F2D8B852700EF48B3 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2CA97C8E2D8B852700EF48B3 /* UpliftAPI */; };
1110
291433852D87387B00F913D5 /* UserProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433842D87387500F913D5 /* UserProfile.swift */; };
1211
291433872D87388C00F913D5 /* WeeklyWorkoutData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433862D87388800F913D5 /* WeeklyWorkoutData.swift */; };
1312
291433892D8738A400F913D5 /* WorkoutHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291433882D8738A200F913D5 /* WorkoutHistory.swift */; };
@@ -97,25 +96,19 @@
9796
636E3D442BBE1F3800B6EFFC /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 636E3D432BBE1F3800B6EFFC /* UpliftAPI */; };
9897
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 63A7ABCC2B86B971008D58FB /* UpliftAPI */; };
9998
63A7ABCF2B8C119A008D58FB /* Equipment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63A7ABCE2B8C119A008D58FB /* Equipment.swift */; };
100-
893AD9132D59468000C0817B /* DropDownArrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AD9122D59466F00C0817B /* DropDownArrow.swift */; };
101-
893AD9152D59569600C0817B /* MuscleCategoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AD9142D59569600C0817B /* MuscleCategoryView.swift */; };
102-
893AD9172D595DC800C0817B /* MuscleGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 893AD9162D595DC300C0817B /* MuscleGroupView.swift */; };
10399
89599A4E2BD4B39B00DA44DE /* FitnessClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89599A4D2BD4B39B00DA44DE /* FitnessClass.swift */; };
104100
89599A502BD4B4B600DA44DE /* FitnessClassInstance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */; };
105101
896500DC2BB4D33500D822AB /* ClassDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 896500DB2BB4D33500D822AB /* ClassDetailView.swift */; };
106102
897703662BA2028D00F9992F /* ClassesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897703652BA2028D00F9992F /* ClassesViewModel.swift */; };
107103
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 897DF9B92CCDC49B00246B0D /* UpliftAPI */; };
108-
8983A9A62CFEA077008E84DB /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 8983A9A52CFEA077008E84DB /* UpliftAPI */; };
109104
89950D8A2B992E8400DFB007 /* ClassesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89950D892B992E8400DFB007 /* ClassesView.swift */; };
110105
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8996FEDF2BDF351800F13C67 /* NextSessionCell.swift */; };
111106
899B186D2CA5FAFB00FAC061 /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899B186C2CA5FAFB00FAC061 /* ProfileView.swift */; };
112107
89A652F92D02B00000277A16 /* CapacityRemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F62D02B00000277A16 /* CapacityRemindersView.swift */; };
113108
89A652FA2D02B00000277A16 /* RemindersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89A652F72D02B00000277A16 /* RemindersView.swift */; };
114109
89C34AA12CA66E9C00C579A5 /* CapacityRemindersViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */; };
115110
89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C8658C2BB4779C00758337 /* ClassCell.swift */; };
116-
89CE47422D03F3C700BCB79D /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 89CE47412D03F3C700BCB79D /* UpliftAPI */; };
117-
89E4FAAA2CEFEC3C00A952B1 /* CapacitySemiCircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */; };
118-
89E4FAAC2CF28E7500A952B1 /* HourlyAverageCapacity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E4FAAB2CF28E6600A952B1 /* HourlyAverageCapacity.swift */; };
111+
89D26F202D7A9196007C839B /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 89D26F1F2D7A9196007C839B /* UpliftAPI */; };
119112
/* End PBXBuildFile section */
120113

121114
/* Begin PBXContainerItemProxy section */
@@ -204,9 +197,6 @@
204197
6329A4472CA0F89D00D30A2F /* CreateProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateProfileView.swift; sourceTree = "<group>"; };
205198
6329A4492CA0FE8A00D30A2F /* CheckBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxView.swift; sourceTree = "<group>"; };
206199
63A7ABCE2B8C119A008D58FB /* Equipment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Equipment.swift; sourceTree = "<group>"; };
207-
893AD9122D59466F00C0817B /* DropDownArrow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropDownArrow.swift; sourceTree = "<group>"; };
208-
893AD9142D59569600C0817B /* MuscleCategoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MuscleCategoryView.swift; sourceTree = "<group>"; };
209-
893AD9162D595DC300C0817B /* MuscleGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MuscleGroupView.swift; sourceTree = "<group>"; };
210200
89599A4D2BD4B39B00DA44DE /* FitnessClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitnessClass.swift; sourceTree = "<group>"; };
211201
89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitnessClassInstance.swift; sourceTree = "<group>"; };
212202
896500DB2BB4D33500D822AB /* ClassDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassDetailView.swift; sourceTree = "<group>"; };
@@ -218,8 +208,6 @@
218208
89A652F72D02B00000277A16 /* RemindersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemindersView.swift; sourceTree = "<group>"; };
219209
89C34AA02CA66E9000C579A5 /* CapacityRemindersViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacityRemindersViewModel.swift; sourceTree = "<group>"; };
220210
89C8658C2BB4779C00758337 /* ClassCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassCell.swift; sourceTree = "<group>"; };
221-
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapacitySemiCircleView.swift; sourceTree = "<group>"; };
222-
89E4FAAB2CF28E6600A952B1 /* HourlyAverageCapacity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HourlyAverageCapacity.swift; sourceTree = "<group>"; };
223211
/* End PBXFileReference section */
224212

225213
/* Begin PBXFrameworksBuildPhase section */
@@ -238,10 +226,9 @@
238226
63001AD82CC9AD970082AFFA /* GoogleSignIn in Frameworks */,
239227
2EE5F3E22B12EDB6008E0299 /* Apollo in Frameworks */,
240228
2E6785BC2B3A48D700DD3ADA /* WrappingHStack in Frameworks */,
229+
89D26F202D7A9196007C839B /* UpliftAPI in Frameworks */,
241230
2E4F06DC2B4B48DC008905C8 /* UpliftAPI in Frameworks */,
242-
2CA97C8F2D8B852700EF48B3 /* UpliftAPI in Frameworks */,
243231
2E090ECB2B12FF5900BAE982 /* UpliftAPI in Frameworks */,
244-
8983A9A62CFEA077008E84DB /* UpliftAPI in Frameworks */,
245232
2E45B2452B4F632700FB83B7 /* FirebaseAnalytics in Frameworks */,
246233
6338EC5F2CE14B54000BBFD3 /* UpliftAPI in Frameworks */,
247234
2E39D82F2B3BCBA400AD238B /* UpliftAPI in Frameworks */,
@@ -252,7 +239,6 @@
252239
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */,
253240
2E45B2402B4E361100FB83B7 /* FirebaseCrashlytics in Frameworks */,
254241
636E3D412BBE1EB100B6EFFC /* UpliftAPI in Frameworks */,
255-
89CE47422D03F3C700BCB79D /* UpliftAPI in Frameworks */,
256242
2E2932C62BA2B9B5008445CE /* UpliftAPI in Frameworks */,
257243
636E3D442BBE1F3800B6EFFC /* UpliftAPI in Frameworks */,
258244
2EC3EE662B3C000E00E927BF /* Kingfisher in Frameworks */,
@@ -277,16 +263,15 @@
277263
291433862D87388800F913D5 /* WeeklyWorkoutData.swift */,
278264
291433842D87387500F913D5 /* UserProfile.swift */,
279265
2E15F4D92B39102A00414BEC /* Capacity.swift */,
280-
2E6785C32B3A780600DD3ADA /* DayOfWeek.swift */,
281-
63A7ABCE2B8C119A008D58FB /* Equipment.swift */,
282-
2E15F4DD2B3912C700414BEC /* Facility.swift */,
283266
89599A4D2BD4B39B00DA44DE /* FitnessClass.swift */,
284267
89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */,
268+
2E6785C32B3A780600DD3ADA /* DayOfWeek.swift */,
269+
2E15F4DD2B3912C700414BEC /* Facility.swift */,
285270
2E15F4DF2B39143700414BEC /* Gym.swift */,
286271
2E39D8272B3B726D00AD238B /* GymTabType.swift */,
287-
89E4FAAB2CF28E6600A952B1 /* HourlyAverageCapacity.swift */,
288272
2E15F4DB2B39117300414BEC /* OpenHours.swift */,
289273
2E15F4E12B3917B200414BEC /* Status.swift */,
274+
63A7ABCE2B8C119A008D58FB /* Equipment.swift */,
290275
);
291276
path = Models;
292277
sourceTree = "<group>";
@@ -420,10 +405,6 @@
420405
isa = PBXGroup;
421406
children = (
422407
2E15F50B2B3A0B2100414BEC /* CapacityCircleView.swift */,
423-
89E4FAA92CEFEC3000A952B1 /* CapacitySemiCircleView.swift */,
424-
893AD9122D59466F00C0817B /* DropDownArrow.swift */,
425-
893AD9142D59569600C0817B /* MuscleCategoryView.swift */,
426-
893AD9162D595DC300C0817B /* MuscleGroupView.swift */,
427408
2E39D81B2B3B5F3700AD238B /* NavBackButton.swift */,
428409
2E39D8212B3B631200AD238B /* DividerLine.swift */,
429410
2E39D8252B3B6C6500AD238B /* SlidingTabBarView.swift */,
@@ -619,7 +600,7 @@
619600
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
620601
6338EC5B2CE149AA000BBFD3 /* UpliftAPI */,
621602
6338EC5E2CE14B54000BBFD3 /* UpliftAPI */,
622-
2CA97C8E2D8B852700EF48B3 /* UpliftAPI */,
603+
89D26F1F2D7A9196007C839B /* UpliftAPI */,
623604
);
624605
productName = Uplift;
625606
productReference = 2E8FE38C2B1278B700B3DC6A /* Uplift.app */;
@@ -660,7 +641,7 @@
660641
2EC3EE642B3C000E00E927BF /* XCRemoteSwiftPackageReference "Kingfisher" */,
661642
2E45B23E2B4E361100FB83B7 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
662643
63001AD42CC9A6B20082AFFA /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
663-
2CA97C8D2D8B852700EF48B3 /* XCLocalSwiftPackageReference "UpliftAPI" */,
644+
89D26F1E2D7A9196007C839B /* XCLocalSwiftPackageReference "UpliftAPI" */,
664645
);
665646
productRefGroup = 2E8FE38D2B1278B700B3DC6A /* Products */;
666647
projectDirPath = "";
@@ -772,13 +753,10 @@
772753
2E15F4FB2B39573C00414BEC /* Double+Extension.swift in Sources */,
773754
2E39D8162B3B3AD600AD238B /* ScaleButtonStyle.swift in Sources */,
774755
2E6785B92B3A425E00DD3ADA /* GymDetailView.swift in Sources */,
775-
893AD9152D59569600C0817B /* MuscleCategoryView.swift in Sources */,
776756
89C8658D2BB4779C00758337 /* ClassCell.swift in Sources */,
777757
291433852D87387B00F913D5 /* UserProfile.swift in Sources */,
778758
294CC21D2D7E34D300EF6487 /* WeeklyWorkoutTrackerView.swift in Sources */,
779759
2E1105BF2B13B0E100119F5B /* HomeViewModel.swift in Sources */,
780-
893AD9172D595DC800C0817B /* MuscleGroupView.swift in Sources */,
781-
89E4FAAA2CEFEC3C00A952B1 /* CapacitySemiCircleView.swift in Sources */,
782760
89599A4E2BD4B39B00DA44DE /* FitnessClass.swift in Sources */,
783761
2E15F5122B3A3D0000414BEC /* TriangleShape.swift in Sources */,
784762
2E8FE3922B1278B700B3DC6A /* HomeView.swift in Sources */,
@@ -789,8 +767,6 @@
789767
2E090EC52B12EF2600BAE982 /* Publishers.swift in Sources */,
790768
2E39D8222B3B631200AD238B /* DividerLine.swift in Sources */,
791769
2E15F5062B39F81B00414BEC /* MainView.swift in Sources */,
792-
893AD9132D59468000C0817B /* DropDownArrow.swift in Sources */,
793-
89E4FAAC2CF28E7500A952B1 /* HourlyAverageCapacity.swift in Sources */,
794770
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */,
795771
6329A4482CA0F89D00D30A2F /* CreateProfileView.swift in Sources */,
796772
2E39D82A2B3B9F3D00AD238B /* FacilityExpandedView.swift in Sources */,
@@ -1128,7 +1104,7 @@
11281104
/* End XCConfigurationList section */
11291105

11301106
/* Begin XCLocalSwiftPackageReference section */
1131-
2CA97C8D2D8B852700EF48B3 /* XCLocalSwiftPackageReference "UpliftAPI" */ = {
1107+
89D26F1E2D7A9196007C839B /* XCLocalSwiftPackageReference "UpliftAPI" */ = {
11321108
isa = XCLocalSwiftPackageReference;
11331109
relativePath = UpliftAPI;
11341110
};
@@ -1178,10 +1154,6 @@
11781154
/* End XCRemoteSwiftPackageReference section */
11791155

11801156
/* Begin XCSwiftPackageProductDependency section */
1181-
2CA97C8E2D8B852700EF48B3 /* UpliftAPI */ = {
1182-
isa = XCSwiftPackageProductDependency;
1183-
productName = UpliftAPI;
1184-
};
11851157
2E090ECA2B12FF5900BAE982 /* UpliftAPI */ = {
11861158
isa = XCSwiftPackageProductDependency;
11871159
productName = UpliftAPI;
@@ -1270,11 +1242,7 @@
12701242
isa = XCSwiftPackageProductDependency;
12711243
productName = UpliftAPI;
12721244
};
1273-
8983A9A52CFEA077008E84DB /* UpliftAPI */ = {
1274-
isa = XCSwiftPackageProductDependency;
1275-
productName = UpliftAPI;
1276-
};
1277-
89CE47412D03F3C700BCB79D /* UpliftAPI */ = {
1245+
89D26F1F2D7A9196007C839B /* UpliftAPI */ = {
12781246
isa = XCSwiftPackageProductDependency;
12791247
productName = UpliftAPI;
12801248
};

‎Uplift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

-186
This file was deleted.

‎Uplift/Models/Capacity.swift

-7
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,3 @@ enum CapacityStatus: Hashable {
5959
case veryBusy(Double)
6060

6161
}
62-
63-
/// An enumeration of the status message of the current capacity.
64-
enum CapacityText: String {
65-
case notBusy = "Not Busy"
66-
case slightlyBusy = "Slightly Busy"
67-
case veryBusy = "Very Busy"
68-
}

0 commit comments

Comments
 (0)