@@ -36,8 +36,8 @@ discard block |
||
36 | 36 | */ |
37 | 37 | $capsule = new Capsule; |
38 | 38 | $capsule->addConnection([ |
39 | - 'driver' => 'sqlite', |
|
40 | - 'database' => ':memory:', |
|
39 | + 'driver' => 'sqlite', |
|
40 | + 'database' => ':memory:', |
|
41 | 41 | ]); |
42 | 42 | $capsule->setEventDispatcher(new Dispatcher); |
43 | 43 | $capsule->setAsGlobal(); |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | $capsule->schema()->dropIfExists('models'); |
47 | 47 | |
48 | 48 | $capsule->schema()->create('models', function (Blueprint $table) { |
49 | - $table->increments('id'); |
|
50 | - $table->string('string'); |
|
51 | - $table->string('email'); |
|
52 | - $table->timestamps(); |
|
49 | + $table->increments('id'); |
|
50 | + $table->string('string'); |
|
51 | + $table->string('email'); |
|
52 | + $table->timestamps(); |
|
53 | 53 | }); |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | | |
17 | 17 | */ |
18 | 18 | |
19 | -require __DIR__ . '/vendor/autoload.php'; |
|
19 | +require __DIR__.'/vendor/autoload.php'; |
|
20 | 20 | |
21 | 21 | /* |
22 | 22 | |-------------------------------------------------------------------------- |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | $capsule->schema()->dropIfExists('models'); |
47 | 47 | |
48 | -$capsule->schema()->create('models', function (Blueprint $table) { |
|
48 | +$capsule->schema()->create('models', function(Blueprint $table) { |
|
49 | 49 | $table->increments('id'); |
50 | 50 | $table->string('string'); |
51 | 51 | $table->string('email'); |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | m::close(); |
22 | 22 | } |
23 | 23 | |
24 | - public function testItReturnsTheDashboardIfUserIsAuthenticated () |
|
24 | + public function testItReturnsTheDashboardIfUserIsAuthenticated() |
|
25 | 25 | { |
26 | 26 | // $user = factory(App\User::class)->create(); |
27 | 27 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | // $this->assertFalse($request); |
34 | 34 | } |
35 | 35 | |
36 | - public function testItRedirectsToLoginIfUserIsNotAuthenticated () |
|
36 | + public function testItRedirectsToLoginIfUserIsNotAuthenticated() |
|
37 | 37 | { |
38 | 38 | //$request = $this->urlGenerator->to('admin')->assertRedirectedTo('login'); |
39 | 39 | $this->assertTrue(true); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('sites', function (Blueprint $table) { |
|
15 | + Schema::create('sites', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('title'); |
18 | 18 | $table->string('twitter'); |
@@ -7,23 +7,23 @@ |
||
7 | 7 | |
8 | 8 | class AuthController extends Controller |
9 | 9 | { |
10 | - public function __construct () { |
|
10 | + public function __construct() { |
|
11 | 11 | $this->middleware('guest'); |
12 | 12 | } |
13 | 13 | |
14 | - public function showLoginForm () { |
|
14 | + public function showLoginForm() { |
|
15 | 15 | return view('Blue::auth.login'); |
16 | 16 | } |
17 | 17 | |
18 | - public function postLoginForm () { |
|
18 | + public function postLoginForm() { |
|
19 | 19 | return 'Posted!'; |
20 | 20 | } |
21 | 21 | |
22 | - public function showRegisterForm () { |
|
22 | + public function showRegisterForm() { |
|
23 | 23 | return view('Blue::auth.register'); |
24 | 24 | } |
25 | 25 | |
26 | - public function postRegisterForm () { |
|
26 | + public function postRegisterForm() { |
|
27 | 27 | return 'Posted!'; |
28 | 28 | } |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -11,7 +11,7 @@ |
||
11 | 11 | |
12 | 12 | class PagesController extends Controller |
13 | 13 | { |
14 | - public function page ($page = null) { |
|
14 | + public function page($page = null) { |
|
15 | 15 | if (is_null($page)) { |
16 | 16 | return SEO::make([], 'Blue::home'); |
17 | 17 | } |
@@ -7,15 +7,15 @@ |
||
7 | 7 | |
8 | 8 | class AdminController extends Controller |
9 | 9 | { |
10 | - public function __construct () { |
|
10 | + public function __construct() { |
|
11 | 11 | $this->middleware('auth'); |
12 | 12 | } |
13 | 13 | |
14 | - public function index () { |
|
14 | + public function index() { |
|
15 | 15 | return redirect('admin/dashboard'); |
16 | 16 | } |
17 | 17 | |
18 | - public function showDashboard () { |
|
18 | + public function showDashboard() { |
|
19 | 19 | return view('Blue::admin.dashboard'); |
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (! function_exists('insert_if_exists')) { |
|
4 | - function insert_if_exists ($insert, $template = null, $match = null) { |
|
3 | +if (!function_exists('insert_if_exists')) { |
|
4 | + function insert_if_exists($insert, $template = null, $match = null) { |
|
5 | 5 | if (!is_null($insert)) { // if item exists |
6 | 6 | if (is_array($insert)) { // if more than one item is given |
7 | 7 | $ret = ''; // total of all items to return |
@@ -1,6 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | if (! function_exists('insert_if_exists')) { |
4 | + |
|
5 | + /** |
|
6 | + * @param Closure $match |
|
7 | + */ |
|
4 | 8 | function insert_if_exists ($insert, $template = null, $match = null) { |
5 | 9 | if (!is_null($insert)) { // if item exists |
6 | 10 | if (is_array($insert)) { // if more than one item is given |
@@ -2,23 +2,23 @@ |
||
2 | 2 | |
3 | 3 | Route::group(['namespace' => 'MeestorHok\\Blue\\Http\\Controllers', 'middleware' => 'web'], function() |
4 | 4 | { |
5 | - Route::group(['middleware' => 'siteDoesntExist'], function () |
|
5 | + Route::group(['middleware' => 'siteDoesntExist'], function() |
|
6 | 6 | { // if the user hasn't created a site yet |
7 | 7 | Route::get('new', 'SiteController@showCreateForm'); |
8 | 8 | Route::post('new', 'SiteController@createSite')->name('create.site'); |
9 | 9 | }); |
10 | 10 | |
11 | - Route::group(['middleware' => 'siteExists'], function () |
|
11 | + Route::group(['middleware' => 'siteExists'], function() |
|
12 | 12 | { // At least one site exists |
13 | - Route::group(['middleware' => 'adminDoesntExist'], function () |
|
13 | + Route::group(['middleware' => 'adminDoesntExist'], function() |
|
14 | 14 | { // if no admin exists yet |
15 | 15 | Route::get('admin/new', 'SiteController@showAdminForm'); |
16 | 16 | Route::post('admin/new', 'SiteController@createAdmin')->name('create.admin'); |
17 | 17 | }); |
18 | 18 | |
19 | - Route::group(['middleware' => 'adminExists'], function () |
|
19 | + Route::group(['middleware' => 'adminExists'], function() |
|
20 | 20 | { // At least one admin exists |
21 | - Route::group(['prefix' => 'admin'], function () |
|
21 | + Route::group(['prefix' => 'admin'], function() |
|
22 | 22 | { |
23 | 23 | Route::get('/', 'AdminController@index'); |
24 | 24 | Route::get('dashboard', 'AdminController@showDashboard'); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | { |
12 | 12 | public $defaults; |
13 | 13 | |
14 | - public function __construct () { |
|
14 | + public function __construct() { |
|
15 | 15 | $this->defaults = [ |
16 | 16 | 'title' => 'Home', |
17 | 17 | 'title-spacer' => ' – ', |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | ]; |
31 | 31 | } |
32 | 32 | |
33 | - public function generateSEO (array $page) |
|
33 | + public function generateSEO(array $page) |
|
34 | 34 | { |
35 | 35 | SEOTools::metatags() |
36 | 36 | ->setTitleDefault($page['title-description']) |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | } |
66 | 66 | } |
67 | 67 | |
68 | - public function make (array $details, $view = null) |
|
68 | + public function make(array $details, $view = null) |
|
69 | 69 | { |
70 | 70 | $this->defaults = array_replace($this->defaults, $details); |
71 | 71 | |
@@ -76,64 +76,64 @@ discard block |
||
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | - public function get () |
|
79 | + public function get() |
|
80 | 80 | { |
81 | - return (Site::first()->is_public_site) ? str_replace(PHP_EOL, '', SEOTools::generate()) . $this->getFavicons() : '<meta name="robots" content="noindex,nofollow">'.$this->getFavicons(); |
|
81 | + return (Site::first()->is_public_site) ? str_replace(PHP_EOL, '', SEOTools::generate()).$this->getFavicons() : '<meta name="robots" content="noindex,nofollow">'.$this->getFavicons(); |
|
82 | 82 | } |
83 | 83 | |
84 | - public function generateFavicons ($dir = '') |
|
84 | + public function generateFavicons($dir = '') |
|
85 | 85 | { |
86 | 86 | $colors = $this->defaults['colors']; |
87 | 87 | return |
88 | - insert_if_exists (['60x60', '72x72', '114x114', '120x120', '152x152', '180x180'], function ($insert) use ($dir) { |
|
89 | - return '<link rel="apple-touch-icon" sizes="' . $insert . '" href="' . asset($dir . '/apple-touch-icon-' . $insert . '.png').'">'; |
|
90 | - }, function ($insert) use ($dir) { |
|
88 | + insert_if_exists(['60x60', '72x72', '114x114', '120x120', '152x152', '180x180'], function($insert) use ($dir) { |
|
89 | + return '<link rel="apple-touch-icon" sizes="'.$insert.'" href="'.asset($dir.'/apple-touch-icon-'.$insert.'.png').'">'; |
|
90 | + }, function($insert) use ($dir) { |
|
91 | 91 | return File::exists(public_path($dir.'/apple-touch-icon-'.$insert.'.png')); |
92 | - }) . |
|
93 | - insert_if_exists (['16x16', '32x32', '96x96', '194x194'], function ($insert) use ($dir) { |
|
94 | - return '<link rel="icon" type="image/png" href="' . asset($dir . '/favicon-' . $insert . '.png').'" sizes="'.$insert.'">'; |
|
95 | - }, function ($insert) use ($dir) { |
|
92 | + }). |
|
93 | + insert_if_exists(['16x16', '32x32', '96x96', '194x194'], function($insert) use ($dir) { |
|
94 | + return '<link rel="icon" type="image/png" href="'.asset($dir.'/favicon-'.$insert.'.png').'" sizes="'.$insert.'">'; |
|
95 | + }, function($insert) use ($dir) { |
|
96 | 96 | return File::exists(public_path($dir.'/favicon-'.$insert.'.png')); |
97 | - }) . |
|
98 | - insert_if_exists (['192x192'], function ($insert) use ($dir) { |
|
99 | - return '<link rel="icon" type="image/png" href="' . asset($dir . '/android-chrome-' . $insert . '.png').'" sizes="'.$insert.'">'; |
|
100 | - }, function ($insert) use ($dir) { |
|
97 | + }). |
|
98 | + insert_if_exists(['192x192'], function($insert) use ($dir) { |
|
99 | + return '<link rel="icon" type="image/png" href="'.asset($dir.'/android-chrome-'.$insert.'.png').'" sizes="'.$insert.'">'; |
|
100 | + }, function($insert) use ($dir) { |
|
101 | 101 | return File::exists(public_path($dir.'/android-chrome-'.$insert.'.png')); |
102 | - }) . |
|
103 | - insert_if_exists ($dir.'/manifest.json', function ($insert) { |
|
104 | - return '<link rel="manifest" href="' . asset($insert) . '">'; |
|
105 | - }, function ($insert) { |
|
102 | + }). |
|
103 | + insert_if_exists($dir.'/manifest.json', function($insert) { |
|
104 | + return '<link rel="manifest" href="'.asset($insert).'">'; |
|
105 | + }, function($insert) { |
|
106 | 106 | return File::exists(public_path($insert)); |
107 | - }) . |
|
108 | - insert_if_exists ($dir.'/safari-pinned-tab.svg', function ($insert) use ($colors) { |
|
109 | - return '<link rel="mask-icon" href="'.asset($insert).'" color="' . insert_if_exists($colors['safari_pinned']) . '">'; |
|
110 | - }, function ($insert) { |
|
107 | + }). |
|
108 | + insert_if_exists($dir.'/safari-pinned-tab.svg', function($insert) use ($colors) { |
|
109 | + return '<link rel="mask-icon" href="'.asset($insert).'" color="'.insert_if_exists($colors['safari_pinned']).'">'; |
|
110 | + }, function($insert) { |
|
111 | 111 | return File::exists(public_path($insert)); |
112 | - }) . |
|
113 | - insert_if_exists ($dir.'/favicon.ico', function ($insert) { |
|
112 | + }). |
|
113 | + insert_if_exists($dir.'/favicon.ico', function($insert) { |
|
114 | 114 | return '<link rel="shortcut icon" href="'.asset($insert).'">'; |
115 | - }, function ($insert) { |
|
115 | + }, function($insert) { |
|
116 | 116 | return File::exists(public_path($insert)); |
117 | - }) . |
|
118 | - insert_if_exists ($dir.'/mstile-144x144.png', function ($insert) { |
|
117 | + }). |
|
118 | + insert_if_exists($dir.'/mstile-144x144.png', function($insert) { |
|
119 | 119 | return '<meta name="msapplication-TileImage" content="'.asset($insert).'">'; |
120 | - }, function ($insert) { |
|
120 | + }, function($insert) { |
|
121 | 121 | return File::exists(public_path($insert)); |
122 | - }) . |
|
123 | - insert_if_exists ($dir.'/browserconfig.xml', function ($insert) { |
|
122 | + }). |
|
123 | + insert_if_exists($dir.'/browserconfig.xml', function($insert) { |
|
124 | 124 | return '<meta name="msapplication-config" content="'.asset($insert).'">'; |
125 | - }, function ($insert) { |
|
125 | + }, function($insert) { |
|
126 | 126 | return File::exists(public_path($insert)); |
127 | - }) . |
|
128 | - insert_if_exists ($colors['ms_tile'], function ($insert) { |
|
127 | + }). |
|
128 | + insert_if_exists($colors['ms_tile'], function($insert) { |
|
129 | 129 | return '<meta name="msapplication-TileColor" content="'.$insert.'">'; |
130 | - }) . |
|
131 | - insert_if_exists ($colors['theme'], function ($insert) { |
|
130 | + }). |
|
131 | + insert_if_exists($colors['theme'], function($insert) { |
|
132 | 132 | return '<meta name="theme-color" content="'.$insert.'">'; |
133 | 133 | }); |
134 | 134 | } |
135 | 135 | |
136 | - public function getFavicons () |
|
136 | + public function getFavicons() |
|
137 | 137 | { |
138 | 138 | $site = Site::first(); |
139 | 139 | if (is_null($site)) { |