Mentor/Mentee Edit Profile Screens

ALUM/ALUM.xcodeproj/project.pbxproj

@@ -7,11 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0723BB862A1C995700911948 /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB852A1C995700911948 /* HomeScreen.swift */; };
-		0723BB8F2A1CDF7500911948 /* UnpairedScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB8E2A1CDF7500911948 /* UnpairedScreen.swift */; };
-		0723BB912A1D4ADE00911948 /* PreSessionFormRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB902A1D4ADE00911948 /* PreSessionFormRouter.swift */; };
-		0723BB932A1D576800911948 /* ProfileTabRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB922A1D576800911948 /* ProfileTabRouter.swift */; };
-		0723BB952A1D578400911948 /* HomeTabRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB942A1D578400911948 /* HomeTabRouter.swift */; };
 		0723BB862A1C995700911948 /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB852A1C995700911948 /* HomeScreen.swift */; };
 		0723BB8F2A1CDF7500911948 /* UnpairedScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB8E2A1CDF7500911948 /* UnpairedScreen.swift */; };
 		0723BB912A1D4ADE00911948 /* PreSessionFormRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0723BB902A1D4ADE00911948 /* PreSessionFormRouter.swift */; };
@@ -48,12 +43,6 @@
 		0799ACE52A00924F00EEAFA2 /* LoggedInRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0799ACE42A00924F00EEAFA2 /* LoggedInRouter.swift */; };
 		0799ACE92A00A6C200EEAFA2 /* APIConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0799ACE82A00A6C200EEAFA2 /* APIConfig.swift */; };
 		0799ACF22A01109100EEAFA2 /* LoginReviewPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0799ACF12A01109000EEAFA2 /* LoginReviewPage.swift */; };
-		07A565C82A1C3806008C96BC /* SessionDetailsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A565C72A1C3806008C96BC /* SessionDetailsScreen.swift */; };
-		07CA49932A1C50CC00A81153 /* DevelopmentModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CA49922A1C50CC00A81153 /* DevelopmentModels.swift */; };
-		07CA49962A1C53DA00A81153 /* ALUMColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CA49942A1C53DA00A81153 /* ALUMColor.swift */; };
-		07CA49972A1C53DA00A81153 /* ALUMText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CA49952A1C53DA00A81153 /* ALUMText.swift */; };
-		07E885362A19F0D300B7AD27 /* RootRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E885352A19F0D300B7AD27 /* RootRouter.swift */; };
-		07ECF5F72A2279940093C37B /* PostSessionFormRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07ECF5F62A2279940093C37B /* PostSessionFormRouter.swift */; };
 		07A15DD52A23FB5F00C52798 /* FullWidthButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A15DD42A23FB5F00C52798 /* FullWidthButtonStyle.swift */; };
 		07A565C82A1C3806008C96BC /* SessionDetailsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A565C72A1C3806008C96BC /* SessionDetailsScreen.swift */; };
 		07CA49932A1C50CC00A81153 /* DevelopmentModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07CA49922A1C50CC00A81153 /* DevelopmentModels.swift */; };
@@ -64,6 +53,14 @@
 		2A638880299FF3BC00F9EA97 /* DrawerContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63887F299FF3BC00F9EA97 /* DrawerContainer.swift */; };
 		2A8E07E2297B4FB0001AA153 /* OutlinedButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E07E1297B4FB0001AA153 /* OutlinedButtonStyle.swift */; };
 		2ADCE5BF299DBD570069802F /* ParagraphInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADCE5BE299DBD570069802F /* ParagraphInput.swift */; };
+		2C2195262A39212C00F313C0 /* MultipartRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2195252A39212C00F313C0 /* MultipartRequest.swift */; };
+		2C2195282A39667000F313C0 /* ImageService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2195272A39667000F313C0 /* ImageService.swift */; };
+		2C21952A2A397ED100F313C0 /* ProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2195292A397ED100F313C0 /* ProfileImage.swift */; };
+		2C27FDC82A1854CF007F66A9 /* EditMenteeProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C27FDC72A1854CF007F66A9 /* EditMenteeProfile.swift */; };
+		2C49296A2A1AD39A0060C0B7 /* EditMentorProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4929692A1AD39A0060C0B7 /* EditMentorProfile.swift */; };
+		2C49296C2A1AD88E0060C0B7 /* EditProfileImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C49296B2A1AD88E0060C0B7 /* EditProfileImage.swift */; };
+		2C49296E2A1ADAE90060C0B7 /* AboutInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C49296D2A1ADAE90060C0B7 /* AboutInput.swift */; };
+		2CA05CE02A2F096C0038E4DD /* EditProfileHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA05CDF2A2F096C0038E4DD /* EditProfileHeader.swift */; };
 		741D534229A4EDD3004C04E6 /* TagDisplay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741D534129A4EDD3004C04E6 /* TagDisplay.swift */; };
 		741D534429A4EED0004C04E6 /* AddTagButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 741D534329A4EED0004C04E6 /* AddTagButton.swift */; };
 		7439C6892A0AE88F00489708 /* ForgotPasswordSetUpScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7439C6882A0AE88F00489708 /* ForgotPasswordSetUpScreen.swift */; };
@@ -191,6 +188,14 @@
 		2A63887F299FF3BC00F9EA97 /* DrawerContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawerContainer.swift; sourceTree = "<group>"; };
 		2A8E07E1297B4FB0001AA153 /* OutlinedButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlinedButtonStyle.swift; sourceTree = "<group>"; };
 		2ADCE5BE299DBD570069802F /* ParagraphInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParagraphInput.swift; sourceTree = "<group>"; };
+		2C2195252A39212C00F313C0 /* MultipartRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipartRequest.swift; sourceTree = "<group>"; };
+		2C2195272A39667000F313C0 /* ImageService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageService.swift; sourceTree = "<group>"; };
+		2C2195292A397ED100F313C0 /* ProfileImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileImage.swift; sourceTree = "<group>"; };
+		2C27FDC72A1854CF007F66A9 /* EditMenteeProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMenteeProfile.swift; sourceTree = "<group>"; };
+		2C4929692A1AD39A0060C0B7 /* EditMentorProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMentorProfile.swift; sourceTree = "<group>"; };
+		2C49296B2A1AD88E0060C0B7 /* EditProfileImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileImage.swift; sourceTree = "<group>"; };
+		2C49296D2A1ADAE90060C0B7 /* AboutInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutInput.swift; sourceTree = "<group>"; };
+		2CA05CDF2A2F096C0038E4DD /* EditProfileHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileHeader.swift; sourceTree = "<group>"; };
 		741D534129A4EDD3004C04E6 /* TagDisplay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagDisplay.swift; sourceTree = "<group>"; };
 		741D534329A4EED0004C04E6 /* AddTagButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddTagButton.swift; sourceTree = "<group>"; };
 		7439C6882A0AE88F00489708 /* ForgotPasswordSetUpScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForgotPasswordSetUpScreen.swift; sourceTree = "<group>"; };
@@ -395,29 +400,6 @@
 			path = PostSessionForm;
 			sourceTree = "<group>";
 		};
-		07E885342A19F0B800B7AD27 /* Routers */ = {
-			isa = PBXGroup;
-			children = (
-				0799ACE42A00924F00EEAFA2 /* LoggedInRouter.swift */,
-				07E885352A19F0D300B7AD27 /* RootRouter.swift */,
-				0723BB922A1D576800911948 /* ProfileTabRouter.swift */,
-				0723BB942A1D578400911948 /* HomeTabRouter.swift */,
-			);
-			path = Routers;
-			sourceTree = "<group>";
-		};
-		07ECF5F82A22A94A0093C37B /* PostSessionForm */ = {
-			isa = PBXGroup;
-			children = (
-				974D62D029FAFA7C0096FE80 /* ViewPostSessionNotesPage.swift */,
-				0757552B29FAA2D6008E73FB /* MissedSessionScreen.swift */,
-				0757552629FAA2D5008E73FB /* PostSessionConfirmationScreen.swift */,
-				0757552529FAA2D5008E73FB /* PostSessionQuestionScreen.swift */,
-				07ECF5F62A2279940093C37B /* PostSessionFormRouter.swift */,
-			);
-			path = PostSessionForm;
-			sourceTree = "<group>";
-		};
 		07F9A50C297180D700BC11A8 /* Components */ = {
 			isa = PBXGroup;
 			children = (
@@ -453,6 +435,9 @@
 				8095FE7429E4153C006AA63C /* ProfileHeaderComponent.swift */,
 				8095FE7129E41214006AA63C /* NavigationComponent.swift */,
 				97F1DB6B2A09DD4600DE8DB4 /* SessionButtonComponent.swift */,
+				2C49296B2A1AD88E0060C0B7 /* EditProfileImage.swift */,
+				2C49296D2A1ADAE90060C0B7 /* AboutInput.swift */,
+				2C2195292A397ED100F313C0 /* ProfileImage.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -475,6 +460,7 @@
 				07A565C72A1C3806008C96BC /* SessionDetailsScreen.swift */,
 				07ECF5F82A22A94A0093C37B /* PostSessionForm */,
 				07E885342A19F0B800B7AD27 /* Routers */,
+				2C27FDC62A18544E007F66A9 /* EditProfile */,
 				0799ACF12A01109000EEAFA2 /* LoginReviewPage.swift */,
 				97A31AC729BAFA7600B79D30 /* PreSessionForm */,
 				97A2FE8B2989C20900405FD6 /* LoginScreen.swift */,
@@ -514,10 +500,22 @@
 				979303DF29E8B06E0053C30E /* SessionService.swift */,
 				8045EEB029F6844A00BD179C /* ServiceHelper.swift */,
 				0799ACE82A00A6C200EEAFA2 /* APIConfig.swift */,
+				2C2195252A39212C00F313C0 /* MultipartRequest.swift */,
+				2C2195272A39667000F313C0 /* ImageService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
 		};
+		2C27FDC62A18544E007F66A9 /* EditProfile */ = {
+			isa = PBXGroup;
+			children = (
+				2C27FDC72A1854CF007F66A9 /* EditMenteeProfile.swift */,
+				2C4929692A1AD39A0060C0B7 /* EditMentorProfile.swift */,
+				2CA05CDF2A2F096C0038E4DD /* EditProfileHeader.swift */,
+			);
+			path = EditProfile;
+			sourceTree = "<group>";
+		};
 		97992B5D29A6E7E200701CC7 /* SignUpPage */ = {
 			isa = PBXGroup;
 			children = (
@@ -722,11 +720,14 @@
 			files = (
 				0757553C29FAA387008E73FB /* NotesService.swift in Sources */,
 				0723BB912A1D4ADE00911948 /* PreSessionFormRouter.swift in Sources */,
+				2CA05CE02A2F096C0038E4DD /* EditProfileHeader.swift in Sources */,
 				0794653429DC536200B68EFD /* InputValidationComponent.swift in Sources */,
+				2C49296A2A1AD39A0060C0B7 /* EditMentorProfile.swift in Sources */,
 				8095FE7229E41214006AA63C /* NavigationComponent.swift in Sources */,
 				07CA49932A1C50CC00A81153 /* DevelopmentModels.swift in Sources */,
 				07CA49962A1C53DA00A81153 /* ALUMColor.swift in Sources */,
 				0757552029FAA2AB008E73FB /* StaticProgressBarComponent.swift in Sources */,
+				2C49296E2A1ADAE90060C0B7 /* AboutInput.swift in Sources */,
 				8071E52D2A044E2900BD11A3 /* CurrentUserModel.swift in Sources */,
 				2A638880299FF3BC00F9EA97 /* DrawerContainer.swift in Sources */,
 				979303E029E8B06E0053C30E /* SessionService.swift in Sources */,
@@ -750,6 +751,7 @@
 				9756DF752982338300A0BCB5 /* InputValidationText.swift in Sources */,
 				97886D0F29C1964B00548A12 /* ResizingTextBox.swift in Sources */,
 				0757552129FAA2AB008E73FB /* Bullet.swift in Sources */,
+				2C21952A2A397ED100F313C0 /* ProfileImage.swift in Sources */,
 				74CCE01F2A0B0B3D000AE3DD /* ForgotPasswordView.swift in Sources */,
 				97E439F029AD95FA00F0B7C1 /* SignUpSetUpScreen.swift in Sources */,
 				804AE4AD297B1DA4000B08F2 /* FilledInButtonStyle.swift in Sources */,
@@ -758,6 +760,7 @@
 				0757553029FAA2D6008E73FB /* PreSessionConfirmationScreen.swift in Sources */,
 				0726C9EF29DC4B120042A486 /* CustomErrors.swift in Sources */,
 				E3F4186629E7246400FDE56D /* CalendlyBooking.swift in Sources */,
+				2C27FDC82A1854CF007F66A9 /* EditMenteeProfile.swift in Sources */,
 				97E439F829AD986A00F0B7C1 /* SignUpJoinOption.swift in Sources */,
 				07E885362A19F0D300B7AD27 /* RootRouter.swift in Sources */,
 				0799ACF22A01109100EEAFA2 /* LoginReviewPage.swift in Sources */,
@@ -779,6 +782,7 @@
 				0757552229FAA2AB008E73FB /* CircleAddButton.swift in Sources */,
 				0757552E29FAA2D6008E73FB /* PostSessionConfirmationScreen.swift in Sources */,
 				974D62D129FAFA7C0096FE80 /* ViewPostSessionNotesPage.swift in Sources */,
+				2C49296C2A1AD88E0060C0B7 /* EditProfileImage.swift in Sources */,
 				0757553829FAA350008E73FB /* QuestionModel.swift in Sources */,
 				0757553429FAA2D6008E73FB /* ConfirmationScreen.swift in Sources */,
 				9760067C299FFCD2000945E2 /* SignUpPageView.swift in Sources */,
@@ -788,6 +792,7 @@
 				741D534229A4EDD3004C04E6 /* TagDisplay.swift in Sources */,
 				9752A4EA2978B90F001E0AAB /* TextInputFieldComponent.swift in Sources */,
 				979303D829E87E0E0053C30E /* SessionModel.swift in Sources */,
+				2C2195262A39212C00F313C0 /* MultipartRequest.swift in Sources */,
 				0799ACE32A007E8A00EEAFA2 /* LoadingScreen.swift in Sources */,
 				0723BB952A1D578400911948 /* HomeTabRouter.swift in Sources */,
 				80F5388A29AF6E8E00FB5E66 /* SignUpConfirmationMentorScreen.swift in Sources */,
@@ -797,6 +802,7 @@
 				979F812029B8181400D6E964 /* SelectYearComponent.swift in Sources */,
 				0723BB8F2A1CDF7500911948 /* UnpairedScreen.swift in Sources */,
 				075379F729B6A9F100A0DD5E /* TagEditor.swift in Sources */,
+				2C2195282A39667000F313C0 /* ImageService.swift in Sources */,
 				97E439F429AD97FA00F0B7C1 /* SignUpMenteeInfoScreen.swift in Sources */,
 				0748209129712921004AF547 /* ContentView.swift in Sources */,
 				979303DE29E885990053C30E /* HorizontalMenteeCard.swift in Sources */,

ALUM/ALUM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -95,8 +95,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/promises.git",
       "state" : {
-        "revision" : "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
-        "version" : "2.2.0"
+        "revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb",
+        "version" : "2.1.1"
       }
     },
     {

ALUM/ALUM/Assets.xcassets/CameraIcon.imageset/Contents.json

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

ALUM/ALUM/Assets.xcassets/DefaultProfileImage.imageset/Contents.json

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

ALUM/ALUM/Assets.xcassets/LibraryIcon.imageset/Contents.json

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

ALUM/ALUM/Assets.xcassets/TrashIcon.imageset/Contents.json

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

ALUM/ALUM/Components/ALUMTextFieldComponent.swift

@@ -11,6 +11,7 @@ struct ALUMTextFieldComponent: View {
     @State var title: String = ""
     @State var suggestion: String = ""
     @Binding var text: String
+    @State var isSecure = false
 
     var body: some View {
         VStack {
@@ -23,23 +24,28 @@ struct ALUMTextFieldComponent: View {
             }
             .padding(.bottom, 2).padding(.leading, 16)
 
-            TextField(suggestion, text: $text)
-                .padding(.init(top: 0.0, leading: 16.0, bottom: 0.0, trailing: 16.0))
-                .frame(height: 48.0)
-                .background(Color("ALUM White").cornerRadius(8.0))
-                .overlay(
-                    RoundedRectangle(cornerRadius: 8.0)
-                        .stroke(Color("NeutralGray3"), lineWidth: 1.0)
-                )
+            Group {
+                if isSecure {
+                    SecureField(suggestion, text: $text)
+                } else {
+                    TextField(suggestion, text: $text)
+                }
+            }
+            .padding(.init(top: 0.0, leading: 16.0, bottom: 0.0, trailing: 16.0))
+            .frame(height: 48.0)
+            .background(Color("ALUM White").cornerRadius(8.0))
+            .overlay(
+                RoundedRectangle(cornerRadius: 8.0)
+                    .stroke(Color("NeutralGray3"), lineWidth: 1.0)
+            )
             .padding(.init(top: 0.0, leading: 16.0, bottom: 32.0, trailing: 16.0))
         }
     }
 }
 
 struct ALUMTextFieldComponent_Previews: PreviewProvider {
-    static var text = Binding.constant("hello")
-
     static var previews: some View {
-        ALUMTextFieldComponent(text: text)
+        @State var text = "hello"
+        return ALUMTextFieldComponent(text: $text)
     }
 }