Added history page and color filter

Flowerdex/Flowerdex.xcodeproj/project.pbxproj

@@ -13,6 +13,10 @@
 		A52FB5C42546C2EA000AD235 /* rawResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = A52FB5C32546C2EA000AD235 /* rawResponse.json */; };
 		A5711B8B255CE03000E727BB /* Flower.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5711B8A255CE03000E727BB /* Flower.swift */; };
 		A5711B8E255CE53900E727BB /* DummyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5711B8D255CE53900E727BB /* DummyData.swift */; };
+		A5799DB02591390D003E975D /* HistoryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5799DAF2591390D003E975D /* HistoryService.swift */; };
+		A5799DB4259157AC003E975D /* FlowerVerbose.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5799DB3259157AC003E975D /* FlowerVerbose.swift */; };
+		A5799DB72591594D003E975D /* HistoryResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5799DB62591594D003E975D /* HistoryResponseModel.swift */; };
+		A5799DBB25915C2B003E975D /* FlowerVerboseDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5799DBA25915C2B003E975D /* FlowerVerboseDetailView.swift */; };
 		A58640BA258F30AD00F626AB /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58640B9258F30AD00F626AB /* LoginView.swift */; };
 		A58640BE258F30F200F626AB /* RegisterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58640BD258F30F200F626AB /* RegisterView.swift */; };
 		A59A2741254556880052319F /* FlowerdexApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59A2740254556880052319F /* FlowerdexApp.swift */; };
@@ -24,6 +28,8 @@
 		A5EA2F28258FEC3D00699182 /* FlowerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F27258FEC3D00699182 /* FlowerService.swift */; };
 		A5EA2F2C258FF0BD00699182 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F2B258FF0BD00699182 /* Constants.swift */; };
 		A5EA2F32258FF58200699182 /* Responses.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F31258FF58200699182 /* Responses.swift */; };
+		A5EA2F3A2590A62D00699182 /* HistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F392590A62D00699182 /* HistoryView.swift */; };
+		A5EA2F3F2590A65A00699182 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F3E2590A65A00699182 /* MainView.swift */; };
 		A5EE388D2576362B0014D0BE /* FilterFields.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE388C2576362B0014D0BE /* FilterFields.swift */; };
 		A5EE389125763D3A0014D0BE /* AuthenticationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE389025763D3A0014D0BE /* AuthenticationModel.swift */; };
 		A5EE3897257658400014D0BE /* Filters.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE3896257658400014D0BE /* Filters.swift */; };
@@ -42,6 +48,10 @@
 		A52FB5C32546C2EA000AD235 /* rawResponse.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = rawResponse.json; sourceTree = "<group>"; };
 		A5711B8A255CE03000E727BB /* Flower.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Flower.swift; sourceTree = "<group>"; };
 		A5711B8D255CE53900E727BB /* DummyData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DummyData.swift; sourceTree = "<group>"; };
+		A5799DAF2591390D003E975D /* HistoryService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryService.swift; sourceTree = "<group>"; };
+		A5799DB3259157AC003E975D /* FlowerVerbose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerVerbose.swift; sourceTree = "<group>"; };
+		A5799DB62591594D003E975D /* HistoryResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryResponseModel.swift; sourceTree = "<group>"; };
+		A5799DBA25915C2B003E975D /* FlowerVerboseDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerVerboseDetailView.swift; sourceTree = "<group>"; };
 		A58640B9258F30AD00F626AB /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
 		A58640BD258F30F200F626AB /* RegisterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterView.swift; sourceTree = "<group>"; };
 		A59A273D254556880052319F /* Flowerdex.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Flowerdex.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -55,6 +65,8 @@
 		A5EA2F27258FEC3D00699182 /* FlowerService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerService.swift; sourceTree = "<group>"; };
 		A5EA2F2B258FF0BD00699182 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		A5EA2F31258FF58200699182 /* Responses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Responses.swift; sourceTree = "<group>"; };
+		A5EA2F392590A62D00699182 /* HistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryView.swift; sourceTree = "<group>"; };
+		A5EA2F3E2590A65A00699182 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
 		A5EE388C2576362B0014D0BE /* FilterFields.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterFields.swift; sourceTree = "<group>"; };
 		A5EE389025763D3A0014D0BE /* AuthenticationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationModel.swift; sourceTree = "<group>"; };
 		A5EE3896257658400014D0BE /* Filters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filters.swift; sourceTree = "<group>"; };
@@ -81,9 +93,11 @@
 			isa = PBXGroup;
 			children = (
 				A51B4F762546674C002AFF05 /* FlowersResponseModel.swift */,
+				A5799DB62591594D003E975D /* HistoryResponseModel.swift */,
+				A5EE389025763D3A0014D0BE /* AuthenticationModel.swift */,
+				A5799DB3259157AC003E975D /* FlowerVerbose.swift */,
 				A5711B8A255CE03000E727BB /* Flower.swift */,
 				A5EE3896257658400014D0BE /* Filters.swift */,
-				A5EE389025763D3A0014D0BE /* AuthenticationModel.swift */,
 				A5F0D2FB258F3D2200AF735C /* User.swift */,
 			);
 			path = Model;
@@ -102,20 +116,22 @@
 		A5711B85255CCC1700E727BB /* View */ = {
 			isa = PBXGroup;
 			children = (
-				A58640AE258F213600F626AB /* Authentication */,
+				A58640AE258F213600F626AB /* Authentication Page */,
 				A5EE38B6257819AA0014D0BE /* Discover Page */,
+				A5EA2F382590A61000699182 /* History Page */,
+				A5EA2F3E2590A65A00699182 /* MainView.swift */,
 				A5EE38B2257818BE0014D0BE /* StatusIcons.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
 		};
-		A58640AE258F213600F626AB /* Authentication */ = {
+		A58640AE258F213600F626AB /* Authentication Page */ = {
 			isa = PBXGroup;
 			children = (
 				A58640B9258F30AD00F626AB /* LoginView.swift */,
 				A58640BD258F30F200F626AB /* RegisterView.swift */,
 			);
-			path = Authentication;
+			path = "Authentication Page";
 			sourceTree = "<group>";
 		};
 		A59A2734254556870052319F = {
@@ -162,9 +178,10 @@
 			isa = PBXGroup;
 			children = (
 				A50EEFCC255D175400545CFE /* ContentDataSource.swift */,
+				A5EE38A3257700230014D0BE /* ImageManager.swift */,
 				A5EA2F23258FEC2300699182 /* AuthenticationService.swift */,
 				A5EA2F27258FEC3D00699182 /* FlowerService.swift */,
-				A5EE38A3257700230014D0BE /* ImageManager.swift */,
+				A5799DAF2591390D003E975D /* HistoryService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -178,6 +195,15 @@
 			path = Supporting;
 			sourceTree = "<group>";
 		};
+		A5EA2F382590A61000699182 /* History Page */ = {
+			isa = PBXGroup;
+			children = (
+				A5EA2F392590A62D00699182 /* HistoryView.swift */,
+				A5799DBA25915C2B003E975D /* FlowerVerboseDetailView.swift */,
+			);
+			path = "History Page";
+			sourceTree = "<group>";
+		};
 		A5EE38B6257819AA0014D0BE /* Discover Page */ = {
 			isa = PBXGroup;
 			children = (
@@ -263,16 +289,21 @@
 			buildActionMask = 2147483647;
 			files = (
 				A50EEFCD255D175400545CFE /* ContentDataSource.swift in Sources */,
+				A5EA2F3F2590A65A00699182 /* MainView.swift in Sources */,
 				A5EA2F2C258FF0BD00699182 /* Constants.swift in Sources */,
 				A59A2743254556880052319F /* DiscoverView.swift in Sources */,
 				A5EE389125763D3A0014D0BE /* AuthenticationModel.swift in Sources */,
 				A5EE38A4257700230014D0BE /* ImageManager.swift in Sources */,
 				A5EE38B0257818520014D0BE /* FlowersList.swift in Sources */,
+				A5799DB02591390D003E975D /* HistoryService.swift in Sources */,
+				A5EA2F3A2590A62D00699182 /* HistoryView.swift in Sources */,
 				A51B4F772546674C002AFF05 /* FlowersResponseModel.swift in Sources */,
 				A5EE3897257658400014D0BE /* Filters.swift in Sources */,
 				A5711B8B255CE03000E727BB /* Flower.swift in Sources */,
 				A59A2741254556880052319F /* FlowerdexApp.swift in Sources */,
+				A5799DB72591594D003E975D /* HistoryResponseModel.swift in Sources */,
 				A5EA2F32258FF58200699182 /* Responses.swift in Sources */,
+				A5799DBB25915C2B003E975D /* FlowerVerboseDetailView.swift in Sources */,
 				A58640BE258F30F200F626AB /* RegisterView.swift in Sources */,
 				A5EE388D2576362B0014D0BE /* FilterFields.swift in Sources */,
 				A5F3271A25460C0B003BCE0F /* FlowerDetailView.swift in Sources */,
@@ -284,6 +315,7 @@
 				A5F0D2FC258F3D2200AF735C /* User.swift in Sources */,
 				A5EE38AC257772200014D0BE /* FiltersSheet.swift in Sources */,
 				A5EA2F28258FEC3D00699182 /* FlowerService.swift in Sources */,
+				A5799DB4259157AC003E975D /* FlowerVerbose.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Flowerdex/Flowerdex/FlowerdexApp.swift

@@ -12,11 +12,13 @@ struct FlowerdexApp: App {
     @StateObject var lm = LoginModel()
     @StateObject var rm = RegistrationModel()
     @StateObject var fm = FlowerService()
+    @StateObject var hm = HistoryService()
     var body: some Scene {
         WindowGroup {
             if User.exists() {
-                DiscoverView()
+                MainView()
                     .environmentObject(fm)
+                    .environmentObject(hm)
             } else {
                 LoginView()
                     .environmentObject(lm)

Flowerdex/Flowerdex/Model/Filters.swift

@@ -16,8 +16,9 @@ class Filters {
     var bloomMonths: Int
     var scientificName: String
     var commonName: String
+    var flowerColor: String
     
-    init(edible: Bool, vegetable: Bool, petalCount: Int, growthMonths: Int, bloomMonths: Int, scientificName: String, commonName: String) {
+    init(edible: Bool, vegetable: Bool, petalCount: Int, growthMonths: Int, bloomMonths: Int, scientificName: String, commonName: String, flowerColor: String) {
         self.edible = edible
         self.vegetable = vegetable
         self.petalCount = petalCount
@@ -25,6 +26,7 @@ class Filters {
         self.bloomMonths = bloomMonths
         self.scientificName = scientificName
         self.commonName = commonName
+        self.flowerColor = flowerColor
     }
     
 }

Flowerdex/Flowerdex/Model/Flower.swift

@@ -9,6 +9,7 @@ import Foundation
 
 struct Flower: Hashable, Codable, Identifiable {
     let id: Int
+    
     let common_name: String?
     var commonName: String {
         if let cm = common_name {
@@ -17,14 +18,25 @@ struct Flower: Hashable, Codable, Identifiable {
             return scientificName
         }
     }
+    
     let slug: String // *
+    
     let scientific_name: String
     var scientificName: String { scientific_name }
+    
+    let image_url: String?
+    var imageURL: String {
+        if let iu = image_url {
+            return iu
+        } else {
+            return "[Image URL]"
+        }
+    }
+    
     let year: Int?
     let bibliography: String?
     let author: String? // *
-    let status: String // *
-    let rank: String // *
+    
     let family_common_name: String?
     var familyCommonName: String {
         if let fcn = family_common_name {
@@ -33,30 +45,24 @@ struct Flower: Hashable, Codable, Identifiable {
             return "[Family Common Name]"
         }
     }
+    
     let genus_id: Int // *
     var genusID: Int { genus_id }
-    let image_url: String?
-    var imageURL: String {
-        if let iu = image_url {
-            return iu
-        } else {
-            return "[Image URL]"
-        }
-    }
+    
+    let status: String // *
+    let rank: String // *
     let synonyms: [String]
     let genus: String
     let family: String
-    let links: Dictionary<String, String> // FlowerLinks
+    let links: FlowerLinks
     
     // Properties added by us
     let isFavorite: Bool
     let hasBeenFound: Bool
 }
 
-/*
-struct FlowerLinks: Codable {
-    // let self: String
+struct FlowerLinks: Codable, Hashable {
+     let `self`: String
     let plant: String
     let genus: String
 }
-*/

Flowerdex/Flowerdex/Model/FlowerVerbose.swift

@@ -0,0 +1,111 @@
+//
+//  FlowerVerbose.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import Foundation
+
+struct FlowerVerbose: Hashable, Identifiable, Codable {
+    let id: Int
+    
+    let common_name: String?
+    var commonName: String {
+        if let cm = common_name {
+            return cm
+        } else {
+            return scientificName
+        }
+    }
+    
+    let slug: String // *
+    
+    let scientific_name: String
+    var scientificName: String { scientific_name }
+    
+    let image_url: String?
+    var imageURL: String {
+        if let iu = image_url {
+            return iu
+        } else {
+            return "[Image URL]"
+        }
+    }
+    
+    let year: Int?
+    let bibliography: String?
+    let author: String? // *
+    
+    let family_common_name: String?
+    var familyCommonName: String {
+        if let fcn = family_common_name {
+            return fcn
+        } else {
+            return "[Family Common Name]"
+        }
+    }
+    
+    let genus_id: Int // *
+    var genusID: Int { genus_id }
+    
+    let observations: String? // new
+    let vegetable: Bool? // new
+    let links: FlowerLinks
+    let genus: GenusVerbose? // changed
+    let family: FamilyVerbose? // changed
+    let species: [Flower]? // new
+    
+//    let subspecies: []
+//    let varieties: []
+//    let hybrids: []
+//    let forms : []
+//    let subvarieties: []
+//    let sources: []
+    
+    // Properties added by us
+    let isFavorite: Bool
+    let hasBeenFound: Bool
+}
+
+struct GenusVerbose: Codable, Hashable, Identifiable {
+    let id: Int
+    let name: String
+    let slug: String
+    let links: FlowerLinks
+}
+
+struct FamilyVerbose: Codable, Hashable, Identifiable {
+    let id: Int
+    let name: String
+    let common_name: String
+    let slug: String
+    let links: FlowerLinks
+}
+
+/*
+ "id": 238331,
+ "common_name": null,
+ "slug": "senecio-gamolepis",
+ "scientific_name": "Senecio gamolepis",
+ "main_species_id": 273225,
+ "image_url": null,
+ "year": 1955,
+ "bibliography": "Notas Mus. La Plata, Bot. 18(89): 222 (1955)",
+ "author": "Cabrera",
+ "family_common_name": "Aster family",
+ "genus_id": 669,
+ "observations": "Peru",
+ "vegetable": false,
+ "links": {},
+ "main_species": {},
+ "genus": {},
+ "family": {},
+ "species": [],
+ "subspecies": [ ],
+ "varieties": [ ],
+ "hybrids": [ ],
+ "forms": [ ],
+ "subvarieties": [ ],
+ "sources": []
+ */

Flowerdex/Flowerdex/Model/HistoryResponseModel.swift

@@ -0,0 +1,13 @@
+//
+//  HistoryResponseModel.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import Foundation
+
+struct HistoryResponseModel: Hashable, Codable {
+    let data: [FlowerVerbose]?
+    let error: String?
+}

Flowerdex/Flowerdex/Services/FlowerService.swift

@@ -20,13 +20,13 @@ class FlowerService: ObservableObject {
         list.append(URLQueryItem(name: "vegetable", value: "\(filters.vegetable)"))
         
         if filters.commonName != "" {
-            list.append(URLQueryItem(name: "q", value: filters.commonName))
+            list.append(URLQueryItem(name: "q", value: filters.commonName.lowercased()))
         }
-//        list.append(URLQueryItem(name: "common_name", value: filters.commonName)) // if common_name was empty, which didn't make sense
+//        list.append(URLQueryItem(name: "common_name", value: filters.commonName.lowercased())) // if common_name was empty, which didn't make sense
         
 
         if filters.scientificName != "" {
-            list.append(URLQueryItem(name: "scientific_name", value: filters.scientificName))
+            list.append(URLQueryItem(name: "scientific_name", value: filters.scientificName.lowercased()))
         }
         
         if filters.growthMonths > 0 {
@@ -37,6 +37,10 @@ class FlowerService: ObservableObject {
             list.append(URLQueryItem(name: "bloom_months", value: "\(filters.bloomMonths)"))
         }
         
+        if filters.flowerColor != "" {
+            list.append(URLQueryItem(name: "flower_color", value: filters.flowerColor.lowercased()))
+        }
+        
         return list
         
     }

Flowerdex/Flowerdex/Services/HistoryService.swift

@@ -0,0 +1,100 @@
+//
+//  HistoryService.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import Foundation
+
+class HistoryService: ObservableObject {
+    
+    @Published var response: Response = .unfetched
+    @Published var items = [FlowerVerbose]()
+    
+    
+    private func getBaseURLComponent(_ apiPath: String) -> URLComponents {
+        var components = URLComponents()
+        components.scheme = Constants.Services.apiScheme
+        components.host = Constants.Services.apiHost
+        components.path = apiPath
+        if apiPath == Constants.Services.apiGetHistoryPath {
+            components.queryItems = [
+                URLQueryItem(name: "user_id", value: "\(User.current.id!)"),
+            ]
+        }
+        return components
+    }
+    
+    
+    private func fetchFlowers(_ request: URLRequest) {
+        URLSession.shared.dataTask(with: request) { data, response, error in
+            guard let data = data else {
+                print("No data in response: \(error?.localizedDescription ?? "Unknown error")")
+                DispatchQueue.main.async {
+                    self.response = .failure
+                }
+                return
+            }
+            print(response ?? "No response")
+//            print("Recieved data:", String(decoding: data, as: UTF8.self))
+            
+            guard let apiResponse = try? JSONDecoder().decode(HistoryResponseModel.self, from: data) else {
+                print("Failed to decode History response")
+                DispatchQueue.main.async {
+                    self.response = .failure
+                }
+                return
+            }
+            
+            if let httpResponse = response as? HTTPURLResponse {
+                DispatchQueue.main.async {
+                    if httpResponse.statusCode == 200 && apiResponse.error == nil {
+                        print("No error")
+                        self.response = .success
+                        self.items = apiResponse.data!
+                    } else {
+                        print("Error: \(apiResponse.error ?? "Unknown error")")
+                        self.response = .failure
+//                        self.items = [FlowerVerbose]()
+                    }
+                }
+            }
+        }.resume()
+    }
+    
+    
+    func getHistory() {
+        
+        // Start loading state
+        self.response = .loading
+        
+        // Construct URL
+        let components = getBaseURLComponent(Constants.Services.apiGetHistoryPath)
+        
+        // Prepare and carry out request
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "GET"
+        self.fetchFlowers(request)
+        
+    }
+    
+    
+    func getWishlist() {
+        
+        // Start loading state
+        self.response = .loading
+        
+        // Construct URL
+        let components = getBaseURLComponent(Constants.Services.apiGetWishlistPath)
+        
+        // Prepare and carry out request
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "GET"
+        self.fetchFlowers(request)
+        
+    }
+    
+    
+    
+}

Flowerdex/Flowerdex/Services/ImageManager.swift

@@ -45,48 +45,3 @@ class ImageManager: ObservableObject {
     }
     
 }
-
-//
-//class HistoryManager: ObservableObject {
-//    
-//    @Published var response: Response = .unfetched
-//    @Published var hasBeenFound = false
-//    let baseURL = "https://ada.uprrp.edu/~victor.hernandez17/"
-//    let foundEndpoint = "flowerdex/isFoundFlower.php"
-//    let putFoundEndpoint = "flowerdex/putFoundFlower.php"
-//    let removeFoundEndpoint = "flowerdex/removeFoundFlower.php"
-//    
-//    func fetch() {
-//        
-//        // Start loading state
-//        self.response = .loading
-//        
-//        let urlString = baseURL + foundEndpoint
-//        
-//        if let url = URL(string: urlString) {
-//            URLSession(configuration: .default).dataTask(with: url) { data, response, error in
-//                
-//                if error != nil {
-//                    print("Error occurred: \(error?.localizedDescription ?? "Unknown error")")
-//                    return
-//                }
-//                
-//                guard let data = data else {
-//                    print("No data in response: \(error?.localizedDescription ?? "Unknown error")")
-//                    return
-//                }
-//                
-//                DispatchQueue.main.async {
-//                    if let img = UIImage(data: data) {
-//                        self.image = img
-//                        self.response = .success
-//                    } else {
-//                        self.response = .failure
-//                    }
-//                }
-//                
-//            }.resume()
-//        }
-//    }URLSession.shared.dataTask(with: request) { data, response, error in
-//    
-//}

Flowerdex/Flowerdex/Supporting/Constants.swift

@@ -24,6 +24,8 @@ struct Constants {
         static let apiRemoveFavoritePath = "/~victor.hernandez17/flowerdex/removeFavoriteFlower.php"
         static let apiPutFoundPath = "/~victor.hernandez17/flowerdex/putFoundFlower.php"
         static let apiRemoveFoundPath = "/~victor.hernandez17/flowerdex/removeFoundFlower.php"
+        static let apiGetHistoryPath = "/~victor.hernandez17/flowerdex/listHistory.php"
+        static let apiGetWishlistPath = "/~victor.hernandez17/flowerdex/getWishlist.php"
     }
     
     struct Colors {

Flowerdex/Flowerdex/View/Discover Page/DiscoverView.swift

@@ -21,6 +21,7 @@ struct DiscoverView: View {
     @State var bloomMonths: Int = 0
     @State var scientificName: String = ""
     @State var commonName: String = ""
+    @State var flowerColor: String = ""
     
     init() {
         // FROM: https://sarunw.com/posts/uinavigationbar-changes-in-ios13/
@@ -42,12 +43,15 @@ struct DiscoverView: View {
                     FilterButtonIcon()
                 }
                 .sheet(isPresented: $showingFilterPane, content: {
-                    FiltersSheet(showingFilterPane: $showingFilterPane, page: $page, edible: $edible, vegetable: $vegetable, petalCount: $petalCount, growthMonths: $growthMonths, bloomMonths: $bloomMonths, scientificName: $scientificName, commonName: $commonName)
+                    FiltersSheet(showingFilterPane: $showingFilterPane, page: $page, edible: $edible, vegetable: $vegetable, petalCount: $petalCount, growthMonths: $growthMonths, bloomMonths: $bloomMonths, scientificName: $scientificName, commonName: $commonName, flowerColor: $flowerColor)
                 })
             )
         }
         .onAppear {
-            self.fModel.getFlowers(p: page, f: nil)
+            // Refresh only if there's no items loaded yet
+            if self.fModel.items.count == 0 {
+                self.fModel.getFlowers(p: page, f: nil)
+            }
         }
     }
     

Flowerdex/Flowerdex/View/Discover Page/FilterFields.swift

@@ -16,6 +16,7 @@ struct FilterFields: View {
     @Binding var bloomMonths: Int
     @Binding var scientificName: String
     @Binding var commonName: String
+    @Binding var flowerColor: String
     
     var body: some View {
         VStack {
@@ -27,6 +28,7 @@ struct FilterFields: View {
             BloomMonthsField(bloomMonths: $bloomMonths)
             CommonNameField(commonName: $commonName)
             ScientificNameField(scientificName: $scientificName)
+            FlowerColorField(flowerColor: $flowerColor)
         }
         .padding()
     }
@@ -41,6 +43,20 @@ struct MainText: View {
     }
 }
 
+struct FlowerColorField: View {
+    @Binding var flowerColor: String
+    @Environment(\.colorScheme) var colorScheme
+    var body: some View {
+        TextField("FlowerColor", text: $flowerColor)
+            .disableAutocorrection(true)
+            .autocapitalization(.none)
+            .padding()
+            .background(colorScheme == .dark ? Constants.Colors.darkGrayColor : Constants.Colors.lightGrayColor)
+            .cornerRadius(5.0)
+            .padding(.bottom, 5)
+    }
+}
+
 struct CommonNameField: View {
     @Binding var commonName: String
     @Environment(\.colorScheme) var colorScheme

Flowerdex/Flowerdex/View/Discover Page/FiltersSheet.swift

@@ -21,14 +21,15 @@ struct FiltersSheet: View {
     @Binding var bloomMonths: Int
     @Binding var scientificName: String
     @Binding var commonName: String
+    @Binding var flowerColor: String
 
     var body: some View {
-        FilterFields(edible: $edible, vegetable: $vegetable, petalCount: $petalCount, growthMonths: $growthMonths, bloomMonths: $bloomMonths, scientificName: $scientificName, commonName: $commonName)
+        FilterFields(edible: $edible, vegetable: $vegetable, petalCount: $petalCount, growthMonths: $growthMonths, bloomMonths: $bloomMonths, scientificName: $scientificName, commonName: $commonName, flowerColor: $flowerColor)
         
         Spacer()
         
         Button(action: {
-            let filters = Filters(edible: edible, vegetable: vegetable, petalCount: petalCount, growthMonths: growthMonths, bloomMonths: bloomMonths, scientificName: scientificName, commonName: commonName)
+            let filters = Filters(edible: edible, vegetable: vegetable, petalCount: petalCount, growthMonths: growthMonths, bloomMonths: bloomMonths, scientificName: scientificName, commonName: commonName, flowerColor: flowerColor)
             
             self.fModel.getFlowers(p: page, f: filters)
             

Flowerdex/Flowerdex/View/History Page/FlowerVerboseDetailView.swift

@@ -0,0 +1,112 @@
+//
+//  FlowerVerboseDetailView.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import SwiftUI
+
+struct FlowerVerboseDetailView: View {
+    
+    var flower: FlowerVerbose
+    @State var hasBeenFoundLocal: Bool
+    @ObservedObject var imageManager = ImageManager()
+    @EnvironmentObject var fModel: FlowerService
+    var size: CGFloat = 300
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack {
+                Text(self.flower.commonName.capitalized)
+                    .font(.title)
+                    .fontWeight(/*@START_MENU_TOKEN@*/.semibold/*@END_MENU_TOKEN@*/)
+                    .foregroundColor(Constants.Colors.blueGray)
+                //                .frame(width: .infinity, alignment: .center)
+                Spacer()
+                Button(action: {
+                    
+                    // Depending on past value
+                    if self.hasBeenFoundLocal {
+                        fModel.removeFound(self.flower.id)
+                    } else {
+                        fModel.putFound(self.flower.id)
+                    }
+                    
+                    // Change value after request
+                    self.hasBeenFoundLocal.toggle()
+                    
+                }) {
+                    if self.hasBeenFoundLocal {
+                        Image(systemName: "eye")
+                            .font(.title)
+                            .foregroundColor(Constants.Colors.rausch)
+                    } else {
+                        Image(systemName: "eye.slash")
+                            .font(.title)
+                            .foregroundColor(Constants.Colors.blueGray)
+                    }
+                    
+                }
+            }
+            
+            .padding()
+            
+
+            
+//            URLImage(url: self.flower.imageURL)
+//            Image("amapola")
+            // TODO: make placeholder and actual image look equally good
+            Image(uiImage: self.imageManager.image!)
+                .resizable()
+                .frame(width: self.size, height: self.size)
+            FlowerVerboseInformationPane(flower: flower)
+            Spacer()
+        }
+        .onAppear {
+            self.imageManager.fetchImage(self.flower.imageURL)
+        }
+    }
+}
+
+// TODO: account for text overflow
+struct FlowerVerboseInformationPane: View {
+    var flower: FlowerVerbose
+    var body: some View {
+        HStack {
+            VStack(alignment: .leading, spacing: nil) {
+                Text("Scientific Name:")
+                    .bold()
+                Text("\(self.flower.scientificName)")
+                    .foregroundColor(Constants.Colors.blueGray)
+                    .padding(.bottom)
+                Text("Year Discovered:")
+                    .bold()
+                Text("\(self.flower.year ?? -999)")
+                    .foregroundColor(Constants.Colors.blueGray)
+            }
+            .foregroundColor(Constants.Colors.rausch)
+            .padding()
+            VStack(alignment: .leading, spacing: nil) {
+                Text("Bibliography:")
+                    .bold()
+                Text("\(self.flower.bibliography ?? "n/a")")
+                    .foregroundColor(Constants.Colors.blueGray)
+                    .padding(.bottom)
+                Text("Author:")
+                    .bold()
+                Text("\(self.flower.author ?? "n/a")")
+                    .foregroundColor(Constants.Colors.blueGray)
+            }
+            .foregroundColor(Constants.Colors.rausch)
+            .padding()
+        }
+        .padding(.vertical)
+    }
+}
+
+struct FlowerVerboseDetailView_Previews: PreviewProvider {
+    static var previews: some View {
+        FlowerDetailView(flower: dummyFlowers[0], hasBeenFoundLocal: true)
+    }
+}

Flowerdex/Flowerdex/View/History Page/HistoryView.swift

@@ -0,0 +1,50 @@
+//
+//  HistoryView.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import SwiftUI
+
+struct HistoryView: View {
+    @EnvironmentObject var hModel: HistoryService
+    var body: some View {
+        NavigationView {
+            ScrollableHistoryContent()
+        }
+        .onAppear {
+            self.hModel.getHistory()
+        }
+    }
+}
+
+struct ScrollableHistoryContent: View {
+    @EnvironmentObject var hModel: HistoryService
+    var body: some View {
+        if hModel.response == .success {
+            List {
+                HistoryList(flowerList: hModel.items)
+            }
+            .navigationBarTitle("Discover")
+        } else if hModel.response == .loading || hModel.response == .unfetched {
+            // TODO: make this centered vertically within parent ScrollView
+            ProgressView("Loading...")
+        } else if hModel.response == .failure {
+            // TODO: make this centered vertically within parent ScrollView
+            FailureIcon()
+        }
+    }
+}
+
+struct HistoryList: View {
+    var flowerList: [FlowerVerbose]
+    var body: some View {
+        ForEach(flowerList) { flower in
+            NavigationLink(destination: FlowerVerboseDetailView(flower: flower, hasBeenFoundLocal: flower.hasBeenFound)) {
+                Text(flower.commonName.capitalized)
+            }
+//                    .foregroundColor(Constants.Colors.blueGray)
+        }
+    }
+}

Flowerdex/Flowerdex/View/MainView.swift

@@ -0,0 +1,27 @@
+//
+//  MainView.swift
+//  Flowerdex
+//
+//  Created by Víctor A. Hernández on 12/21/20.
+//
+
+import SwiftUI
+
+struct MainView: View {
+    var body: some View {
+        TabView {
+            DiscoverView()
+                .tabItem {
+                    Image(systemName: "magnifyingglass")
+                    Text("Discover")
+                }
+            
+            HistoryView()
+                .tabItem {
+                    Image(systemName: "square.and.pencil")
+                    Text("History")
+                }
+        }
+        .accentColor(Constants.Colors.rausch)
+    }
+}