Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void
*/
protected function schedule(Schedule $schedule)
Expand Down
13 changes: 7 additions & 6 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
use Exception;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Foundation\Validation\ValidationException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Foundation\Validation\ValidationException;
use Symfony\Component\HttpKernel\Exception\HttpException;

class Handler extends ExceptionHandler
{
Expand All @@ -29,7 +28,8 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Exception $e
*
* @return void
*/
public function report(Exception $e)
Expand All @@ -40,8 +40,9 @@ public function report(Exception $e)
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @param \Illuminate\Http\Request $request
* @param \Exception $e
*
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
Expand Down
11 changes: 1 addition & 10 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@

namespace App\Http\Controllers;

use Redirect;
use Request;
use App;

class AdminController extends WebCurdController
{


public function __construct()
{
parent::__construct();
$this->middleware('auth.role:admin');
$this->setupTheme(config('theme.themes.admin.theme'), config('theme.themes.admin.layout'));
}

/**
* Show admin dashboard.
*
Expand Down Expand Up @@ -67,8 +62,4 @@ public function reports()
{
return $this->theme->of('admin::general.reports')->render();
}




}
16 changes: 5 additions & 11 deletions app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@

namespace App\Http\Controllers\Auth;

use AuthenticateUser;
use User;
use Validator;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Request;
use Socialite;
use Theme;

use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use User;
use Validator;

class AuthController extends Controller
{
Expand All @@ -31,15 +29,13 @@ class AuthController extends Controller
/**
* Default role to be assigned for newely created user.
*/

protected $role = 'user';

/**
* Where to redirect users after login / registration.
*
* @var string
*/

protected $redirectTo = '/home';

/**
Expand Down Expand Up @@ -131,7 +127,5 @@ public function redirectToProvider($provider)
public function handleProviderCallback($provider)
{
$user = Socialite::driver($provider)->user();

}

}
19 changes: 9 additions & 10 deletions app/Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,17 @@ public function __construct()
$this->setupTheme(config('theme.themes.public.theme'), config('theme.themes.public.layout'));
}


/**
* Display the password reset view for the given token.
*
* If no token is present, display the link request form.
*
* @param string|null $token
* @param string|null $token
*
* @return \Illuminate\Http\Response
*/
public function showResetForm($token = null)
{

if (is_null($token)) {
return $this->getEmail();
}
Expand All @@ -61,12 +60,12 @@ public function showLinkRequestForm()
}

/**
* Display the form to request a password reset link.
*
* @return \Illuminate\Http\Response
*/
* Display the form to request a password reset link.
*
* @return \Illuminate\Http\Response
*/
public function getEmail()
{
return $this->theme->of('public::user.password')->render();
}
{
return $this->theme->of('public::user.password')->render();
}
}
4 changes: 2 additions & 2 deletions app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace App\Http\Controllers;

use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Routing\Controller as BaseController;
use Theme;

class Controller extends BaseController
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/PublicController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public function __construct()
public function home()
{
$this->theme->layout('home');

return $this->theme->of('public::home', compact('page'))->render();
}
}
6 changes: 0 additions & 6 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@

namespace App\Http\Controllers;

use Redirect;
use Request;
use App;

class UserController extends WebCurdController
{

public function __construct()
{
parent::__construct();
Expand All @@ -24,5 +19,4 @@ public function home()
{
return $this->theme->of('public::welcome')->render();
}

}
32 changes: 18 additions & 14 deletions app/Http/Controllers/WebCurdController.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?php

namespace App\Http\Controllers;
use Illuminate\Http\Request;

use Illuminate\Http\Request;
use Response;

class WebCurdController extends Controller
{

/*
* Store response datas
*/
protected $response;

/**
*Store modal repositiry
*Store modal repositiry.
*/
protected $repository;

Expand All @@ -33,14 +32,18 @@ public function __construct()
*/
public function respond(Request $request)
{
if($request->wantsJson())
if ($request->wantsJson()) {
return $this->respondJson();
}

if($request->ajax())
if ($request->ajax()) {
return $this->respondAjax();
}

if(empty($this->responseRedirect) && !is_null($this->responseView))
if (empty($this->responseRedirect) && !is_null($this->responseView)) {
return $this->respondTheme();
}

return $this->respondRedirect();
}

Expand All @@ -53,11 +56,11 @@ public function respondJson()
{
return Response::json(
[
'data' => $this->responseData,
'message' => $this->responseMessage,
'code' => $this->responseCode,
'meta' => $this->responseMeta,
'redirect' => $this->responseRedirect
'data' => $this->responseData,
'message' => $this->responseMessage,
'code' => $this->responseCode,
'meta' => $this->responseMeta,
'redirect' => $this->responseRedirect,
]
);
}
Expand Down Expand Up @@ -95,9 +98,11 @@ public function respondTheme()
}

/**
* Set vari
* Set vari.
*
* @param type $name
* @param type $value
*
* @return type
*/
public function __set($name, $value)
Expand All @@ -111,7 +116,6 @@ public function __get($name)
return $this->response[$name];
}

return null;
return;
}

}
8 changes: 4 additions & 4 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth.role' => \App\Http\Middleware\RoleAuthenticate::class,
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.role' => \App\Http\Middleware\RoleAuthenticate::class,
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
];
}
14 changes: 6 additions & 8 deletions app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
namespace App\Http\Middleware;

use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Support\Facades\Auth;
use Illuminate\Contracts\Auth\Guard;

class Authenticate
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/

private $socialite;
private $auth;
private $users;
Expand All @@ -30,9 +30,7 @@ public function handle($request, Closure $next, $guard = null)
return redirect()->guest('login');
}
}

return $next($request);
}


}
7 changes: 4 additions & 3 deletions app/Http/Middleware/RedirectIfAuthenticated.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
Expand Down
3 changes: 1 addition & 2 deletions app/Http/Middleware/RoleAuthenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

class RoleAuthenticate
{

/**
* Handle an incoming request.
*
Expand All @@ -25,7 +24,7 @@ public function handle($request, Closure $next, $role, $guard = null)
if ($request->ajax()) {
return response('Unauthorized.', 401);
} else {
return redirect()->guest("/login");
return redirect()->guest('/login');
}
}
}
2 changes: 0 additions & 2 deletions app/Http/Requests/StoreBlogPostRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace App\Http\Requests;

use App\Http\Requests\Request;

class StoreBlogPostRequest extends Request
{
/**
Expand Down
5 changes: 2 additions & 3 deletions app/Http/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
|
*/


// Dashboard for administartor

// User routes
Expand All @@ -42,6 +41,6 @@
Route::get(Trans::setLocale().'admin/reports', 'AdminController@reports');
});

Route::get('/test', function(){
Route::get('/test', function () {
return \Menu::menu('admin', 'menu.admin');
});
});
Loading