Merged branch Sales-Redirect into master

Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "396"
+            startingLineNumber = "437"
-            endingLineNumber = "396"
+            endingLineNumber = "437"
             landmarkName = "tableView(_:cellForRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -42,11 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "106"
+            startingLineNumber = "140"
-            endingLineNumber = "106"
+            endingLineNumber = "140"
             landmarkName = "activeHistorSegSwitch(_:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -58,11 +58,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/MenuPanelViewController.swift"
-            timestampString = "504757534.091052"
+            timestampString = "505228994.948802"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "140"
+            startingLineNumber = "141"
-            endingLineNumber = "140"
+            endingLineNumber = "141"
             landmarkName = "MenuPanelViewController"
             landmarkType = "3">
          </BreakpointContent>
@@ -152,11 +152,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/MenuPanelViewController.swift"
-            timestampString = "504757491.577779"
+            timestampString = "505228994.948802"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "96"
+            startingLineNumber = "97"
-            endingLineNumber = "96"
+            endingLineNumber = "97"
             landmarkName = "tableView(_:cellForRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -248,11 +248,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/MenuPanelViewController.swift"
-            timestampString = "504763946.426514"
+            timestampString = "505228994.948802"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "69"
+            startingLineNumber = "70"
-            endingLineNumber = "69"
+            endingLineNumber = "70"
             landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -280,7 +280,7 @@
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505143090.189899"
+                  timestampString = "505232756.284131"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -295,7 +295,7 @@
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505143090.190043"
+                  timestampString = "505232756.284321"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -310,7 +310,7 @@
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505143090.190152"
+                  timestampString = "505232756.284478"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -325,7 +325,7 @@
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505143090.190242"
+                  timestampString = "505232756.284637"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -358,11 +358,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "253"
+            startingLineNumber = "294"
-            endingLineNumber = "253"
+            endingLineNumber = "294"
             landmarkName = "numberOfSectionsInTableView(_:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -374,11 +374,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "493"
+            startingLineNumber = "534"
-            endingLineNumber = "493"
+            endingLineNumber = "534"
             landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -390,11 +390,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "494"
+            startingLineNumber = "535"
-            endingLineNumber = "494"
+            endingLineNumber = "535"
             landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -406,11 +406,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/HomeViewController.swift"
-            timestampString = "505142560.542505"
+            timestampString = "505231873.493537"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "212"
+            startingLineNumber = "213"
-            endingLineNumber = "212"
+            endingLineNumber = "213"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
             <Locations>
@@ -454,11 +454,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/HomeViewController.swift"
-            timestampString = "505142560.542505"
+            timestampString = "505231873.493537"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "214"
+            startingLineNumber = "215"
-            endingLineNumber = "214"
+            endingLineNumber = "215"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
             <Locations>
@@ -502,11 +502,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/HomeViewController.swift"
-            timestampString = "505142560.542505"
+            timestampString = "505231873.493537"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "216"
+            startingLineNumber = "217"
-            endingLineNumber = "216"
+            endingLineNumber = "217"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
          </BreakpointContent>
@@ -518,11 +518,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/HomeViewController.swift"
-            timestampString = "505142560.542505"
+            timestampString = "505231873.493537"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "149"
+            startingLineNumber = "150"
-            endingLineNumber = "149"
+            endingLineNumber = "150"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
          </BreakpointContent>
@@ -534,11 +534,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "107"
+            startingLineNumber = "141"
-            endingLineNumber = "107"
+            endingLineNumber = "141"
             landmarkName = "activeHistorSegSwitch(_:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -550,14 +550,46 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Vendoo/ItemTableViewController.swift"
-            timestampString = "505143089.818284"
+            timestampString = "505233658.513094"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "120"
+            startingLineNumber = "154"
-            endingLineNumber = "120"
+            endingLineNumber = "154"
             landmarkName = "historyCurrentlyFilterSegSwitch(_:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Vendoo/HomeViewController.swift"
+            timestampString = "505231873.493537"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "88"
+            endingLineNumber = "88"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Vendoo/ItemTableViewController.swift"
+            timestampString = "505233658.513094"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Vendoo/HomeViewController.swift

@@ -82,9 +82,10 @@ class HomeViewController: UITabBarController {
                 }
                 
                 NSUserDefaults.standardUserDefaults().setObject(userDict!["name"] as? String, forKey: "name")
-                
                 //check if user has any listings to track for notifications
-                if listingDict != nil {
+                NSUserDefaults.standardUserDefaults().removeObjectForKey("isAnalytics")
+
+                if listingDict != nil || !NSUserDefaults.standardUserDefaults().boolForKey("isAnalytics"){
                     var notificationStartTracker = 0 //number used to indicate when to start retrieving notifications
                     
                     dispatch_async(dispatch_get_main_queue(), {

Vendoo/ItemTableViewController.swift

@@ -23,19 +23,49 @@ class ItemTableViewController: UIViewController {
     
     @IBOutlet weak var historyCurrentlyFilter: UISegmentedControl!
     
+    @IBOutlet weak var cancelBtn: UIBarButtonItem!
     
     var loadingView: UIView!
     var selectedListing: Listing!
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        //Check if this segment was loaded through the analytics button
+        if(NSUserDefaults.standardUserDefaults().boolForKey("isAnalytics")){
+            dispatch_async(dispatch_get_main_queue(), {
+                self.tabBarController?.tabBar.hidden = true
+                self.tableSegmentController.selectedSegmentIndex = 1
+                self.tableSegmentController.userInteractionEnabled = false
+                self.tableSegmentController.hidden = true
+                self.tableSegmentController.enabled = false
+                self.tabBarController?.tabBar.userInteractionEnabled = false
+                self.cancelBtn.enabled = true
+                self.cancelBtn.tintColor = UIColor(red: 0.35, green: 0.83, blue: 0.74, alpha: 1.0)
+                self.historyCurrentlyFilter.setTitle("Sold", forSegmentAtIndex: 0)
+                self.historyCurrentlyFilter.setTitle("Unsold", forSegmentAtIndex: 1)
+            })
+        }else{
+            dispatch_async(dispatch_get_main_queue(), {
+                self.tabBarController?.tabBar.hidden = false
+                self.tableSegmentController.selectedSegmentIndex = 0
+                self.tableSegmentController.userInteractionEnabled = true
+                self.tableSegmentController.hidden = false
+                self.tableSegmentController.enabled = true
+                self.historyCurrentlyFilter.setTitle("Active", forSegmentAtIndex: 0)
+                self.historyCurrentlyFilter.setTitle("Draft", forSegmentAtIndex: 1)
+                self.cancelBtn.enabled = false
+                self.cancelBtn.tintColor = UIColor.clearColor()
+                self.tabBarController?.tabBar.userInteractionEnabled = true
+            })
+        }
+        
         // Uncomment the following line to preserve selection between presentations
         // self.clearsSelectionOnViewWillAppear = false
 
         // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
         // self.navigationItem.rightBarButtonItem = self.editButtonItem()
         
-        self.tabBarController?.tabBar.hidden = false
+        //self.tabBarController?.tabBar.hidden = false
         
         //set delegates
         self.itemTable.dataSource = self
@@ -81,6 +111,10 @@ class ItemTableViewController: UIViewController {
         self.tabBarController?.tabBar.hidden = false
         
     }
+    
+    override func viewWillDisappear(animated: Bool) {
+        NSUserDefaults.standardUserDefaults().removeObjectForKey("isAnalytics")
+    }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
@@ -120,6 +154,13 @@ extension ItemTableViewController {
         self.itemTable.reloadData()
     }
     
+    @IBAction func cancelPressed(sender:AnyObject){
+        let vc = self.storyboard?.instantiateViewControllerWithIdentifier("Reveal View Controller")
+        NSUserDefaults.standardUserDefaults().removeObjectForKey("isAnalytics")
+        self.navigationItem.rightBarButtonItem = nil
+        self.presentViewController(vc!, animated: false, completion: nil)
+    }
+    
 }
 
 // MARK: - Side Menu View

Vendoo/Main.storyboard

@@ -1187,6 +1187,12 @@
                                                 <segue destination="mWD-m1-fQS" kind="modal" id="NOz-ya-avj"/>
                                             </connections>
                                         </barButtonItem>
+                                        <barButtonItem key="rightBarButtonItem" systemItem="stop" id="Bug-zf-hXF">
+                                            <color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
+                                            <connections>
+                                                <action selector="cancelPressed:" destination="Iwh-sn-a0Q" id="Icq-hE-OY1"/>
+                                            </connections>
+                                        </barButtonItem>
                                     </navigationItem>
                                 </items>
                             </navigationBar>
@@ -1314,6 +1320,7 @@
                     <nil key="simulatedStatusBarMetrics"/>
                     <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
                     <connections>
+                        <outlet property="cancelBtn" destination="Bug-zf-hXF" id="EiJ-ib-0Jw"/>
                         <outlet property="historyCurrentlyFilter" destination="hyA-UD-JyK" id="FLi-xQ-Bgr"/>
                         <outlet property="itemTable" destination="Thg-pb-lhN" id="u15-xE-hz6"/>
                         <outlet property="menuButton" destination="WjT-mo-4jm" id="1CT-vV-KLK"/>
@@ -1472,6 +1479,9 @@
                                                 </imageView>
                                             </subviews>
                                         </tableViewCellContentView>
+                                        <connections>
+                                            <segue destination="l3z-FC-7D6" kind="custom" customClass="SWRevealViewControllerSeguePushController" id="ria-Nw-h7a"/>
+                                        </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="FAQ_Cell" id="Ak8-L0-HzG">
                                         <rect key="frame" x="0.0" y="177" width="375" height="44"/>
@@ -2489,13 +2499,13 @@
         <image name="start" width="50" height="50"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="syc-IR-LNQ"/>
+        <segue reference="ria-Nw-h7a"/>
-        <segue reference="Ds4-LY-IRj"/>
+        <segue reference="NOz-ya-avj"/>
+        <segue reference="qb4-wt-avv"/>
         <segue reference="Gnt-iE-cW9"/>
         <segue reference="eaI-bm-1aI"/>
         <segue reference="nUj-1v-ftF"/>
-        <segue reference="NOz-ya-avj"/>
+        <segue reference="Ds4-LY-IRj"/>
-        <segue reference="qb4-wt-avv"/>
     </inferredMetricsTieBreakers>
     <color key="tintColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
 </document>

Vendoo/MenuPanelViewController.swift

@@ -63,6 +63,7 @@ extension MenuPanelViewController: UITableViewDelegate
             
         //display analytics (next iteration)
         case 3:
+            NSUserDefaults.standardUserDefaults().setObject(true, forKey: "isAnalytics")
             break
             
         //display FAQ cell