@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Afrittella\BackProject\Repositories; |
3 | 3 | |
4 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
5 | - |
|
6 | 4 | class Roles extends Base |
7 | 5 | { |
8 | 6 | public function model() |
@@ -54,7 +54,7 @@ |
||
54 | 54 | $body = []; |
55 | 55 | |
56 | 56 | foreach ($data as $row): |
57 | - $actions =[]; |
|
57 | + $actions = []; |
|
58 | 58 | |
59 | 59 | if ($row->name !== 'administrator' and $row->name !== 'user') { |
60 | 60 | $actions = [ |
@@ -97,6 +97,9 @@ |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | |
100 | + /** |
|
101 | + * @param string $name |
|
102 | + */ |
|
100 | 103 | public function getUniqueUsername($name) |
101 | 104 | { |
102 | 105 | $nrRand = rand(0,100); |
@@ -2,9 +2,7 @@ |
||
2 | 2 | |
3 | 3 | namespace Afrittella\BackProject\Repositories; |
4 | 4 | |
5 | -use Afrittella\BackProject\Contracts\BaseRepository; |
|
6 | 5 | use Afrittella\BackProject\Models\SocialAccount; |
7 | -use Kalnoy\Nestedset\QueryBuilder; |
|
8 | 6 | use Laravel\Socialite\Contracts\User as SocialProvider; |
9 | 7 | |
10 | 8 | class Users extends Base |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | public function getUniqueUsername($name) |
101 | 101 | { |
102 | - $nrRand = rand(0,100); |
|
102 | + $nrRand = rand(0, 100); |
|
103 | 103 | |
104 | 104 | return $name.$nrRand; |
105 | 105 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | foreach ($data as $row): |
134 | 134 | $body[] = [ |
135 | 135 | 'columns' => [ |
136 | - ['content' => '<img src="' . \Avatar::create(strtoupper($row->username))->toBase64() . '" alt="' . $row->username . ' width="40px" height="40px"> '], |
|
136 | + ['content' => '<img src="'.\Avatar::create(strtoupper($row->username))->toBase64().'" alt="'.$row->username.' width="40px" height="40px"> '], |
|
137 | 137 | //['content' => false, 'action' => false, 'icon' => ($row->isConfirmed() ? "check" : 'times')], |
138 | 138 | ['content' => $row->username], |
139 | 139 | ['content' => $row->email], |
@@ -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 | } |
@@ -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 | /** |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | public function __construct(MenuRepository $menuRepository) |
14 | 14 | { |
15 | - $this->menuRepository = $menuRepository; |
|
15 | + $this->menuRepository = $menuRepository; |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function compose(View $view) |
@@ -95,21 +95,21 @@ discard block |
||
95 | 95 | $menuString = ""; |
96 | 96 | $hasActive = false; |
97 | 97 | foreach ($rows as $menu) { |
98 | - if (!empty($menu->permission) and !$user->hasPermission($menu->permission)) { |
|
99 | - continue; |
|
100 | - } |
|
101 | - $hasActive = false; |
|
102 | - $link = sprintf($templates['menu_link'], |
|
98 | + if (!empty($menu->permission) and !$user->hasPermission($menu->permission)) { |
|
99 | + continue; |
|
100 | + } |
|
101 | + $hasActive = false; |
|
102 | + $link = sprintf($templates['menu_link'], |
|
103 | 103 | (!empty($menu->route) ? url($menu->route) : '#'), |
104 | 104 | (!empty($menu->icon) ? $menu->icon : 'fa fa-circle-o'), |
105 | 105 | //trans('back-project::base.dashboard') |
106 | 106 | __('back-project::menu.'.$menu->title) |
107 | - ); |
|
107 | + ); |
|
108 | 108 | |
109 | - $submenu = ""; |
|
110 | - $authorized = true; |
|
109 | + $submenu = ""; |
|
110 | + $authorized = true; |
|
111 | 111 | |
112 | - if ($menu->children->count() > 0) { |
|
112 | + if ($menu->children->count() > 0) { |
|
113 | 113 | list($submenuString, $hasActive) = $traverse($menu->children); |
114 | 114 | $submenu = ""; |
115 | 115 | if (!empty($submenuString)) { |
@@ -117,19 +117,19 @@ discard block |
||
117 | 117 | } else { |
118 | 118 | $authorized = false; |
119 | 119 | } |
120 | - } |
|
120 | + } |
|
121 | 121 | |
122 | - $class = (!empty($submenu) ? 'treeview' : ''); |
|
123 | - $current_url = \Route::current()->uri(); |
|
122 | + $class = (!empty($submenu) ? 'treeview' : ''); |
|
123 | + $current_url = \Route::current()->uri(); |
|
124 | 124 | |
125 | - if ($authorized) { |
|
126 | - $menuString .= sprintf($templates['menu_row'], $class, $link.$submenu); |
|
127 | - } |
|
125 | + if ($authorized) { |
|
126 | + $menuString .= sprintf($templates['menu_row'], $class, $link.$submenu); |
|
127 | + } |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | return [ |
131 | - $menuString, |
|
132 | - $hasActive |
|
131 | + $menuString, |
|
132 | + $hasActive |
|
133 | 133 | ]; |
134 | 134 | }; |
135 | 135 |
@@ -91,7 +91,7 @@ |
||
91 | 91 | <a href="%s"><i class="%s text-red"></i><span>%s</span></a> |
92 | 92 | ' // url, icon, title |
93 | 93 | ]; |
94 | - $traverse = function ($rows) use (&$traverse, $templates, $user) { |
|
94 | + $traverse = function($rows) use (&$traverse, $templates, $user) { |
|
95 | 95 | $menuString = ""; |
96 | 96 | $hasActive = false; |
97 | 97 | foreach ($rows as $menu) { |