clean up the code in loginviewcontroller a bit

1 files changed, 29 insertions, 81 deletions

diff --git a/cakeside-ios/controllers/LoginViewController.m b/cakeside-ios/controllers/LoginViewController.m
index 3514005..89aaed1 100644
--- a/cakeside-ios/controllers/LoginViewController.m
+++ b/cakeside-ios/controllers/LoginViewController.m
@@ -1,15 +1,4 @@
-//
-//  ViewController.m
-//  cakeside-ios
-//
-//  Created by mo khan on 2013-07-14.
-//  Copyright (c) 2013 mo khan. All rights reserved.
-//
-
 #import "LoginViewController.h"
-#import "SSKeychain.h"
-#import "MBProgressHUD.h"
-#import "AFNetworking.h"
 
 @interface LoginViewController ()<UITextFieldDelegate>
 @property (strong, nonatomic) MBProgressHUD *HUD;
@@ -20,7 +9,6 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
   UIView *emailPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)];
   self.emailTextBox.leftView = emailPaddingView;
   self.emailTextBox.leftViewMode = UITextFieldViewModeAlways;
@@ -29,16 +17,13 @@
   self.passwordTextBox.leftView = passwordPaddingView;
   self.passwordTextBox.leftViewMode = UITextFieldViewModeAlways;
   
-//  self.contentView.$y = 0;
-  
   // prepopulate username/password with stored information
-
   NSError *error;
   NSString *username = [SSKeychain passwordForService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT error:&error];
   if (error) { username = nil; }
   NSString *password = [SSKeychain passwordForService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT error:&error];
   if (error) { password = nil; }
-  
+
   if (username)
   {
     self.emailTextBox.text = username;
@@ -79,7 +64,6 @@
     {
       [self login:self.passwordTextBox];
     }
-  
   return YES;
 }
 
@@ -89,26 +73,9 @@
   [textField resignFirstResponder];
 }
 
-
-- (void)textFieldDidBeginEditing:(UITextField *)textField
-{
-  [UIView animateWithDuration:HUD_ANIMATION_DURATION animations:^{
-//    self.contentView.$y = -116;
-  }];
-}
-
-
 - (void)dismissKeyboard
 {
   [self.view endEditing:YES];
-  /*
-  if (self.contentView.$y!=0)
-  {
-    [UIView animateWithDuration:HUD_ANIMATION_DURATION animations:^{
-      self.contentView.$y = 0;
-    }];
-  }
-  */
 }
 
 #pragma mark - Action methods
@@ -121,68 +88,49 @@
 
 - (IBAction)login:(id)sender
 {
-  //    [self performSegueWithIdentifier:@"gotoMainInterface" sender:nil];
-  //    return;
-  
   [self dismissKeyboard];
   self.HUD.mode = MBProgressHUDModeIndeterminate;
   self.HUD.labelText = nil;
   self.HUD.customView = nil;
   [self.HUD show:YES];
-  
-  
+
   // try to login/register...
   NSDictionary *params = @{@"email": self.emailTextBox.text, @"password": self.passwordTextBox.text};
-  
   AFHTTPClient *httpClient = [[AFHTTPClient alloc] initWithBaseURL:[NSURL URLWithString:HOST]];
   [httpClient registerHTTPOperationClass:[AFJSONRequestOperation class]];
   [httpClient setDefaultHeader:@"Accept" value:@"application/json"];
   [httpClient.operationQueue setMaxConcurrentOperationCount:1];
   [httpClient setParameterEncoding:AFJSONParameterEncoding];
   NSMutableURLRequest *request = [httpClient requestWithMethod:@"POST" path:URL_LOGIN parameters:params];
-  
+
   NSLog(@"POST: %@", request);
-  
-  AFJSONRequestOperation *operation = [AFJSONRequestOperation
-                                       JSONRequestOperationWithRequest:request
-                                       success:^(NSURLRequest *request, NSHTTPURLResponse *response, id JSON)
-                                       {
-                                         NSLog(@"%@", JSON);
-                                         
-                                         // check if login was successfull
-                                         NSString *token = [JSON objectForKey:@"auth_token"];
-                                         if (!token || [token isEmpty])
-                                         {
-                                           [self.HUD hide:YES];
-                                           [TSMessage showNotificationInViewController:self
-                                                                             withTitle:@"Login failed!"
-                                                                           withMessage:@"Please verify your login credentials and try again."
-                                                                              withType:TSMessageNotificationTypeError
-                                                                          withDuration:OVERLAY_MESSAGE_DURATION
-                                            ];
-                                         }
-                                         else
-                                         {
-                                           // successfull login!
-                                           [SSKeychain setPassword:token forService:KEYCHAIN_API_TOKEN account:KEYCHAIN_ACCOUNT];
-                                           [SSKeychain setPassword:self.emailTextBox.text forService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT];
-                                           [SSKeychain setPassword:self.passwordTextBox.text forService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT];
-                                           
-                                           //[self performSegueWithIdentifier:@"gotoMainInterface" sender:nil];
-                                         }
-                                         
-                                       }
-                                       failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error, id JSON)
-                                       {
-                                         [self.HUD hide:YES];
-                                         NSLog(@"Request Failed with Error: %@, %@", error, error.userInfo);
-                                         
-                                         BlockAlertView *alert = [BlockAlertView alertWithTitle:@"Something's not working." message:@"Login/Signup currently not possible. Please try again."];
-                                         [alert setCancelButtonWithTitle:@"Ok" block:nil];
-                                         [alert show];
-                                       }];
+  AFJSONRequestOperation *operation = [AFJSONRequestOperation JSONRequestOperationWithRequest:request success:^(NSURLRequest *request, NSHTTPURLResponse *response, id JSON) {
+     NSLog(@"%@", JSON);
+     // check if login was successfull
+     NSString *token = [JSON objectForKey:@"auth_token"];
+     if (!token || [token isEmpty])
+     {
+       [self.HUD hide:YES];
+       [TSMessage showNotificationInViewController:self withTitle:@"Login failed!" withMessage:@"Please verify your login credentials and try again." withType:TSMessageNotificationTypeError withDuration:OVERLAY_MESSAGE_DURATION];
+     }
+     else
+     {
+       // successfull login!
+       [SSKeychain setPassword:token forService:KEYCHAIN_API_TOKEN account:KEYCHAIN_ACCOUNT];
+       [SSKeychain setPassword:self.emailTextBox.text forService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT];
+       [SSKeychain setPassword:self.passwordTextBox.text forService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT];
+       //[self performSegueWithIdentifier:@"gotoMainInterface" sender:nil];
+     }
+   }
+   failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error, id JSON)
+   {
+     [self.HUD hide:YES];
+     NSLog(@"Request Failed with Error: %@, %@", error, error.userInfo);
+     BlockAlertView *alert = [BlockAlertView alertWithTitle:@"Something's not working." message:@"Login/Signup currently not possible. Please try again."];
+     [alert setCancelButtonWithTitle:@"Ok" block:nil];
+     [alert show];
+   }];
   [operation start];
-  
 }
 
 @end