summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Volta.xcworkspace/contents.xcworkspacedata1
-rw-r--r--Volta/Views/LoginViewController.m17
-rw-r--r--Volta/Volta-Prefix.pch1
-rw-r--r--Volta/en.lproj/MainStoryboard.storyboard172
5 files changed, 186 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index b7d7400..1311504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
-*.xcworkspace
!default.xcworkspace
xcuserdata
profile
@@ -17,3 +16,4 @@ profile
DerivedData
.idea/
Podfile.lock
+Volta.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Volta.xcworkspace/contents.xcworkspacedata b/Volta.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..956b68b
--- /dev/null
+++ b/Volta.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8'?><Workspace version='1.0'><FileRef location='group:Volta.xcodeproj'/><FileRef location='group:Pods/Pods.xcodeproj'/></Workspace> \ No newline at end of file
diff --git a/Volta/Views/LoginViewController.m b/Volta/Views/LoginViewController.m
index 341b274..4f3b10a 100644
--- a/Volta/Views/LoginViewController.m
+++ b/Volta/Views/LoginViewController.m
@@ -35,6 +35,22 @@
self.password.leftViewMode = UITextFieldViewModeAlways;
self.contentView.$y = 0;
+
+ // prepopulate username/password with stored information
+ NSError *error;
+ NSString *username = [SSKeychain passwordForService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT error:&error];
+ if (error) { username = nil; }
+ NSString *password = [SSKeychain passwordForService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT error:&error];
+ if (error) { password = nil; }
+
+ if (username)
+ {
+ self.email.text = username;
+ }
+ if (password)
+ {
+ self.password.text = password;
+ }
}
@@ -184,4 +200,5 @@
}
+
@end
diff --git a/Volta/Volta-Prefix.pch b/Volta/Volta-Prefix.pch
index 938b997..3861be7 100644
--- a/Volta/Volta-Prefix.pch
+++ b/Volta/Volta-Prefix.pch
@@ -33,6 +33,7 @@
//#define HOST @"" // PROD
#define HOST @"http://fast-gorge-5977.herokuapp.com" // DEV
+#define URL_TOKEN @"?token=%@"
#define URL_LOGIN @"/login"
#define URL_LOGOUT @"/logout"
diff --git a/Volta/en.lproj/MainStoryboard.storyboard b/Volta/en.lproj/MainStoryboard.storyboard
index 41f84ea..2531538 100644
--- a/Volta/en.lproj/MainStoryboard.storyboard
+++ b/Volta/en.lproj/MainStoryboard.storyboard
@@ -92,17 +92,180 @@
</objects>
<point key="canvasLocation" x="676" y="46"/>
</scene>
- <!--View Controller-->
+ <!--View Controller - Graph-->
+ <scene sceneID="vzw-RS-NdO">
+ <objects>
+ <viewController id="jXX-Hl-vMK" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="RNT-pX-Ndy">
+ <rect key="frame" x="0.0" y="20" width="568" height="251"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+ </view>
+ <tabBarItem key="tabBarItem" title="Graph" id="mih-A8-3eo"/>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="WLB-YE-vcF" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="1602" y="1037"/>
+ </scene>
+ <!--View Controller - Table-->
+ <scene sceneID="Z8b-Q5-fhC">
+ <objects>
+ <viewController id="iov-Wj-U1x" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="frN-a3-8Kd">
+ <rect key="frame" x="0.0" y="20" width="568" height="251"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+ </view>
+ <tabBarItem key="tabBarItem" title="Table" id="tGC-Ag-uNg"/>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="EhK-Tt-ico" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="1672" y="568"/>
+ </scene>
+ <!--Tab Bar Controller - Statistics-->
+ <scene sceneID="VvW-f8-jo2">
+ <objects>
+ <tabBarController definesPresentationContext="YES" id="f4D-Nl-1Q5" sceneMemberID="viewController">
+ <navigationItem key="navigationItem" title="Statistics" id="9AT-do-y0Z"/>
+ <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
+ <tabBar key="tabBar" contentMode="scaleToFill" id="gDo-Eb-Z3G">
+ <rect key="frame" x="129" y="330" width="163" height="49"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+ </tabBar>
+ <connections>
+ <segue destination="iov-Wj-U1x" kind="relationship" relationship="viewControllers" id="ORp-hP-fbD"/>
+ <segue destination="jXX-Hl-vMK" kind="relationship" relationship="viewControllers" id="HV5-qo-jfa"/>
+ </connections>
+ </tabBarController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="h6N-95-9pC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="939" y="582"/>
+ </scene>
+ <!--View Controller - Select Time Period-->
<scene sceneID="quO-Wa-U6p">
<objects>
<viewController id="lv2-8L-bY1" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="HAf-JS-Kd2">
<rect key="frame" x="0.0" y="20" width="568" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+ <subviews>
+ <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="UXO-Vt-5K9">
+ <rect key="frame" x="0.0" y="44" width="568" height="256"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Start Date" minimumFontSize="17" id="FTW-dx-T0r">
+ <rect key="frame" x="76" y="184" width="160" height="30"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <fontDescription key="fontDescription" type="system" pointSize="18"/>
+ <textInputTraits key="textInputTraits" returnKeyType="next"/>
+ <connections>
+ <outlet property="delegate" destination="lv2-8L-bY1" id="6TX-S1-CNs"/>
+ </connections>
+ </textField>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="cuU-tX-8gu">
+ <rect key="frame" x="454" y="182" width="92" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <state key="normal" title="Go">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="PJM-6d-TeN">
+ <rect key="frame" x="20" y="98" width="528" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <state key="normal" title="Last 60 days">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="X35-Uk-NCu">
+ <rect key="frame" x="20" y="140" width="528" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <state key="normal" title="Current Year (2013)">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="hCt-Nf-lhx">
+ <rect key="frame" x="20" y="55" width="528" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <state key="normal" title="Last 30 days">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ </button>
+ <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="End Date" minimumFontSize="17" id="7zh-ce-be2">
+ <rect key="frame" x="277" y="184" width="160" height="30"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <fontDescription key="fontDescription" type="system" pointSize="18"/>
+ <textInputTraits key="textInputTraits" returnKeyType="next"/>
+ <connections>
+ <outlet property="delegate" destination="lv2-8L-bY1" id="aNe-SM-ZxM"/>
+ </connections>
+ </textField>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="Prl-07-V0C">
+ <rect key="frame" x="20" y="13" width="528" height="34"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <color key="backgroundColor" red="0.074509806930000005" green="0.062745101750000004" blue="0.29019609089999998" alpha="1" colorSpace="deviceRGB"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+ <state key="normal" title="Current Month (June 2013)">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ <state key="highlighted">
+ <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </state>
+ </button>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="From" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0zU-1a-0yD">
+ <rect key="frame" x="23" y="188" width="40" height="21"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="to" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GM9-Lw-EXV">
+ <rect key="frame" x="250" y="188" width="15" height="21"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ </scrollView>
+ </subviews>
+ <color key="backgroundColor" red="0.92549026010000002" green="0.91764712329999998" blue="0.90980398650000005" alpha="1" colorSpace="deviceRGB"/>
<simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
</view>
- <navigationItem key="navigationItem" id="vag-rM-2cb"/>
+ <navigationItem key="navigationItem" title="Select Time Period" id="vag-rM-2cb"/>
+ <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" barStyle="blackTranslucent" prompted="NO"/>
+ <connections>
+ <segue destination="f4D-Nl-1Q5" kind="push" id="irZ-KB-Vgl"/>
+ </connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="90L-NY-XHf" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@@ -136,9 +299,6 @@
<class className="LoginViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/LoginViewController.h"/>
<relationships>
- <relationship kind="action" name="backgroundTapped:"/>
- <relationship kind="action" name="dismissKeyboard:"/>
- <relationship kind="action" name="login:"/>
<relationship kind="outlet" name="contentView" candidateClass="UIView"/>
<relationship kind="outlet" name="email" candidateClass="UITextField"/>
<relationship kind="outlet" name="logo" candidateClass="UIImageView"/>
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-02 04:29:24 +0000