Skip to content

Commit ac61d36

Browse files
mafellowsmafellows
committed
Added login with Facebook
1 parent 190c0c5 commit ac61d36

409 files changed

Lines changed: 29061 additions & 1721 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cluster.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
8D2ACF6F2CBE666F0651BC7A /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B255B4D666AF91CF21B4DDEE /* libPods.a */; };
5050
9DBA246E1BE14A14005D6AD6 /* MessageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DBA246D1BE14A14005D6AD6 /* MessageTableViewCell.swift */; };
5151
9DBA24701BE152F3005D6AD6 /* MembersTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DBA246F1BE152F3005D6AD6 /* MembersTableViewCell.swift */; };
52+
9DBA24721BE2B26D005D6AD6 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DBA24711BE2B26D005D6AD6 /* LoginViewController.swift */; };
53+
9DBA24741BE2B2D2005D6AD6 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9DBA24731BE2B2D2005D6AD6 /* Login.storyboard */; };
5254
CE0413501BD88B8300BED627 /* MembersTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE04134F1BD88B8300BED627 /* MembersTableViewController.swift */; };
5355
CE0413521BD88CEB00BED627 /* MessagesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0413511BD88CEB00BED627 /* MessagesTableViewController.swift */; };
5456
CE0F3C541BD729D20012B7D7 /* KlusterHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0F3C531BD729D20012B7D7 /* KlusterHeaderView.swift */; };
@@ -136,6 +138,8 @@
136138
3546CD1362BCE0677D077A57 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
137139
9DBA246D1BE14A14005D6AD6 /* MessageTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageTableViewCell.swift; sourceTree = "<group>"; };
138140
9DBA246F1BE152F3005D6AD6 /* MembersTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MembersTableViewCell.swift; sourceTree = "<group>"; };
141+
9DBA24711BE2B26D005D6AD6 /* LoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewController.swift; sourceTree = "<group>"; };
142+
9DBA24731BE2B2D2005D6AD6 /* Login.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
139143
B255B4D666AF91CF21B4DDEE /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
140144
BF30D58564BAC072F96024A4 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
141145
CE04134F1BD88B8300BED627 /* MembersTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MembersTableViewController.swift; sourceTree = "<group>"; };
@@ -337,11 +341,13 @@
337341
9DBA246D1BE14A14005D6AD6 /* MessageTableViewCell.swift */,
338342
CE04134F1BD88B8300BED627 /* MembersTableViewController.swift */,
339343
9DBA246F1BE152F3005D6AD6 /* MembersTableViewCell.swift */,
344+
9DBA24711BE2B26D005D6AD6 /* LoginViewController.swift */,
340345
CE0F3C551BD729DD0012B7D7 /* Kluster Screens */,
341346
CE8BE8FF1BB2411A00BBEC24 /* Profile Screen */,
342347
CED448A01BA5136500F11808 /* Home Screen */,
343348
CED4489F1BA5135E00F11808 /* Model */,
344349
CEA8EA151B854B2100DC2AA5 /* Main.storyboard */,
350+
9DBA24731BE2B2D2005D6AD6 /* Login.storyboard */,
345351
CEA8EA181B854B2100DC2AA5 /* Images.xcassets */,
346352
CEA8EA1A1B854B2100DC2AA5 /* LaunchScreen.xib */,
347353
28EE23241BDF1F83009161AE /* Spring */,
@@ -498,6 +504,7 @@
498504
28EE23521BDF1F83009161AE /* LoadingView.xib in Resources */,
499505
CEA8EA1C1B854B2100DC2AA5 /* LaunchScreen.xib in Resources */,
500506
CEA8EA191B854B2100DC2AA5 /* Images.xcassets in Resources */,
507+
9DBA24741BE2B2D2005D6AD6 /* Login.storyboard in Resources */,
501508
);
502509
runOnlyForDeploymentPostprocessing = 0;
503510
};
@@ -572,6 +579,7 @@
572579
28EE234C1BDF1F83009161AE /* DesignableTextView.swift in Sources */,
573580
CE8BE8FE1BB23FFE00BBEC24 /* ProfileViewController.swift in Sources */,
574581
28EE236C1BDF1FF9009161AE /* AnimationController.swift in Sources */,
582+
9DBA24721BE2B26D005D6AD6 /* LoginViewController.swift in Sources */,
575583
28EE234E1BDF1F83009161AE /* ImageLoader.swift in Sources */,
576584
CEA8EA321B854B7F00DC2AA5 /* HomeViewController.swift in Sources */,
577585
28EE23501BDF1F83009161AE /* KeyboardLayoutConstraint.swift in Sources */,

‎Cluster.xcworkspace/xcuserdata/mafellows.xcuserdatad/UserInterfaceState.xcuserstate‎

1.11 KB
Binary file not shown.

‎Cluster.xcworkspace/xcuserdata/mafellows.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,6 @@
1919
landmarkType = "5">
2020
</BreakpointContent>
2121
</BreakpointProxy>
22-
<BreakpointProxy
23-
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
24-
<BreakpointContent
25-
shouldBeEnabled = "Yes"
26-
ignoreCount = "0"
27-
continueAfterRunningActions = "No"
28-
filePath = "Cluster/MessagesTableViewController.swift"
29-
timestampString = "467751059.422643"
30-
startingColumnNumber = "9223372036854775807"
31-
endingColumnNumber = "9223372036854775807"
32-
startingLineNumber = "21"
33-
endingLineNumber = "21"
34-
landmarkName = "viewDidLoad()"
35-
landmarkType = "5">
36-
</BreakpointContent>
37-
</BreakpointProxy>
3822
<BreakpointProxy
3923
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
4024
<BreakpointContent
@@ -63,8 +47,8 @@
6347
endingColumnNumber = "9223372036854775807"
6448
startingLineNumber = "37"
6549
endingLineNumber = "37"
66-
landmarkName = "numberOfSectionsInTableView(_:)"
67-
landmarkType = "5">
50+
landmarkName = "MessagesTableViewController"
51+
landmarkType = "3">
6852
</BreakpointContent>
6953
</BreakpointProxy>
7054
</Breakpoints>

‎Cluster/AppDelegate.swift‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1818

1919
Parse.enableLocalDatastore()
2020

21-
2221
Parse.setApplicationId("x2X4qfklv87fys08IPwRGrV8ZTK8ZiK0BOCyw0PL", clientKey: "fmh7ckro2uB3WSfwlUjv3HII2JiokuINTwp3kwl2")
23-
22+
PFFacebookUtils.initializeFacebookWithApplicationLaunchOptions(launchOptions)
2423

2524
return true
2625
}
@@ -41,12 +40,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4140

4241
func applicationDidBecomeActive(application: UIApplication) {
4342
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
43+
FBSDKAppEvents.activateApp()
4444
}
4545

4646
func applicationWillTerminate(application: UIApplication) {
4747
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4848
}
49-
50-
49+
50+
func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
51+
return FBSDKApplicationDelegate.sharedInstance().application(application,
52+
openURL: url,
53+
sourceApplication: sourceApplication,
54+
annotation: annotation)
55+
}
5156
}
5257

‎Cluster/Base.lproj/Main.storyboard‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@
671671
<rect key="frame" x="0.0" y="22" width="600" height="44"/>
672672
<autoresizingMask key="autoresizingMask"/>
673673
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Twh-ds-AJy" id="vFL-F4-sLk">
674-
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
674+
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
675675
<autoresizingMask key="autoresizingMask"/>
676676
</tableViewCellContentView>
677677
</tableViewCell>
@@ -1208,15 +1208,15 @@
12081208
<rect key="frame" x="0.0" y="253" width="600" height="12"/>
12091209
<autoresizingMask key="autoresizingMask"/>
12101210
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QKl-1o-Nfm" id="UHr-64-ZAI">
1211-
<rect key="frame" x="0.0" y="0.0" width="600" height="11.5"/>
1211+
<rect key="frame" x="0.0" y="0.0" width="600" height="12"/>
12121212
<autoresizingMask key="autoresizingMask"/>
12131213
</tableViewCellContentView>
12141214
</tableViewCell>
12151215
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="50" id="uBC-UL-enr">
12161216
<rect key="frame" x="0.0" y="265" width="600" height="50"/>
12171217
<autoresizingMask key="autoresizingMask"/>
12181218
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uBC-UL-enr" id="CSt-hw-sXu">
1219-
<rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
1219+
<rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
12201220
<autoresizingMask key="autoresizingMask"/>
12211221
<subviews>
12221222
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NAME" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="raZ-d0-oVc">
@@ -1262,7 +1262,7 @@
12621262
<rect key="frame" x="0.0" y="315" width="600" height="50"/>
12631263
<autoresizingMask key="autoresizingMask"/>
12641264
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XJE-qb-m3m" id="AC3-h7-U6o">
1265-
<rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
1265+
<rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
12661266
<autoresizingMask key="autoresizingMask"/>
12671267
<subviews>
12681268
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="AGE" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ueG-ZC-zZt">
@@ -1298,7 +1298,7 @@
12981298
<rect key="frame" x="0.0" y="365" width="600" height="50"/>
12991299
<autoresizingMask key="autoresizingMask"/>
13001300
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kzm-oc-Imh" id="Itg-69-1D4">
1301-
<rect key="frame" x="0.0" y="0.0" width="600" height="49.5"/>
1301+
<rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
13021302
<autoresizingMask key="autoresizingMask"/>
13031303
<subviews>
13041304
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LOCATION" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiP-Jf-zFS">
@@ -1344,7 +1344,7 @@
13441344
<rect key="frame" x="0.0" y="437" width="600" height="137"/>
13451345
<autoresizingMask key="autoresizingMask"/>
13461346
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qcu-5n-R6G" id="FTp-Fs-Ekt">
1347-
<rect key="frame" x="0.0" y="0.0" width="600" height="136.5"/>
1347+
<rect key="frame" x="0.0" y="0.0" width="600" height="137"/>
13481348
<autoresizingMask key="autoresizingMask"/>
13491349
<subviews>
13501350
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" text="Some test text." translatesAutoresizingMaskIntoConstraints="NO" id="AoN-qV-m1T">
@@ -1360,7 +1360,7 @@
13601360
<rect key="frame" x="0.0" y="574" width="600" height="137"/>
13611361
<autoresizingMask key="autoresizingMask"/>
13621362
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dZn-kQ-znH" id="9cm-hf-tbc">
1363-
<rect key="frame" x="0.0" y="0.0" width="600" height="136.5"/>
1363+
<rect key="frame" x="0.0" y="0.0" width="600" height="137"/>
13641364
<autoresizingMask key="autoresizingMask"/>
13651365
<subviews>
13661366
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k8b-7N-tUT" customClass="DesignableButton" customModule="Cluster" customModuleProvider="target">

‎Cluster/Cluster-Bridging-Header.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
//
44

55
#import <Parse/Parse.h>
6+
#import <FBSDKCoreKit/FBSDKCoreKit.h>
7+
#import <ParseFacebookUtilsV4/PFFacebookUtils.h>
68
#import "SWRevealViewController.h"

‎Cluster/Login.storyboard‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
3+
<dependencies>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
6+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
7+
</dependencies>
8+
<scenes>
9+
<!--Login View Controller-->
10+
<scene sceneID="bbS-Ao-SlG">
11+
<objects>
12+
<viewController storyboardIdentifier="LoginViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="DoV-9U-lLc" customClass="LoginViewController" customModule="Cluster" customModuleProvider="target" sceneMemberID="viewController">
13+
<layoutGuides>
14+
<viewControllerLayoutGuide type="top" id="l11-IV-AqP"/>
15+
<viewControllerLayoutGuide type="bottom" id="i2x-R9-0vp"/>
16+
</layoutGuides>
17+
<view key="view" contentMode="scaleToFill" id="w4B-pY-5Jh">
18+
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20+
<subviews>
21+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T7T-xu-GBs">
22+
<rect key="frame" x="20" y="550" width="560" height="30"/>
23+
<constraints>
24+
<constraint firstAttribute="height" constant="30" id="XRh-VQ-7Nd"/>
25+
</constraints>
26+
<state key="normal" title="Login With Facebook"/>
27+
<connections>
28+
<action selector="loginWithFacebookPressed:" destination="DoV-9U-lLc" eventType="touchUpInside" id="wPH-gF-MWh"/>
29+
</connections>
30+
</button>
31+
</subviews>
32+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
33+
<constraints>
34+
<constraint firstAttribute="leadingMargin" secondItem="T7T-xu-GBs" secondAttribute="leading" id="9VA-Wo-MCt"/>
35+
<constraint firstAttribute="trailingMargin" secondItem="T7T-xu-GBs" secondAttribute="trailing" id="EhT-X4-6Uj"/>
36+
<constraint firstItem="i2x-R9-0vp" firstAttribute="top" secondItem="T7T-xu-GBs" secondAttribute="bottom" constant="20" id="hVv-Gw-ioy"/>
37+
</constraints>
38+
</view>
39+
</viewController>
40+
<placeholder placeholderIdentifier="IBFirstResponder" id="7bw-qJ-nb3" userLabel="First Responder" sceneMemberID="firstResponder"/>
41+
</objects>
42+
<point key="canvasLocation" x="836" y="419"/>
43+
</scene>
44+
</scenes>
45+
</document>

0 commit comments

Comments
 (0)