Cleaned up a bit and added favorite/found setting logic from buttons

Flowerdex/Flowerdex.xcodeproj/project.pbxproj

@@ -11,7 +11,7 @@
 		A51B4F772546674C002AFF05 /* FlowersResponseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51B4F762546674C002AFF05 /* FlowersResponseModel.swift */; };
 		A51B4F7B25466A75002AFF05 /* flowers.json in Resources */ = {isa = PBXBuildFile; fileRef = A51B4F7A25466A75002AFF05 /* flowers.json */; };
 		A52FB5C42546C2EA000AD235 /* rawResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = A52FB5C32546C2EA000AD235 /* rawResponse.json */; };
-		A5711B8B255CE03000E727BB /* FlowerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5711B8A255CE03000E727BB /* FlowerItem.swift */; };
+		A5711B8B255CE03000E727BB /* Flower.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5711B8A255CE03000E727BB /* Flower.swift */; };
 		A5711B8E255CE53900E727BB /* DummyData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5711B8D255CE53900E727BB /* DummyData.swift */; };
 		A58640BA258F30AD00F626AB /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58640B9258F30AD00F626AB /* LoginView.swift */; };
 		A58640BE258F30F200F626AB /* RegisterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58640BD258F30F200F626AB /* RegisterView.swift */; };
@@ -20,7 +20,7 @@
 		A59A27452545568A0052319F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A59A27442545568A0052319F /* Assets.xcassets */; };
 		A59A27482545568A0052319F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A59A27472545568A0052319F /* Preview Assets.xcassets */; };
 		A5AF3F5C2545FDEB0035AC9A /* FlowerCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AF3F5B2545FDEB0035AC9A /* FlowerCard.swift */; };
-		A5EA2F24258FEC2300699182 /* UserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F23258FEC2300699182 /* UserService.swift */; };
+		A5EA2F24258FEC2300699182 /* AuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EA2F23258FEC2300699182 /* AuthenticationService.swift */; };
 		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 */; };
@@ -31,7 +31,7 @@
 		A5EE38AC257772200014D0BE /* FiltersSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE38AB257772200014D0BE /* FiltersSheet.swift */; };
 		A5EE38B0257818520014D0BE /* FlowersList.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE38AF257818520014D0BE /* FlowersList.swift */; };
 		A5EE38B3257818BE0014D0BE /* StatusIcons.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE38B2257818BE0014D0BE /* StatusIcons.swift */; };
-		A5F0D2FC258F3D2200AF735C /* UserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F0D2FB258F3D2200AF735C /* UserModel.swift */; };
+		A5F0D2FC258F3D2200AF735C /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F0D2FB258F3D2200AF735C /* User.swift */; };
 		A5F3271A25460C0B003BCE0F /* FlowerDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F3271925460C0B003BCE0F /* FlowerDetailView.swift */; };
 /* End PBXBuildFile section */
 
@@ -40,7 +40,7 @@
 		A51B4F762546674C002AFF05 /* FlowersResponseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowersResponseModel.swift; sourceTree = "<group>"; };
 		A51B4F7A25466A75002AFF05 /* flowers.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = flowers.json; sourceTree = "<group>"; };
 		A52FB5C32546C2EA000AD235 /* rawResponse.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = rawResponse.json; sourceTree = "<group>"; };
-		A5711B8A255CE03000E727BB /* FlowerItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerItem.swift; 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>"; };
 		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>"; };
@@ -51,7 +51,7 @@
 		A59A27472545568A0052319F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		A59A27492545568A0052319F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A5AF3F5B2545FDEB0035AC9A /* FlowerCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerCard.swift; sourceTree = "<group>"; };
-		A5EA2F23258FEC2300699182 /* UserService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserService.swift; sourceTree = "<group>"; };
+		A5EA2F23258FEC2300699182 /* AuthenticationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationService.swift; sourceTree = "<group>"; };
 		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>"; };
@@ -62,7 +62,7 @@
 		A5EE38AB257772200014D0BE /* FiltersSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiltersSheet.swift; sourceTree = "<group>"; };
 		A5EE38AF257818520014D0BE /* FlowersList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowersList.swift; sourceTree = "<group>"; };
 		A5EE38B2257818BE0014D0BE /* StatusIcons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusIcons.swift; sourceTree = "<group>"; };
-		A5F0D2FB258F3D2200AF735C /* UserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserModel.swift; sourceTree = "<group>"; };
+		A5F0D2FB258F3D2200AF735C /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
 		A5F3271925460C0B003BCE0F /* FlowerDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowerDetailView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -81,10 +81,10 @@
 			isa = PBXGroup;
 			children = (
 				A51B4F762546674C002AFF05 /* FlowersResponseModel.swift */,
-				A5711B8A255CE03000E727BB /* FlowerItem.swift */,
+				A5711B8A255CE03000E727BB /* Flower.swift */,
 				A5EE3896257658400014D0BE /* Filters.swift */,
 				A5EE389025763D3A0014D0BE /* AuthenticationModel.swift */,
-				A5F0D2FB258F3D2200AF735C /* UserModel.swift */,
+				A5F0D2FB258F3D2200AF735C /* User.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -162,7 +162,7 @@
 			isa = PBXGroup;
 			children = (
 				A50EEFCC255D175400545CFE /* ContentDataSource.swift */,
-				A5EA2F23258FEC2300699182 /* UserService.swift */,
+				A5EA2F23258FEC2300699182 /* AuthenticationService.swift */,
 				A5EA2F27258FEC3D00699182 /* FlowerService.swift */,
 				A5EE38A3257700230014D0BE /* ImageManager.swift */,
 			);
@@ -270,7 +270,7 @@
 				A5EE38B0257818520014D0BE /* FlowersList.swift in Sources */,
 				A51B4F772546674C002AFF05 /* FlowersResponseModel.swift in Sources */,
 				A5EE3897257658400014D0BE /* Filters.swift in Sources */,
-				A5711B8B255CE03000E727BB /* FlowerItem.swift in Sources */,
+				A5711B8B255CE03000E727BB /* Flower.swift in Sources */,
 				A59A2741254556880052319F /* FlowerdexApp.swift in Sources */,
 				A5EA2F32258FF58200699182 /* Responses.swift in Sources */,
 				A58640BE258F30F200F626AB /* RegisterView.swift in Sources */,
@@ -279,9 +279,9 @@
 				A58640BA258F30AD00F626AB /* LoginView.swift in Sources */,
 				A5AF3F5C2545FDEB0035AC9A /* FlowerCard.swift in Sources */,
 				A5EE38B3257818BE0014D0BE /* StatusIcons.swift in Sources */,
-				A5EA2F24258FEC2300699182 /* UserService.swift in Sources */,
+				A5EA2F24258FEC2300699182 /* AuthenticationService.swift in Sources */,
 				A5711B8E255CE53900E727BB /* DummyData.swift in Sources */,
-				A5F0D2FC258F3D2200AF735C /* UserModel.swift in Sources */,
+				A5F0D2FC258F3D2200AF735C /* User.swift in Sources */,
 				A5EE38AC257772200014D0BE /* FiltersSheet.swift in Sources */,
 				A5EA2F28258FEC3D00699182 /* FlowerService.swift in Sources */,
 			);

Flowerdex/Flowerdex/Model/FlowerItem.swift → Flowerdex/Flowerdex/Model/Flower.swift

@@ -1,5 +1,5 @@
 //
-//  FlowerItem.swift
+//  Flower.swift
 //  Flowerdex
 //
 //  Created by Víctor A. Hernández on 11/11/20.
@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct FlowerItem: Hashable, Codable, Identifiable {
+struct Flower: Hashable, Codable, Identifiable {
     let id: Int
     let common_name: String?
     var commonName: String {

Flowerdex/Flowerdex/Model/FlowersResponseModel.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 struct FlowersResponseModel: Hashable, Codable {
-    let data: [FlowerItem]?
+    let data: [Flower]?
     let links: Dictionary<String, String>?
     let meta: Dictionary<String, Int>?
     let error: String?

Flowerdex/Flowerdex/Model/UserModel.swift → Flowerdex/Flowerdex/Model/User.swift

@@ -1,5 +1,5 @@
 //
-//  UserModel.swift
+//  User.swift
 //  Flowerdex
 //
 //  Created by Víctor A. Hernández on 12/20/20.

Flowerdex/Flowerdex/Resources/DummyData.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-let dummyFlowers: [FlowerItem] = load("flowers.json")
+let dummyFlowers: [Flower] = load("flowers.json")
 
 func load<T: Decodable>(_ filename: String) -> T {
     let data: Data

Flowerdex/Flowerdex/Services/UserService.swift → Flowerdex/Flowerdex/Services/AuthenticationService.swift

@@ -1,5 +1,5 @@
 //
-//  UserService.swift
+//  AuthenticationService.swift
 //  Flowerdex
 //
 //  Created by Víctor A. Hernández on 12/20/20.

Flowerdex/Flowerdex/Services/ContentDataSource.swift

@@ -11,7 +11,7 @@ import Combine
 
 /*
 class ContentDataSource: ObservableObject {
-  @Published var items = [FlowerItem]() // ListItem
+  @Published var items = [Flower]() // ListItem
   @Published var isLoadingPage = false
   private var currentPage = 1
   private var canLoadMorePages = true

Flowerdex/Flowerdex/Services/FlowerService.swift

@@ -10,7 +10,7 @@ import Foundation
 class FlowerService: ObservableObject {
     
     @Published var response: Response = .unfetched
-    @Published var items = [FlowerItem]()
+    @Published var items = [Flower]()
     
     
     private func getQueryParameters(_ filters: Filters) -> [URLQueryItem] {
@@ -47,9 +47,11 @@ class FlowerService: ObservableObject {
         components.scheme = Constants.Services.apiScheme
         components.host = Constants.Services.apiHost
         components.path = apiPath
-        components.queryItems = [
-            URLQueryItem(name: "user_id", value: "\(User.current.id!)"),
-        ]
+        if apiPath == Constants.Services.apiGetFlowersPath {
+            components.queryItems = [
+                URLQueryItem(name: "user_id", value: "\(User.current.id!)"),
+            ]
+        }
         return components
     }
     
@@ -111,4 +113,79 @@ class FlowerService: ObservableObject {
         
     }
     
+    
+    func wishlistOrHistorySkeletonRequest(_ flowerID: Int, remove: Bool, wishlist: Bool) {
+        
+        // Construct Body
+        let jsonObject : [String: Int] = [
+            "user_id": User.current.id!,
+            "flower_id": flowerID
+        ]
+        
+        guard let jsonData = try? JSONEncoder().encode(jsonObject) else {
+            print("Failed to encode JSON for \(flowerID)")
+            return
+        }
+        
+        print(String(data: jsonData, encoding: .utf8)!)
+        
+        // Construct URL
+        var path: String
+        if remove {
+            if wishlist {
+                path = Constants.Services.apiRemoveFavoritePath
+            } else {
+                path = Constants.Services.apiRemoveFoundPath
+            }
+        } else {
+            if wishlist {
+                path = Constants.Services.apiPutFavoritePath
+            } else {
+                path = Constants.Services.apiPutFoundPath
+            }
+        }
+        
+        print((remove ? "removing " : "putting ") + (wishlist ? "favorite" : "found"))
+        let components = getBaseURLComponent(path)
+        
+        var request = URLRequest(url: components.url!)
+        request.httpMethod = "POST"
+        request.httpBody = jsonData
+        
+        // Send POST request
+        URLSession.shared.dataTask(with: request) { data, response, error in
+            print(response ?? "No response")
+            if let httpResponse = response as? HTTPURLResponse {
+                DispatchQueue.main.async {
+                    if httpResponse.statusCode == 200 {
+                        // alert that we removed favorite
+                        print("Success!")
+                    } else {
+                        // alert that we couldn't remove favorite
+                        print("Error! \(httpResponse.statusCode)")
+                    }
+                }
+            }
+        }.resume()
+    }
+    
+    
+    func removeFavorite(_ flowerID: Int) {
+        wishlistOrHistorySkeletonRequest(flowerID, remove: true, wishlist: true)
+    }
+    
+
+    func putFavorite(_ flowerID: Int) {
+        wishlistOrHistorySkeletonRequest(flowerID, remove: false, wishlist: true)
+    }
+    
+    
+    func removeFound(_ flowerID: Int) {
+        wishlistOrHistorySkeletonRequest(flowerID, remove: true, wishlist: false)
+    }
+
+    func putFound(_ flowerID: Int) {
+        wishlistOrHistorySkeletonRequest(flowerID, remove: false, wishlist: false)
+    }
+    
 }

Flowerdex/Flowerdex/Supporting/Constants.swift

@@ -20,6 +20,10 @@ struct Constants {
         static let apiGetFlowersPath = "/~victor.hernandez17/flowerdex/listFlowers.php"
         static let apiLoginPath = "/~victor.hernandez17/flowerdex/login.php"
         static let apiRegistrationPath = "/~victor.hernandez17/flowerdex/signup.php"
+        static let apiPutFavoritePath = "/~victor.hernandez17/flowerdex/putFavoriteFlower.php"
+        static let apiRemoveFavoritePath = "/~victor.hernandez17/flowerdex/removeFavoriteFlower.php"
+        static let apiPutFoundPath = "/~victor.hernandez17/flowerdex/putFoundFlower.php"
+        static let apiRemoveFoundPath = "/~victor.hernandez17/flowerdex/removeFoundFlower.php"
     }
     
     struct Colors {

Flowerdex/Flowerdex/View/Discover Page/FlowerCard.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct FlowerCard: View {
     
-    var flower: FlowerItem
+    var flower: Flower
     @ObservedObject var imageManager = ImageManager()
     var size: CGFloat = 150
     @Environment(\.colorScheme) var colorScheme
@@ -24,7 +24,7 @@ struct FlowerCard: View {
                     .aspectRatio(contentMode: .fill)
                     .frame(width: self.size, height: self.size)
                     .background(colorScheme == .dark ? Constants.Colors.darkGrayColor : Color.white)
-                CardDescription(commonName: self.flower.commonName, genus: self.flower.genus, family: self.flower.family, size: self.size, isFavorite: self.flower.isFavorite)
+                CardDescription(flower: flower, size: size, isFavoriteLocal: flower.isFavorite)
             }
             
         }
@@ -40,31 +40,41 @@ struct FlowerCard: View {
 
 struct CardDescription: View {
     
-    var commonName: String
-    var genus: String
-    var family: String
+    var flower: Flower
     var size: CGFloat
-    var isFavorite: Bool
+    @State var isFavoriteLocal: Bool
+    @EnvironmentObject var fModel: FlowerService
     @Environment(\.colorScheme) var colorScheme
     
     var body: some View {
         VStack(alignment: .leading) {
-            Text(self.commonName.capitalized)
+            Text(self.flower.commonName.capitalized)
                 .font(.headline)
             Spacer()
             HStack {
-                Text(self.genus + " > " + self.family)
+                Text(self.flower.genus + " > " + self.flower.family)
                     .font(.caption)
                 Spacer()
-                Button(action: {print("hello")}) { // 
-                    if self.isFavorite {
+                Button(action: {
+                    
+                    // Depending on past value
+                    if self.isFavoriteLocal {
+                        fModel.removeFavorite(self.flower.id)
+                    } else {
+                        fModel.putFavorite(self.flower.id)
+                    }
+                    
+                    // Change value after request
+                    self.isFavoriteLocal.toggle()
+                    
+                }) {
+                    if self.isFavoriteLocal {
                         Image(systemName: "star.fill")
                             .foregroundColor(.yellow)
                     } else {
                         Image(systemName: "star")
                             .foregroundColor(.black)
                     }
-                    
                 }
             }
         }

Flowerdex/Flowerdex/View/Discover Page/FlowerDetailView.swift

@@ -9,9 +9,10 @@ import SwiftUI
 
 struct FlowerDetailView: View {
     
-    var flower: FlowerItem
+    var flower: Flower
+    @State var hasBeenFoundLocal: Bool
     @ObservedObject var imageManager = ImageManager()
-//    @ObservedObject var foundManager = FoundManager()
+    @EnvironmentObject var fModel: FlowerService
     var size: CGFloat = 300
     
     var body: some View {
@@ -21,11 +22,22 @@ struct FlowerDetailView: View {
                     .font(.title)
                     .fontWeight(/*@START_MENU_TOKEN@*/.semibold/*@END_MENU_TOKEN@*/)
                     .foregroundColor(Constants.Colors.blueGray)
-                    
                 //                .frame(width: .infinity, alignment: .center)
                 Spacer()
-                Button(action: {print("hello")}) { //self.hasBeenFound.toggle()
-                    if self.flower.hasBeenFound {
+                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)
@@ -59,7 +71,7 @@ struct FlowerDetailView: View {
 
 // TODO: account for text overflow
 struct FlowerInformationPane: View {
-    var flower: FlowerItem
+    var flower: Flower
     var body: some View {
         HStack {
             VStack(alignment: .leading, spacing: nil) {
@@ -95,6 +107,6 @@ struct FlowerInformationPane: View {
 
 struct FlowerDetailView_Previews: PreviewProvider {
     static var previews: some View {
-        FlowerDetailView(flower: dummyFlowers[0])
+        FlowerDetailView(flower: dummyFlowers[0], hasBeenFoundLocal: true)
     }
 }

Flowerdex/Flowerdex/View/Discover Page/FlowersList.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct FlowersList: View {
-    var flowerList: [FlowerItem]
+    var flowerList: [Flower]
     var body: some View {
         if flowerList.count == 0 {
             // TODO: make this centered vertically within parent ScrollView
@@ -16,7 +16,7 @@ struct FlowersList: View {
         } else {
             LazyVStack {
                 ForEach(flowerList) { flower in
-                    NavigationLink(destination: FlowerDetailView(flower: flower)) {
+                    NavigationLink(destination: FlowerDetailView(flower: flower, hasBeenFoundLocal: flower.hasBeenFound)) {
                         FlowerCard(flower: flower)
                     }
                     .foregroundColor(Constants.Colors.blueGray)