From a0362f60f7270d9d3fdd89c5b9bfd9635311f5b5 Mon Sep 17 00:00:00 2001
From: myt588 <Tian@Macintosh.local>
Date: Tue, 26 May 2015 01:40:43 +0800
Subject: [PATCH 1/3] Audio Reimplemented

User Defaults Implemented
---
 Arrived.xcodeproj/project.pbxproj    | 56 ++++++++++++-----
 Arrived/Main.storyboard              | 52 ++++++++--------
 Classes/Services/AudioManager.swift  |  4 +-
 Classes/Services/AudioPlayer.swift   |  2 +-
 Classes/Services/AudioRecorder.swift | 18 +++---
 Classes/Services/User.swift          | 39 +++++++++++-
 Classes/VCs/AddPaymentInfoVC.swift   |  2 +
 Classes/VCs/MainScreenVC.swift       | 91 +++++++---------------------
 Classes/VCs/MakeOrderVC.swift        |  2 +-
 Classes/VCs/UserLocationsTVC.swift   |  1 -
 Classes/VCs/WaveformVC.swift         | 53 +++-------------
 Classes/VCs/WelcomeVC.swift          |  2 +
 12 files changed, 150 insertions(+), 172 deletions(-)

diff --git a/Arrived.xcodeproj/project.pbxproj b/Arrived.xcodeproj/project.pbxproj
index ee997eb..78b78e5 100644
--- a/Arrived.xcodeproj/project.pbxproj
+++ b/Arrived.xcodeproj/project.pbxproj
@@ -136,10 +136,10 @@
 		890E3FBC1AEC5B9500F22912 /* HelperMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperMethods.swift; sourceTree = "<group>"; };
 		890F54C61B0175200066E835 /* OrdersListTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrdersListTVC.swift; sourceTree = "<group>"; };
 		890F54C81B0175370066E835 /* OrdersListTVCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrdersListTVCell.swift; sourceTree = "<group>"; };
-		890F54CA1B01F4120066E835 /* AudioContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioContext.swift; sourceTree = "<group>"; };
-		890F54CB1B01F4120066E835 /* AudioManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioManager.swift; sourceTree = "<group>"; };
-		890F54CC1B01F4120066E835 /* AudioPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = "<group>"; };
-		890F54CD1B01F4120066E835 /* AudioRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioRecorder.swift; sourceTree = "<group>"; };
+		890F54CA1B01F4120066E835 /* AudioContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioContext.swift; path = Services/AudioContext.swift; sourceTree = "<group>"; };
+		890F54CB1B01F4120066E835 /* AudioManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioManager.swift; path = Services/AudioManager.swift; sourceTree = "<group>"; };
+		890F54CC1B01F4120066E835 /* AudioPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioPlayer.swift; path = Services/AudioPlayer.swift; sourceTree = "<group>"; };
+		890F54CD1B01F4120066E835 /* AudioRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioRecorder.swift; path = Services/AudioRecorder.swift; sourceTree = "<group>"; };
 		890F54D21B01F41D0066E835 /* MakeOrderVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MakeOrderVC.swift; sourceTree = "<group>"; };
 		89471C3D1B09F6C600EFE101 /* HoshiTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HoshiTextField.swift; sourceTree = "<group>"; };
 		89471C3E1B09F6C600EFE101 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -185,8 +185,8 @@
 		899DA8D01AF41AC700F0C476 /* email-104.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "email-104.png"; path = "Assets/UI/Icons/email-104.png"; sourceTree = "<group>"; };
 		899DA8D11AF41AC700F0C476 /* mental_status-96.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mental_status-96.png"; path = "Assets/UI/Icons/mental_status-96.png"; sourceTree = "<group>"; };
 		899DA8D21AF41AC700F0C476 /* toilet-104.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "toilet-104.png"; path = "Assets/UI/Icons/toilet-104.png"; sourceTree = "<group>"; };
-		899DA8D81AF4222C00F0C476 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
-		89C413501AF16ACF000C2C95 /* TestUserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUserService.swift; sourceTree = "<group>"; };
+		899DA8D81AF4222C00F0C476 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = Services/User.swift; sourceTree = "<group>"; };
+		89C413501AF16ACF000C2C95 /* TestUserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestUserService.swift; path = Services/TestUserService.swift; sourceTree = "<group>"; };
 		89C413541AF1C3D9000C2C95 /* background.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = background.jpeg; path = Assets/UI/background.jpeg; sourceTree = "<group>"; };
 		89C413561AF1C523000C2C95 /* Screen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Screen.png; path = Assets/UI/Screen.png; sourceTree = "<group>"; };
 		89C4135A1AF1CD91000C2C95 /* Phone Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Phone Icon.png"; path = "Assets/UI/Phone Icon.png"; sourceTree = "<group>"; };
@@ -203,8 +203,8 @@
 		89D7C6B71AE4796500FFD592 /* ImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageLoader.swift; sourceTree = "<group>"; };
 		89E6FB851B11EA98003A8276 /* UserMenuVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserMenuVC.swift; sourceTree = "<group>"; };
 		89E6FB871B12029C003A8276 /* MenuTransitionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuTransitionManager.swift; sourceTree = "<group>"; };
-		89EEF4FF1B00720B006881FD /* TestReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestReviewService.swift; sourceTree = "<group>"; };
-		89EEF5011B007233006881FD /* TestRequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRequestService.swift; sourceTree = "<group>"; };
+		89EEF4FF1B00720B006881FD /* TestReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestReviewService.swift; path = Services/TestReviewService.swift; sourceTree = "<group>"; };
+		89EEF5011B007233006881FD /* TestRequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestRequestService.swift; path = Services/TestRequestService.swift; sourceTree = "<group>"; };
 		89EEF5051B008B05006881FD /* OrderDetailVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderDetailVC.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -287,6 +287,9 @@
 		890D4C6F1AE4433400BD05DF /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				94AF3FCC1B1358A00048FD5F /* Model */,
+				94AF3FCB1B13587F0048FD5F /* Test */,
+				94AF3FCA1B1358590048FD5F /* Audio */,
 				89471C671B0C4D3200EFE101 /* Customizations */,
 				890D4C751AE4433400BD05DF /* Supports */,
 				890D4C701AE4433400BD05DF /* Services */,
@@ -298,17 +301,9 @@
 		890D4C701AE4433400BD05DF /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				890F54CA1B01F4120066E835 /* AudioContext.swift */,
-				890F54CB1B01F4120066E835 /* AudioManager.swift */,
-				890F54CC1B01F4120066E835 /* AudioPlayer.swift */,
-				890F54CD1B01F4120066E835 /* AudioRecorder.swift */,
 				890A1C431AEAD02F00E6E6D9 /* ServiceHandler.swift */,
 				890D4C731AE4433400BD05DF /* UserService.swift */,
 				890D4C711AE4433400BD05DF /* BaseService.swift */,
-				89C413501AF16ACF000C2C95 /* TestUserService.swift */,
-				899DA8D81AF4222C00F0C476 /* User.swift */,
-				89EEF4FF1B00720B006881FD /* TestReviewService.swift */,
-				89EEF5011B007233006881FD /* TestRequestService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -545,6 +540,35 @@
 			path = Frameworks/UICountingLabel;
 			sourceTree = "<group>";
 		};
+		94AF3FCA1B1358590048FD5F /* Audio */ = {
+			isa = PBXGroup;
+			children = (
+				890F54CA1B01F4120066E835 /* AudioContext.swift */,
+				890F54CB1B01F4120066E835 /* AudioManager.swift */,
+				890F54CC1B01F4120066E835 /* AudioPlayer.swift */,
+				890F54CD1B01F4120066E835 /* AudioRecorder.swift */,
+			);
+			name = Audio;
+			sourceTree = "<group>";
+		};
+		94AF3FCB1B13587F0048FD5F /* Test */ = {
+			isa = PBXGroup;
+			children = (
+				89C413501AF16ACF000C2C95 /* TestUserService.swift */,
+				89EEF4FF1B00720B006881FD /* TestReviewService.swift */,
+				89EEF5011B007233006881FD /* TestRequestService.swift */,
+			);
+			name = Test;
+			sourceTree = "<group>";
+		};
+		94AF3FCC1B1358A00048FD5F /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				899DA8D81AF4222C00F0C476 /* User.swift */,
+			);
+			name = Model;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
diff --git a/Arrived/Main.storyboard b/Arrived/Main.storyboard
index fdd4b44..aae8c90 100644
--- a/Arrived/Main.storyboard
+++ b/Arrived/Main.storyboard
@@ -924,7 +924,7 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Addresses" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V8h-OZ-hca">
-                                <rect key="frame" x="108" y="313" width="84.5" height="20"/>
+                                <rect key="frame" x="108" y="313" width="85" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -936,7 +936,7 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Bank Cards" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fwn-we-Bas">
-                                <rect key="frame" x="403" y="313" width="94.5" height="20"/>
+                                <rect key="frame" x="403" y="313" width="95" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -954,25 +954,25 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6rT-Ap-DAE">
-                                <rect key="frame" x="400" y="50.5" width="100" height="100"/>
+                                <rect key="frame" x="400" y="51" width="100" height="100"/>
                                 <state key="normal" image="set pin icon">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Pin" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFd-cb-L2p">
-                                <rect key="frame" x="437.5" y="158.5" width="27" height="20"/>
+                                <rect key="frame" x="438" y="159" width="27" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hC0-qX-lJm">
-                                <rect key="frame" x="100" y="50.5" width="100" height="100"/>
+                                <rect key="frame" x="100" y="51" width="100" height="100"/>
                                 <state key="normal" image="set phone icon">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Phone" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bEy-iD-Wq0">
-                                <rect key="frame" x="125" y="158.5" width="51" height="20"/>
+                                <rect key="frame" x="125" y="159" width="51" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -984,7 +984,7 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 </state>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Support" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jnz-b3-MI2">
-                                <rect key="frame" x="416.5" y="458" width="66.5" height="20"/>
+                                <rect key="frame" x="417" y="458" width="67" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1098,12 +1098,12 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Taylor" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dE6-9f-JIa">
-                                <rect key="frame" x="256" y="371" width="87" height="17.5"/>
+                                <rect key="frame" x="256" y="371" width="87" height="18"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter-Light" family="American Typewriter" pointSize="15"/>
                                 <color key="textColor" red="0.4823529411764706" green="0.4823529411764706" blue="0.4823529411764706" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5zk-aF-uFU">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5zk-aF-uFU">
                                 <rect key="frame" x="498" y="186" width="56" height="56"/>
                                 <state key="normal" image="status ok">
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -1112,38 +1112,38 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                     <action selector="changeStatus:" destination="zRY-j3-8Ei" eventType="touchUpInside" id="kfV-ED-lzY"/>
                                 </connections>
                             </button>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="balance icon" translatesAutoresizingMaskIntoConstraints="NO" id="xNw-5t-PV1">
-                                <rect key="frame" x="482.5" y="351" width="66.5" height="67"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="balance icon" translatesAutoresizingMaskIntoConstraints="NO" id="xNw-5t-PV1">
+                                <rect key="frame" x="483" y="351" width="67" height="67"/>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tasks icon" translatesAutoresizingMaskIntoConstraints="NO" id="7ZI-qF-sWo">
-                                <rect key="frame" x="51" y="351" width="66.5" height="67"/>
+                                <rect key="frame" x="51" y="351" width="67" height="67"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfU-dO-9a3" customClass="UICountingLabel">
-                                <rect key="frame" x="494" y="426" width="43.5" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="3500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfU-dO-9a3" customClass="UICountingLabel">
+                                <rect key="frame" x="494" y="426" width="44" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="0.40784313725490196" green="0.40784313725490196" blue="0.40784313725490196" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="balance" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tsX-nq-Tbt">
-                                <rect key="frame" x="484" y="454" width="62.5" height="19.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="balance" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tsX-nq-Tbt">
+                                <rect key="frame" x="484" y="454" width="63" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter-Light" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="0.41568627450980394" green="0.41960784313725491" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="likes" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V8H-L3-oTb">
-                                <rect key="frame" x="280" y="454" width="37.5" height="19.5"/>
+                                <rect key="frame" x="280" y="454" width="38" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter-Light" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="0.41568627450980394" green="0.41960784313725491" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="tasks" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qTQ-FY-skW">
-                                <rect key="frame" x="63.5" y="454" width="43" height="19.5"/>
+                                <rect key="frame" x="64" y="454" width="43" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter-Light" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="0.41568627450980394" green="0.41960784313725491" blue="0.42745098039215684" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="37" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ITr-a4-c3s" customClass="UICountingLabel">
-                                <rect key="frame" x="73.5" y="426" width="22" height="20"/>
+                                <rect key="frame" x="74" y="426" width="22" height="20"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="17"/>
                                 <color key="textColor" red="0.40784313725490196" green="0.40784313725490196" blue="0.40784313725490196" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1154,21 +1154,21 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                 <color key="textColor" red="0.40784313725490196" green="0.40784313725490196" blue="0.40784313725490196" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my portrait" translatesAutoresizingMaskIntoConstraints="NO" id="yD0-bq-Vn5" userLabel="portrait">
-                                <rect key="frame" x="184" y="99" width="231" height="231.5"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="my portrait" translatesAutoresizingMaskIntoConstraints="NO" id="yD0-bq-Vn5" userLabel="portrait">
+                                <rect key="frame" x="184" y="99" width="231" height="232"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="yD0-bq-Vn5" secondAttribute="height" multiplier="1:1" id="Pg0-Zv-LaK"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" alpha="0.59999999999999998" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="It's a beautiful day, people need to buy my album" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3L-ah-rEZ">
-                                <rect key="frame" x="0.0" y="418.5" width="600" height="17"/>
+                                <rect key="frame" x="0.0" y="419" width="600" height="17"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" name="AmericanTypewriter-Condensed" family="American Typewriter" pointSize="15"/>
                                 <color key="textColor" red="0.4823529412" green="0.4823529412" blue="0.4823529412" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="likes icon" translatesAutoresizingMaskIntoConstraints="NO" id="6Ll-vH-rzw">
-                                <rect key="frame" x="266.5" y="351" width="67" height="67"/>
+                                <rect key="frame" x="267" y="351" width="67" height="67"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="6Ll-vH-rzw" secondAttribute="height" multiplier="1:1" id="uIl-bb-jXY"/>
                                 </constraints>
@@ -1297,13 +1297,13 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="fullName" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dc5-lQ-Ade">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="fullName" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dc5-lQ-Ade">
                                             <rect key="frame" x="8" y="66" width="584" height="21"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="cvv" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="T6q-Kl-sTE">
+                                        <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="cvv" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="T6q-Kl-sTE">
                                             <rect key="frame" x="8" y="95" width="584" height="17"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
@@ -1692,7 +1692,7 @@ Moderation is conducted through a democratic system known as the Tribunal. In th
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="edc-f6-2OI"/>
-        <segue reference="y0z-cC-yKA"/>
+        <segue reference="Z22-2j-XGJ"/>
         <segue reference="OIk-6K-j7x"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Classes/Services/AudioManager.swift b/Classes/Services/AudioManager.swift
index 4a7879b..72a3c07 100644
--- a/Classes/Services/AudioManager.swift
+++ b/Classes/Services/AudioManager.swift
@@ -22,7 +22,7 @@ class AudioManager: NSObject {
             fileManager.createDirectoryAtURL(userFolderUrl, withIntermediateDirectories: true, attributes: nil, error: nil)
             println("audio folder created")
         }
-        println("audio folder is \(userFolderUrl)")
+        //println("audio folder is \(userFolderUrl)")
         return userFolderUrl
     }
     
@@ -54,7 +54,7 @@ class AudioManager: NSObject {
         return true
     }
     
-    func removeAduioWithName(name: NSString) -> Bool{
+    func removeAudioWithName(name: NSString) -> Bool{
         let path = self.audioURLWithName(name)
         if self.exists(path.absoluteString!) {
             let error : NSErrorPointer = nil
diff --git a/Classes/Services/AudioPlayer.swift b/Classes/Services/AudioPlayer.swift
index 7859fc9..3a3fcbf 100644
--- a/Classes/Services/AudioPlayer.swift
+++ b/Classes/Services/AudioPlayer.swift
@@ -21,7 +21,7 @@ class AudioPlayer : NSObject, AVAudioPlayerDelegate{
     
     func playAudio(path : NSURL){
         
-        println("file URL \(path)")
+        //println("file URL \(path)")
         //if it's ready playing an audio
         if (audioPlayer != nil) {
             if (audioPlayer!.playing){
diff --git a/Classes/Services/AudioRecorder.swift b/Classes/Services/AudioRecorder.swift
index 0fcc557..e74918a 100644
--- a/Classes/Services/AudioRecorder.swift
+++ b/Classes/Services/AudioRecorder.swift
@@ -20,6 +20,15 @@ class AudioRecorder: NSObject, AVAudioRecorderDelegate{
         audioContext.active()
     }
     
+    func initRecorder(name : NSString){
+        var error: NSError?
+        let audioRecordingURL = AudioManager().audioDir().URLByAppendingPathComponent("\(name).m4a")
+        audioRecorder = AVAudioRecorder(URL: audioRecordingURL,
+            settings: audioRecordingSettings(),
+            error: &error)
+        audioRecorder?.meteringEnabled = true
+    }
+    
     func audioRecordingPath() -> NSURL{
         let fileManager = NSFileManager()
         let documentsFolderUrl = fileManager.URLForDirectory(.DocumentDirectory, inDomain: .UserDomainMask,
@@ -52,14 +61,7 @@ class AudioRecorder: NSObject, AVAudioRecorderDelegate{
         }
     }
     
-    func startRecording(name: NSString){
-        var error: NSError?
-        
-        let audioRecordingURL = AudioManager().audioDir().URLByAppendingPathComponent("\(name).m4a")
-        
-        audioRecorder = AVAudioRecorder(URL: audioRecordingURL,
-            settings: audioRecordingSettings(),
-            error: &error)
+    func startRecording(){
         audioContext.switchRecord()
         audioContext.disableProximityMonitor()
         if let recorder = audioRecorder{
diff --git a/Classes/Services/User.swift b/Classes/Services/User.swift
index 52bf7b5..d5478b6 100644
--- a/Classes/Services/User.swift
+++ b/Classes/Services/User.swift
@@ -8,8 +8,6 @@
 
 import Foundation
 
-
-
 class User {
     
     struct location {
@@ -27,9 +25,44 @@ class User {
         private var cvv: String
     }
     
+    var uid : Int? = nil
+    var sid : String? = nil
+    var regTime : Int? = nil
+    var deviceId : String? = nil
+    var token : String? = nil
+    var sessionValidTime : Int = 3
+    
     private var locations = [location]?()
     private var bankCards = [bankCard]?()
-    var id = 0
+    
+    func saveLoginInfo() -> Bool{
+        var login : NSUserDefaults = NSUserDefaults.standardUserDefaults()
+        if (uid == nil || sid == nil || regTime == nil || deviceId == nil || token == nil){
+            return false
+        } else {
+            login.setInteger(uid!, forKey: "uid")
+            login.setObject(sid, forKey: "sid")
+            login.setInteger(regTime!, forKey: "regTime")
+            login.setObject(deviceId, forKey: "deviceId")
+            login.setObject(token, forKey: "token")
+        }
+        return true
+    }
+    
+    func verifySession() -> Bool{
+        var login = NSUserDefaults.standardUserDefaults()
+        let regTime : Int = login.integerForKey("regTime")
+        let currentTime = NSDate()
+        let curTime = Int(currentTime.timeIntervalSince1970)
+        sessionValidTime = sessionValidTime * 24 * 60 * 60
+        let temp = regTime + sessionValidTime
+        if (temp > curTime){
+            return true
+        }
+        return false
+    }
+    
+    
     
 
 }
diff --git a/Classes/VCs/AddPaymentInfoVC.swift b/Classes/VCs/AddPaymentInfoVC.swift
index bc38433..f43ff09 100755
--- a/Classes/VCs/AddPaymentInfoVC.swift
+++ b/Classes/VCs/AddPaymentInfoVC.swift
@@ -9,6 +9,8 @@
 //
 
 import UIKit
+//import SHSPhoneComponent
+
 
 class AddPaymentInfoVC: UIViewController, UITextFieldDelegate, UIPickerViewDelegate, UIPickerViewDataSource {
     
diff --git a/Classes/VCs/MainScreenVC.swift b/Classes/VCs/MainScreenVC.swift
index 80d0372..2a04560 100755
--- a/Classes/VCs/MainScreenVC.swift
+++ b/Classes/VCs/MainScreenVC.swift
@@ -10,12 +10,7 @@ import UIKit
 import AVFoundation
 import Foundation
 
-class RecordedAudio: NSObject {
-    var title: String?
-    var filePathURL: String?
-}
-
-class MainScreenVC: UITabBarController, UITabBarDelegate, AVAudioPlayerDelegate, AVAudioRecorderDelegate {
+class MainScreenVC: UITabBarController, UITabBarDelegate{
     
     private var buttonImage: UIImage? = UIImage(named: "center button")
     private var buttonHightLightImage: UIImage?
@@ -35,11 +30,12 @@ class MainScreenVC: UITabBarController, UITabBarDelegate, AVAudioPlayerDelegate,
     }
     
     // audio related
+    
     private var hasRecording = false
-    private var soundPlayer : AVAudioPlayer?
-    private var soundRecorder : AVAudioRecorder?
-    private var session : AVAudioSession?
-    private var soundPath : String?
+    var audioRecorder : AudioRecorder = AudioRecorder()
+    var audioPlayer : AudioPlayer = AudioPlayer()
+    var audioManager : AudioManager = AudioManager()
+    var name : NSString = "Recording"
     
     private var waveformView = SiriWaveformView()
     private var recordingView = UIView()
@@ -58,40 +54,19 @@ class MainScreenVC: UITabBarController, UITabBarDelegate, AVAudioPlayerDelegate,
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        initAudioRecorder()
+        let now = NSDate()
+        let dateFormatter = NSDateFormatter()
+        dateFormatter.dateFormat = "yyyy-MM-dd-HH-mm-ss"
+        name = dateFormatter.stringFromDate(now)
+        audioRecorder.initRecorder(name)
         initWaveformView()
         initRecordingView()
-        
+    
         customizeColorOfBarItems()
         addCenterRaisedButton()
         addButtonLongPressGuesture()
     }
     
-    func initAudioRecorder() {
-        soundPath = "\(NSTemporaryDirectory())test.wav"
-        
-        let url = NSURL(fileURLWithPath: soundPath!)
-        
-        session = AVAudioSession.sharedInstance()
-        session?.setActive(true, error: nil)
-        
-        var error : NSError?
-        
-        session?.setCategory(AVAudioSessionCategoryPlayAndRecord, error: &error)
-        
-        soundRecorder = AVAudioRecorder(URL: url, settings: nil, error: &error)
-        soundRecorder?.meteringEnabled = true
-        
-        if(error != nil)
-        {
-            println("Error initializing the recorder: \(error)")
-        }
-        
-        soundRecorder?.delegate = self
-        soundRecorder?.prepareToRecord()
-    }
-    
     func initWaveformView() {
         var displaylink = CADisplayLink(target: self, selector: "updateWaveform")
         displaylink.addToRunLoop(NSRunLoop.currentRunLoop(), forMode: NSRunLoopCommonModes)
@@ -175,8 +150,8 @@ class MainScreenVC: UITabBarController, UITabBarDelegate, AVAudioPlayerDelegate,
         Update waveform when recording
     */
     func updateWaveform() {
-        soundRecorder?.updateMeters()
-        var normalizedValue = pow(10, soundRecorder!.averagePowerForChannel(0) / 20)
+        self.audioRecorder.audioRecorder?.updateMeters()
+        var normalizedValue = pow(10, self.audioRecorder.audioRecorder!.averagePowerForChannel(0) / 20)
         waveformView.updateWithLevel(CGFloat(normalizedValue))
     }
     
@@ -220,46 +195,24 @@ class MainScreenVC: UITabBarController, UITabBarDelegate, AVAudioPlayerDelegate,
     }
     
     func recordAudio() {
-        session?.requestRecordPermission(){
-            granted in
-            if(granted == true)
-            {
-                self.soundRecorder?.record()
-                
-                // add waveform view
-                self.view.addSubview(self.recordingView)
-                self.view.bringSubviewToFront(self.button)
-            }
-            else
-            {
-                println("Unable to record")
-            }
-        }
+        self.view.addSubview(self.recordingView)
+        self.view.bringSubviewToFront(self.button)
+        self.audioRecorder.startRecording()
+        
     }
     
     func stopRecording() {
-        soundRecorder?.stop()
-        
+        //soundRecorder?.stop()
+        self.audioRecorder.stopRecordng()
         // remove waveform view
         recordingView.removeFromSuperview()
         hasRecording = true
     }
     
     func playAudio() {
-        let url = NSURL(fileURLWithPath: soundPath!)
-        var error : NSError?
         
-        soundPlayer = AVAudioPlayer(contentsOfURL: url, error: &error)
-        
-        if(error == nil)
-        {
-            soundPlayer?.delegate = self
-            soundPlayer?.play()
-        }
-        else
-        {
-            println("Error initializing player \(error)")
-        }
+        let path = audioManager.audioURLWithName(name)
+        self.audioPlayer.playAudio(path)
         hasRecording = false
     }
     
diff --git a/Classes/VCs/MakeOrderVC.swift b/Classes/VCs/MakeOrderVC.swift
index 4763672..a152407 100644
--- a/Classes/VCs/MakeOrderVC.swift
+++ b/Classes/VCs/MakeOrderVC.swift
@@ -25,7 +25,7 @@ class MakeOrderVC: UIViewController {
         let dateFormatter = NSDateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd-HH-mm-ss"
         name = dateFormatter.stringFromDate(now)
-        self.audioRecorder.startRecording(name)
+        self.audioRecorder.startRecording()
     }
     @IBAction func stopRecording(sender: AnyObject) {
         self.audioRecorder.stopRecordng()
diff --git a/Classes/VCs/UserLocationsTVC.swift b/Classes/VCs/UserLocationsTVC.swift
index 83df1ca..8e62d67 100755
--- a/Classes/VCs/UserLocationsTVC.swift
+++ b/Classes/VCs/UserLocationsTVC.swift
@@ -23,7 +23,6 @@ class UserLocationsTVC: UITableViewController, MKMapViewDelegate {
         // self.navigationItem.rightBarButtonItem = self.editButtonItem()
 
         
-        
     }
     
     override func viewWillAppear(animated: Bool) {
diff --git a/Classes/VCs/WaveformVC.swift b/Classes/VCs/WaveformVC.swift
index a136658..26224d7 100644
--- a/Classes/VCs/WaveformVC.swift
+++ b/Classes/VCs/WaveformVC.swift
@@ -9,57 +9,20 @@
 import UIKit
 import AVFoundation
 
-class WaveformVC: UIViewController, AVAudioPlayerDelegate, AVAudioRecorderDelegate {
+class WaveformVC: UIViewController {
 
     @IBOutlet weak var waveformView: SiriWaveformView!
     
-    private var recorder: AVAudioRecorder?
-    
     // audio related
     private var hasRecording = false
-    private var soundPlayer : AVAudioPlayer?
-    private var soundRecorder : AVAudioRecorder?
-    private var session : AVAudioSession?
-    private var soundPath : String?
+    var audioRecorder : AudioRecorder = AudioRecorder()
+    var audioPlayer : AudioPlayer = AudioPlayer()
+    var audioManager : AudioManager = AudioManager()
+    var name : NSString = "Recording"
 
     
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        
-        soundPath = "\(NSTemporaryDirectory())test.wav"
-        
-        let url = NSURL(fileURLWithPath: soundPath!)
-        
-        session = AVAudioSession.sharedInstance()
-        session?.setActive(true, error: nil)
-        
-        var error : NSError?
-        
-        session?.setCategory(AVAudioSessionCategoryPlayAndRecord, error: &error)
-        
-        soundRecorder = AVAudioRecorder(URL: url, settings: nil, error: &error)
-        soundRecorder?.meteringEnabled = true
-        
-        if(error != nil)
-        {
-            println("Error initializing the recorder: \(error)")
-        }
-        
-        soundRecorder?.delegate = self
-        soundRecorder?.prepareToRecord()
-        
-        session?.requestRecordPermission(){
-            granted in
-            if(granted == true)
-            {
-                self.soundRecorder?.record()
-            }
-            else
-            {
-                println("Unable to record")
-            }
-        }
         
         // Do any additional setup after loading the view.
         initAudioRecorder()
@@ -92,9 +55,9 @@ class WaveformVC: UIViewController, AVAudioPlayerDelegate, AVAudioRecorderDelega
     Update waveform when recording
     */
     func updateWaveform() {
-        soundRecorder?.updateMeters()
-        var normalizedValue = pow(10, soundRecorder!.averagePowerForChannel(0) / 20)
-        waveformView?.updateWithLevel(CGFloat(normalizedValue))
+        audioRecorder.audioRecorder?.updateMeters()
+        var normalizedValue = pow(10, audioRecorder.audioRecorder!.averagePowerForChannel(2) / 20)
+        waveformView.updateWithLevel(CGFloat(normalizedValue))
     }
 
 }
diff --git a/Classes/VCs/WelcomeVC.swift b/Classes/VCs/WelcomeVC.swift
index c8efd0d..9dd17f7 100755
--- a/Classes/VCs/WelcomeVC.swift
+++ b/Classes/VCs/WelcomeVC.swift
@@ -8,6 +8,8 @@
 
 import UIKit
 import CoreTelephony
+//import SHSPhoneComponent
+
 
 class WelcomeVC: UIViewController {
     

From 3367c8e3b773784e681dc061ae44bc608aa30ab5 Mon Sep 17 00:00:00 2001
From: myt588 <Tian@Macintosh.local>
Date: Wed, 27 May 2015 13:49:38 +0800
Subject: [PATCH 2/3] Folder Reordered

Config/Port added
Model/Bank, Request, Review, Address added
Services/Login, Address, Bank, Request, Review Added
---
 Arrived.xcodeproj/project.pbxproj             | 158 ++++++++++++------
 .../Audio}/AudioContext.swift                 |   0
 .../Audio}/AudioManager.swift                 |   2 +-
 .../Audio}/AudioPlayer.swift                  |   0
 .../Audio}/AudioRecorder.swift                |   0
 Classes/Model/Address.swift                   |  18 ++
 Classes/Model/Bank.swift                      |  19 +++
 Classes/Model/Request.swift                   |  25 +++
 Classes/Model/Review.swift                    |  16 ++
 Classes/{Services => Model}/User.swift        |  23 +--
 Classes/Services/AddressService.swift         |  23 +++
 Classes/Services/BankService.swift            |  29 ++++
 .../{BaseService.swift => HttpService.swift}  |   2 +-
 Classes/Services/LoginService.swift           |  25 +++
 Classes/Services/RequestService.swift         |  41 +++++
 Classes/Services/ReviewService.swift          |  29 ++++
 Classes/Services/ServiceHandler.swift         |  47 ------
 Classes/Services/UserService.swift            |  41 +----
 .../TestRequestService.swift                  |   2 +-
 .../TestReviewService.swift                   |   2 +-
 .../{Services => Test}/TestUserService.swift  |   2 +-
 21 files changed, 348 insertions(+), 156 deletions(-)
 rename Classes/{Services => Component/Audio}/AudioContext.swift (100%)
 rename Classes/{Services => Component/Audio}/AudioManager.swift (98%)
 rename Classes/{Services => Component/Audio}/AudioPlayer.swift (100%)
 rename Classes/{Services => Component/Audio}/AudioRecorder.swift (100%)
 create mode 100644 Classes/Model/Address.swift
 create mode 100644 Classes/Model/Bank.swift
 create mode 100644 Classes/Model/Request.swift
 create mode 100644 Classes/Model/Review.swift
 rename Classes/{Services => Model}/User.swift (73%)
 create mode 100644 Classes/Services/AddressService.swift
 create mode 100644 Classes/Services/BankService.swift
 rename Classes/Services/{BaseService.swift => HttpService.swift} (99%)
 create mode 100644 Classes/Services/LoginService.swift
 create mode 100644 Classes/Services/RequestService.swift
 create mode 100644 Classes/Services/ReviewService.swift
 delete mode 100755 Classes/Services/ServiceHandler.swift
 rename Classes/{Services => Test}/TestRequestService.swift (99%)
 rename Classes/{Services => Test}/TestReviewService.swift (97%)
 rename Classes/{Services => Test}/TestUserService.swift (99%)

diff --git a/Arrived.xcodeproj/project.pbxproj b/Arrived.xcodeproj/project.pbxproj
index 78b78e5..2bc3b8a 100644
--- a/Arrived.xcodeproj/project.pbxproj
+++ b/Arrived.xcodeproj/project.pbxproj
@@ -10,9 +10,6 @@
 		8908FF561AE01ECF00C990DC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8908FF551AE01ECF00C990DC /* AppDelegate.swift */; };
 		8908FF601AE01ECF00C990DC /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8908FF5E1AE01ECF00C990DC /* LaunchScreen.xib */; };
 		8908FF6C1AE01ECF00C990DC /* ArrivedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8908FF6B1AE01ECF00C990DC /* ArrivedTests.swift */; };
-		890A1C441AEAD02F00E6E6D9 /* ServiceHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890A1C431AEAD02F00E6E6D9 /* ServiceHandler.swift */; };
-		890D4C7D1AE4433400BD05DF /* BaseService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890D4C711AE4433400BD05DF /* BaseService.swift */; };
-		890D4C7F1AE4433400BD05DF /* UserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890D4C731AE4433400BD05DF /* UserService.swift */; };
 		890D4C811AE4433400BD05DF /* AddPaymentInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890D4C781AE4433400BD05DF /* AddPaymentInfoVC.swift */; };
 		890D4C821AE4433400BD05DF /* LoggedInVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890D4C791AE4433400BD05DF /* LoggedInVC.swift */; };
 		890D4C831AE4433400BD05DF /* StartVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890D4C7A1AE4433400BD05DF /* StartVC.swift */; };
@@ -26,10 +23,6 @@
 		890E3FBD1AEC5B9500F22912 /* HelperMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890E3FBC1AEC5B9500F22912 /* HelperMethods.swift */; };
 		890F54C71B0175200066E835 /* OrdersListTVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54C61B0175200066E835 /* OrdersListTVC.swift */; };
 		890F54C91B0175370066E835 /* OrdersListTVCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54C81B0175370066E835 /* OrdersListTVCell.swift */; };
-		890F54CE1B01F4120066E835 /* AudioContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54CA1B01F4120066E835 /* AudioContext.swift */; };
-		890F54CF1B01F4120066E835 /* AudioManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54CB1B01F4120066E835 /* AudioManager.swift */; };
-		890F54D01B01F4120066E835 /* AudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54CC1B01F4120066E835 /* AudioPlayer.swift */; };
-		890F54D11B01F4120066E835 /* AudioRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54CD1B01F4120066E835 /* AudioRecorder.swift */; };
 		890F54D31B01F41D0066E835 /* MakeOrderVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890F54D21B01F41D0066E835 /* MakeOrderVC.swift */; };
 		89471C471B09F6C600EFE101 /* HoshiTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89471C3D1B09F6C600EFE101 /* HoshiTextField.swift */; };
 		89471C481B09F6C600EFE101 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 89471C3E1B09F6C600EFE101 /* Info.plist */; };
@@ -73,8 +66,6 @@
 		899DA8D51AF41AC700F0C476 /* email-104.png in Resources */ = {isa = PBXBuildFile; fileRef = 899DA8D01AF41AC700F0C476 /* email-104.png */; };
 		899DA8D61AF41AC700F0C476 /* mental_status-96.png in Resources */ = {isa = PBXBuildFile; fileRef = 899DA8D11AF41AC700F0C476 /* mental_status-96.png */; };
 		899DA8D71AF41AC700F0C476 /* toilet-104.png in Resources */ = {isa = PBXBuildFile; fileRef = 899DA8D21AF41AC700F0C476 /* toilet-104.png */; };
-		899DA8D91AF4222C00F0C476 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 899DA8D81AF4222C00F0C476 /* User.swift */; };
-		89C413511AF16ACF000C2C95 /* TestUserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89C413501AF16ACF000C2C95 /* TestUserService.swift */; };
 		89C413551AF1C3D9000C2C95 /* background.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = 89C413541AF1C3D9000C2C95 /* background.jpeg */; };
 		89C413571AF1C523000C2C95 /* Screen.png in Resources */ = {isa = PBXBuildFile; fileRef = 89C413561AF1C523000C2C95 /* Screen.png */; };
 		89C4135B1AF1CD91000C2C95 /* Phone Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 89C4135A1AF1CD91000C2C95 /* Phone Icon.png */; };
@@ -90,9 +81,27 @@
 		89D7C6B81AE4796500FFD592 /* ImageLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89D7C6B71AE4796500FFD592 /* ImageLoader.swift */; };
 		89E6FB861B11EA98003A8276 /* UserMenuVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E6FB851B11EA98003A8276 /* UserMenuVC.swift */; };
 		89E6FB881B12029C003A8276 /* MenuTransitionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89E6FB871B12029C003A8276 /* MenuTransitionManager.swift */; };
-		89EEF5001B00720B006881FD /* TestReviewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF4FF1B00720B006881FD /* TestReviewService.swift */; };
-		89EEF5021B007233006881FD /* TestRequestService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5011B007233006881FD /* TestRequestService.swift */; };
 		89EEF5061B008B05006881FD /* OrderDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89EEF5051B008B05006881FD /* OrderDetailVC.swift */; };
+		94AF3FE01B143C490048FD5F /* AudioContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FDC1B143C490048FD5F /* AudioContext.swift */; };
+		94AF3FE11B143C490048FD5F /* AudioManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FDD1B143C490048FD5F /* AudioManager.swift */; };
+		94AF3FE21B143C490048FD5F /* AudioPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FDE1B143C490048FD5F /* AudioPlayer.swift */; };
+		94AF3FE31B143C490048FD5F /* AudioRecorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FDF1B143C490048FD5F /* AudioRecorder.swift */; };
+		94AF3FEB1B143C6C0048FD5F /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FE61B143C6C0048FD5F /* User.swift */; };
+		94AF3FEC1B143C6C0048FD5F /* TestRequestService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FE81B143C6C0048FD5F /* TestRequestService.swift */; };
+		94AF3FED1B143C6C0048FD5F /* TestReviewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FE91B143C6C0048FD5F /* TestReviewService.swift */; };
+		94AF3FEE1B143C6C0048FD5F /* TestUserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FEA1B143C6C0048FD5F /* TestUserService.swift */; };
+		94AF3FF01B143CB80048FD5F /* Port.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FEF1B143CB80048FD5F /* Port.swift */; };
+		94AF3FF71B14B7790048FD5F /* HttpService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FF51B14B7790048FD5F /* HttpService.swift */; };
+		94AF3FF81B14B7790048FD5F /* UserService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FF61B14B7790048FD5F /* UserService.swift */; };
+		94AF3FFA1B14C65D0048FD5F /* LoginService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FF91B14C65D0048FD5F /* LoginService.swift */; };
+		94AF3FFC1B14C6B10048FD5F /* AddressService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FFB1B14C6B10048FD5F /* AddressService.swift */; };
+		94AF3FFE1B14C7C20048FD5F /* RequestService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FFD1B14C7C20048FD5F /* RequestService.swift */; };
+		94AF40001B14C7FC0048FD5F /* BankService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FFF1B14C7FC0048FD5F /* BankService.swift */; };
+		94AF40021B14C9E60048FD5F /* ReviewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40011B14C9E60048FD5F /* ReviewService.swift */; };
+		94AF40041B14CA5C0048FD5F /* Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40031B14CA5C0048FD5F /* Address.swift */; };
+		94AF40061B14CA690048FD5F /* Bank.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40051B14CA690048FD5F /* Bank.swift */; };
+		94AF40081B14CA770048FD5F /* Review.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40071B14CA770048FD5F /* Review.swift */; };
+		94AF400A1B14CA800048FD5F /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40091B14CA800048FD5F /* Request.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -113,9 +122,6 @@
 		8908FF651AE01ECF00C990DC /* ArrivedTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArrivedTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8908FF6A1AE01ECF00C990DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8908FF6B1AE01ECF00C990DC /* ArrivedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrivedTests.swift; sourceTree = "<group>"; };
-		890A1C431AEAD02F00E6E6D9 /* ServiceHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceHandler.swift; sourceTree = "<group>"; };
-		890D4C711AE4433400BD05DF /* BaseService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseService.swift; sourceTree = "<group>"; };
-		890D4C731AE4433400BD05DF /* UserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserService.swift; sourceTree = "<group>"; };
 		890D4C761AE4433400BD05DF /* MyPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = MyPlayground.playground; sourceTree = "<group>"; };
 		890D4C781AE4433400BD05DF /* AddPaymentInfoVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddPaymentInfoVC.swift; sourceTree = "<group>"; };
 		890D4C791AE4433400BD05DF /* LoggedInVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoggedInVC.swift; sourceTree = "<group>"; };
@@ -136,10 +142,6 @@
 		890E3FBC1AEC5B9500F22912 /* HelperMethods.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperMethods.swift; sourceTree = "<group>"; };
 		890F54C61B0175200066E835 /* OrdersListTVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrdersListTVC.swift; sourceTree = "<group>"; };
 		890F54C81B0175370066E835 /* OrdersListTVCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrdersListTVCell.swift; sourceTree = "<group>"; };
-		890F54CA1B01F4120066E835 /* AudioContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioContext.swift; path = Services/AudioContext.swift; sourceTree = "<group>"; };
-		890F54CB1B01F4120066E835 /* AudioManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioManager.swift; path = Services/AudioManager.swift; sourceTree = "<group>"; };
-		890F54CC1B01F4120066E835 /* AudioPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioPlayer.swift; path = Services/AudioPlayer.swift; sourceTree = "<group>"; };
-		890F54CD1B01F4120066E835 /* AudioRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AudioRecorder.swift; path = Services/AudioRecorder.swift; sourceTree = "<group>"; };
 		890F54D21B01F41D0066E835 /* MakeOrderVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MakeOrderVC.swift; sourceTree = "<group>"; };
 		89471C3D1B09F6C600EFE101 /* HoshiTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HoshiTextField.swift; sourceTree = "<group>"; };
 		89471C3E1B09F6C600EFE101 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -185,8 +187,6 @@
 		899DA8D01AF41AC700F0C476 /* email-104.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "email-104.png"; path = "Assets/UI/Icons/email-104.png"; sourceTree = "<group>"; };
 		899DA8D11AF41AC700F0C476 /* mental_status-96.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mental_status-96.png"; path = "Assets/UI/Icons/mental_status-96.png"; sourceTree = "<group>"; };
 		899DA8D21AF41AC700F0C476 /* toilet-104.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "toilet-104.png"; path = "Assets/UI/Icons/toilet-104.png"; sourceTree = "<group>"; };
-		899DA8D81AF4222C00F0C476 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = Services/User.swift; sourceTree = "<group>"; };
-		89C413501AF16ACF000C2C95 /* TestUserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestUserService.swift; path = Services/TestUserService.swift; sourceTree = "<group>"; };
 		89C413541AF1C3D9000C2C95 /* background.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = background.jpeg; path = Assets/UI/background.jpeg; sourceTree = "<group>"; };
 		89C413561AF1C523000C2C95 /* Screen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Screen.png; path = Assets/UI/Screen.png; sourceTree = "<group>"; };
 		89C4135A1AF1CD91000C2C95 /* Phone Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Phone Icon.png"; path = "Assets/UI/Phone Icon.png"; sourceTree = "<group>"; };
@@ -203,9 +203,27 @@
 		89D7C6B71AE4796500FFD592 /* ImageLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageLoader.swift; sourceTree = "<group>"; };
 		89E6FB851B11EA98003A8276 /* UserMenuVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserMenuVC.swift; sourceTree = "<group>"; };
 		89E6FB871B12029C003A8276 /* MenuTransitionManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuTransitionManager.swift; sourceTree = "<group>"; };
-		89EEF4FF1B00720B006881FD /* TestReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestReviewService.swift; path = Services/TestReviewService.swift; sourceTree = "<group>"; };
-		89EEF5011B007233006881FD /* TestRequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestRequestService.swift; path = Services/TestRequestService.swift; sourceTree = "<group>"; };
 		89EEF5051B008B05006881FD /* OrderDetailVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderDetailVC.swift; sourceTree = "<group>"; };
+		94AF3FDC1B143C490048FD5F /* AudioContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioContext.swift; sourceTree = "<group>"; };
+		94AF3FDD1B143C490048FD5F /* AudioManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioManager.swift; sourceTree = "<group>"; };
+		94AF3FDE1B143C490048FD5F /* AudioPlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = "<group>"; };
+		94AF3FDF1B143C490048FD5F /* AudioRecorder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioRecorder.swift; sourceTree = "<group>"; };
+		94AF3FE61B143C6C0048FD5F /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		94AF3FE81B143C6C0048FD5F /* TestRequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRequestService.swift; sourceTree = "<group>"; };
+		94AF3FE91B143C6C0048FD5F /* TestReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestReviewService.swift; sourceTree = "<group>"; };
+		94AF3FEA1B143C6C0048FD5F /* TestUserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestUserService.swift; sourceTree = "<group>"; };
+		94AF3FEF1B143CB80048FD5F /* Port.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Port.swift; sourceTree = "<group>"; };
+		94AF3FF51B14B7790048FD5F /* HttpService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HttpService.swift; sourceTree = "<group>"; };
+		94AF3FF61B14B7790048FD5F /* UserService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserService.swift; sourceTree = "<group>"; };
+		94AF3FF91B14C65D0048FD5F /* LoginService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginService.swift; sourceTree = "<group>"; };
+		94AF3FFB1B14C6B10048FD5F /* AddressService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressService.swift; sourceTree = "<group>"; };
+		94AF3FFD1B14C7C20048FD5F /* RequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestService.swift; sourceTree = "<group>"; };
+		94AF3FFF1B14C7FC0048FD5F /* BankService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BankService.swift; sourceTree = "<group>"; };
+		94AF40011B14C9E60048FD5F /* ReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReviewService.swift; sourceTree = "<group>"; };
+		94AF40031B14CA5C0048FD5F /* Address.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Address.swift; sourceTree = "<group>"; };
+		94AF40051B14CA690048FD5F /* Bank.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bank.swift; sourceTree = "<group>"; };
+		94AF40071B14CA770048FD5F /* Review.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Review.swift; sourceTree = "<group>"; };
+		94AF40091B14CA800048FD5F /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -287,9 +305,10 @@
 		890D4C6F1AE4433400BD05DF /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				94AF3FCC1B1358A00048FD5F /* Model */,
-				94AF3FCB1B13587F0048FD5F /* Test */,
-				94AF3FCA1B1358590048FD5F /* Audio */,
+				94AF3FE41B143C6C0048FD5F /* Config */,
+				94AF3FE51B143C6C0048FD5F /* Model */,
+				94AF3FE71B143C6C0048FD5F /* Test */,
+				94AF3FDA1B143C490048FD5F /* Component */,
 				89471C671B0C4D3200EFE101 /* Customizations */,
 				890D4C751AE4433400BD05DF /* Supports */,
 				890D4C701AE4433400BD05DF /* Services */,
@@ -301,9 +320,13 @@
 		890D4C701AE4433400BD05DF /* Services */ = {
 			isa = PBXGroup;
 			children = (
-				890A1C431AEAD02F00E6E6D9 /* ServiceHandler.swift */,
-				890D4C731AE4433400BD05DF /* UserService.swift */,
-				890D4C711AE4433400BD05DF /* BaseService.swift */,
+				94AF3FF51B14B7790048FD5F /* HttpService.swift */,
+				94AF3FF61B14B7790048FD5F /* UserService.swift */,
+				94AF3FF91B14C65D0048FD5F /* LoginService.swift */,
+				94AF3FFB1B14C6B10048FD5F /* AddressService.swift */,
+				94AF3FFF1B14C7FC0048FD5F /* BankService.swift */,
+				94AF3FFD1B14C7C20048FD5F /* RequestService.swift */,
+				94AF40011B14C9E60048FD5F /* ReviewService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -540,33 +563,53 @@
 			path = Frameworks/UICountingLabel;
 			sourceTree = "<group>";
 		};
-		94AF3FCA1B1358590048FD5F /* Audio */ = {
+		94AF3FDA1B143C490048FD5F /* Component */ = {
 			isa = PBXGroup;
 			children = (
-				890F54CA1B01F4120066E835 /* AudioContext.swift */,
-				890F54CB1B01F4120066E835 /* AudioManager.swift */,
-				890F54CC1B01F4120066E835 /* AudioPlayer.swift */,
-				890F54CD1B01F4120066E835 /* AudioRecorder.swift */,
+				94AF3FDB1B143C490048FD5F /* Audio */,
 			);
-			name = Audio;
+			path = Component;
 			sourceTree = "<group>";
 		};
-		94AF3FCB1B13587F0048FD5F /* Test */ = {
+		94AF3FDB1B143C490048FD5F /* Audio */ = {
 			isa = PBXGroup;
 			children = (
-				89C413501AF16ACF000C2C95 /* TestUserService.swift */,
-				89EEF4FF1B00720B006881FD /* TestReviewService.swift */,
-				89EEF5011B007233006881FD /* TestRequestService.swift */,
+				94AF3FDC1B143C490048FD5F /* AudioContext.swift */,
+				94AF3FDD1B143C490048FD5F /* AudioManager.swift */,
+				94AF3FDE1B143C490048FD5F /* AudioPlayer.swift */,
+				94AF3FDF1B143C490048FD5F /* AudioRecorder.swift */,
 			);
-			name = Test;
+			path = Audio;
 			sourceTree = "<group>";
 		};
-		94AF3FCC1B1358A00048FD5F /* Model */ = {
+		94AF3FE41B143C6C0048FD5F /* Config */ = {
 			isa = PBXGroup;
 			children = (
-				899DA8D81AF4222C00F0C476 /* User.swift */,
+				94AF3FEF1B143CB80048FD5F /* Port.swift */,
 			);
-			name = Model;
+			path = Config;
+			sourceTree = "<group>";
+		};
+		94AF3FE51B143C6C0048FD5F /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				94AF3FE61B143C6C0048FD5F /* User.swift */,
+				94AF40031B14CA5C0048FD5F /* Address.swift */,
+				94AF40051B14CA690048FD5F /* Bank.swift */,
+				94AF40071B14CA770048FD5F /* Review.swift */,
+				94AF40091B14CA800048FD5F /* Request.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		94AF3FE71B143C6C0048FD5F /* Test */ = {
+			isa = PBXGroup;
+			children = (
+				94AF3FE81B143C6C0048FD5F /* TestRequestService.swift */,
+				94AF3FE91B143C6C0048FD5F /* TestReviewService.swift */,
+				94AF3FEA1B143C6C0048FD5F /* TestUserService.swift */,
+			);
+			path = Test;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -695,13 +738,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				890A1C441AEAD02F00E6E6D9 /* ServiceHandler.swift in Sources */,
-				890D4C7F1AE4433400BD05DF /* UserService.swift in Sources */,
 				899DA8C91AF40B5E00F0C476 /* ProfileVC.swift in Sources */,
 				890E3FBD1AEC5B9500F22912 /* HelperMethods.swift in Sources */,
 				8975DAC31B0E2043009D4991 /* WaveformVC.swift in Sources */,
-				890F54CE1B01F4120066E835 /* AudioContext.swift in Sources */,
+				94AF400A1B14CA800048FD5F /* Request.swift in Sources */,
 				89EEF5061B008B05006881FD /* OrderDetailVC.swift in Sources */,
+				94AF3FF01B143CB80048FD5F /* Port.swift in Sources */,
 				89471C4D1B09F6C600EFE101 /* MinoruTextField.swift in Sources */,
 				89471C4C1B09F6C600EFE101 /* MadokaTextField.swift in Sources */,
 				890D4C851AE4433400BD05DF /* WelcomeVC.swift in Sources */,
@@ -718,43 +760,53 @@
 				890D72B11B0739E5006360E7 /* SHSFlagAccessoryView.m in Sources */,
 				890D4C811AE4433400BD05DF /* AddPaymentInfoVC.swift in Sources */,
 				89C4136E1AF4052C000C2C95 /* MainScreenVC.swift in Sources */,
-				89EEF5001B00720B006881FD /* TestReviewService.swift in Sources */,
-				890F54CF1B01F4120066E835 /* AudioManager.swift in Sources */,
-				899DA8D91AF4222C00F0C476 /* User.swift in Sources */,
-				890F54D11B01F4120066E835 /* AudioRecorder.swift in Sources */,
+				94AF3FFC1B14C6B10048FD5F /* AddressService.swift in Sources */,
+				94AF40041B14CA5C0048FD5F /* Address.swift in Sources */,
 				89D7C6B61AE44D0A00FFD592 /* ViewController.swift in Sources */,
-				890F54D01B01F4120066E835 /* AudioPlayer.swift in Sources */,
+				94AF3FFE1B14C7C20048FD5F /* RequestService.swift in Sources */,
 				8975DAC11B0E187A009D4991 /* SiriWaveformView.swift in Sources */,
 				89471C4A1B09F6C600EFE101 /* JiroTextField.swift in Sources */,
+				94AF3FEB1B143C6C0048FD5F /* User.swift in Sources */,
+				94AF3FF71B14B7790048FD5F /* HttpService.swift in Sources */,
 				89471C491B09F6C600EFE101 /* IsaoTextField.swift in Sources */,
+				94AF40061B14CA690048FD5F /* Bank.swift in Sources */,
 				890D4C821AE4433400BD05DF /* LoggedInVC.swift in Sources */,
 				890D72B71B0741C5006360E7 /* UserAgreementVC.swift in Sources */,
 				8981A4D31AF58FCE00F3046A /* AddLocationVC.swift in Sources */,
+				94AF3FED1B143C6C0048FD5F /* TestReviewService.swift in Sources */,
 				8981A4CF1AF5641500F3046A /* UserLocationsTVCell.swift in Sources */,
 				895822721B05061C000DA21E /* GoogleWearAlert.swift in Sources */,
-				89C413511AF16ACF000C2C95 /* TestUserService.swift in Sources */,
 				89E6FB881B12029C003A8276 /* MenuTransitionManager.swift in Sources */,
 				890F54C91B0175370066E835 /* OrdersListTVCell.swift in Sources */,
 				89471C5F1B0C0C1700EFE101 /* RAMFrameItemAnimation.swift in Sources */,
-				890D4C7D1AE4433400BD05DF /* BaseService.swift in Sources */,
+				94AF3FE01B143C490048FD5F /* AudioContext.swift in Sources */,
 				8958227B1B050AD7000DA21E /* JSSAlertView.swift in Sources */,
 				8981A4D51AF5B0AD00F3046A /* LocationManager.swift in Sources */,
 				89471C5E1B0C0C1700EFE101 /* RAMBounceAnimation.swift in Sources */,
 				890D72B31B0739E5006360E7 /* SHSPhoneNumberFormatter+UserConfig.m in Sources */,
+				94AF3FE31B143C490048FD5F /* AudioRecorder.swift in Sources */,
 				890D72B21B0739E5006360E7 /* SHSPhoneLogic.m in Sources */,
 				8981A4D11AF56DB700F3046A /* UserBankCardsTVCell.swift in Sources */,
 				898455A21AF6EABD0071A31B /* OrdersVC.swift in Sources */,
 				89471C4B1B09F6C600EFE101 /* KaedeTextField.swift in Sources */,
 				89471C691B0C4D6400EFE101 /* CustomizedTabBarItem.swift in Sources */,
-				89EEF5021B007233006881FD /* TestRequestService.swift in Sources */,
 				89471C631B0C0C1700EFE101 /* RAMAnimatedTabBarController.swift in Sources */,
 				89471C621B0C0C1700EFE101 /* RAMTransitionItemAnimation.swift in Sources */,
+				94AF3FEE1B143C6C0048FD5F /* TestUserService.swift in Sources */,
 				89471C4E1B09F6C600EFE101 /* TextFieldsEffects.swift in Sources */,
 				890D72B41B0739E5006360E7 /* SHSPhoneNumberFormatter.m in Sources */,
 				89471C641B0C0C1700EFE101 /* RAMItemAnimationProtocol.swift in Sources */,
+				94AF3FE21B143C490048FD5F /* AudioPlayer.swift in Sources */,
+				94AF3FFA1B14C65D0048FD5F /* LoginService.swift in Sources */,
+				94AF3FE11B143C490048FD5F /* AudioManager.swift in Sources */,
+				94AF3FF81B14B7790048FD5F /* UserService.swift in Sources */,
 				8908FF561AE01ECF00C990DC /* AppDelegate.swift in Sources */,
 				89471C611B0C0C1700EFE101 /* RAMRotationAnimation.swift in Sources */,
+				94AF40021B14C9E60048FD5F /* ReviewService.swift in Sources */,
+				94AF40001B14C7FC0048FD5F /* BankService.swift in Sources */,
+				94AF40081B14CA770048FD5F /* Review.swift in Sources */,
 				890D4C831AE4433400BD05DF /* StartVC.swift in Sources */,
+				94AF3FEC1B143C6C0048FD5F /* TestRequestService.swift in Sources */,
 				890F54D31B01F41D0066E835 /* MakeOrderVC.swift in Sources */,
 				890D72B51B0739E5006360E7 /* SHSPhoneTextField.m in Sources */,
 			);
diff --git a/Classes/Services/AudioContext.swift b/Classes/Component/Audio/AudioContext.swift
similarity index 100%
rename from Classes/Services/AudioContext.swift
rename to Classes/Component/Audio/AudioContext.swift
diff --git a/Classes/Services/AudioManager.swift b/Classes/Component/Audio/AudioManager.swift
similarity index 98%
rename from Classes/Services/AudioManager.swift
rename to Classes/Component/Audio/AudioManager.swift
index 72a3c07..1ce7a47 100644
--- a/Classes/Services/AudioManager.swift
+++ b/Classes/Component/Audio/AudioManager.swift
@@ -17,7 +17,7 @@ class AudioManager: NSObject {
             appropriateForURL: nil,
             create: false,
             error: nil)
-        let userFolderUrl = documentsFolderUrl!.URLByAppendingPathComponent("\(User().id)")
+        let userFolderUrl = documentsFolderUrl!.URLByAppendingPathComponent("\(User().uid)")
         if !fileManager.fileExistsAtPath(userFolderUrl.absoluteString!){
             fileManager.createDirectoryAtURL(userFolderUrl, withIntermediateDirectories: true, attributes: nil, error: nil)
             println("audio folder created")
diff --git a/Classes/Services/AudioPlayer.swift b/Classes/Component/Audio/AudioPlayer.swift
similarity index 100%
rename from Classes/Services/AudioPlayer.swift
rename to Classes/Component/Audio/AudioPlayer.swift
diff --git a/Classes/Services/AudioRecorder.swift b/Classes/Component/Audio/AudioRecorder.swift
similarity index 100%
rename from Classes/Services/AudioRecorder.swift
rename to Classes/Component/Audio/AudioRecorder.swift
diff --git a/Classes/Model/Address.swift b/Classes/Model/Address.swift
new file mode 100644
index 0000000..1d5a8f2
--- /dev/null
+++ b/Classes/Model/Address.swift
@@ -0,0 +1,18 @@
+//
+//  Location.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class Address {
+    
+    private var addressId: String? = nil
+    private var latitude: String? = nil
+    private var longitude: String? = nil
+    private var address: String? = nil
+    
+}
\ No newline at end of file
diff --git a/Classes/Model/Bank.swift b/Classes/Model/Bank.swift
new file mode 100644
index 0000000..78bcfb8
--- /dev/null
+++ b/Classes/Model/Bank.swift
@@ -0,0 +1,19 @@
+//
+//  Bank.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class Bank {
+    
+    private var bankCardId: String? = nil
+    private var fullName: String? = nil
+    private var bankCardNumber: String? = nil
+    private var expirationDate: String? = nil
+    private var cvv: String? = nil
+    
+}
\ No newline at end of file
diff --git a/Classes/Model/Request.swift b/Classes/Model/Request.swift
new file mode 100644
index 0000000..3ff00e5
--- /dev/null
+++ b/Classes/Model/Request.swift
@@ -0,0 +1,25 @@
+//
+//  Request.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class Request {
+    
+    var title : String? = nil
+    var body : String? = nil
+    var price : Int? = nil
+    var tags : NSArray? = nil
+    var effectiveStartDate : NSDate? = nil
+    var effectiveEndDate : NSDate? = nil
+    var latitude : Double? = nil
+    var longitude : Double? = nil
+    var address : String? = nil
+    var photos : NSArray? = nil
+    var audios : NSArray? = nil
+    
+}
diff --git a/Classes/Model/Review.swift b/Classes/Model/Review.swift
new file mode 100644
index 0000000..d0dba07
--- /dev/null
+++ b/Classes/Model/Review.swift
@@ -0,0 +1,16 @@
+//
+//  Review.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class Review {
+    
+    var like : Bool? = nil
+    var message : String? = nil
+    
+}
diff --git a/Classes/Services/User.swift b/Classes/Model/User.swift
similarity index 73%
rename from Classes/Services/User.swift
rename to Classes/Model/User.swift
index d5478b6..c22df40 100644
--- a/Classes/Services/User.swift
+++ b/Classes/Model/User.swift
@@ -10,21 +10,6 @@ import Foundation
 
 class User {
     
-    struct location {
-        private var locationId: String
-        private var latitude: String
-        private var longitude: String
-        private var address: String
-    }
-    
-    struct bankCard {
-        private var bankCardId: String
-        private var fullName: String
-        private var bankCardNumber: String
-        private var expirationDate: String
-        private var cvv: String
-    }
-    
     var uid : Int? = nil
     var sid : String? = nil
     var regTime : Int? = nil
@@ -32,9 +17,6 @@ class User {
     var token : String? = nil
     var sessionValidTime : Int = 3
     
-    private var locations = [location]?()
-    private var bankCards = [bankCard]?()
-    
     func saveLoginInfo() -> Bool{
         var login : NSUserDefaults = NSUserDefaults.standardUserDefaults()
         if (uid == nil || sid == nil || regTime == nil || deviceId == nil || token == nil){
@@ -64,5 +46,10 @@ class User {
     
     
     
+    
+    
+    
+    
+    
 
 }
diff --git a/Classes/Services/AddressService.swift b/Classes/Services/AddressService.swift
new file mode 100644
index 0000000..7d89a7b
--- /dev/null
+++ b/Classes/Services/AddressService.swift
@@ -0,0 +1,23 @@
+//
+//  AddressService.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class AddressService : HttpService {
+    
+    var port = Port()
+    
+    func add(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.location_add, jsonObj: data, callback: callback)
+    }
+    
+    func get(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.location_get, jsonObj: data, callback: callback)
+    }
+    
+}
\ No newline at end of file
diff --git a/Classes/Services/BankService.swift b/Classes/Services/BankService.swift
new file mode 100644
index 0000000..b5d53b5
--- /dev/null
+++ b/Classes/Services/BankService.swift
@@ -0,0 +1,29 @@
+//
+//  BankService.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class BankService : HttpService {
+    
+    var port = Port()
+    
+    func add(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.bank_add, jsonObj: data, callback: callback)
+    }
+    
+    func get(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.bank_get + "?" + build(data)!
+        getRequest(url, callback: callback)
+    }
+    
+    func delete(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.bank_delete + "?" + build(data)!
+        getRequest(url, callback: callback)
+    }
+    
+}
\ No newline at end of file
diff --git a/Classes/Services/BaseService.swift b/Classes/Services/HttpService.swift
similarity index 99%
rename from Classes/Services/BaseService.swift
rename to Classes/Services/HttpService.swift
index 5310ee7..71c4eff 100755
--- a/Classes/Services/BaseService.swift
+++ b/Classes/Services/HttpService.swift
@@ -10,7 +10,7 @@ import Foundation
 
 let errorDomain = "error.domain"
 
-class BaseService{
+class HttpService{
     var stringEncoding: NSNumber
     var cachePolicy: NSURLRequestCachePolicy
     var timeoutInterval: NSTimeInterval
diff --git a/Classes/Services/LoginService.swift b/Classes/Services/LoginService.swift
new file mode 100644
index 0000000..88d7742
--- /dev/null
+++ b/Classes/Services/LoginService.swift
@@ -0,0 +1,25 @@
+//
+//  LoginService.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class LoginService : HttpService {
+    
+    var port = Port()
+    
+    //Send Verification Code
+    func get(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.login_get, jsonObj: data, callback: callback)
+    }
+    
+    //Authenticate Code
+    func auth(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.login_auth, jsonObj: data, callback: callback)
+    }
+    
+}
\ No newline at end of file
diff --git a/Classes/Services/RequestService.swift b/Classes/Services/RequestService.swift
new file mode 100644
index 0000000..c93c2fd
--- /dev/null
+++ b/Classes/Services/RequestService.swift
@@ -0,0 +1,41 @@
+//
+//  RequestService.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class RequestService : HttpService {
+    
+    var port = Port()
+    
+    func post(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.request_post, jsonObj: data, callback: callback)
+    }
+    
+    func takers(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.request_takers + "?" + build(data)!
+        getRequest(url, callback: callback)
+    }
+    
+    func pick(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.request_pick, jsonObj: data, callback: callback)
+    }
+    
+    func jobs(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.request_jobs + "?" + build(data)!
+        getRequest(url, callback: callback)
+    }
+    
+    func interested(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.request_interested, jsonObj: data, callback: callback)
+    }
+    
+    func finished(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.request_finished, jsonObj: data, callback: callback)
+    }
+    
+}
diff --git a/Classes/Services/ReviewService.swift b/Classes/Services/ReviewService.swift
new file mode 100644
index 0000000..bd27ce2
--- /dev/null
+++ b/Classes/Services/ReviewService.swift
@@ -0,0 +1,29 @@
+//
+//  ReviewService.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class ReviewService : HttpService {
+    
+    var port = Port()
+    
+    func post(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        postRequest(port.review_post, jsonObj: data, callback: callback)
+    }
+    
+    func delete(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.review_delete + "?" + build(data)!
+        deleteRequest(url, callback: callback)
+    }
+    
+    func get(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.review_get + "?" + build(data)!
+        getRequest(url, callback: callback)
+    }
+    
+}
diff --git a/Classes/Services/ServiceHandler.swift b/Classes/Services/ServiceHandler.swift
deleted file mode 100755
index 0743cb2..0000000
--- a/Classes/Services/ServiceHandler.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  ServiceHandler.swift
-//  Arrived
-//
-//  Created by Lu Cao on 4/25/15.
-//  Copyright (c) 2015 LoopCow. All rights reserved.
-//
-
-import Foundation
-import UIKit
-
-class ServiceHandler: UserService {
-    
-//    func verify(phoneNumber: String) -> Dictionary<String, AnyObject>? {
-//        
-//        var dict = Dictionary<String, AnyObject>()
-//        
-//        verify(phoneNumber) {
-//            (result: Dictionary<String, AnyObject>?, error: String?) -> Void in
-//
-//            // print result for testing purpose
-//            println(result!)
-//            
-//            // prompt alert if connection error
-//            if error != nil {
-//                displayAlert("Connection Error", error!)
-//            } else if let code = result!["code"] as? Int {
-//                if code == 20000 {
-//                    if let data = result!["data"] as? Dictionary<String, AnyObject> {
-//                        dict["phoneNumberId"] = data["phoneNumberId"] as? String
-//                        dict["verificationCode"] = data["verificationCode"] as? String
-//                        dict["isNewUser"] = data["isNewUser"] as? String
-//                        println("123")
-//                    }
-//                }
-//            } else {
-//                displayAlert("Error retrieving data", result!["message"] as! String)
-//            }
-//        }
-//        
-//        return dict
-//    }
-//    
-//    
-//    
-//    
-}
\ No newline at end of file
diff --git a/Classes/Services/UserService.swift b/Classes/Services/UserService.swift
index 84971c9..8f9be87 100755
--- a/Classes/Services/UserService.swift
+++ b/Classes/Services/UserService.swift
@@ -8,49 +8,24 @@
 
 import Foundation
 
-class UserService : BaseService {
+class UserService : HttpService {
     
-    var url = "yetian.xyz"
+    var port = Port()
     
-    func verify(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/getCode"
-        postRequest(url, jsonObj: data, callback: callback)
-    }
-    
-    func authenticate(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/auth"
-        postRequest(url, jsonObj: data, callback: callback)
-    }
-    
-    func getUserInfo(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/get?" + build(data)!
+    func getOne(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        var url = port.user_getOne + "?" + build(data)!
         getRequest(url, callback: callback)
     }
     
-    func addBankCard(data : Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/register"
-        postRequest(url, jsonObj: data, callback: callback)
+    func update(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        patchRequest(port.user_update, jsonObj: data, callback: callback)
     }
     
-    func updateUserInfo(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/update"
-        patchRequest(url, jsonObj: data, callback: callback)
+    func logout(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
+        patchRequest(port.user_update, jsonObj: data, callback: callback)
     }
     
-    func addLocation(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/addLocation"
-        postRequest(url, jsonObj: data, callback: callback)
-    }
     
-    func getUserBankInfo(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://\(self.url)/api/v1/users/get?" + build(data)!
-        getRequest(url, callback: callback)
-    }
-    
-    func uploadPhoto(data: Dictionary<String, AnyObject>, callback: (Dictionary<String, AnyObject>?, String?) -> Void){
-        var url = "http://arrived.dev/api/v1/users/upload"
-        uploadRequest(url, jsonObj: data, callback: callback)
-    }
     
 }
 
diff --git a/Classes/Services/TestRequestService.swift b/Classes/Test/TestRequestService.swift
similarity index 99%
rename from Classes/Services/TestRequestService.swift
rename to Classes/Test/TestRequestService.swift
index 659812a..c3d38ae 100644
--- a/Classes/Services/TestRequestService.swift
+++ b/Classes/Test/TestRequestService.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-class TestRequestService : BaseService {
+class TestRequestService : HttpService {
     
     func addData(data : Dictionary<String, AnyObject>) -> Dictionary<String, AnyObject> {
         var test : Dictionary<String, AnyObject> = ["data": data, "code": "20000", "message": "success"]
diff --git a/Classes/Services/TestReviewService.swift b/Classes/Test/TestReviewService.swift
similarity index 97%
rename from Classes/Services/TestReviewService.swift
rename to Classes/Test/TestReviewService.swift
index ef3dcb7..b853b79 100644
--- a/Classes/Services/TestReviewService.swift
+++ b/Classes/Test/TestReviewService.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-class TestReviewService : BaseService {
+class TestReviewService : HttpService {
     
     func addData(data : Dictionary<String, AnyObject>) -> Dictionary<String, AnyObject> {
         var test : Dictionary<String, AnyObject> = ["data": data, "code": "20000", "message": "success"]
diff --git a/Classes/Services/TestUserService.swift b/Classes/Test/TestUserService.swift
similarity index 99%
rename from Classes/Services/TestUserService.swift
rename to Classes/Test/TestUserService.swift
index 95ca2f5..be38030 100755
--- a/Classes/Services/TestUserService.swift
+++ b/Classes/Test/TestUserService.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-class TestUserService : BaseService {
+class TestUserService : HttpService {
     
     func addData(data : Dictionary<String, AnyObject>) -> Dictionary<String, AnyObject> {
         var test : Dictionary<String, AnyObject> = ["data": data, "code": "20000", "message": "success"]

From e6082083327557c469341aed84a6824ed81b6a8c Mon Sep 17 00:00:00 2001
From: myt588 <Tian@Macintosh.local>
Date: Thu, 28 May 2015 17:40:52 +0800
Subject: [PATCH 3/3] persistent data implemented

---
 Arrived.xcodeproj/project.pbxproj | 32 ++++++++++----
 Classes/Config/Port.swift         | 49 +++++++++++++++++++++
 Classes/Model/Address.swift       | 57 ++++++++++++++++++++----
 Classes/Model/Bank.swift          |  5 ++-
 Classes/Model/DataManager.swift   | 55 +++++++++++++++++++++++
 Classes/Model/Request.swift       | 56 ++++++++++++++++++++++--
 Classes/Model/User.swift          | 72 +++++++++++++++++++++++++------
 Classes/Model/address.plist       | 16 +++++++
 Classes/Model/profile.plist       |  5 +++
 Classes/Model/request.plist       |  7 +++
 10 files changed, 319 insertions(+), 35 deletions(-)
 create mode 100644 Classes/Config/Port.swift
 create mode 100644 Classes/Model/DataManager.swift
 create mode 100644 Classes/Model/address.plist
 create mode 100644 Classes/Model/profile.plist
 create mode 100644 Classes/Model/request.plist

diff --git a/Arrived.xcodeproj/project.pbxproj b/Arrived.xcodeproj/project.pbxproj
index 2bc3b8a..4db9802 100644
--- a/Arrived.xcodeproj/project.pbxproj
+++ b/Arrived.xcodeproj/project.pbxproj
@@ -98,10 +98,14 @@
 		94AF3FFE1B14C7C20048FD5F /* RequestService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FFD1B14C7C20048FD5F /* RequestService.swift */; };
 		94AF40001B14C7FC0048FD5F /* BankService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF3FFF1B14C7FC0048FD5F /* BankService.swift */; };
 		94AF40021B14C9E60048FD5F /* ReviewService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40011B14C9E60048FD5F /* ReviewService.swift */; };
-		94AF40041B14CA5C0048FD5F /* Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40031B14CA5C0048FD5F /* Address.swift */; };
 		94AF40061B14CA690048FD5F /* Bank.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40051B14CA690048FD5F /* Bank.swift */; };
 		94AF40081B14CA770048FD5F /* Review.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40071B14CA770048FD5F /* Review.swift */; };
-		94AF400A1B14CA800048FD5F /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40091B14CA800048FD5F /* Request.swift */; };
+		94AF401E1B1717AB0048FD5F /* address.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94AF401B1B1717AB0048FD5F /* address.plist */; };
+		94AF401F1B1717AB0048FD5F /* Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF401C1B1717AB0048FD5F /* Address.swift */; };
+		94AF40201B1717AB0048FD5F /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF401D1B1717AB0048FD5F /* Request.swift */; };
+		94AF40221B1717C30048FD5F /* request.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94AF40211B1717C30048FD5F /* request.plist */; };
+		94AF40241B1717EE0048FD5F /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94AF40231B1717EE0048FD5F /* DataManager.swift */; };
+		94AF40261B1718180048FD5F /* profile.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94AF40251B1718180048FD5F /* profile.plist */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -220,10 +224,14 @@
 		94AF3FFD1B14C7C20048FD5F /* RequestService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestService.swift; sourceTree = "<group>"; };
 		94AF3FFF1B14C7FC0048FD5F /* BankService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BankService.swift; sourceTree = "<group>"; };
 		94AF40011B14C9E60048FD5F /* ReviewService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReviewService.swift; sourceTree = "<group>"; };
-		94AF40031B14CA5C0048FD5F /* Address.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Address.swift; sourceTree = "<group>"; };
 		94AF40051B14CA690048FD5F /* Bank.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bank.swift; sourceTree = "<group>"; };
 		94AF40071B14CA770048FD5F /* Review.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Review.swift; sourceTree = "<group>"; };
-		94AF40091B14CA800048FD5F /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
+		94AF401B1B1717AB0048FD5F /* address.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = address.plist; sourceTree = "<group>"; };
+		94AF401C1B1717AB0048FD5F /* Address.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Address.swift; sourceTree = "<group>"; };
+		94AF401D1B1717AB0048FD5F /* Request.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
+		94AF40211B1717C30048FD5F /* request.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = request.plist; sourceTree = "<group>"; };
+		94AF40231B1717EE0048FD5F /* DataManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = "<group>"; };
+		94AF40251B1718180048FD5F /* profile.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = profile.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -593,11 +601,15 @@
 		94AF3FE51B143C6C0048FD5F /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				94AF401B1B1717AB0048FD5F /* address.plist */,
+				94AF40211B1717C30048FD5F /* request.plist */,
+				94AF40251B1718180048FD5F /* profile.plist */,
 				94AF3FE61B143C6C0048FD5F /* User.swift */,
-				94AF40031B14CA5C0048FD5F /* Address.swift */,
+				94AF401C1B1717AB0048FD5F /* Address.swift */,
+				94AF401D1B1717AB0048FD5F /* Request.swift */,
 				94AF40051B14CA690048FD5F /* Bank.swift */,
 				94AF40071B14CA770048FD5F /* Review.swift */,
-				94AF40091B14CA800048FD5F /* Request.swift */,
+				94AF40231B1717EE0048FD5F /* DataManager.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -700,9 +712,12 @@
 			files = (
 				8958224B1B04F0A4000DA21E /* SHSPhoneImage.bundle in Resources */,
 				89CAA3DC1B10A50A00D7E4C2 /* Images.xcassets in Resources */,
+				94AF40261B1718180048FD5F /* profile.plist in Resources */,
 				899DA8D31AF41AC700F0C476 /* birthday-104.png in Resources */,
+				94AF40221B1717C30048FD5F /* request.plist in Resources */,
 				89C4135B1AF1CD91000C2C95 /* Phone Icon.png in Resources */,
 				89C4136A1AF40402000C2C95 /* Main.storyboard in Resources */,
+				94AF401E1B1717AB0048FD5F /* address.plist in Resources */,
 				895822741B05061C000DA21E /* errorIcon@2x.png in Resources */,
 				89C413661AF32029000C2C95 /* user-104.png in Resources */,
 				899DA8CD1AF419C000F0C476 /* thunbs_up-96.png in Resources */,
@@ -741,7 +756,7 @@
 				899DA8C91AF40B5E00F0C476 /* ProfileVC.swift in Sources */,
 				890E3FBD1AEC5B9500F22912 /* HelperMethods.swift in Sources */,
 				8975DAC31B0E2043009D4991 /* WaveformVC.swift in Sources */,
-				94AF400A1B14CA800048FD5F /* Request.swift in Sources */,
+				94AF40201B1717AB0048FD5F /* Request.swift in Sources */,
 				89EEF5061B008B05006881FD /* OrderDetailVC.swift in Sources */,
 				94AF3FF01B143CB80048FD5F /* Port.swift in Sources */,
 				89471C4D1B09F6C600EFE101 /* MinoruTextField.swift in Sources */,
@@ -761,9 +776,9 @@
 				890D4C811AE4433400BD05DF /* AddPaymentInfoVC.swift in Sources */,
 				89C4136E1AF4052C000C2C95 /* MainScreenVC.swift in Sources */,
 				94AF3FFC1B14C6B10048FD5F /* AddressService.swift in Sources */,
-				94AF40041B14CA5C0048FD5F /* Address.swift in Sources */,
 				89D7C6B61AE44D0A00FFD592 /* ViewController.swift in Sources */,
 				94AF3FFE1B14C7C20048FD5F /* RequestService.swift in Sources */,
+				94AF40241B1717EE0048FD5F /* DataManager.swift in Sources */,
 				8975DAC11B0E187A009D4991 /* SiriWaveformView.swift in Sources */,
 				89471C4A1B09F6C600EFE101 /* JiroTextField.swift in Sources */,
 				94AF3FEB1B143C6C0048FD5F /* User.swift in Sources */,
@@ -774,6 +789,7 @@
 				890D72B71B0741C5006360E7 /* UserAgreementVC.swift in Sources */,
 				8981A4D31AF58FCE00F3046A /* AddLocationVC.swift in Sources */,
 				94AF3FED1B143C6C0048FD5F /* TestReviewService.swift in Sources */,
+				94AF401F1B1717AB0048FD5F /* Address.swift in Sources */,
 				8981A4CF1AF5641500F3046A /* UserLocationsTVCell.swift in Sources */,
 				895822721B05061C000DA21E /* GoogleWearAlert.swift in Sources */,
 				89E6FB881B12029C003A8276 /* MenuTransitionManager.swift in Sources */,
diff --git a/Classes/Config/Port.swift b/Classes/Config/Port.swift
new file mode 100644
index 0000000..b879860
--- /dev/null
+++ b/Classes/Config/Port.swift
@@ -0,0 +1,49 @@
+//
+//  Port.swift
+//  Arrived
+//
+//  Created by Yetian Mao on 5/26/15.
+//  Copyright (c) 2015 LoopCow. All rights reserved.
+//
+
+import Foundation
+
+class Port {
+    
+    static var url = "http://arrived.xyz/api/v1"
+    
+    
+    
+    var login_get = "\(url)/users/getCode"
+    var login_auth = "\(url)/users/auth"
+    
+    var user_getOne = "\(url)/users/getUserInfo"
+    var user_update = "\(url)/users/update"
+    
+    var bank_add = "\(url)/users/addBankCard"
+    var bank_get = "\(url)/users/getUserBankInfo"
+    var bank_delete = "\(url)/bank/delete"
+    
+    var location_add = "\(url)/users/addLocation"
+    var location_get = "\(url)/users/getUserLocationInfo"
+    
+    //Asker
+    var request_post = "\(url)/requests/post"
+    var request_takers = "\(url)/requests/takers"
+    var request_pick = "\(url)/requests/pick"
+    //Taker
+    var request_jobs = "\(url)/requests/jobs"
+    var request_interested = "\(url)/requests/interested"
+    var request_notInterested = "\(url)/requests/notInterested"
+    
+    var request_accepted = "\(url)/requests/accepted"
+    var request_finished = "\(url)/requests/finished"
+
+    var review_post = "\(url)/reviews/post"
+    var review_delete = "\(url)/reviews/delete"
+    var review_get = "\(url)/reviews/get"
+    
+    
+    
+    
+}
\ No newline at end of file
diff --git a/Classes/Model/Address.swift b/Classes/Model/Address.swift
index 1d5a8f2..ab5d913 100644
--- a/Classes/Model/Address.swift
+++ b/Classes/Model/Address.swift
@@ -1,18 +1,57 @@
 //
-//  Location.swift
-//  Arrived
+//  Address.swift
+//  Arrive
 //
-//  Created by Yetian Mao on 5/26/15.
-//  Copyright (c) 2015 LoopCow. All rights reserved.
+//  Created by Yetian Mao on 5/28/15.
+//  Copyright (c) 2015 yetian. All rights reserved.
 //
 
 import Foundation
 
-class Address {
+class Address{
+    
+    var addressId: Int? = nil
+    var latitude: Double? = nil
+    var longitude: Double? = nil
+    var address: String? = nil
+    
+    var dataManager = DataManager()
+    var path : String = DataManager().path("address")
+    
+
+    func load() -> NSMutableArray{
+        return dataManager.load(path, name: "address")
+    }
+    
+    
+    func save() -> Bool {
+        
+        var dict: NSMutableDictionary = NSMutableDictionary()
+    
+        //saving values
+        dict.setObject(addressId!, forKey: "addressId")
+        dict.setObject(latitude!, forKey: "latitude")
+        dict.setObject(longitude!, forKey: "longitude")
+        dict.setObject(address!, forKey: "address")
+        //...
+        //writing to GameData.plist
+        var array: NSMutableArray = self.load()
+        array.addObject(dict)
+        array.writeToFile(path, atomically: false)
+        return true
+    }
+    
+    func delete() -> Bool {
+        return dataManager.delete(path)
+    }
+    
+    func deleteOne(index : Int) -> Bool {
+        
+        var array : NSMutableArray = self.load()
+        array.removeObjectAtIndex(index)
+        array.writeToFile(path, atomically: false)
+        return true
+    }
     
-    private var addressId: String? = nil
-    private var latitude: String? = nil
-    private var longitude: String? = nil
-    private var address: String? = nil
     
 }
\ No newline at end of file
diff --git a/Classes/Model/Bank.swift b/Classes/Model/Bank.swift
index 78bcfb8..5fd7ae1 100644
--- a/Classes/Model/Bank.swift
+++ b/Classes/Model/Bank.swift
@@ -10,10 +10,11 @@ import Foundation
 
 class Bank {
     
-    private var bankCardId: String? = nil
+    private var localId : Int? = nil
+    private var bankCardId: Int? = nil
     private var fullName: String? = nil
     private var bankCardNumber: String? = nil
     private var expirationDate: String? = nil
-    private var cvv: String? = nil
+    private var cardType : Int? = nil
     
 }
\ No newline at end of file
diff --git a/Classes/Model/DataManager.swift b/Classes/Model/DataManager.swift
new file mode 100644
index 0000000..6b4a9a5
--- /dev/null
+++ b/Classes/Model/DataManager.swift
@@ -0,0 +1,55 @@
+//
+//  DataManager.swift
+//  Arrive
+//
+//  Created by Yetian Mao on 5/28/15.
+//  Copyright (c) 2015 yetian. All rights reserved.
+//
+
+import Foundation
+
+class DataManager {
+    
+    func path(name : String) -> String {
+        // getting path to address.plist
+        let paths = NSSearchPathForDirectoriesInDomains(.DocumentDirectory, .UserDomainMask, true) as NSArray
+        let documentsDirectory = paths[0] as! String
+        let path = documentsDirectory.stringByAppendingPathComponent("\(name).plist")
+        return path
+    }
+    
+    
+    func load(path : String, name : String) -> NSMutableArray{
+        let fileManager = NSFileManager.defaultManager()
+        //check if file exists
+        if(!fileManager.fileExistsAtPath(path)) {
+            // If it doesn't, copy it from the default file in the Bundle
+            if let bundlePath = NSBundle.mainBundle().pathForResource("\(name)", ofType: "plist") {
+                let resultArray = NSMutableArray(contentsOfFile: bundlePath)
+                println("Bundle \(name).plist file is --> \(resultArray?.description)")
+                fileManager.copyItemAtPath(bundlePath, toPath: path, error: nil)
+                println("copy")
+            } else {
+                println("\(name).plist not found. Please, make sure it is part of the bundle.")
+            }
+        } else {
+            println("\(name).plist already exits at path.")
+        }
+        let resultArray = NSMutableArray(contentsOfFile: path)
+        println("Loaded \(name).plist file is --> \(resultArray?.description)")
+        return resultArray!
+    }
+    
+    
+    func delete(path : String) -> Bool {
+        
+        let fileManager = NSFileManager.defaultManager()
+        if(fileManager.fileExistsAtPath(path)){
+            fileManager.removeItemAtPath(path, error: nil)
+            return true
+        }
+        return false
+    }
+    
+
+}
\ No newline at end of file
diff --git a/Classes/Model/Request.swift b/Classes/Model/Request.swift
index 3ff00e5..eb2daee 100644
--- a/Classes/Model/Request.swift
+++ b/Classes/Model/Request.swift
@@ -1,13 +1,14 @@
 //
 //  Request.swift
-//  Arrived
+//  Arrive
 //
-//  Created by Yetian Mao on 5/26/15.
-//  Copyright (c) 2015 LoopCow. All rights reserved.
+//  Created by Yetian Mao on 5/28/15.
+//  Copyright (c) 2015 yetian. All rights reserved.
 //
 
 import Foundation
 
+
 class Request {
     
     var title : String? = nil
@@ -22,4 +23,51 @@ class Request {
     var photos : NSArray? = nil
     var audios : NSArray? = nil
     
-}
+    var dataManager = DataManager()
+    var path : String = DataManager().path("request")
+    
+    func load() -> NSMutableArray{
+        return dataManager.load(path, name: "request")
+    }
+    
+    func save() -> Bool {
+        
+        var dict: NSMutableDictionary = NSMutableDictionary()
+        
+        //saving values
+        dict.setObject(title!, forKey: "title")
+        dict.setObject(body!, forKey: "body")
+        dict.setObject(price!, forKey: "price")
+        dict.setObject(tags!, forKey: "tags")
+        dict.setObject(effectiveStartDate!, forKey: "effectiveStartDate")
+        dict.setObject(effectiveEndDate!, forKey: "effectiveEndDate")
+        dict.setObject(latitude!, forKey: "latitude")
+        dict.setObject(longitude!, forKey: "longitude")
+        dict.setObject(address!, forKey: "address")
+        dict.setObject(photos!, forKey: "photos")
+        dict.setObject(audios!, forKey: "audios")
+        //...
+        //writing to plist
+        var array: NSMutableArray = self.load()
+        array.addObject(dict)
+        array.writeToFile(path, atomically: false)
+        return true
+    }
+    
+    func delete() -> Bool {
+        return dataManager.delete(path)
+    }
+    
+    func deleteOne(index : Int) -> Bool {
+        
+        var array : NSMutableArray = self.load()
+        array.removeObjectAtIndex(index)
+        array.writeToFile(path, atomically: false)
+        return true
+    }
+
+    
+    
+    
+    
+}
\ No newline at end of file
diff --git a/Classes/Model/User.swift b/Classes/Model/User.swift
index c22df40..4440ba0 100644
--- a/Classes/Model/User.swift
+++ b/Classes/Model/User.swift
@@ -10,6 +10,7 @@ import Foundation
 
 class User {
     
+    //User Authentication params
     var uid : Int? = nil
     var sid : String? = nil
     var regTime : Int? = nil
@@ -17,23 +18,35 @@ class User {
     var token : String? = nil
     var sessionValidTime : Int = 3
     
+    //User Profile
+    var nickname : String? = nil
+    var portrait : NSData? = nil
+    var sex : Int? = nil
+    var birth : String? = nil
+    var email : String? = nil
+    var status : String? = nil
+    
+    var dataManager = DataManager()
+    var listName : String = "profile"
+    var path : String = DataManager().path("profile")
+    
     func saveLoginInfo() -> Bool{
-        var login : NSUserDefaults = NSUserDefaults.standardUserDefaults()
+        var defaults : NSUserDefaults = NSUserDefaults.standardUserDefaults()
         if (uid == nil || sid == nil || regTime == nil || deviceId == nil || token == nil){
             return false
         } else {
-            login.setInteger(uid!, forKey: "uid")
-            login.setObject(sid, forKey: "sid")
-            login.setInteger(regTime!, forKey: "regTime")
-            login.setObject(deviceId, forKey: "deviceId")
-            login.setObject(token, forKey: "token")
+            defaults.setInteger(uid!, forKey: "uid")
+            defaults.setObject(sid, forKey: "sid")
+            defaults.setInteger(regTime!, forKey: "regTime")
+            defaults.setObject(deviceId, forKey: "deviceId")
+            defaults.setObject(token, forKey: "token")
         }
         return true
     }
     
     func verifySession() -> Bool{
-        var login = NSUserDefaults.standardUserDefaults()
-        let regTime : Int = login.integerForKey("regTime")
+        var defaults = NSUserDefaults.standardUserDefaults()
+        let regTime : Int = defaults.integerForKey("regTime")
         let currentTime = NSDate()
         let curTime = Int(currentTime.timeIntervalSince1970)
         sessionValidTime = sessionValidTime * 24 * 60 * 60
@@ -44,12 +57,47 @@ class User {
         return false
     }
     
+    func load() -> NSMutableDictionary{
+        let fileManager = NSFileManager.defaultManager()
+        //check if file exists
+        if(!fileManager.fileExistsAtPath(path)) {
+            // If it doesn't, copy it from the default file in the Bundle
+            if let bundlePath = NSBundle.mainBundle().pathForResource("\(listName)", ofType: "plist") {
+                let resultDictionary = NSMutableDictionary(contentsOfFile: bundlePath)
+                println("Bundle \(listName).plist file is --> \(resultDictionary?.description)")
+                fileManager.copyItemAtPath(bundlePath, toPath: path, error: nil)
+                println("copy")
+            } else {
+                println("\(listName).plist not found. Please, make sure it is part of the bundle.")
+            }
+        } else {
+            println("\(listName).plist already exits at path.")
+        }
+        let resultDictionary = NSMutableDictionary(contentsOfFile: path)
+        println("Loaded \(listName).plist file is --> \(resultDictionary?.description)")
+        return resultDictionary!
+    }
     
+    func save() -> Bool {
+        
+        var dict: NSMutableDictionary = NSMutableDictionary()
+        
+        //saving values
+        dict.setObject(nickname!, forKey: "nickname")
+        dict.setObject(portrait!, forKey: "portrait")
+        dict.setObject(sex!, forKey: "sex")
+        dict.setObject(birth!, forKey: "birth")
+        dict.setObject(email!, forKey: "email")
+        dict.setObject(status!, forKey: "status")
+        //...
+        //writing to plist
+        dict.writeToFile(path, atomically: false)
+        return true
+    }
     
+    func delete() -> Bool {
+        return dataManager.delete(path)
+    }
     
     
-    
-    
-    
-
 }
diff --git a/Classes/Model/address.plist b/Classes/Model/address.plist
new file mode 100644
index 0000000..0252551
--- /dev/null
+++ b/Classes/Model/address.plist
@@ -0,0 +1,16 @@
+<?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">
+<array>
+	<dict>
+		<key>addressId</key>
+		<integer>1</integer>
+		<key>longitude</key>
+		<real>100.1</real>
+		<key>latitude</key>
+		<real>-10.2</real>
+		<key>address</key>
+		<string>Homestead 102, CA</string>
+	</dict>
+</array>
+</plist>
diff --git a/Classes/Model/profile.plist b/Classes/Model/profile.plist
new file mode 100644
index 0000000..0c67376
--- /dev/null
+++ b/Classes/Model/profile.plist
@@ -0,0 +1,5 @@
+<?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/>
+</plist>
diff --git a/Classes/Model/request.plist b/Classes/Model/request.plist
new file mode 100644
index 0000000..20e247e
--- /dev/null
+++ b/Classes/Model/request.plist
@@ -0,0 +1,7 @@
+<?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">
+<array>
+	<dict/>
+</array>
+</plist>