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
23 changes: 11 additions & 12 deletions database/migrations/2015_01_05_100001_create_users_table.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<?php

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

class CreateUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
* Run the migrations.
*
* @return void
*/
public function up()
{ /**
{ /*
* Table: users
*/
Schema::create('users', function ($table) {
Expand All @@ -22,7 +21,7 @@ public function up()
$table->string('password', 100);
$table->boolean('active')->nullable();
$table->string('remember_token', 255)->nullable();
$table->enum('sex', ['', 'male','female'])->nullable();
$table->enum('sex', ['', 'male', 'female'])->nullable();
$table->date('dob')->nullable();
$table->string('designation', 50)->nullable();
$table->string('mobile', 100)->nullable();
Expand All @@ -41,11 +40,11 @@ public function up()
});
}

/**
* Reverse the migrations.
*
* @return void
*/
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('users');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

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

class CreatePasswordResetsTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function up()
$table->string('skey')->nullable();
$table->string('name')->nullable();
$table->string('value')->nullable();
$table->enum('type', ['System','Default','User'])->nullable();
$table->enum('type', ['System', 'Default', 'User'])->nullable();
$table->string('upload_folder', 100)->nullable();
$table->softDeletes();
$table->nullableTimestamps();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function up()
$table->integer('order')->nullable();
$table->mediumText('banner')->nullable();
$table->string('view', 20)->default('page');
$table->enum('compiler', ['php','blade','twif','none'])->default('none')->nullable();
$table->enum('compiler', ['php', 'blade', 'twif', 'none'])->default('none')->nullable();
$table->boolean('status')->default('1');
$table->string('upload_folder', 100)->nullable();
$table->text('heading')->nullable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function up()
$table->string('permission', 100)->nullable();
$table->text('name')->nullable();
$table->text('description')->nullable();
$table->enum('open', ['New','Same'])->default('Same')->nullable();
$table->enum('open', ['New', 'Same'])->default('Same')->nullable();
$table->boolean('has_sub')->nullable();
$table->integer('order')->nullable();
$table->string('uload_folder', 150)->nullable();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?php

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

class CreateRevisionsTable extends Migration
{

public function up()
{
Schema::create('revisions', function (Blueprint $table) {
Expand All @@ -26,4 +25,4 @@ public function down()
{
Schema::dropIfExists('revisions');
}
}
}
2 changes: 1 addition & 1 deletion database/seeds/DatabaseSeeder.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Database\Seeder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Seeder;

class DatabaseSeeder extends Seeder
{
Expand Down
12 changes: 6 additions & 6 deletions database/seeds/PermissionTableSeeder.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Illuminate\Database\Seeder;
use Illuminate\Database\Eloquent\Model;

class PermissionTableSeeder extends Seeder
{
Expand All @@ -9,20 +9,20 @@ public function run()
DB::table('permissions')->insert([
[
'slug' => 'user.user.view',
'name' => 'View user'
'name' => 'View user',
],
[
'slug' => 'user.user.create',
'name' => 'Create user'
'name' => 'Create user',
],
[
'slug' => 'user.user.edit',
'name' => 'Update user'
'name' => 'Update user',
],
[
'slug' => 'user.user.delete',
'name' => 'Delete user'
]
'name' => 'Delete user',
],

]);
}
Expand Down
6 changes: 3 additions & 3 deletions database/seeds/RoleTableSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ public function run()
DB::table('roles')->insert([
[
'id' => 1,
'name' => 'superuser'
'name' => 'superuser',
],
[
'id' => 2,
'name' => 'admin'
'name' => 'admin',
],
[
'id' => 3,
'name' => 'user'
'name' => 'user',
],
]);

Expand Down
8 changes: 4 additions & 4 deletions database/seeds/SettingTableSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ public function run()
DB::table('permissions')->insert([
[
'slug' => 'settings.setting.view',
'name' => 'View Setting',
'name' => 'View Setting',
],
[
'slug' => 'settings.setting.create',
'name' => 'Create Setting',
'name' => 'Create Setting',
],
[
'slug' => 'settings.setting.edit',
'name' => 'Update Setting',
'name' => 'Update Setting',
],
[
'slug' => 'settings.setting.delete',
'name' => 'Delete Setting',
'name' => 'Delete Setting',
],
]);

Expand Down
2 changes: 0 additions & 2 deletions database/seeds/UserTableSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class UserTableSeeder extends Seeder
{
public function run()
{

DB::table('users')->insert([

[
Expand All @@ -22,6 +21,5 @@ public function run()
'created_at' => '2015-09-15',
],
]);

}
}