Skip to content

Commit

Permalink
More updates and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
GrahamCampbell committed Jan 31, 2015
1 parent 597c5d1 commit 279bbaa
Show file tree
Hide file tree
Showing 34 changed files with 442 additions and 98 deletions.
4 changes: 2 additions & 2 deletions app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

namespace GrahamCampbell\BootstrapCMS\Providers;

use Illuminate\Foundation\Support\Providers\EventServiceProvider;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;

/**
* This is the event service provider class.
*
* @author Graham Campbell <graham@mineuk.com>
*/
class EventServiceProvider extends EventServiceProvider
class EventServiceProvider extends ServiceProvider
{
/**
* The event handler mappings for the application.
Expand Down
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions config/asset.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

/*
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

return [

/*
* The paths where the assets will be searched in, relative to the project.
*/
'search_paths' => [
'/vendor',
'/resources/assets',
],

/*
* The directory, relative to "public" where the assets will be published to.
*/
'public_dir' => 'assets',

/*
* Turn on/off assets minification.
*/
'minify' => false,

/*
* The patterns for minified assets.
*
* If an asset filename contains one of these patterns, then it will be
* considered already minified and skip the minification process.
*/
'minify_patterns' => ['-min.', '.min.'],

/*
* Turn on/off assets caching.
*/
'use_cache' => true,

];
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel CloudFlare.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel CloudFlare API.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down Expand Up @@ -38,14 +38,14 @@
'connections' => [

'main' => [
'token' => 'your-token',
'email' => 'your-email',
'token' => 'your-token',
'email' => 'your-email',
// 'baseurl' => 'https://www.cloudflare.com/api_json.html'
],

'alternative' => [
'token' => 'your-token',
'email' => 'your-email',
'token' => 'your-token',
'email' => 'your-email',
// 'baseurl' => 'https://www.cloudflare.com/api_json.html'
],

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Contact.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
30 changes: 15 additions & 15 deletions .../packages/graham-campbell/core/config.php → config/core.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Core.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down Expand Up @@ -39,43 +39,43 @@

/*
|--------------------------------------------------------------------------
| Enable Commands
| Page Layout
|--------------------------------------------------------------------------
|
| This enables the install/update/reset commands and bindings shipped with
| this package. Other packages can read this config to save time by not
| registering event command event listeners if command are disabled.
| This specifies the your views should extend.
|
| Default to true.
| Default to 'layouts.default'.
|
*/

'commands' => true,
'default' => 'layouts.default',

/*
|--------------------------------------------------------------------------
| Page Layout
| Email Layout
|--------------------------------------------------------------------------
|
| This specifies the your views should extend.
| This specifies the view that your email views should extend.
|
| Default to 'layouts.default'.
| Default to 'layouts.email'.
|
*/

'layout' => 'layouts.default',
'email' => 'layouts.email',

/*
|--------------------------------------------------------------------------
| Email Layout
| Enable Commands
|--------------------------------------------------------------------------
|
| This specifies the view that your email views should extend.
| This enables the install/update/reset commands and bindings shipped with
| this package. Other packages can read this config to save time by not
| registering event command event listeners if command are disabled.
|
| Default to 'layouts.email'.
| Default to true.
|
*/

'email' => 'layouts.email',
'commands' => true,

];
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Credentials.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel HTMLMin.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand All @@ -26,7 +26,7 @@
|
*/

'blade' => true,
'blade' => false,

/*
|--------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel LogViewer.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Markdown.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
51 changes: 0 additions & 51 deletions config/packages/graham-campbell/core-api/config.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Security.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

/*
* This file is part of Laravel Throttle.
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

/*
* This file is part of Bootstrap CMS.
*
* (c) Graham Campbell <graham@mineuk.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class MigrationCartalystSentryInstallUsers extends Migration {

/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('users', function (Blueprint $table) {
$table->increments('id');
$table->string('email');
$table->string('password');
$table->text('permissions')->nullable();
$table->boolean('activated')->default(0);
$table->string('activation_code')->nullable();
$table->timestamp('activated_at')->nullable();
$table->timestamp('last_login')->nullable();
$table->string('persist_code')->nullable();
$table->string('reset_password_code')->nullable();
$table->string('first_name')->nullable();
$table->string('last_name')->nullable();
$table->timestamps();

// We'll need to ensure that MySQL uses the InnoDB engine to
// support the indexes, other engines aren't affected.
$table->engine = 'InnoDB';
$table->unique('email');
$table->index('activation_code');
$table->index('reset_password_code');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('users');
}
}
Loading

0 comments on commit 279bbaa

Please sign in to comment.