@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | public function up() |
11 | 11 | { |
12 | - Schema::create('social_accounts', function (Blueprint $table) { |
|
12 | + Schema::create('social_accounts', function(Blueprint $table) { |
|
13 | 13 | $table->increments('id'); |
14 | 14 | $table->integer('user_id')->unsigned()->nullable()->index(); |
15 | 15 | $table->string('provider')->index(); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | public function __construct() |
13 | 13 | { |
14 | - $this->table_menus = config('back-project.menus.table'); |
|
14 | + $this->table_menus = config('back-project.menus.table'); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | /** |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | public function up() |
23 | 23 | { |
24 | 24 | Schema::create($this->table_menus, function (Blueprint $table) { |
25 | - $table->increments('id'); |
|
26 | - $table->string('name')->index(); |
|
27 | - $table->string('permission')->nullable()->index(); |
|
28 | - $table->string('title'); |
|
29 | - $table->string('description')->nullable(); |
|
30 | - $table->string('route')->nullable(); |
|
31 | - $table->string('icon')->nullable(); |
|
32 | - $table->boolean('is_active')->default(1); |
|
25 | + $table->increments('id'); |
|
26 | + $table->string('name')->index(); |
|
27 | + $table->string('permission')->nullable()->index(); |
|
28 | + $table->string('title'); |
|
29 | + $table->string('description')->nullable(); |
|
30 | + $table->string('route')->nullable(); |
|
31 | + $table->string('icon')->nullable(); |
|
32 | + $table->boolean('is_active')->default(1); |
|
33 | 33 | $table->boolean('is_protected')->default(0); |
34 | - NestedSet::columns($table); |
|
35 | - $table->timestamps(); |
|
34 | + NestedSet::columns($table); |
|
35 | + $table->timestamps(); |
|
36 | 36 | |
37 | 37 | |
38 | 38 | }); |
@@ -21,7 +21,7 @@ |
||
21 | 21 | */ |
22 | 22 | public function up() |
23 | 23 | { |
24 | - Schema::create($this->table_menus, function (Blueprint $table) { |
|
24 | + Schema::create($this->table_menus, function(Blueprint $table) { |
|
25 | 25 | $table->increments('id'); |
26 | 26 | $table->string('name')->index(); |
27 | 27 | $table->string('permission')->nullable()->index(); |
@@ -8,16 +8,16 @@ |
||
8 | 8 | public function up() |
9 | 9 | { |
10 | 10 | Schema::table('users', function(Blueprint $table) { |
11 | - $table->string('email')->nullable()->change(); |
|
12 | - $table->boolean('is_social')->nullable()->default(0); |
|
11 | + $table->string('email')->nullable()->change(); |
|
12 | + $table->boolean('is_social')->nullable()->default(0); |
|
13 | 13 | }); |
14 | 14 | } |
15 | 15 | |
16 | 16 | public function down() |
17 | 17 | { |
18 | 18 | Schema::table('users', function(Blueprint $table) { |
19 | - $table->dropColumn('is_social'); |
|
20 | - $table->string('email')->change(); |
|
19 | + $table->dropColumn('is_social'); |
|
20 | + $table->string('email')->change(); |
|
21 | 21 | }); |
22 | 22 | } |
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -33,8 +33,8 @@ |
||
33 | 33 | }); |
34 | 34 | |
35 | 35 | Schema::create('attachables', function(Blueprint $table) { |
36 | - $table->integer('attachment_id')->unsigned(); |
|
37 | - $table->morphs('attachable'); |
|
36 | + $table->integer('attachment_id')->unsigned(); |
|
37 | + $table->morphs('attachable'); |
|
38 | 38 | }); |
39 | 39 | } |
40 | 40 |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | public function up() |
22 | 22 | { |
23 | - Schema::create($this->table_attachments, function (Blueprint $table) { |
|
23 | + Schema::create($this->table_attachments, function(Blueprint $table) { |
|
24 | 24 | $table->increments('id'); |
25 | 25 | $table->string('name'); |
26 | 26 | $table->string('original_name'); |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | public function up() |
15 | 15 | { |
16 | 16 | Schema::table('users', function(Blueprint $table) { |
17 | - $table->renameColumn('name', 'username'); |
|
18 | - $table->boolean('confirmed')->default(0); |
|
19 | - $table->string('confirmation_code')->nullable(); |
|
17 | + $table->renameColumn('name', 'username'); |
|
18 | + $table->boolean('confirmed')->default(0); |
|
19 | + $table->string('confirmation_code')->nullable(); |
|
20 | 20 | }); |
21 | 21 | } |
22 | 22 | |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function down() |
29 | 29 | { |
30 | - Schema::table('users', function(Blueprint $table) { |
|
30 | + Schema::table('users', function(Blueprint $table) { |
|
31 | 31 | $table->renameColumn('username', 'name'); |
32 | 32 | $table->dropColumn('confirmed'); |
33 | 33 | $table->dropColumn('confirmation_code'); |
34 | - }); |
|
34 | + }); |
|
35 | 35 | } |
36 | 36 | } |
@@ -37,12 +37,12 @@ |
||
37 | 37 | |
38 | 38 | public function create(Permissions $permissions) |
39 | 39 | { |
40 | - return view('back-project::roles.create')->with('permissions', $permissions->all()); |
|
40 | + return view('back-project::roles.create')->with('permissions', $permissions->all()); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function store(RoleAdd $request, Roles $roles) |
44 | 44 | { |
45 | - $role= $roles->create($request->all()); |
|
45 | + $role = $roles->create($request->all()); |
|
46 | 46 | |
47 | 47 | Alert::add('success', trans('back-project::crud.model_created', ['model' => trans('back-project::roles.role')]))->flash(); |
48 | 48 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | |
43 | 43 | public function store(PermissionAdd $request, Permissions $permissions) |
44 | 44 | { |
45 | - $permission= $permissions->create($request->all()); |
|
45 | + $permission = $permissions->create($request->all()); |
|
46 | 46 | |
47 | 47 | Alert::add('success', trans('back-project::crud.model_created', ['model' => trans('back-project::permissions.permission')]))->flash(); |
48 | 48 |
@@ -10,24 +10,24 @@ |
||
10 | 10 | { |
11 | 11 | |
12 | 12 | use AuthenticatesUsers { |
13 | - logout as defaultLogout; |
|
13 | + logout as defaultLogout; |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function __construct() |
17 | 17 | { |
18 | - $this->middleware('guest', ['except' => 'logout']); |
|
19 | - // ---------------------------------- |
|
20 | - // Use the admin prefix in all routes |
|
21 | - // If not logged in redirect here. |
|
22 | - $this->loginPath = property_exists($this, 'loginPath') ? $this->loginPath |
|
18 | + $this->middleware('guest', ['except' => 'logout']); |
|
19 | + // ---------------------------------- |
|
20 | + // Use the admin prefix in all routes |
|
21 | + // If not logged in redirect here. |
|
22 | + $this->loginPath = property_exists($this, 'loginPath') ? $this->loginPath |
|
23 | 23 | : config('back-project.route_prefix', 'admin').'/login'; |
24 | - // Redirect here after successful login. |
|
25 | - $this->redirectTo = property_exists($this, 'redirectTo') ? $this->redirectTo |
|
24 | + // Redirect here after successful login. |
|
25 | + $this->redirectTo = property_exists($this, 'redirectTo') ? $this->redirectTo |
|
26 | 26 | : config('back-project.route_prefix', 'admin').'/dashboard'; |
27 | - // Redirect here after logout. |
|
28 | - $this->redirectAfterLogout = property_exists($this, 'redirectAfterLogout') ? $this->redirectAfterLogout |
|
27 | + // Redirect here after logout. |
|
28 | + $this->redirectAfterLogout = property_exists($this, 'redirectAfterLogout') ? $this->redirectAfterLogout |
|
29 | 29 | : '/'; |
30 | - // ---------------------------------- |
|
30 | + // ---------------------------------- |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | protected $data = []; // the information we send to the view |
17 | 17 | |
18 | - use RegistersUsers; |
|
18 | + use RegistersUsers; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * Create a new controller instance. |
@@ -77,24 +77,24 @@ discard block |
||
77 | 77 | |
78 | 78 | public function validator(array $data) |
79 | 79 | { |
80 | - $user_model = config('back-project.user_model'); |
|
81 | - $user = new $user_model; |
|
82 | - $users_table = $user->getTable(); |
|
80 | + $user_model = config('back-project.user_model'); |
|
81 | + $user = new $user_model; |
|
82 | + $users_table = $user->getTable(); |
|
83 | 83 | |
84 | - return Validator::make($data, [ |
|
84 | + return Validator::make($data, [ |
|
85 | 85 | 'username' => 'required|max:255|unique:'.$users_table, |
86 | 86 | 'email' => 'required|email|max:255|unique:'.$users_table, |
87 | 87 | 'password' => 'required|min:6|confirmed' |
88 | - ]); |
|
88 | + ]); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | public function confirm(Users $users, $code, $username) { |
92 | - if ($users->findBy('username', $username)->confirm($code)) { |
|
93 | - Alert::add('success', trans('back-project::base.user_confirmed'))->flash(); |
|
94 | - } else { |
|
95 | - Alert::add('error', trans('back-project::base.user_not_confirmed'))->flash(); |
|
96 | - } |
|
92 | + if ($users->findBy('username', $username)->confirm($code)) { |
|
93 | + Alert::add('success', trans('back-project::base.user_confirmed'))->flash(); |
|
94 | + } else { |
|
95 | + Alert::add('error', trans('back-project::base.user_not_confirmed'))->flash(); |
|
96 | + } |
|
97 | 97 | |
98 | - return redirect(route('login')); |
|
98 | + return redirect(route('login')); |
|
99 | 99 | } |
100 | 100 | } |