Merge branch 'main' of https://github.com/yale-swe/f23-here

yale-swe · Nov 4, 2023 · b4d3fc9 · b4d3fc9
2 parents 0379149 + 743d60c
commit b4d3fc9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/newHere1/newHere.xcodeproj/project.pbxproj b/app/newHere1/newHere.xcodeproj/project.pbxproj
@@ -20,6 +20,7 @@
 		1531A90F2AED9917009F644E /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A90E2AED9917009F644E /* Post.swift */; };
 		1531A9132AEDAE2A009F644E /* LocationDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A9122AEDAE2A009F644E /* LocationDataManager.swift */; };
 		1531A9152AEDCADB009F644E /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A9142AEDCADB009F644E /* Message.swift */; };
+		ECB2736F2AF6CCF80033D871 /* Registration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECB2736E2AF6CCF80033D871 /* Registration.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -57,6 +58,7 @@
 		1531A90E2AED9917009F644E /* Post.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Post.swift; sourceTree = "<group>"; };
 		1531A9122AEDAE2A009F644E /* LocationDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationDataManager.swift; sourceTree = "<group>"; };
 		1531A9142AEDCADB009F644E /* Message.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
+		ECB2736E2AF6CCF80033D871 /* Registration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Registration.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -114,6 +116,7 @@
 				1531A90A2AED964A009F644E /* Profile.swift */,
 				1531A90E2AED9917009F644E /* Post.swift */,
 				1531A9142AEDCADB009F644E /* Message.swift */,
+				ECB2736E2AF6CCF80033D871 /* Registration.swift */,
 				1531A9122AEDAE2A009F644E /* LocationDataManager.swift */,
 				1531A8E12AED95FF009F644E /* Assets.xcassets */,
 				1531A8E32AED95FF009F644E /* newHere.entitlements */,
@@ -281,6 +284,7 @@
 				1531A8E02AED95FD009F644E /* ContentView.swift in Sources */,
 				1531A90B2AED964A009F644E /* Profile.swift in Sources */,
 				1531A90D2AED9663009F644E /* Messages.swift in Sources */,
+				ECB2736F2AF6CCF80033D871 /* Registration.swift in Sources */,
 				1531A90F2AED9917009F644E /* Post.swift in Sources */,
 				1531A9152AEDCADB009F644E /* Message.swift in Sources */,
 				1531A9092AED9618009F644E /* Home.swift in Sources */,

diff --git a/...codeproj/project.xcworkspace/xcuserdata/sophia.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/sophia.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/app/newHere1/newHere/Registration.swift b/app/newHere1/newHere/Registration.swift
@@ -57,12 +57,12 @@ struct RegistrationView: View {
             "password": password
         ]
 
-        let jsonData = try ? JSONSerialization.data(withJSONObject: requestBody) else {
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: requestBody)
+        else {
             return
         }
 
-        let url = URL(string: registerUrlString) else {
-            print("Invalid URL")
+        guard let url = URL(string: registerUrlString) else {
             return
         }
 
@@ -78,6 +78,6 @@ struct RegistrationView: View {
 
 struct RegistrationView_Previews: PreviewProvider {
     static var previews: some View {
-        RegistrationView()
+        RegistrationView(isRegistered: self.isRegistered)
     }
 }