Skip to content
Closed
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
2 changes: 1 addition & 1 deletion app/Console/Commands/Inspire.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Console\Commands;
namespace app\Console\Commands;

use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring;
Expand Down
5 changes: 3 additions & 2 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Console;
namespace app\Console;

use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
Expand All @@ -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
2 changes: 1 addition & 1 deletion app/Events/Event.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Events;
namespace app\Events;

abstract class Event
{
Expand Down
10 changes: 6 additions & 4 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Exceptions;
namespace app\Exceptions;

use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
Expand All @@ -21,7 +21,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 @@ -32,8 +33,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
32 changes: 13 additions & 19 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<?php namespace App\Http\Controllers;
<?php

use Cartalyst\Sentry\Facades\Laravel\Sentry;
use Illuminate\Support\Facades\Redirect;
namespace app\Http\Controllers;

use Event;
use Illuminate\Http\Request;
use User;
use Illuminate\Support\Facades\Redirect;
use Session;
use Event;
use User;

class AdminController extends Controller
{
protected $session;


public function __construct()
{

$this->setupTheme(config('cms.themes.admin.theme'), config('cms.themes.admin.layout'));
$this->middleware('auth.admin', ['except' => ['login', 'postLogin', 'logout']]);
}

/**
* Show the login form
* Show the login form.
*/
public function login()
{
Expand All @@ -36,16 +35,14 @@ public function login()
*/
public function postLogin(Request $request)
{
$input = $request->only('email', 'password', 'type');
$remember = $request->get('rememberme');

$input = $request->only('email', 'password', 'type');
$remember = $request->get('rememberme');

try
{
try {
// Authenticate the user
$user = User::authenticate($input, $remember);
return Redirect::intended('/admin');

return Redirect::intended('/admin');
} catch (\Lavalite\user\Exceptions\LoginRequiredException $e) {
$result = 'Login field is required.';
} catch (\Lavalite\user\Exceptions\PasswordRequiredException $e) {
Expand All @@ -68,14 +65,13 @@ public function postLogin(Request $request)
Session::flash('error', $result);

return Redirect::to('admin/login')->withInput();


}

/**
* Remove the specified resource from storage.
*
* @param int $id
* @param int $id
*
* @return Response
*/
public function logout()
Expand All @@ -90,6 +86,4 @@ public function home()
{
return $this->theme->of('admin::home')->render();
}


}
20 changes: 11 additions & 9 deletions app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace App\Http\Controllers\Auth;
namespace app\Http\Controllers\Auth;

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

class AuthController extends Controller
{
Expand Down Expand Up @@ -35,29 +35,31 @@ public function __construct()
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|confirmed|min:6',
]);
}

/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @param array $data
*
* @return User
*/
protected function create(array $data)
{
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'name' => $data['name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Http\Controllers\Auth;
namespace app\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
Expand Down
15 changes: 6 additions & 9 deletions app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php
namespace App\Http\Controllers;

use Former\Facades\Former;
use Teepluss\Theme\Facades\Theme;
namespace app\Http\Controllers;

use Former\Facades\Former;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Teepluss\Theme\Facades\Theme;

abstract class Controller extends BaseController {

abstract class Controller extends BaseController
{
use DispatchesJobs, ValidatesRequests;

/**
Expand All @@ -26,12 +26,9 @@ abstract class Controller extends BaseController {

public function setupTheme($theme = 'default', $layout = 'default')
{

$this->theme = Theme::uses($theme)->layout($layout);
//Former::framework('TwitterBootstrap3');
//Former::config('fetch_errors', true);
//Former::config('push_checkboxes', true);
}


}
11 changes: 6 additions & 5 deletions app/Http/Controllers/PublicController.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php namespace App\Http\Controllers;
<?php

namespace app\Http\Controllers;

use Page;

Expand All @@ -11,12 +13,11 @@ public function __construct()

public function home()
{

$data['page'] = Page::getPage('home');
//$this->theme->layout('home');
$this -> theme -> setTitle($data['page'] -> title);
$this -> theme -> setKeywords($data['page'] -> keyword);
$this -> theme -> setDescription($data['page'] -> description);
$this->theme->setTitle($data['page']->title);
$this->theme->setKeywords($data['page']->keyword);
$this->theme->setDescription($data['page']->description);

return $this->theme->of('public.home', $data)->render();
}
Expand Down
Loading