Skip to content

Commit

Permalink
Merge pull request #54 from Lambda-School-Labs/staging
Browse files Browse the repository at this point in the history 
Staging -> Master
  • Loading branch information
@bobbyhalljr
bobbyhalljr authored Apr 29, 2020
2 parents 8cf406e + 42dc759 commit 4ae52c4
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 157 deletions.
Binary file added Presentation/Swaap Demo Day Presentation.key
View file
Binary file not shown.
0 swaap video script.md → Presentation/swaap video script.md
View file
File renamed without changes.
0 swaap video script.txt → Presentation/swaap video script.txt
View file
File renamed without changes.
12 changes: 8 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,22 @@

* You can find the deployed project [the iOS App Store](https://apple.co/37dNMdI) or the deployed [website](htt[s://swaap.co]).

* [Project Video](https://www.youtube.com/watch?v=udMbmjqXUrc)
* Project Videos:
* [Labs 18](https://www.youtube.com/watch?v=udMbmjqXUrc)
* [Labs 22](https://www.youtube.com/watch?v=dmQT35PXuck)

* [Trello Board](https://trello.com/b/Jh8cS46t/conference-contacts)
* Trello Board:
* [Labs 18](https://trello.com/b/Jh8cS46t/conference-contacts)
* [Labs 22](https://trello.com/b/PSg0U9VH/labs-22-swaap)

* [Product Canvas](https://www.notion.so/Release-1-0-Auth-User-Profile-7abf0ffafe804fc88e9af40ed335f17b)

* [UX Design files](https://www.figma.com/file/CkvwWMzxcI4lI4udHm8QiH/Labs18_Conference-Contacts%2C-Emily%2CTylerr?node-id=211%3A5)

Swaap is an app to help professional people make great contacts at events such as conferences, conventions, or trade shows. A lot of times it can be difficult to keep track of the people you've added to your network. Swaap makes it super easy to swap contact information with others and keep in touch. Easy QR code reader or NFC will automatically redirect you to that person's profile page where you are shown many different ways to connect with that person. Their profile will even let you know what the best way to get in touch with them.

<img src="Screenshots/girlLightFrontOfCard.png" width="400"> <img src="Screenshots/guyDarkFronOfCard.png" width="400">
<img src="Screenshots/girlLightBackOfCard.png" width="400"> <img src="Screenshots/guyDarkBackOfcard.png" width="400">
<img src="Screenshots/labs22LightProfile.png" width="400"> <img src="Screenshots/labs22DarkProfile.png" width="400">
<img src="Screenshots/labs22LightQRCode.png" width="400"> <img src="Screenshots/labs22DarkQRCode.png" width="400">


### Features
Expand Down
Binary file added Screenshots/labs22DarkProfile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/labs22DarkQRCode.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/labs22LightProfile.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshots/labs22LightQRCode.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions swaap/swaap.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
33C00788238FDDEC000D72A7 /* VectorExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C00787238FDDEC000D72A7 /* VectorExtensions.swift */; };
33CCBABA2398F21200A98C82 /* ProfileController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CCBAB92398F21200A98C82 /* ProfileController.swift */; };
33CCBABC2398F3C200A98C82 /* GQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CCBABB2398F3C200A98C82 /* GQuery.swift */; };
33E7BBFD23A19BC000D81C02 /* QRViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E7BBFC23A19BC000D81C02 /* QRViewController.swift */; };
33E7BC0923A19CBD00D81C02 /* HandyExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E7BC0823A19CBC00D81C02 /* HandyExtensions.swift */; };
33E8C7C323AC6025005E1E2C /* LocationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E8C7C223AC6025005E1E2C /* LocationHandler.swift */; };
33E8C7E023AD884E005E1E2C /* SwaapGQLQueries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E8C7DF23AD884D005E1E2C /* SwaapGQLQueries.swift */; };
Expand Down Expand Up @@ -198,7 +197,6 @@
33C00787238FDDEC000D72A7 /* VectorExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VectorExtensions.swift; sourceTree = "<group>"; };
33CCBAB92398F21200A98C82 /* ProfileController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileController.swift; sourceTree = "<group>"; usesTabs = 1; };
33CCBABB2398F3C200A98C82 /* GQuery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GQuery.swift; sourceTree = "<group>"; };
33E7BBFC23A19BC000D81C02 /* QRViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRViewController.swift; sourceTree = "<group>"; };
33E7BC0823A19CBC00D81C02 /* HandyExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HandyExtensions.swift; sourceTree = "<group>"; };
33E8C7C223AC6025005E1E2C /* LocationHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocationHandler.swift; sourceTree = "<group>"; };
33E8C7DF23AD884D005E1E2C /* SwaapGQLQueries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwaapGQLQueries.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -489,7 +487,6 @@
37F93449239736B000ACBA23 /* EditProfileViewController.swift */,
37F9344F2397399500ACBA23 /* EditProfileViewController+Camera.swift */,
37F934572398941400ACBA23 /* InputTextFieldViewController.swift */,
33E7BBFC23A19BC000D81C02 /* QRViewController.swift */,
37A8B3A023ABFBFE0019F17B /* ConnectViewController.swift */,
37A8B3AA23AC0D2D0019F17B /* ScannerViewController.swift */,
37B3958B23BEAAC1001BEE01 /* NotificationViewController.swift */,
Expand Down Expand Up @@ -921,7 +918,6 @@
37B3958C23BEAAC1001BEE01 /* NotificationViewController.swift in Sources */,
3797A5702388637800CB8621 /* Storyboarded.swift in Sources */,
37A2F41D237D543B00C1EF3B /* ButtonHelper.swift in Sources */,
33E7BBFD23A19BC000D81C02 /* QRViewController.swift in Sources */,
37B3B70E238F50D700FB9CFA /* SocialButton.swift in Sources */,
33CCBABC2398F3C200A98C82 /* GQuery.swift in Sources */,
37F9344A239736B000ACBA23 /* EditProfileViewController.swift in Sources */,
Expand Down
61 changes: 0 additions & 61 deletions swaap/swaap/Storyboards/Connect.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,66 +238,6 @@ tap button for camera</string>
</objects>
<point key="canvasLocation" x="1353.6231884057972" y="561.83035714285711"/>
</scene>
<!--View Controller-->
<scene sceneID="yxI-M4-SN8">
<objects>
<viewController storyboardIdentifier="QRViewController" id="BaM-Hi-uyt" customClass="QRViewController" customModule="swaap" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="cgi-jh-UfU">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="chevron.compact.down" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="Afz-eK-ifu">
<rect key="frame" x="162.66666666666666" y="71" width="50" height="21"/>
<color key="tintColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="cgF-uO-DwT"/>
<constraint firstAttribute="height" constant="35" id="ynj-Jk-ibd"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7D7-BL-Dvg">
<rect key="frame" x="64" y="282.66666666666669" width="247" height="247.00000000000006"/>
<accessibility key="accessibilityConfiguration" identifier="QRVC.QRImageView"/>
<constraints>
<constraint firstAttribute="width" secondItem="7D7-BL-Dvg" secondAttribute="height" multiplier="1:1" id="RmW-gM-qHz"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Once your new connection has their swaap app open to the camera, show them this QR code!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tep-kJ-WHZ">
<rect key="frame" x="60" y="167.66666666666666" width="255" height="81.333333333333343"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(Staging Environment)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8OW-zh-r36">
<rect key="frame" x="102" y="537.66666666666663" width="171" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="tep-kJ-WHZ" firstAttribute="leading" secondItem="oYF-fr-cMY" secondAttribute="leading" constant="60" id="L7C-gF-KNh"/>
<constraint firstItem="7D7-BL-Dvg" firstAttribute="centerY" secondItem="cgi-jh-UfU" secondAttribute="centerY" id="Tvj-T9-OBy"/>
<constraint firstItem="oYF-fr-cMY" firstAttribute="trailing" secondItem="7D7-BL-Dvg" secondAttribute="trailing" constant="64" id="XfA-vd-keZ"/>
<constraint firstItem="Afz-eK-ifu" firstAttribute="centerX" secondItem="cgi-jh-UfU" secondAttribute="centerX" id="aMf-iu-b0Q"/>
<constraint firstItem="7D7-BL-Dvg" firstAttribute="top" secondItem="tep-kJ-WHZ" secondAttribute="bottom" constant="33.666666666666629" id="aTx-YL-Hiy"/>
<constraint firstItem="8OW-zh-r36" firstAttribute="top" secondItem="7D7-BL-Dvg" secondAttribute="bottom" constant="8" id="ecd-xQ-MAn"/>
<constraint firstItem="8OW-zh-r36" firstAttribute="centerX" secondItem="7D7-BL-Dvg" secondAttribute="centerX" id="gQr-mL-TcG"/>
<constraint firstItem="oYF-fr-cMY" firstAttribute="trailing" secondItem="tep-kJ-WHZ" secondAttribute="trailing" constant="60" id="jOK-BD-kL7"/>
<constraint firstItem="Afz-eK-ifu" firstAttribute="top" secondItem="oYF-fr-cMY" secondAttribute="top" constant="20" id="kLA-IL-edd"/>
<constraint firstItem="7D7-BL-Dvg" firstAttribute="leading" secondItem="oYF-fr-cMY" secondAttribute="leading" constant="64" id="r0g-jA-DIq"/>
</constraints>
<viewLayoutGuide key="safeArea" id="oYF-fr-cMY"/>
</view>
<connections>
<outlet property="qrImageView" destination="7D7-BL-Dvg" id="Pw7-dp-WUt"/>
<outlet property="stagingIndicatorLabel" destination="8OW-zh-r36" id="avs-K6-bFJ"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="m22-3r-njp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="587" y="-195"/>
</scene>
<!--Swipe Back Navigation Controller-->
<scene sceneID="IB4-Tw-Dff">
<objects>
Expand All @@ -320,7 +260,6 @@ tap button for camera</string>
</scenes>
<resources>
<image name="camera.viewfinder" catalog="system" width="128" height="114"/>
<image name="chevron.compact.down" catalog="system" width="128" height="43"/>
<image name="dot.radiowaves.left.and.right" catalog="system" width="128" height="89"/>
<image name="photo" catalog="system" width="128" height="93"/>
<image name="swaaplogoblues" width="233" height="333"/>
Expand Down
88 changes: 0 additions & 88 deletions swaap/swaap/View Controllers/QRViewController.swift
View file

This file was deleted.

0 comments on commit 4ae52c4

Please sign in to comment.