Merge pull request #15 from NawafSwe/nawaf

Nawaf
NawafSwe · Dec 8, 2020 · 9258528 · 9258528
2 parents 67c7071 + bb7326a
commit 9258528
Show file tree

Hide file tree

Showing 41 changed files with 782 additions and 246 deletions.
diff --git a/Billing-Tracker.xcodeproj/project.pbxproj b/Billing-Tracker.xcodeproj/project.pbxproj
@@ -47,6 +47,7 @@
 		3961174E2571165900919EF3 /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3961174D2571165900919EF3 /* Subscription.swift */; };
 		39611754257116EA00919EF3 /* Images.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39611753257116EA00919EF3 /* Images.swift */; };
 		396B0BB425768E1E000476DF /* ProviderRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396B0BB325768E1E000476DF /* ProviderRepository.swift */; };
+		3971A696257EC6F10020A858 /* AccountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3971A695257EC6F10020A858 /* AccountView.swift */; };
 		397EAB0A2573E81C00E1F7C3 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397EAB092573E81C00E1F7C3 /* LoadingView.swift */; };
 		397EAB0E2573E84300E1F7C3 /* LottieFiles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 397EAB0D2573E84300E1F7C3 /* LottieFiles.swift */; };
 		397EAB122573E8C100E1F7C3 /* loading.json in Resources */ = {isa = PBXBuildFile; fileRef = 397EAB112573E8C100E1F7C3 /* loading.json */; };
@@ -56,7 +57,12 @@
 		398603A22572FD3800554B34 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 398603A12572FD3800554B34 /* GoogleService-Info.plist */; };
 		398A474D257367D700C4212B /* RegisterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398A474C257367D700C4212B /* RegisterViewModel.swift */; };
 		398A475625736FDD00C4212B /* SettingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398A475525736FDD00C4212B /* SettingViewModel.swift */; };
-		39984170257847BA00A3F15C /* EmptySubscriptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3998416F257847BA00A3F15C /* EmptySubscriptionsView.swift */; };
+		39921E91257F941C0081ED42 /* AccountViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39921E90257F941C0081ED42 /* AccountViewModel.swift */; };
+		39921E9A257FA0350081ED42 /* UserServices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39921E99257FA0350081ED42 /* UserServices.swift */; };
+		39921E9E257FDA370081ED42 /* EmailBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39921E9D257FDA370081ED42 /* EmailBoxView.swift */; };
+		39921EA2257FDA450081ED42 /* PasswordBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39921EA1257FDA450081ED42 /* PasswordBoxView.swift */; };
+		39921EA5257FDAE20081ED42 /* LockIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39921EA4257FDAE20081ED42 /* LockIconView.swift */; };
+		39984170257847BA00A3F15C /* EmptySubscriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3998416F257847BA00A3F15C /* EmptySubscriptionView.swift */; };
 		39984173257847CC00A3F15C /* EmptyProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39984172257847CC00A3F15C /* EmptyProviders.swift */; };
 		3999564A2578BAF4000D907D /* ManageProvidersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399956492578BAF4000D907D /* ManageProvidersView.swift */; };
 		3999564D2578BC45000D907D /* ManageProvidersViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3999564C2578BC45000D907D /* ManageProvidersViewModel.swift */; };
@@ -129,6 +135,7 @@
 		3961174D2571165900919EF3 /* Subscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = "<group>"; };
 		39611753257116EA00919EF3 /* Images.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Images.swift; sourceTree = "<group>"; };
 		396B0BB325768E1E000476DF /* ProviderRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProviderRepository.swift; sourceTree = "<group>"; };
+		3971A695257EC6F10020A858 /* AccountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountView.swift; sourceTree = "<group>"; };
 		397EAB092573E81C00E1F7C3 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
 		397EAB0D2573E84300E1F7C3 /* LottieFiles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LottieFiles.swift; sourceTree = "<group>"; };
 		397EAB112573E8C100E1F7C3 /* loading.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = loading.json; sourceTree = "<group>"; };
@@ -138,7 +145,12 @@
 		398603A12572FD3800554B34 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		398A474C257367D700C4212B /* RegisterViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterViewModel.swift; sourceTree = "<group>"; };
 		398A475525736FDD00C4212B /* SettingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingViewModel.swift; sourceTree = "<group>"; };
-		3998416F257847BA00A3F15C /* EmptySubscriptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptySubscriptionsView.swift; sourceTree = "<group>"; };
+		39921E90257F941C0081ED42 /* AccountViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewModel.swift; sourceTree = "<group>"; };
+		39921E99257FA0350081ED42 /* UserServices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserServices.swift; sourceTree = "<group>"; };
+		39921E9D257FDA370081ED42 /* EmailBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailBoxView.swift; sourceTree = "<group>"; };
+		39921EA1257FDA450081ED42 /* PasswordBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordBoxView.swift; sourceTree = "<group>"; };
+		39921EA4257FDAE20081ED42 /* LockIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockIconView.swift; sourceTree = "<group>"; };
+		3998416F257847BA00A3F15C /* EmptySubscriptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptySubscriptionView.swift; sourceTree = "<group>"; };
 		39984172257847CC00A3F15C /* EmptyProviders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyProviders.swift; sourceTree = "<group>"; };
 		399956492578BAF4000D907D /* ManageProvidersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageProvidersView.swift; sourceTree = "<group>"; };
 		3999564C2578BC45000D907D /* ManageProvidersViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageProvidersViewModel.swift; sourceTree = "<group>"; };
@@ -297,13 +309,6 @@
 			path = ProviderCellView;
 			sourceTree = "<group>";
 		};
-		3932C83C257ACD3D0042DEF6 /* Forms */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Forms;
-			sourceTree = "<group>";
-		};
 		394780C72571854500C97EAA /* SubscriptionTimingsView */ = {
 			isa = PBXGroup;
 			children = (
@@ -382,10 +387,10 @@
 		396117492571157800919EF3 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				39921E9C257FDA230081ED42 /* BoxFormView */,
 				3929C7E42571DC350012DD51 /* UIkitViews */,
-				3932C83C257ACD3D0042DEF6 /* Forms */,
 				3998416E2578479800A3F15C /* Empty State views */,
-				39F215A725772B9F009332E7 /* PersonIconView */,
+				39F215A725772B9F009332E7 /* iconsView */,
 				397EAB082573E68B00E1F7C3 /* LottiesViews */,
 				3929C7BC2571C3260012DD51 /* SubscriptionBoxView */,
 				39D913492571819F00D9BDFE /* RingView */,
@@ -473,10 +478,19 @@
 			path = Repositories;
 			sourceTree = "<group>";
 		};
+		39921E9C257FDA230081ED42 /* BoxFormView */ = {
+			isa = PBXGroup;
+			children = (
+				39921E9D257FDA370081ED42 /* EmailBoxView.swift */,
+				39921EA1257FDA450081ED42 /* PasswordBoxView.swift */,
+			);
+			path = BoxFormView;
+			sourceTree = "<group>";
+		};
 		3998416E2578479800A3F15C /* Empty State views */ = {
 			isa = PBXGroup;
 			children = (
-				3998416F257847BA00A3F15C /* EmptySubscriptionsView.swift */,
+				3998416F257847BA00A3F15C /* EmptySubscriptionView.swift */,
 				39984172257847CC00A3F15C /* EmptyProviders.swift */,
 			);
 			path = "Empty State views";
@@ -549,6 +563,7 @@
 			isa = PBXGroup;
 			children = (
 				39D3B7B425731F40005881A4 /* UserAuthenticationManager.swift */,
+				39921E99257FA0350081ED42 /* UserServices.swift */,
 			);
 			path = UserAuth;
 			sourceTree = "<group>";
@@ -639,17 +654,20 @@
 			path = SubscriptionCellView;
 			sourceTree = "<group>";
 		};
-		39F215A725772B9F009332E7 /* PersonIconView */ = {
+		39F215A725772B9F009332E7 /* iconsView */ = {
 			isa = PBXGroup;
 			children = (
 				39F215A825772BB8009332E7 /* PersonIconView.swift */,
+				39921EA4257FDAE20081ED42 /* LockIconView.swift */,
 			);
-			path = PersonIconView;
+			path = iconsView;
 			sourceTree = "<group>";
 		};
 		39F215AC25772F77009332E7 /* AccountView */ = {
 			isa = PBXGroup;
 			children = (
+				3971A695257EC6F10020A858 /* AccountView.swift */,
+				39921E90257F941C0081ED42 /* AccountViewModel.swift */,
 			);
 			path = AccountView;
 			sourceTree = "<group>";
@@ -798,7 +816,8 @@
 				397EAB1D2573FF5C00E1F7C3 /* FirestoreService.swift in Sources */,
 				3929C7F12571DCDF0012DD51 /* SafariView.swift in Sources */,
 				3929C7EA2571DC720012DD51 /* LottieView.swift in Sources */,
-				39984170257847BA00A3F15C /* EmptySubscriptionsView.swift in Sources */,
+				39984170257847BA00A3F15C /* EmptySubscriptionView.swift in Sources */,
+				39921E9A257FA0350081ED42 /* UserServices.swift in Sources */,
 				399AD2E825706F9300AFA10A /* HomeTabView.swift in Sources */,
 				39D3B7B125731EBD005881A4 /* LandingView.swift in Sources */,
 				390BF4FC2577E6B9007B4BC3 /* BackTrackButton.swift in Sources */,
@@ -808,6 +827,7 @@
 				3999564D2578BC45000D907D /* ManageProvidersViewModel.swift in Sources */,
 				392C38162579281100252032 /* ProviderCellView.swift in Sources */,
 				3929C7F52571E2370012DD51 /* SubscriptionFormViewModel.swift in Sources */,
+				39921E9E257FDA370081ED42 /* EmailBoxView.swift in Sources */,
 				390E967925747198004B17DA /* SubscriptionTimingsViewModel.swift in Sources */,
 				39F215A4257728F6009332E7 /* TabIconsModifiers.swift in Sources */,
 				39E7754725770F5300BB3B31 /* StandardButton.swift in Sources */,
@@ -824,6 +844,7 @@
 				390761712576C7E200955366 /* SubscriptionAlert.swift in Sources */,
 				397EAB20257404CB00E1F7C3 /* FireStoreErr.swift in Sources */,
 				3961174E2571165900919EF3 /* Subscription.swift in Sources */,
+				39921E91257F941C0081ED42 /* AccountViewModel.swift in Sources */,
 				39D9134B257181AC00D9BDFE /* DaysRingView.swift in Sources */,
 				397EAB0A2573E81C00E1F7C3 /* LoadingView.swift in Sources */,
 				39D9134125716E5F00D9BDFE /* UpdateSubscriptionView.swift in Sources */,
@@ -836,6 +857,7 @@
 				39290E332577CD64004D9768 /* ProviderServices.swift in Sources */,
 				399956512578C0C1000D907D /* AddProviderView.swift in Sources */,
 				3909834225758B9E001430C9 /* Date+Ext.swift in Sources */,
+				3971A696257EC6F10020A858 /* AccountView.swift in Sources */,
 				39290E2D2577C6F9004D9768 /* SubscriptionService.swift in Sources */,
 				39F7DE50257B074000D2AB99 /* ProvidedProvidersView.swift in Sources */,
 				39EF3A612576723E00777442 /* SubscriptionRepository.swift in Sources */,
@@ -854,6 +876,7 @@
 				39E7754325770A9700BB3B31 /* TextFieldModifiers.swift in Sources */,
 				39BEE92C2573651400218130 /* AuthAlert.swift in Sources */,
 				3929C7E62571DC4D0012DD51 /* BlurView.swift in Sources */,
+				39921EA5257FDAE20081ED42 /* LockIconView.swift in Sources */,
 				394780C92571856A00C97EAA /* SubscriptionTimings.swift in Sources */,
 				399AD2E625706F9300AFA10A /* Billing_TrackerApp.swift in Sources */,
 				3929C7BE2571C3460012DD51 /* SubscriptionBoxView.swift in Sources */,
@@ -864,6 +887,7 @@
 				390E967E257476F3004B17DA /* AddSubscriptionButton.swift in Sources */,
 				3981A52725764B7D00F8B677 /* UserRepository.swift in Sources */,
 				39D9133225711C4300D9BDFE /* Color+Ext.swift in Sources */,
+				39921EA2257FDA450081ED42 /* PasswordBoxView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Billing-Tracker/Assets.xcassets/blogging-site-concept.imageset/Contents.json b/Billing-Tracker/Assets.xcassets/blogging-site-concept.imageset/Contents.json
diff --git a/...racker/Assets.xcassets/blogging-site-concept.imageset/blogging-site-concept.jpg b/...racker/Assets.xcassets/blogging-site-concept.imageset/blogging-site-concept.jpg
diff --git a/Billing-Tracker/Assets.xcassets/sales-team.imageset/Contents.json b/Billing-Tracker/Assets.xcassets/sales-team.imageset/Contents.json
@@ -0,0 +1,52 @@
+{
+  "images" : [
+    {
+      "filename" : "sales-team 2.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "sales-team.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Billing-Tracker/Assets.xcassets/sales-team.imageset/sales-team 2.pdf b/Billing-Tracker/Assets.xcassets/sales-team.imageset/sales-team 2.pdf
diff --git a/Billing-Tracker/Assets.xcassets/sales-team.imageset/sales-team.pdf b/Billing-Tracker/Assets.xcassets/sales-team.imageset/sales-team.pdf
diff --git a/Billing-Tracker/Managers/FireStoreServices/FireStoreErr.swift b/Billing-Tracker/Managers/FireStoreServices/FireStoreErr.swift
@@ -10,5 +10,4 @@ enum FireStoreErr :String, Error  {
     case noSnapShot = "No snap shot found"
     case noSnapShotData  = "There is not data"
     case cannotDecode = "Unable to decode data"
-
-}
+    }
diff --git a/Billing-Tracker/Managers/ProvidersServices/ProviderServices.swift b/Billing-Tracker/Managers/ProvidersServices/ProviderServices.swift
@@ -9,15 +9,15 @@ import Foundation
 import Firebase
 import Combine
 final class ProviderServices : ObservableObject ,Identifiable    {
-
+    
     @Published var provider : Provider
     @Published var providersRepository = ProviderRepository()
     var id = ""
     var userId = Auth.auth().currentUser?.uid
     private var cancellables  = Set<AnyCancellable>()
     init(provider:Provider){
         self.provider  = provider
-
+        //getting all providers
         $provider
             .compactMap{provider in
                 provider.id