From 8ed675ebe1a4324fe311646f336fe45034a0ccd9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 Mar 2015 16:35:57 +0200
Subject: [PATCH] Working on users

---
 app/Http/Controllers/AppController.php  |  2 +-
 app/Http/Controllers/HomeController.php |  2 ++
 app/Services/Registrar.php              |  2 +-
 composer.lock                           | 21 +++++++++++----------
 config/auth.php                         |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 4e8edf0362..b799f973ea 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -91,7 +91,7 @@ class AppController extends BaseController
         fclose($fp);
 
         // == DB Migrate & Seed == //
-        Artisan::call('migrate:rollback', array('--force' => true)); // Debug Purposes
+        // Artisan::call('migrate:rollback', array('--force' => true)); // Debug Purposes
         Artisan::call('migrate', array('--force' => true));
         Artisan::call('db:seed', array('--force' => true));
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 25fb49884d..23681afb28 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -4,6 +4,8 @@ use App\Libraries\Utils;
 use App\Ninja\Mailers\Mailer;
 use Redirect;
 use App\Models\Account;
+use Auth;
+use View;
 
 class HomeController extends BaseController
 {
diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php
index 1035468140..cf19d6f4b7 100644
--- a/app/Services/Registrar.php
+++ b/app/Services/Registrar.php
@@ -1,6 +1,6 @@
 <?php namespace App\Services;
 
-use App\User;
+use App\Model\User;
 use Validator;
 use Illuminate\Contracts\Auth\Registrar as RegistrarContract;
 
diff --git a/composer.lock b/composer.lock
index 0120225329..27bc81075e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1999,12 +1999,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lokielse/omnipay-alipay.git",
-                "reference": "6000ac36e23f529a780bacf52aaf04f1352791c5"
+                "reference": "ee43b64cb0968eed870cab77027bd0ba0d3754b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/6000ac36e23f529a780bacf52aaf04f1352791c5",
-                "reference": "6000ac36e23f529a780bacf52aaf04f1352791c5",
+                "url": "https://api.github.com/repos/lokielse/omnipay-alipay/zipball/ee43b64cb0968eed870cab77027bd0ba0d3754b8",
+                "reference": "ee43b64cb0968eed870cab77027bd0ba0d3754b8",
                 "shasum": ""
             },
             "require": {
@@ -2040,7 +2040,7 @@
                 "payment",
                 "purchase"
             ],
-            "time": "2015-03-19 05:33:28"
+            "time": "2015-03-26 11:54:18"
         },
         {
             "name": "maximebf/debugbar",
@@ -2272,20 +2272,21 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.17.0",
+            "version": "1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "a1dd1ad9abfc8b3c4d8768068e6c71d293424e86"
+                "reference": "99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a1dd1ad9abfc8b3c4d8768068e6c71d293424e86",
-                "reference": "a1dd1ad9abfc8b3c4d8768068e6c71d293424e86",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36",
+                "reference": "99e2f69f7bdc2cc4334b2d00f1e0ba450623ea36",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.3.0",
+                "symfony/translation": "2.6.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "~4.0"
@@ -2314,7 +2315,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2015-03-08 14:05:44"
+            "time": "2015-03-26 03:05:57"
         },
         {
             "name": "nikic/php-parser",
diff --git a/config/auth.php b/config/auth.php
index 5b436aa4f9..1ce67b55a1 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -28,7 +28,7 @@ return [
 	|
 	*/
 
-	'model' => 'App\User',
+	'model' => 'App\Models\User',
 
 	/*
 	|--------------------------------------------------------------------------