Skip to content

Master plus fixed t and c bug #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
violet-badger wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Master plus fixed t and c bug #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b2e079
Updated background color
sprasad123 Nov 11, 2018
9d92eda
Fixed the terms and Conditions bug. 4 files modified. ready for review
Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions Feelicity.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */; };
Expand Down Expand Up @@ -80,6 +78,7 @@
1304F5662168538E00D75A54 /* Feelicity-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Feelicity-Bridging-Header.h"; sourceTree = "<group>"; };
131743C1212F7F4500FAA9C9 /* Q20ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Q20ViewController.swift; sourceTree = "<group>"; };
131743C321304EAD00FAA9C9 /* TAndCViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TAndCViewController.swift; sourceTree = "<group>"; };
1326BF3621989BF200344A98 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../FelicityFinalDocs/GoogleService-Info.plist"; sourceTree = "<group>"; };
1327BCC320FFD64D0008CBF6 /* LogASessionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogASessionViewController.swift; sourceTree = "<group>"; };
1327BCC521000A870008CBF6 /* CBTDefViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CBTDefViewController.swift; sourceTree = "<group>"; };
134AE0B421139482000C0858 /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -121,9 +120,6 @@
13919A032129EB7E009493ED /* emotionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = emotionsCell.swift; sourceTree = "<group>"; };
13919A052129EDA9009493ED /* Emotions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emotions.swift; sourceTree = "<group>"; };
13919A07212A4017009493ED /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
13DC1F9321C1A7C200695C6D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
13DC1F9521C1A82F00695C6D /* Crypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
13DC1F9921C1ADCA00695C6D /* NetworkActivityIndicatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkActivityIndicatorManager.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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 = "<group>";
Expand Down Expand Up @@ -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 */,
);
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -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;
};
Expand Down
8 changes: 8 additions & 0 deletions Feelicity.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
</dict>
</plist>
Binary file removed Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
18 changes: 18 additions & 0 deletions Feelicity.xcworkspace/xcuserdata/sonalprasad.xcuserdatad/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildLocationStyle</key>
<string>UseAppPreferences</string>
<key>CustomBuildLocationType</key>
<string>RelativeToDerivedData</string>
<key>DerivedDataLocationStyle</key>
<string>Default</string>
<key>EnabledFullIndexStoreVisibility</key>
<false/>
<key>IssueFilterStyle</key>
<string>ShowActiveSchemeOnly</string>
<key>LiveSourceIssuesEnabled</key>
<true/>
</dict>
</plist>
3 changes: 2 additions & 1 deletion Feelicity/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading