Added Registration Networking

Comedores Sociales/LoginView.swift

@@ -64,12 +64,12 @@ struct LoginView: View {
     @State var showingRegister: Bool = false
     
     @ObservedObject var loginVM = LoginViewModel()
+    @State private var showingAlert = false
     
     var body: some View {
         VStack {
             WelcomeImage()
             WelcomeText()
-            
             EmailField(email: $email)
             PasswordField(password: $password)
             
@@ -84,7 +84,13 @@ struct LoginView: View {
             }
             
             Button(action: {
-                    self.loginVM.login(data: Authentication(email: email, password: password))
+                let authData = Authentication(email: email, password: password)
+                if authData.isComplete() {
+                    self.loginVM.login(data: authData)
+                } else {
+                    // alert
+                    self.showingAlert = true
+                }
                 
             }) {
                 LoginText()
@@ -94,6 +100,10 @@ struct LoginView: View {
                 RegisterText()
             }
             .sheet(isPresented: $showingRegister, content: {RegisterView()})
+            .alert(isPresented: $showingAlert) {
+                Alert(title: Text("Fields incomplete"), message: Text("Please enter a valid email and password"), dismissButton: .default(Text("OK")))
+                
+            }
         }
         .padding()
     }

Comedores Sociales/NetworkingModel.swift

@@ -17,4 +17,63 @@ class Authentication: Codable {
         self.username = email
         self.password = password
     }
+    
+    func isComplete() -> Bool {
+        if username != "" && password != "" {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+class Registration: Codable {
+    var username: String
+    var password: String
+    var nombre: String
+    var urbanizacion: String
+    var calle: String
+    var pueblo: String
+    var cpostal: String
+    var telefono: String
+    var correo: String
+    var organizacion: String?
+    var puesto: String?
+    
+    init(email: String, password: String, name: String, urb: String, street: String, city: String, zip: String, phone: String, org: String? = nil, position: String? = nil) {
+        if org != "" {
+            self.username = email
+            self.password = password
+            self.nombre = name
+            self.urbanizacion = urb
+            self.calle = street
+            self.pueblo = city
+            self.cpostal = zip
+            self.telefono = phone
+            self.correo = email
+            self.organizacion = org
+            self.puesto = position
+            
+        } else {
+            self.username = email
+            self.password = password
+            self.nombre = name
+            self.urbanizacion = urb
+            self.calle = street
+            self.pueblo = city
+            self.cpostal = zip
+            self.telefono = phone
+            self.correo = email
+            self.organizacion = nil
+            self.puesto = nil
+        }
+    }
+    
+    func isComplete() -> Bool {
+        if username != "" && password != "" && nombre != "" && urbanizacion != "" && calle != "" && pueblo != "" && cpostal != "" && telefono != "" && correo != "" {
+            return true
+        } else {
+            return false
+        }
+    }
 }

Comedores Sociales/RegisterView.swift

@@ -7,14 +7,71 @@
 
 import SwiftUI
 
+class RegisterViewModel: ObservableObject {
+    @Published var response: Bool?
+    
+    func changeResponse(response: Bool) {
+        self.response = response
+    }
+    
+    func register(data: Registration) {
+        
+        let service = "signup.php"
+        guard let encodedData = try? JSONEncoder().encode(data)
+        else {
+            print("Failed to encode register request")
+            return
+        }
+        
+        print("Reg JSON to send:", String(data: encodedData, encoding: .utf8)!)
+        
+        let url = URL(string: serverAddress + service)!
+        var request = URLRequest(url: url)
+        request.setValue("appregister/json", forHTTPHeaderField: "Content-Type")
+        request.httpMethod = "POST"
+        request.httpBody = encodedData
+        
+        URLSession.shared.dataTask(with: request) {data, response, error in
+            
+            //handle result here
+            guard let data = data
+            else {
+                print("No data in response: \(error?.localizedDescription ?? "Unknown error").")
+                return
+            }
+            print(response ?? "No response")
+            print("Recieved data:", data)
+            print(error ?? "No error")
+            
+            if let httpResponse = response as? HTTPURLResponse {
+                DispatchQueue.main.async {
+                    if httpResponse.statusCode == 200 {
+                        self.changeResponse(response: true)
+                    } else {
+                        self.changeResponse(response: false)
+                    }
+                }
+            }
+        }.resume()
+    }
+}
+
 struct RegisterView: View {
-    @State var firstName: String = ""
-    @State var lastName: String = ""
+    @State var name: String = ""
     @State var phoneNumber: String = ""
     @State var email: String = ""
     @State var password: String = ""
+    @State var urb: String = ""
+    @State var city: String = ""
+    @State var street: String = ""
+    @State var org: String = ""
+    @State var position: String = ""
+    @State var zip: String = ""
     @Environment(\.colorScheme) var colorScheme
     
+    @ObservedObject var registerVM = RegisterViewModel()
+    @State private var showingAlert = false
+    
     var body: some View {
         VStack {
             Text("Details")
@@ -23,36 +80,90 @@ struct RegisterView: View {
                 .frame(width: 350, height: 25, alignment: .topLeading)
                 .padding(.bottom, 20)
             
-            TextField("First Name", text: $firstName)
-                .padding()
-                .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
-                .cornerRadius(5.0)
-                .padding(.bottom, 5)
-            TextField("Last Name", text: $lastName)
-                .padding()
-                .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
-                .cornerRadius(5.0)
-                .padding(.bottom, 5)
-            TextField("Phone Number", text: $phoneNumber)
-                .keyboardType(.numberPad)
-                .padding()
-                .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
-                .cornerRadius(5.0)
-                .padding(.bottom, 5)
-            TextField("Email", text: $email)
-                .autocapitalization(.none)
-                .padding()
-                .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
-                .cornerRadius(5.0)
-                .padding(.bottom, 5)
-            SecureField("Password", text: $password)
-                .autocapitalization(.none)
-                .padding()
-                .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
-                .cornerRadius(5.0)
-                .padding(.bottom, 20)
+            ScrollView {
+                Group {
+                    TextField("Full Name", text: $name)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Email", text: $email)
+                        .autocapitalization(.none)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    SecureField("Password", text: $password)
+                        .autocapitalization(.none)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Phone Number", text: $phoneNumber)
+                        .keyboardType(.numberPad)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Urbanization", text: $urb)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Street", text: $street)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("City", text: $city)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Zip Code", text: $zip)
+                        .keyboardType(.numberPad)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Organization (optional)", text: $org)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        .padding(.bottom, 5)
+                    TextField("Position (optional)", text: $position)
+                        .padding()
+                        .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
+                        .cornerRadius(5.0)
+                        //.padding(.bottom, 5)
+                    
+                }.padding(5)
+            }
+            
+            if self.registerVM.response == false {
+                Text("Registration failed, please try again")
+                    //.offset(y: -5)
+                    .foregroundColor(.red)
+            } else if self.registerVM.response == true {
+                Text("Registration successful 🎉")
+                    //.offset(y: -5)
+                    .foregroundColor(.green)
+            }
+            
             
-            Button(action: {print("register tapped")}) {
+            Button(action: {
+                print("register tapped")
+                
+                let registrationData = Registration(email: email, password: password, name: name, urb: urb, street: street, city: city, zip: zip, phone: phoneNumber, org: org, position: position)
+                
+                if registrationData.isComplete() {
+                    self.registerVM.register(data: registrationData)
+                } else {
+                    // Alert here
+                    self.showingAlert = true
+                }
+                
+            }) {
                 Text("Register")
                     .font(.headline)
                     .foregroundColor(.white)
@@ -64,7 +175,9 @@ struct RegisterView: View {
             }
             
             
-        }.padding()
+        }.alert(isPresented: $showingAlert) {
+            Alert(title: Text("Fields incomplete"), message: Text("Please enter a all required information"), dismissButton: .default(Text("OK")))}
+        .padding()
     }
 }