Merge cbc3fa2 into 93db86b

GrupaZero · Nov 22, 2015 · 75c4ce6 · 75c4ce6
2 parents 93db86b + cbc3fa2
commit 75c4ce6
Show file tree

Hide file tree

Showing 7 changed files with 709 additions and 507 deletions.
diff --git a/.env.example b/.env.example
@@ -18,3 +18,12 @@ MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
+
+OAUTH_GOOGLE_CLIENT_ID=
+OAUTH_GOOGLE_CLIENT_SECRET=
+
+OAUTH_FB_CLIENT_ID=
+OAUTH_FB_CLIENT_SECRET=
+
+OAUTH_TWITTER_CLIENT_ID=
+OAUTH_TWITTER_CLIENT_SECRET=
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -18,14 +18,12 @@ class AccountController extends BaseController {
 
     public function account()
     {
-        $user = Auth::user();
         /**@TODO we need proper user menu method */
-        return view('account.index', ['menu' => App::make('user.menu')->getMenu(), 'user' => $user]);
+        return view('account.index', ['menu' => App::make('user.menu')->getMenu(), 'user' => auth()->user()]);
     }
 
     public function edit()
     {
-        $user = Auth::user();
-        return view('account.edit', ['menu' => App::make('user.menu')->getMenu(), 'user' => $user]);
+        return view('account.edit', ['menu' => App::make('user.menu')->getMenu(), 'user' => auth()->user()]);
     }
 }
diff --git a/composer.json b/composer.json
@@ -18,6 +18,7 @@
         "gzero/cms": "dev-master",
         "gzero/api": "dev-master",
         "gzero/admin": "dev-master",
+        "gzero/social": "dev-master",
         "thomaswelton/laravel-gravatar": "~1.0"
     },
     "require-dev": {