Merge pull request #84 from gitaminhq/admin-stuff

Fixed typos
GitaminHQ · Dec 12, 2015 · c5b829b · c5b829b
2 parents 7b1e1e1 + ae949dc
commit c5b829b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -47,7 +47,8 @@ public function postLogin()
             // We probably want to add support for "Remember me" here.
             Auth::attempt($loginData);
 
-            return Redirect::intended('dashboard.index')
+            //return Redirect::intended('/')
+            return Redirect::home()
                 ->withSuccess(trans('gitamin.signin.success'));
         }
 

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -47,7 +47,7 @@ public function __construct(Guard $auth)
     public function handle($request, Closure $next)
     {
         if ($this->auth->check()) {
-            return new RedirectResponse(route('dashboard.index'));
+            return new RedirectResponse(route('home'));
         }
 
         return $next($request);

diff --git a/app/Http/Routes/DefaultRoutes.php b/app/Http/Routes/DefaultRoutes.php
@@ -29,10 +29,9 @@ public function map(Registrar $router)
         $router->group([
             'middleware' => ['app.hasSetting', 'auth'],
             'setting'    => 'app_name',
-            'as'         => 'dashboard.',
         ], function ($router) {
             $router->get('/', [
-                'as'   => 'index',
+                'as'   => 'home',
                 'uses' => 'DashboardController@indexAction',
             ]);
         });

diff --git a/resources/views/default/dashboard/partials/header.blade.php b/resources/views/default/dashboard/partials/header.blade.php
@@ -1,5 +1,5 @@
 <div class="nav-header">
-    <div class="nav-logo"><a href="{{ route('dashboard.index') }}"><img src="/img/dashboard-logo.png"></a></div>
+    <div class="nav-logo"><a href="{{ route('home') }}"><img src="/img/dashboard-logo.png"></a></div>
 		<div class="nav-greeting">
             <div class="nav-menu">
                 <ul>

diff --git a/resources/views/default/dashboard/partials/sidebar.blade.php b/resources/views/default/dashboard/partials/sidebar.blade.php
@@ -2,7 +2,7 @@
     <div class="sidebar-inner">
         <ul>
             <li {!! set_active('dashboard') !!}{!! set_active('/') !!}>
-                <a href="{{ route('dashboard.index') }}">
+                <a href="{{ route('home') }}">
                     <i class="fa fa-dashboard"></i>
                     <span>{{ trans('dashboard.dashboard') }}</span>
                 </a>

diff --git a/resources/views/default/dashboard/user/index.blade.php b/resources/views/default/dashboard/user/index.blade.php
@@ -50,7 +50,7 @@
                                 <hr>
                                 <div class="form-actions">
                                 <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
-                                <a class="btn btn-default" href="{{ route('dashboard.index') }}">{{ trans('forms.cancel') }}</a>
+                                <a class="btn btn-default" href="{{ route('home') }}">{{ trans('forms.cancel') }}</a>
                                 </div>
                             </div>
                         </div>

diff --git a/resources/views/default/install.blade.php b/resources/views/default/install.blade.php
@@ -200,7 +200,7 @@
                     <h3>
                         {{ trans("install.completed") }}
                     </h3>
-                    <a href="{{ route('dashboard.index') }}" class="btn btn-default">
+                    <a href="{{ route('home') }}" class="btn btn-default">
                         <span>{{ trans("install.finish") }}</span>
                     </a>
                 </div>