Added profile view, localizations, connection with member.php

Comedores Sociales.xcodeproj/project.pbxproj

@@ -23,7 +23,11 @@
 		356533A525449C3900F2F0DE /* Comedores_SocialesUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356533A425449C3900F2F0DE /* Comedores_SocialesUITests.swift */; };
 		356533B92544A1AF00F2F0DE /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356533B82544A1AF00F2F0DE /* LoginView.swift */; };
 		356533C42544B1FF00F2F0DE /* RegisterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356533C32544B1FF00F2F0DE /* RegisterView.swift */; };
+		3580269E258A5A2E00CDE7AE /* ProfileSummary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3580269D258A5A2E00CDE7AE /* ProfileSummary.swift */; };
+		358026A6258A5BB700CDE7AE /* ProfileModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358026A5258A5BB700CDE7AE /* ProfileModel.swift */; };
+		358026AB258A5DA600CDE7AE /* ProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358026AA258A5DA600CDE7AE /* ProfileView.swift */; };
 		358E94702558AC130074E928 /* NetworkingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 358E946F2558AC130074E928 /* NetworkingModel.swift */; };
+		35CAE51C258B9B7800FC27A6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 35CAE51E258B9B7800FC27A6 /* Localizable.strings */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -66,7 +70,13 @@
 		356533A625449C3900F2F0DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		356533B82544A1AF00F2F0DE /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
 		356533C32544B1FF00F2F0DE /* RegisterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterView.swift; sourceTree = "<group>"; };
+		3580269D258A5A2E00CDE7AE /* ProfileSummary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSummary.swift; sourceTree = "<group>"; };
+		358026A5258A5BB700CDE7AE /* ProfileModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileModel.swift; sourceTree = "<group>"; };
+		358026AA258A5DA600CDE7AE /* ProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileView.swift; sourceTree = "<group>"; };
 		358E946F2558AC130074E928 /* NetworkingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingModel.swift; sourceTree = "<group>"; };
+		35CAE51D258B9B7800FC27A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		35CAE51F258B9BC600FC27A6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		35CAE520258B9C2A00FC27A6 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -97,10 +107,12 @@
 		350E75972575672F006B17CC /* View */ = {
 			isa = PBXGroup;
 			children = (
+				350E75BB257576BD006B17CC /* CustomNavigationView.swift */,
 				350E75B325757572006B17CC /* FoodCardView.swift */,
+				3580269D258A5A2E00CDE7AE /* ProfileSummary.swift */,
+				358026AA258A5DA600CDE7AE /* ProfileView.swift */,
 				350E759D257567F2006B17CC /* Search */,
-				350E759C257567E4006B17CC /* Login */,
-				350E75BB257576BD006B17CC /* CustomNavigationView.swift */,
+				350E759C257567E4006B17CC /* Auth */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -112,17 +124,18 @@
 				3565338B25449C3800F2F0DE /* Persistence.swift */,
 				350E75AE2575687C006B17CC /* FoodItem.swift */,
 				350E75CC25758D92006B17CC /* UserSettings.swift */,
+				358026A5258A5BB700CDE7AE /* ProfileModel.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
 		};
-		350E759C257567E4006B17CC /* Login */ = {
+		350E759C257567E4006B17CC /* Auth */ = {
 			isa = PBXGroup;
 			children = (
 				356533B82544A1AF00F2F0DE /* LoginView.swift */,
 				356533C32544B1FF00F2F0DE /* RegisterView.swift */,
 			);
-			path = Login;
+			path = Auth;
 			sourceTree = "<group>";
 		};
 		350E759D257567F2006B17CC /* Search */ = {
@@ -137,6 +150,7 @@
 		3565337625449C3600F2F0DE = {
 			isa = PBXGroup;
 			children = (
+				35CAE51E258B9B7800FC27A6 /* Localizable.strings */,
 				3565338125449C3600F2F0DE /* Comedores Sociales */,
 				3565339825449C3800F2F0DE /* Comedores SocialesTests */,
 				356533A325449C3900F2F0DE /* Comedores SocialesUITests */,
@@ -280,6 +294,8 @@
 			knownRegions = (
 				en,
 				Base,
+				es,
+				"es-419",
 			);
 			mainGroup = 3565337625449C3600F2F0DE;
 			productRefGroup = 3565338025449C3600F2F0DE /* Products */;
@@ -299,6 +315,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				3565338A25449C3800F2F0DE /* Preview Assets.xcassets in Resources */,
+				35CAE51C258B9B7800FC27A6 /* Localizable.strings in Resources */,
 				3565338725449C3800F2F0DE /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -324,6 +341,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				358026A6258A5BB700CDE7AE /* ProfileModel.swift in Sources */,
 				358E94702558AC130074E928 /* NetworkingModel.swift in Sources */,
 				356533B92544A1AF00F2F0DE /* LoginView.swift in Sources */,
 				3565338C25449C3800F2F0DE /* Persistence.swift in Sources */,
@@ -331,11 +349,13 @@
 				350E75CD25758D92006B17CC /* UserSettings.swift in Sources */,
 				350E75AF2575687C006B17CC /* FoodItem.swift in Sources */,
 				350E75C125757B24006B17CC /* SearchContainer.swift in Sources */,
+				358026AB258A5DA600CDE7AE /* ProfileView.swift in Sources */,
 				356533C42544B1FF00F2F0DE /* RegisterView.swift in Sources */,
 				350E75AA25756829006B17CC /* Search.swift in Sources */,
 				3565338F25449C3800F2F0DE /* Comedores_Sociales.xcdatamodeld in Sources */,
 				350E75BC257576BD006B17CC /* CustomNavigationView.swift in Sources */,
 				350E75B425757572006B17CC /* FoodCardView.swift in Sources */,
+				3580269E258A5A2E00CDE7AE /* ProfileSummary.swift in Sources */,
 				3565338325449C3600F2F0DE /* Comedores_SocialesApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -371,6 +391,19 @@
 		};
 /* End PBXTargetDependency section */
 
+/* Begin PBXVariantGroup section */
+		35CAE51E258B9B7800FC27A6 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				35CAE51D258B9B7800FC27A6 /* en */,
+				35CAE51F258B9BC600FC27A6 /* es */,
+				35CAE520258B9C2A00FC27A6 /* es-419 */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		356533A725449C3900F2F0DE /* Debug */ = {
 			isa = XCBuildConfiguration;

Comedores Sociales/ContentView.swift

@@ -10,10 +10,12 @@ import SwiftUI
 struct ContentView: View {
     @StateObject var lvm = LoginViewModel()
     @StateObject var rvm = RegisterViewModel()
+    @StateObject var pvm = ProfileViewModel()
 
     var body: some View {
-        if lvm.response ?? false || rvm.response ?? false {
+        if lvm.response == .success || rvm.response == .success || UserDefaults.standard.bool(forKey: "logged-in") {
             SearchContainer()
+                .environmentObject(pvm)
         } else {
             LoginView()
                 .environmentObject(lvm)

Comedores Sociales/Model/NetworkingModel.swift

@@ -10,16 +10,16 @@ import Foundation
 let serverAddress: String = "http://161.35.60.201/"
 
 class Authentication: Codable {
-    var username: String
+    var correo: String
     var password: String
     
     init(email: String, password: String) {
-        self.username = email
+        self.correo = email
         self.password = password
     }
     
     func isComplete() -> Bool {
-        if username != "" && password != "" {
+        if correo != "" && password != "" {
             return true
         } else {
             return false
@@ -78,17 +78,58 @@ class Registration: Codable {
     }
 }
 
+enum Response {
+    case success
+    case failure
+    case loading
+    case unfetched
+}
+
+struct UserToken: Codable {
+    let token: String
+}
+
+func getToken(input: String) -> UserToken {
+    let JSONData = input.data(using: .utf8)!
+    let token: UserToken = try! JSONDecoder().decode(UserToken.self, from: JSONData)
+    return token
+}
+
+struct UserDetails: Codable {
+    let correo: String
+    let nombre: String
+    let organizacion: String?
+    let puesto: String?
+    let calle: String
+    let pueblo: String
+    let cpostal: String
+    let telefono: String
+    let membresia: String?
+    let vigencia: String?
+    let horas_trabajadas: String?
+}
+
+func getUserDetails(input: String) -> UserDetails {
+    let JSONData = input.data(using: .utf8)!
+    let info: UserDetails = try! JSONDecoder().decode(UserDetails.self, from: JSONData)
+    return info
+}
 
 class LoginViewModel: ObservableObject {
-    @Published var response: Bool?
+    @Published var response: Response = .unfetched
     
     func changeResponse(response: Bool) {
-        self.response = response
+        if response == true {
+            self.response = .success
+        } else {
+            self.response = .failure
+        }
     }
     
     func login(data: Authentication) {
+        self.response = .loading
         
-        let service = "login.php"
+        let service = "api/login.php"
         guard let encodedData = try? JSONEncoder().encode(data)
         else {
             print("Failed to encode login request")
@@ -119,6 +160,13 @@ class LoginViewModel: ObservableObject {
                 DispatchQueue.main.async {
                     if httpResponse.statusCode == 200 {
                         self.changeResponse(response: true)
+                        // MARK: JSON Decoding
+                        let dataString = NSString(data: data, encoding: String.Encoding.utf8.rawValue)! as String
+                        let json = getToken(input: dataString)
+                        
+                        let defaults = UserDefaults.standard
+                        defaults.set(json.token, forKey: "token")
+                        defaults.set(true, forKey: "logged-in")
                     } else {
                         self.changeResponse(response: false)
                     }
@@ -131,13 +179,18 @@ class LoginViewModel: ObservableObject {
 }
 
 class RegisterViewModel: ObservableObject {
-    @Published var response: Bool?
+    @Published var response: Response = .unfetched
     
     func changeResponse(response: Bool) {
-        self.response = response
+        if response == true {
+            self.response = .success
+        } else {
+            self.response = .failure
+        }
     }
     
     func register(data: Registration) {
+        self.response = .loading
         
         let service = "signup.php"
         guard let encodedData = try? JSONEncoder().encode(data)
@@ -146,7 +199,7 @@ class RegisterViewModel: ObservableObject {
             return
         }
         
-        print("Reg JSON to send:", String(data: encodedData, encoding: .utf8)!)
+        //print("Reg JSON to send:", String(data: encodedData, encoding: .utf8)!)
         
         let url = URL(string: serverAddress + service)!
         var request = URLRequest(url: url)
@@ -178,3 +231,100 @@ class RegisterViewModel: ObservableObject {
         }.resume()
     }
 }
+
+
+class ProfileViewModel: ObservableObject {
+    @Published var profile: Profile = .default
+    @Published var response: Response = .unfetched
+    
+    func changeResponse(response: Bool) {
+        if response == true {
+            self.response = .success
+        } else {
+            self.response = .failure
+        }
+    }
+    
+    func changeProfile(data: UserDetails) {
+        self.profile.name = data.nombre
+        self.profile.email = data.correo
+        self.profile.phone = addDashes(phone: data.telefono)
+        
+        if data.membresia != "" {
+            self.profile.membership = data.membresia ?? "No memebership recieved from server"
+        }
+        if (data.vigencia != nil) {
+            self.profile.membershipStatus = .valid
+        } else {
+            self.profile.membershipStatus = .expired
+        }
+        
+        if let hours = data.horas_trabajadas {
+            self.profile.hoursWorked = Int(hours) ?? 0
+        }
+        
+    }
+    
+    func fetchMember(token: UserToken) {
+        self.response = .loading
+        
+        let service = "api/member.php"
+        guard let encodedData = try? JSONEncoder().encode(token)
+        else {
+            print("Failed to encode login request")
+            return
+        }
+        
+        //print("JSON to send:", String(data: encodedData, encoding: .utf8)!)
+        
+        let url = URL(string: serverAddress + service)!
+        var request = URLRequest(url: url)
+        request.setValue("appmember/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 {
+                        // MARK: JSON Decoding
+                        let dataString = NSString(data: data, encoding: String.Encoding.utf8.rawValue)! as String
+                        let json = getUserDetails(input: dataString)
+                        //print(json)
+                        self.changeResponse(response: true)
+                        self.changeProfile(data: json)
+                    } else {
+                        self.changeResponse(response: false)
+                    }
+                    
+                }
+            }
+            
+        }.resume()
+    }
+}
+
+func addDashes(phone: String) -> String {
+    var prettyPhone: String = ""
+    var i = 0
+    for number in phone {
+        prettyPhone.append(number)
+        if i == 2 || i == 5 {
+            prettyPhone.append("-")
+        }
+        i += 1
+    }
+    return prettyPhone
+}

Comedores Sociales/Model/ProfileModel.swift

@@ -0,0 +1,25 @@
+//
+//  ProfileModel.swift
+//  Comedores Sociales
+//
+//  Created by Hector Carrion on 12/16/20.
+//
+
+import Foundation
+
+struct Profile {
+    var name: String
+    var email: String
+    var phone: String
+    var membership: String
+    var membershipStatus = membership.undetermined
+    var hoursWorked: Int = 0
+
+    static let `default` = Profile(name: "Comedores Sociales", email: "user@comedores.com", phone: "787-555-5555", membership: "Loading...", membershipStatus: membership.undetermined, hoursWorked: 0)
+    
+    enum membership: String {
+        case valid = "Valid"
+        case expired = "Expired"
+        case undetermined = "Unknown"
+    }
+}

Comedores Sociales/View/Login/LoginView.swift → Comedores Sociales/View/Auth/LoginView.swift

@@ -22,14 +22,17 @@ struct LoginView: View {
             EmailField(email: $email)
             PasswordField(password: $password)
             
-            if loginVM.response == false {
-                Text("Information incorrect, please try again")
+            if loginVM.response == .failure {
+                Text(NSLocalizedString("incorrect", comment:""))
                     .offset(y: -10)
                     .foregroundColor(.red)
-            } else if loginVM.response == true {
+            } else if loginVM.response == .success {
                 Text("Login successful 🎉")
                     .offset(y: -10)
                     .foregroundColor(.green)
+            } else if loginVM.response == .loading {
+                ProgressView("Loading…")
+                    .padding()
             }
             
             Button(action: {
@@ -50,7 +53,7 @@ struct LoginView: View {
             }
             .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")))
+                Alert(title: Text(NSLocalizedString("incomplete", comment:"")), message: Text(NSLocalizedString("enter_valid", comment:"")), dismissButton: .default(Text("OK")))
                 
             }
         }
@@ -82,7 +85,7 @@ struct WelcomeImage: View {
 
 struct LoginText: View {
     var body: some View {
-        Text("Login")
+        Text(NSLocalizedString("login", comment:""))
             .font(.headline)
             .foregroundColor(.white)
             .padding()
@@ -95,7 +98,7 @@ struct LoginText: View {
 
 struct RegisterText: View {
     var body: some View {
-        Text("Don't have an account? Register")
+        Text(NSLocalizedString("register", comment:""))
             .font(.headline)
             .foregroundColor(.gray)
             .padding()
@@ -110,6 +113,7 @@ struct EmailField: View {
     @Environment(\.colorScheme) var colorScheme
     var body: some View {
         TextField("Email", text: $email)
+            .disableAutocorrection(true)
             .autocapitalization(.none)
             .padding()
             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)

Comedores Sociales/View/Login/RegisterView.swift → Comedores Sociales/View/Auth/RegisterView.swift

@@ -28,7 +28,7 @@ struct RegisterView: View {
     
     var body: some View {
         VStack {
-            Text("Details")
+            Text(NSLocalizedString("details", comment:""))
                 .font(.largeTitle)
                 .fontWeight(.semibold)
                 .frame(width: 350, height: 25, alignment: .topLeading)
@@ -37,7 +37,7 @@ struct RegisterView: View {
             ScrollView {
                 Group {
                     Group {
-                        TextField("Full Name", text: $name)
+                        TextField(NSLocalizedString("full_name", comment:""), text: $name)
                             .autocapitalization(.words)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
@@ -56,50 +56,50 @@ struct RegisterView: View {
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        SecureField("Password (confirmation)", text: $passwordConf)
+                        SecureField(NSLocalizedString("pass_conf", comment:""), text: $passwordConf)
                             .autocapitalization(.none)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
                     }
-                        TextField("Phone Number", text: $phoneNumber)
+                        TextField(NSLocalizedString("phone", comment:""), text: $phoneNumber)
                             .keyboardType(.numberPad)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("Urbanization", text: $urb)
+                        TextField(NSLocalizedString("urb", comment:""), text: $urb)
                             .padding()
                             .autocapitalization(.words)
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("Street", text: $street)
+                        TextField(NSLocalizedString("street", comment:""), text: $street)
                             .autocapitalization(.words)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("City", text: $city)
+                        TextField(NSLocalizedString("city", comment:""), text: $city)
                             .autocapitalization(.words)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("Zip Code", text: $zip)
+                        TextField(NSLocalizedString("zip", comment:""), text: $zip)
                             .keyboardType(.numberPad)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("Organization (optional)", text: $org)
+                        TextField(NSLocalizedString("org", comment:""), text: $org)
                             .autocapitalization(.words)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
                             .padding(.bottom, 5)
-                        TextField("Position (optional)", text: $position)
+                        TextField(NSLocalizedString("pos", comment:""), text: $position)
                             .padding()
                             .background(colorScheme == .dark ? darkGreyColor : lightGreyColor)
                             .cornerRadius(5.0)
@@ -108,11 +108,14 @@ struct RegisterView: View {
                 }.padding(5)
             }
             
-            if registerVM.response == false {
-                Text("Registration failed, please try again")
+            if registerVM.response == .failure {
+                Text(NSLocalizedString("reg_fail", comment:""))
                     //.offset(y: -5)
                     .foregroundColor(.red)
-            } else if registerVM.response == true {
+            } else if registerVM.response == .loading {
+                ProgressView("Loading…")
+                    .padding()
+            } else if registerVM.response == .success {
                 Text("Registration successful 🎉")
                     //.offset(y: -5)
                     .foregroundColor(.green)
@@ -138,7 +141,7 @@ struct RegisterView: View {
                 
                 
             }) {
-                Text("Register")
+                Text(NSLocalizedString("reg", comment:""))
                     .font(.headline)
                     .foregroundColor(.white)
                     .padding()
@@ -150,9 +153,9 @@ struct RegisterView: View {
             
             
         }.alert(isPresented: $showingAlert) {
-            Alert(title: Text("Fields incomplete"), message: Text("Please enter a all required information"), dismissButton: .default(Text("OK")))}
+            Alert(title: Text(NSLocalizedString("incomplete", comment:"")), message: Text(NSLocalizedString("enter_all", comment:"")), dismissButton: .default(Text("OK")))}
         .alert(isPresented: $passwordsAlert) {
-            Alert(title: Text("Passwords do not match"), message: Text("Please retype your password and try again"), dismissButton: .default(Text("OK")))}
+            Alert(title: Text(NSLocalizedString("pass_missmatch", comment:"")), message: Text(NSLocalizedString("pass_retype", comment:"")), dismissButton: .default(Text("OK")))}
         .padding()
     }
 }

Comedores Sociales/View/CustomNavigationView.swift

@@ -14,11 +14,9 @@ struct CustomNavigationView: UIViewControllerRepresentable {
         return CustomNavigationView.Coordinator(parent: self)
     }
     
-    // Just Change Your View That Requires Search Bar...
     var view: AnyView
     
     // Ease Of Use.....
-    
     var largeTitle: Bool
     var title: String
     var placeHolder: String
@@ -26,17 +24,19 @@ struct CustomNavigationView: UIViewControllerRepresentable {
     // onSearch And OnCancel Closures....
     var onSearch: (String)->()
     var onCancel: ()->()
+    var onClick: ()->()
     
     // requre closure on Call...
     
-    init(view: AnyView,placeHolder: String? = "Search",largeTitle: Bool? = true,title: String,onSearch: @escaping (String)->(),onCancel: @escaping ()->()) {
+    init(view: AnyView, placeHolder: String? = NSLocalizedString("search", comment:""), largeTitle: Bool? = true, title: String, onSearch: @escaping (String)->(), onCancel: @escaping ()->(), onClick: @escaping ()->()) {
       
-        self.title = title
+        self.title = title // Inventory
         self.largeTitle = largeTitle!
         self.placeHolder = placeHolder!
         self.view = view
         self.onSearch = onSearch
         self.onCancel = onCancel
+        self.onClick = onClick
     }
     
     // Integrating UIKit Navigation Controller With SwiftUI View...
@@ -89,6 +89,10 @@ struct CustomNavigationView: UIViewControllerRepresentable {
         init(parent: CustomNavigationView) {
             self.parent = parent
         }
+        func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) {
+            self.parent.onClick()
+            
+        }
         
         func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
             // when text changes....

Comedores Sociales/View/FoodCardView.swift

@@ -26,7 +26,7 @@ struct FoodCardView: View {
                     
                     VStack(alignment: .leading, spacing: 5) {
                         
-                        Text(item.name)
+                        Text(NSLocalizedString(item.name, comment:""))
                             .font(.title2)
                         
                         Text(item.cuantity)
@@ -40,7 +40,7 @@ struct FoodCardView: View {
                         
                         Button(action: {show.toggle()}) {
                             
-                            Text(show ? "Added" : "$" + String(item.priceLocal))
+                            Text(show ? NSLocalizedString("added", comment:"") : "$" + String(item.priceLocal))
                                 .fontWeight(.heavy)
                                 .padding(.vertical,8)
                                 .padding(.horizontal,20)
@@ -48,7 +48,7 @@ struct FoodCardView: View {
                                 .clipShape(Capsule())
                         }
                         
-                        Text("Savings of $" + String(item.savings))
+                        Text(NSLocalizedString("savings", comment:"") + String(item.savings))
                             .font(.caption2)
                             .foregroundColor(.green)
                     }

Comedores Sociales/View/ProfileSummary.swift

@@ -0,0 +1,91 @@
+//
+//  ProfileView.swift
+//  Comedores Sociales
+//
+//  Created by Hector Carrion on 12/16/20.
+//
+
+import SwiftUI
+
+struct ProfileSummary: View {
+    @State var profile: Profile
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            HStack {
+                Image(systemName: "person.crop.circle")
+                    .font(.system(size: 100))
+                VStack(alignment: .leading, spacing: 5) {
+                    Text(profile.name)
+                        .bold()
+                        .font(.title)
+                    Text(profile.membership)
+                        .font(.headline)
+                    
+                }
+                
+            }.padding()
+            .frame(width: 350, height: 125, alignment: .topLeading)
+            .offset(x: -10, y: 10.0)
+            
+            HStack {
+                Image(systemName: "envelope")
+                    .font(.system(size: 20))
+                    .foregroundColor(.gray)
+                Text(profile.email)
+                    .font(.headline)
+                    .foregroundColor(.gray)
+            }.padding()
+            .offset(x: 0, y: 10.0)
+            HStack {
+                Image(systemName: "phone")
+                    .font(.system(size: 20))
+                    .foregroundColor(.gray)
+                Text(profile.phone)
+                    .font(.headline)
+                    .foregroundColor(.gray)
+            }.padding()
+            
+            HStack() {
+                VStack {
+                    Text(String(profile.hoursWorked))
+                        .font(.title)
+                        .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                    Text(NSLocalizedString("hours_donated", comment:""))
+                        .foregroundColor(.gray)
+                }.padding()
+                
+                Spacer()
+                VStack {
+                    if profile.membershipStatus == .expired {
+                        Text(NSLocalizedString("expired", comment:""))
+                            .font(.title)
+                            .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                            .foregroundColor(.red)
+                    } else if profile.membershipStatus == .valid {
+                        Text(NSLocalizedString("valid", comment:""))
+                            .font(.title)
+                            .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                            .foregroundColor(.green)
+                    } else {
+                        Text(NSLocalizedString("unknown", comment:""))
+                            .font(.title)
+                            .fontWeight(/*@START_MENU_TOKEN@*/.bold/*@END_MENU_TOKEN@*/)
+                            .foregroundColor(.orange)
+                    }
+                    
+                    Text(NSLocalizedString("membership", comment:""))
+                        .foregroundColor(.gray)
+                }.padding()
+            }.padding()
+            .offset(x: 0, y: -10)
+            Spacer()
+        }
+    }
+}
+
+struct ProfileSummary_Previews: PreviewProvider {
+    static var previews: some View {
+        ProfileSummary(profile: Profile.default)
+    }
+}

Comedores Sociales/View/ProfileView.swift

@@ -0,0 +1,30 @@
+//
+//  ProfileView.swift
+//  Comedores Sociales
+//
+//  Created by Hector Carrion on 12/16/20.
+//
+
+import SwiftUI
+
+struct ProfileView: View {
+    
+    @EnvironmentObject var profileVM: ProfileViewModel
+    
+    var body: some View {
+            VStack(alignment: .leading, spacing: 20) {
+                if profileVM.response == .unfetched {
+                    ProfileSummary(profile: Profile.default)
+                } else if profileVM.response == .success {
+                    ProfileSummary(profile: profileVM.profile)
+                }
+            }
+            .padding()
+        }
+}
+
+struct ProfileView_Previews: PreviewProvider {
+    static var previews: some View {
+        ProfileView()
+    }
+}

Comedores Sociales/View/Search/SearchContainer.swift

@@ -9,27 +9,49 @@ import SwiftUI
 
 struct SearchContainer: View {
     @State var filteredItems = foods
+    @State var showingProfile: Bool = false
+    @EnvironmentObject var profileVM: ProfileViewModel
+    @State var hideButton = false
+    @State var disableButton = false
     
     var body: some View {
-
-        CustomNavigationView(view: AnyView(Search(filteredItems: $filteredItems)), placeHolder: "Search", largeTitle: true, title: "Inventory",
-                             
-            onSearch: { (txt) in
-
-            // filterting Data...
-            if txt != ""{
-                self.filteredItems = foods.filter{$0.name.lowercased().contains(txt.lowercased())}
-            }
-            else{
+        ZStack(alignment: .topTrailing) {
+            CustomNavigationView(view: AnyView(Search(filteredItems: $filteredItems)), placeHolder: NSLocalizedString("search", comment:""), largeTitle: true, title: NSLocalizedString("inventory", comment:""),
+                
+                onSearch: { (txt) in
+                // filterting Data...
+                if txt != ""{
+                    self.filteredItems = foods.filter{$0.name.lowercased().contains(txt.lowercased())}
+                }
+                else{
+                    self.filteredItems = foods
+                }
+                
+            }, onCancel: {
+                // Do Your Own Code When Search And Canceled....
                 self.filteredItems = foods
-            }
-            
-        }, onCancel: {
-            // Do Your Own Code When Search And Canceled....
-            self.filteredItems = foods
+                self.hideButton = false
+                self.disableButton = false
+                
+            }, onClick: {
+                self.hideButton = true
+                self.disableButton = true
+            })
+            .ignoresSafeArea()
             
-        })
-        .ignoresSafeArea()
+            Button(action: {
+                self.showingProfile.toggle()
+                let token = UserToken(token: UserDefaults.standard.string(forKey: "token")!)
+                profileVM.fetchMember(token: token)
+            }) {
+                Image(systemName: "person.crop.circle")
+                    .font(.system(size: 30))
+                    .opacity(hideButton ? 0 : 1)
+            }.disabled(disableButton)
+            .offset(x: 0, y: -10)
+            .padding()
+            .sheet(isPresented: $showingProfile, content: {ProfileView()})
+        }
     }
 }
 

en.lproj/Localizable.strings

@@ -0,0 +1,53 @@
+/* 
+  Localizable.strings
+  Comedores Sociales
+
+  Created by Hector Carrion on 12/17/20.
+  
+*/
+
+"hello_world" = "Hello, world!";
+"search" = "Search";
+"incorrect" = "Information incorrect, please try again";
+"incomplete" = "Fields incomplete";
+"enter_valid" = "Please enter a valid email and password";
+"login" = "Login";
+"register" = "Don't have an account? Register";
+"details" = "Details";
+"full_name" = "Full Name";
+"pass_conf" = "Password (confirmation)";
+"phone" = "Phone Number";
+"urb" = "Address";
+"street" = "Address (apt, suite, etc)";
+"city" = "City";
+"zip" = "Zip Code";
+"org" = "Company or Organization (optional)";
+"pos" = "Position (optional)";
+"reg_fail" = "Registration failed, please double-check all fields and try again";
+"reg" = "Register";
+"enter_all" = "Please enter a all required information";
+"pass_missmatch" = "Passwords do not match";
+"pass_retype" = "Please retype your password and try again";
+"inventory" = "Inventory";
+"hours_donated" = "Hours Donated";
+"membership" = "Membership";
+"added" = "Added";
+"savings" = "Savings of $";
+"valid" = "Valid";
+"expired" = "Expired";
+"unknown" = "Unknown";
+"Beans" = "Beans";
+"Carrots" = "Carrots";
+"Eggs" = "Eggs";
+"Malanga" = "Malanga";
+"Oatmeal" = "Oatmeal";
+"Pasta" = "Pasta";
+"Green Peppers" = "Green Peppers";
+"Pineapple" = "Pineapple";
+"Potatoes" = "Potatoes";
+"Rice" = "Rice";
+"Sausages" = "Sausages";
+"Vegetable Oil" = "Vegetable Oil";
+"Yellow Onions" = "Yellow Onions";
+"Yuca" = "Yuca";
+"Crackers" = "Crackers";

es-419.lproj/Localizable.strings

@@ -0,0 +1,53 @@
+/* 
+  Localizable.strings
+  Comedores Sociales
+
+  Created by Hector Carrion on 12/17/20.
+  
+*/
+
+"hello_world" = "Hola mundo!";
+"search" = "Buscar";
+"incorrect" = "Información incorrecta, trate nuevamente";
+"incomplete" = "Campos incompletos";
+"enter_valid" = "Porfavor entre email y password válidos";
+"login" = "Entrar";
+"register" = "¿No tiene cuenta? Regístrese";
+"details" = "Detalles";
+"full_name" = "Nombre Completo";
+"pass_conf" = "Password (confirmación)";
+"phone" = "Número de Teléfono";
+"urb" = "Urbanización";
+"street" = "Calle";
+"city" = "Ciudad";
+"zip" = "Código Zip";
+"org" = "Compañía o Organización (opcional)";
+"pos" = "Posición (optional)";
+"reg_fail" = "Error al registrar, verifique todos los campos y trate nuevamente";
+"reg" = "Registrarme";
+"enter_all" = "Porfavor complete todos los campos requeridos";
+"pass_missmatch" = "Passwords no coinciden";
+"pass_retype" = "Porfavor reescriba su password y trate nuevamente";
+"inventory" = "Inventario";
+"hours_donated" = "Horas Donadas";
+"membership" = "Membresía";
+"added" = "Añadido";
+"savings" = "Ahorros de $";
+"valid" = "Válida";
+"expired" = "Expirada";
+"unknown" = "Desconocida";
+"Beans" = "Habichuelas";
+"Carrots" = "Zanahorias";
+"Eggs" = "Huevos";
+"Malanga" = "Malanga";
+"Oatmeal" = "Avena";
+"Pasta" = "Pasta";
+"Green Peppers" = "Pimiento Verde";
+"Pineapple" = "Piña";
+"Potatoes" = "Papas";
+"Rice" = "Arroz";
+"Sausages" = "Salchichas";
+"Vegetable Oil" = "Aceite Vegetal";
+"Yellow Onions" = "Cebolla Amarilla";
+"Yuca" = "Yuca";
+"Crackers" = "Galletas";

es.lproj/Localizable.strings

@@ -0,0 +1,53 @@
+/* 
+  Localizable.strings
+  Comedores Sociales
+
+  Created by Hector Carrion on 12/17/20.
+  
+*/
+
+"hello_world" = "Hola mundo!";
+"search" = "Buscar";
+"incorrect" = "Información incorrecta, trate nuevamente";
+"incomplete" = "Campos incompletos";
+"enter_valid" = "Porfavor entre email y password válidos";
+"login" = "Entrar";
+"register" = "¿No tiene cuenta? Regístrese";
+"details" = "Detalles";
+"full_name" = "Nombre Completo";
+"pass_conf" = "Password (confirmación)";
+"phone" = "Número de Teléfono";
+"urb" = "Urbanización";
+"street" = "Calle";
+"city" = "Ciudad";
+"zip" = "Código Zip";
+"org" = "Compañía o Organización (opcional)";
+"pos" = "Posición (optional)";
+"reg_fail" = "Error al registrar, verifique todos los campos y trate nuevamente";
+"reg" = "Registrarme";
+"enter_all" = "Porfavor complete todos los campos requeridos";
+"pass_missmatch" = "Passwords no coinciden";
+"pass_retype" = "Porfavor reescriba su password y trate nuevamente";
+"inventory" = "Inventario";
+"hours_donated" = "Horas Donadas";
+"membership" = "Membresía";
+"added" = "Añadido";
+"savings" = "Ahorros de $";
+"valid" = "Válida";
+"expired" = "Expirada";
+"unknown" = "Desconocida";
+"Beans" = "Habichuelas";
+"Carrots" = "Zanahorias";
+"Eggs" = "Huevos";
+"Malanga" = "Malanga";
+"Oatmeal" = "Avena";
+"Pasta" = "Pasta";
+"Green Peppers" = "Pimiento Verde";
+"Pineapple" = "Piña";
+"Potatoes" = "Papas";
+"Rice" = "Arroz";
+"Sausages" = "Salchichas";
+"Vegetable Oil" = "Aceite Vegetal";
+"Yellow Onions" = "Cebolla Amarilla";
+"Yuca" = "Yuca";
+"Crackers" = "Galletas";