Merge efb0a78 into 2104fbe

GrupaZero · Mar 22, 2017 · 2e7b757 · 2e7b757
2 parents 2104fbe + efb0a78
commit 2e7b757
Show file tree

Hide file tree

Showing 15 changed files with 315 additions and 119 deletions.
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -4,35 +4,17 @@
 
 use Illuminate\Http\Request;
 use Gzero\Core\Controllers\BaseController;
-use Gzero\Core\Menu\Register;
 
 class AccountController extends BaseController {
-    /**
-     * @var Register
-     */
-    protected $userMenu;
-
-    /**
-     * AccountController constructor.
-     *
-     * @param Register $userMenu
-     */
-    public function __construct(Register $userMenu)
-    {
-        $this->userMenu = $userMenu;
-        $this->userMenu->addLink(route('account'), 'user.my_account');
-        $this->userMenu->addLink(route('account.oauth'), 'user.oauth');
-    }
 
     public function account()
     {
-        /**@TODO we need proper user menu method */
-        return view('account.index', ['menu' => $this->userMenu->getMenu()]);
+        return view('account.index');
     }
 
     public function edit()
     {
-        return view('account.edit', ['menu' => $this->userMenu->getMenu()]);
+        return view('account.edit');
     }
 
     public function welcome(Request $request)
@@ -48,6 +30,6 @@ public function welcome(Request $request)
 
     public function oauth()
     {
-        return view('account.oauth', ['menu' => $this->userMenu->getMenu()]);
+        return view('account.oauth');
     }
 }
diff --git a/app/Jobs/SendWelcomeEmail.php b/app/Jobs/SendWelcomeEmail.php
@@ -41,7 +41,7 @@ public function handle(Mailer $mailer)
                 ['user' => $this->user],
                 function ($m) {
                     $m->to($this->user->email, $this->user->name)
-                        ->subject(trans('emails.welcome.subject', ['siteName' => config('gzero.site_name')]));
+                        ->subject(trans('emails.welcome.subject', ['siteName' => config('app.name')]));
                 }
             );
         } catch (\Swift_TransportException $e) {

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -26,50 +26,6 @@ function () {
                 }
             );
         }
-
-        view()->composer(
-            'includes.disqus.disqus',
-            function ($view) {
-                $data = [];
-                $user = auth()->user();
-                if (!$user->isGuest()) {
-                    $data = [
-                        "id"       => $user["id"],
-                        "username" => $user->getPresenter()->displayName(),
-                        "email"    => $user["email"],
-                        //"avatar"    => $user["avatar"],
-                    ];
-                }
-
-                function dsq_hmacsha1($data, $key)
-                {
-                    $blockSize = 64;
-                    if (strlen($key) > $blockSize) {
-                        $key = pack('H*', sha1($key));
-                    }
-                    $key  = str_pad($key, $blockSize, chr(0x00));
-                    $ipad = str_repeat(chr(0x36), $blockSize);
-                    $opad = str_repeat(chr(0x5c), $blockSize);
-                    $hmac = pack(
-                        'H*',
-                        sha1(
-                            ($key ^ $opad) . pack(
-                                'H*',
-                                sha1(
-                                    ($key ^ $ipad) . $data
-                                )
-                            )
-                        )
-                    );
-                    return bin2hex($hmac);
-                }
-
-                $message   = base64_encode(json_encode($data));
-                $timestamp = time();
-                $hmac      = dsq_hmacsha1($message . ' ' . $timestamp, config('disqus.api_secret'));
-                $view->with('remoteAuthS3', "$message $hmac $timestamp");
-            }
-        );
     }
 
     /**

diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Providers;
+
+use Gzero\Core\Menu\Link;
+use Gzero\Core\Menu\Register;
+use Illuminate\Support\ServiceProvider;
+
+class ComposerServiceProvider extends ServiceProvider {
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        view()->composer(
+            'account.menu',
+            function ($view) {
+                $menu = app('gzero.menu.account');
+                /** @var $menu Register */
+                $menu->add(new Link(route('account'), trans('user.my_account'), 100));
+                $menu->add(new Link(route('account.oauth'), trans('user.oauth'), 200));
+                $view->with('menu', $menu->getMenu());
+            }
+        );
+
+        view()->composer(
+            'includes.disqus.disqus',
+            function ($view) {
+                $data = [];
+                $user = auth()->user();
+                if (!$user->isGuest()) {
+                    $data = [
+                        "id"       => $user["id"],
+                        "username" => $user->getPresenter()->displayName(),
+                        "email"    => $user["email"],
+                        //"avatar"    => $user["avatar"],
+                    ];
+                }
+
+                function dsq_hmacsha1($data, $key)
+                {
+                    $blockSize = 64;
+                    if (strlen($key) > $blockSize) {
+                        $key = pack('H*', sha1($key));
+                    }
+                    $key  = str_pad($key, $blockSize, chr(0x00));
+                    $ipad = str_repeat(chr(0x36), $blockSize);
+                    $opad = str_repeat(chr(0x5c), $blockSize);
+                    $hmac = pack(
+                        'H*',
+                        sha1(
+                            ($key ^ $opad) . pack(
+                                'H*',
+                                sha1(
+                                    ($key ^ $ipad) . $data
+                                )
+                            )
+                        )
+                    );
+                    return bin2hex($hmac);
+                }
+
+                $message   = base64_encode(json_encode($data));
+                $timestamp = time();
+                $hmac      = dsq_hmacsha1($message . ' ' . $timestamp, config('disqus.api_secret'));
+                $view->with('remoteAuthS3', "$message $hmac $timestamp");
+            }
+        );
+    }
+}
diff --git a/composer.json b/composer.json
@@ -22,6 +22,7 @@
         "gzero/cms": "dev-master",
         "gzero/api": "dev-master",
         "gzero/admin": "dev-master",
+        "gzero/social": "dev-#61_fix_gzero_social",
         "predis/predis": "^1.1",
         "league/flysystem-aws-s3-v3": "^1.0"
     },