diff --git a/Feelicity.xcodeproj/project.pbxproj b/Feelicity.xcodeproj/project.pbxproj index 5ffeaed..8c1d374 100644 --- a/Feelicity.xcodeproj/project.pbxproj +++ b/Feelicity.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 131743C2212F7F4500FAA9C9 /* Q20ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 131743C1212F7F4500FAA9C9 /* Q20ViewController.swift */; }; 131743C421304EAD00FAA9C9 /* TAndCViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 131743C321304EAD00FAA9C9 /* TAndCViewController.swift */; }; + 1326BF3721989BF200344A98 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1326BF3621989BF200344A98 /* GoogleService-Info.plist */; }; 1327BCC420FFD64D0008CBF6 /* LogASessionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1327BCC320FFD64D0008CBF6 /* LogASessionViewController.swift */; }; 1327BCC621000A870008CBF6 /* CBTDefViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1327BCC521000A870008CBF6 /* CBTDefViewController.swift */; }; 134AE0B521139483000C0858 /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 134AE0B421139482000C0858 /* SignUpViewController.swift */; }; @@ -44,9 +45,6 @@ 13919A042129EB7E009493ED /* emotionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13919A032129EB7E009493ED /* emotionsCell.swift */; }; 13919A062129EDA9009493ED /* Emotions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13919A052129EDA9009493ED /* Emotions.swift */; }; 13919A08212A4017009493ED /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13919A07212A4017009493ED /* ViewController.swift */; }; - 13DC1F9421C1A7C200695C6D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13DC1F9321C1A7C200695C6D /* GoogleService-Info.plist */; }; - 13DC1F9621C1A82F00695C6D /* Crypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13DC1F9521C1A82F00695C6D /* Crypto.swift */; }; - 13DC1F9A21C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13DC1F9921C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift */; }; 337E71F27B9BA5BB78FFD533 /* Pods_Feelicity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 10569E2100D6BE3344592C5D /* Pods_Feelicity.framework */; }; 33D706AC64151B5E43B82044 /* Pods_FeelicityUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD96EDB7D34BB097FA7D336D /* Pods_FeelicityUITests.framework */; }; D4D8351E212752C500225736 /* PreMoodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4D8351D212752C500225736 /* PreMoodViewController.swift */; }; @@ -80,6 +78,7 @@ 1304F5662168538E00D75A54 /* Feelicity-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Feelicity-Bridging-Header.h"; sourceTree = ""; }; 131743C1212F7F4500FAA9C9 /* Q20ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Q20ViewController.swift; sourceTree = ""; }; 131743C321304EAD00FAA9C9 /* TAndCViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TAndCViewController.swift; sourceTree = ""; }; + 1326BF3621989BF200344A98 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../FelicityFinalDocs/GoogleService-Info.plist"; sourceTree = ""; }; 1327BCC320FFD64D0008CBF6 /* LogASessionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogASessionViewController.swift; sourceTree = ""; }; 1327BCC521000A870008CBF6 /* CBTDefViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBTDefViewController.swift; sourceTree = ""; }; 134AE0B421139482000C0858 /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = ""; }; @@ -121,9 +120,6 @@ 13919A032129EB7E009493ED /* emotionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = emotionsCell.swift; sourceTree = ""; }; 13919A052129EDA9009493ED /* Emotions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emotions.swift; sourceTree = ""; }; 13919A07212A4017009493ED /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 13DC1F9321C1A7C200695C6D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 13DC1F9521C1A82F00695C6D /* Crypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = ""; }; - 13DC1F9921C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkActivityIndicatorManager.swift; sourceTree = ""; }; 1879F8FD42C5802E621C343E /* Pods-FeelicityTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FeelicityTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FeelicityTests/Pods-FeelicityTests.release.xcconfig"; sourceTree = ""; }; 40B1EF7E0305471429A9BAA8 /* Pods-FeelicityUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FeelicityUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FeelicityUITests/Pods-FeelicityUITests.debug.xcconfig"; sourceTree = ""; }; 75C30687E9CF337D69D524F2 /* Pods-Feelicity.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Feelicity.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Feelicity/Pods-Feelicity.debug.xcconfig"; sourceTree = ""; }; @@ -204,7 +200,6 @@ 13919A032129EB7E009493ED /* emotionsCell.swift */, 1382BA59212795EF00C35F08 /* CBTDiagramViewController.swift */, 134F99812125073200E10B6C /* User.swift */, - 13DC1F9521C1A82F00695C6D /* Crypto.swift */, 134F9983212513B900E10B6C /* Journal.swift */, D4D8351D212752C500225736 /* PreMoodViewController.swift */, D4D83521212789AD00225736 /* Q1ViewController.swift */, @@ -234,11 +229,10 @@ 1327BCC521000A870008CBF6 /* CBTDefViewController.swift */, 1327BCC320FFD64D0008CBF6 /* LogASessionViewController.swift */, 138C305A20898579006D4129 /* Assets.xcassets */, + 1326BF3621989BF200344A98 /* GoogleService-Info.plist */, 138C305C20898579006D4129 /* LaunchScreen.storyboard */, 138C305F20898579006D4129 /* Info.plist */, - 13DC1F9321C1A7C200695C6D /* GoogleService-Info.plist */, 1304F5662168538E00D75A54 /* Feelicity-Bridging-Header.h */, - 13DC1F9921C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift */, ); path = Feelicity; sourceTree = ""; @@ -395,7 +389,7 @@ buildActionMask = 2147483647; files = ( 138C305E20898579006D4129 /* LaunchScreen.storyboard in Resources */, - 13DC1F9421C1A7C200695C6D /* GoogleService-Info.plist in Resources */, + 1326BF3721989BF200344A98 /* GoogleService-Info.plist in Resources */, 138C305B20898579006D4129 /* Assets.xcassets in Resources */, 138C305920898577006D4129 /* Main.storyboard in Resources */, ); @@ -497,8 +491,6 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Feelicity/Pods-Feelicity-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", - "${BUILT_PRODUCTS_DIR}/AlamofireNetworkActivityIndicator/AlamofireNetworkActivityIndicator.framework", "${BUILT_PRODUCTS_DIR}/Bolts/Bolts.framework", "${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework", "${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework", @@ -511,8 +503,6 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlamofireNetworkActivityIndicator.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Bolts.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework", @@ -544,7 +534,6 @@ 134F99802124759800E10B6C /* EndViewController.swift in Sources */, 134F996C2124750200E10B6C /* Q11ViewController.swift in Sources */, 134F9966212474D900E10B6C /* Q8ViewController.swift in Sources */, - 13DC1F9621C1A82F00695C6D /* Crypto.swift in Sources */, 134F9968212474E700E10B6C /* Q9ViewController.swift in Sources */, 134F99702124752D00E10B6C /* Q13ViewController.swift in Sources */, 138C305620898577006D4129 /* SignInViewController.swift in Sources */, @@ -574,7 +563,6 @@ 134AE0B521139483000C0858 /* SignUpViewController.swift in Sources */, 138C13CE2136141A0076A629 /* ReferencesPopup.swift in Sources */, D4D8352421278CBA00225736 /* Q2ViewController.swift in Sources */, - 13DC1F9A21C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Feelicity.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Feelicity.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..949b678 --- /dev/null +++ b/Feelicity.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + BuildSystemType + Original + + diff --git a/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/UserInterfaceState.xcuserstate b/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 1e2fda5..0000000 Binary files a/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/WorkspaceSettings.xcsettings b/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f25782d --- /dev/null +++ b/Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,18 @@ + + + + + BuildLocationStyle + UseAppPreferences + CustomBuildLocationType + RelativeToDerivedData + DerivedDataLocationStyle + Default + EnabledFullIndexStoreVisibility + + IssueFilterStyle + ShowActiveSchemeOnly + LiveSourceIssuesEnabled + + + diff --git a/Feelicity/AppDelegate.swift b/Feelicity/AppDelegate.swift index 68fb99e..d8251b2 100644 --- a/Feelicity/AppDelegate.swift +++ b/Feelicity/AppDelegate.swift @@ -68,7 +68,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate { // User is signed in // ... if let uid = authResult?.user.uid { - self.ref.child("Users").child(uid).setValue(["email": user.profile.email]) + //self.ref.child("Users").child(uid).setValue(["email": user.profile.email]) + self.ref?.child("Users").child(Auth.auth().currentUser!.uid).child("email").setValue(user.profile.email) NotificationCenter.default.post(name: Notification.Name(rawValue: "googleSignInSucceeded"), object: nil) } else { diff --git a/Feelicity/Base.lproj/Main.storyboard b/Feelicity/Base.lproj/Main.storyboard index 4b9c646..1aee1b1 100644 --- a/Feelicity/Base.lproj/Main.storyboard +++ b/Feelicity/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + @@ -174,7 +174,7 @@ - + @@ -4112,7 +4113,7 @@ - + @@ -4362,7 +4364,7 @@ Credit & Contact Information - +