@@ -34,7 +34,9 @@ |
||
34 | 34 | */ |
35 | 35 | public static function getUserHomePage() |
36 | 36 | { |
37 | - if (! $user = Auth::user()) return; |
|
37 | + if (! $user = Auth::user()) { |
|
38 | + return; |
|
39 | + } |
|
38 | 40 | |
39 | 41 | return HomePage::whereIn('role', $user->roles()->pluck('name'))->orderBy('priority')->first(); |
40 | 42 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | static $cache; |
26 | 26 | |
27 | - if (! isset($cache)) { |
|
27 | + if (!isset($cache)) { |
|
28 | 28 | $cache = []; |
29 | 29 | foreach (HomePageJoint::collect() as $joint) { |
30 | 30 | $cache[$joint->link()] = $joint->caption(); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public static function getUserHomePage() |
43 | 43 | { |
44 | - if (! $user = Auth::user()) return; |
|
44 | + if (!$user = Auth::user()) return; |
|
45 | 45 | |
46 | 46 | return HomePage::whereIn('role', $user->roles()->pluck('name'))->orderBy('priority')->first(); |
47 | 47 | } |
@@ -55,6 +55,6 @@ discard block |
||
55 | 55 | { |
56 | 56 | $homepage = self::getUserHomePage(); |
57 | 57 | |
58 | - return $homepage? $homepage->path: self::$defaultPath; |
|
58 | + return $homepage ? $homepage->path : self::$defaultPath; |
|
59 | 59 | } |
60 | 60 | } |
@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | */ |
32 | 32 | class LayoutView extends ModuleView |
33 | 33 | { |
34 | - public $menuLeft; // vertical menu |
|
35 | - public $menu; // horizontal menu |
|
36 | - public $menuRight; // vertical pull-down |
|
34 | + public $menuLeft; // vertical menu |
|
35 | + public $menu; // horizontal menu |
|
36 | + public $menuRight; // vertical pull-down |
|
37 | 37 | public $actionBar; |
38 | 38 | public $locationBar; |
39 | 39 | |
40 | - public $burger = true; // burger menu item |
|
40 | + public $burger = true; // burger menu item |
|
41 | 41 | |
42 | 42 | /* |
43 | 43 | * Whether or not left Menu is visible on Page load. |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']); |
89 | 89 | |
90 | 90 | // location bar |
91 | - $this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]); |
|
91 | + $this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | public function setLocation($crumbs) |
@@ -130,20 +130,20 @@ discard block |
||
130 | 130 | |
131 | 131 | $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
132 | 132 | |
133 | - if (! $this->burger) return; |
|
133 | + if (!$this->burger) return; |
|
134 | 134 | |
135 | - if (! session()->get('menu', 1)) { |
|
135 | + if (!session()->get('menu', 1)) { |
|
136 | 136 | $this->isMenuLeftVisible = false; |
137 | 137 | } |
138 | 138 | |
139 | - $this->burger->add(['Icon', 'content'])->on('click', [ |
|
139 | + $this->burger->add(['Icon', 'content'])->on('click', [ |
|
140 | 140 | (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
141 | 141 | (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
142 | 142 | (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
143 | 143 | $this->burger->add('jsCallback')->set(function($j, $visible) { |
144 | - session()->put('menu', $visible? 1: 0); |
|
144 | + session()->put('menu', $visible ? 1 : 0); |
|
145 | 145 | session()->save(); |
146 | - }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
146 | + }, [new \atk4\ui\jsExpression('$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0')]) |
|
147 | 147 | ]); |
148 | 148 | } |
149 | 149 |
@@ -72,7 +72,9 @@ discard block |
||
72 | 72 | |
73 | 73 | public function setMenu() |
74 | 74 | { |
75 | - if ($this->menu) return; |
|
75 | + if ($this->menu) { |
|
76 | + return; |
|
77 | + } |
|
76 | 78 | |
77 | 79 | $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
78 | 80 | |
@@ -117,7 +119,9 @@ discard block |
||
117 | 119 | |
118 | 120 | public function setMenuRight() |
119 | 121 | { |
120 | - if ($this->menuRight) return; |
|
122 | + if ($this->menuRight) { |
|
123 | + return; |
|
124 | + } |
|
121 | 125 | |
122 | 126 | $this->menuRight = $this->menu->add(new Seeds\RightMenu([ |
123 | 127 | 'ui' => false |
@@ -126,11 +130,15 @@ discard block |
||
126 | 130 | |
127 | 131 | public function setMenuLeft() |
128 | 132 | { |
129 | - if ($this->menuLeft) return; |
|
133 | + if ($this->menuLeft) { |
|
134 | + return; |
|
135 | + } |
|
130 | 136 | |
131 | 137 | $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
132 | 138 | |
133 | - if (! $this->burger) return; |
|
139 | + if (! $this->burger) { |
|
140 | + return; |
|
141 | + } |
|
134 | 142 | |
135 | 143 | if (! session()->get('menu', 1)) { |
136 | 144 | $this->isMenuLeftVisible = false; |
@@ -149,7 +157,9 @@ discard block |
||
149 | 157 | |
150 | 158 | public function setActionBar() |
151 | 159 | { |
152 | - if ($this->actionBar) return; |
|
160 | + if ($this->actionBar) { |
|
161 | + return; |
|
162 | + } |
|
153 | 163 | |
154 | 164 | $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
155 | 165 | } |
@@ -30,64 +30,64 @@ discard block |
||
30 | 30 | */ |
31 | 31 | class LayoutView extends ModuleView |
32 | 32 | { |
33 | - public $menuLeft; // vertical menu |
|
34 | - public $menu; // horizontal menu |
|
35 | - public $menuRight; // vertical pull-down |
|
36 | - public $actionBar; |
|
37 | - public $locationBar; |
|
33 | + public $menuLeft; // vertical menu |
|
34 | + public $menu; // horizontal menu |
|
35 | + public $menuRight; // vertical pull-down |
|
36 | + public $actionBar; |
|
37 | + public $locationBar; |
|
38 | 38 | |
39 | - public $burger = true; // burger menu item |
|
39 | + public $burger = true; // burger menu item |
|
40 | 40 | |
41 | - /* |
|
41 | + /* |
|
42 | 42 | * Whether or not left Menu is visible on Page load. |
43 | 43 | */ |
44 | - public $isMenuLeftVisible = true; |
|
44 | + public $isMenuLeftVisible = true; |
|
45 | 45 | |
46 | - public $defaultTemplate = 'layout/admin.html'; |
|
46 | + public $defaultTemplate = 'layout/admin.html'; |
|
47 | 47 | |
48 | - protected $location; |
|
48 | + protected $location; |
|
49 | 49 | |
50 | - public function init() |
|
51 | - { |
|
52 | - parent::init(); |
|
50 | + public function init() |
|
51 | + { |
|
52 | + parent::init(); |
|
53 | 53 | |
54 | - $this->setMenu(); |
|
55 | - $this->setActionBar(); |
|
54 | + $this->setMenu(); |
|
55 | + $this->setActionBar(); |
|
56 | 56 | |
57 | 57 | // if (request()->pjax()) return; |
58 | 58 | |
59 | - $this->setMenuLeft(); |
|
60 | - $this->setMenuRight(); |
|
59 | + $this->setMenuLeft(); |
|
60 | + $this->setMenuRight(); |
|
61 | 61 | |
62 | - $this->setVersion(); |
|
62 | + $this->setVersion(); |
|
63 | 63 | |
64 | - $this->js(true, null, 'body')->niceScroll(); |
|
64 | + $this->js(true, null, 'body')->niceScroll(); |
|
65 | 65 | |
66 | 66 | // $this->js(true, null, new jsExpression('window'))->on('pageshow', new jsFunction(['event'], [ |
67 | 67 | // new jsExpression(' |
68 | 68 | // if (event.originalEvent.persisted) { |
69 | 69 | // window.location.reload(); |
70 | 70 | // }')])); |
71 | - } |
|
71 | + } |
|
72 | 72 | |
73 | - public function setMenu() |
|
74 | - { |
|
75 | - if ($this->menu) return; |
|
73 | + public function setMenu() |
|
74 | + { |
|
75 | + if ($this->menu) return; |
|
76 | 76 | |
77 | - $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
|
77 | + $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu'); |
|
78 | 78 | |
79 | - // company logo |
|
80 | - // see Epesi\Core\Controllers\SystemController::logo |
|
81 | - $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' => '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']); |
|
79 | + // company logo |
|
80 | + // see Epesi\Core\Controllers\SystemController::logo |
|
81 | + $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' => '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']); |
|
82 | 82 | |
83 | - if ($this->burger) { |
|
84 | - /** @scrutinizer ignore-call */ |
|
85 | - $this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]); |
|
86 | - } |
|
83 | + if ($this->burger) { |
|
84 | + /** @scrutinizer ignore-call */ |
|
85 | + $this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]); |
|
86 | + } |
|
87 | 87 | |
88 | 88 | // home icon redirects to /home path |
89 | 89 | // see Epesi\Core\Controllers\SystemController::home |
90 | - $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']); |
|
90 | + $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']); |
|
91 | 91 | |
92 | 92 | // location bar |
93 | 93 | $this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]); |
@@ -126,50 +126,50 @@ discard block |
||
126 | 126 | ]), 'RightMenu')->addClass('right menu')->removeClass('item'); |
127 | 127 | } |
128 | 128 | |
129 | - public function setMenuLeft() |
|
130 | - { |
|
131 | - if ($this->menuLeft) return; |
|
129 | + public function setMenuLeft() |
|
130 | + { |
|
131 | + if ($this->menuLeft) return; |
|
132 | 132 | |
133 | - $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
|
133 | + $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu'); |
|
134 | 134 | |
135 | - if (! $this->burger) return; |
|
135 | + if (! $this->burger) return; |
|
136 | 136 | |
137 | - if (! session()->get('menu', 1)) { |
|
138 | - $this->isMenuLeftVisible = false; |
|
139 | - } |
|
137 | + if (! session()->get('menu', 1)) { |
|
138 | + $this->isMenuLeftVisible = false; |
|
139 | + } |
|
140 | 140 | |
141 | - $this->burger->add(['Icon', 'content'])->on('click', [ |
|
142 | - (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
143 | - (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
144 | - (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
145 | - $this->burger->add('jsCallback')->set(function($j, $visible) { |
|
146 | - session()->put('menu', $visible? 1: 0); |
|
147 | - session()->save(); |
|
148 | - }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
149 | - ]); |
|
150 | - } |
|
141 | + $this->burger->add(['Icon', 'content'])->on('click', [ |
|
142 | + (new jQuery('.ui.left.sidebar'))->toggleClass('visible'), |
|
143 | + (new jQuery('.epesi-logo'))->toggleClass('expanded'), |
|
144 | + (new jQuery('body'))->toggleClass('atk-leftMenu-visible'), |
|
145 | + $this->burger->add('jsCallback')->set(function($j, $visible) { |
|
146 | + session()->put('menu', $visible? 1: 0); |
|
147 | + session()->save(); |
|
148 | + }, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )]) |
|
149 | + ]); |
|
150 | + } |
|
151 | 151 | |
152 | - public function setActionBar() |
|
153 | - { |
|
154 | - if ($this->actionBar) return; |
|
152 | + public function setActionBar() |
|
153 | + { |
|
154 | + if ($this->actionBar) return; |
|
155 | 155 | |
156 | - $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
|
157 | - } |
|
156 | + $this->actionBar = $this->add(new Seeds\ActionBar(), 'ActionBar'); |
|
157 | + } |
|
158 | 158 | |
159 | - public function setVersion() |
|
160 | - { |
|
161 | - $this->template->trySet('version', $this->app->version); |
|
162 | - } |
|
159 | + public function setVersion() |
|
160 | + { |
|
161 | + $this->template->trySet('version', $this->app->version); |
|
162 | + } |
|
163 | 163 | |
164 | - /** |
|
165 | - * {@inheritdoc} |
|
166 | - */ |
|
164 | + /** |
|
165 | + * {@inheritdoc} |
|
166 | + */ |
|
167 | 167 | |
168 | - public function renderView() |
|
169 | - { |
|
170 | - if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
171 | - $this->menuLeft->addClass('visible'); |
|
172 | - } |
|
173 | - parent::renderView(); |
|
174 | - } |
|
168 | + public function renderView() |
|
169 | + { |
|
170 | + if ($this->menuLeft && $this->isMenuLeftVisible) { |
|
171 | + $this->menuLeft->addClass('visible'); |
|
172 | + } |
|
173 | + parent::renderView(); |
|
174 | + } |
|
175 | 175 | } |
@@ -6,25 +6,25 @@ |
||
6 | 6 | |
7 | 7 | class NoCacheHeaders |
8 | 8 | { |
9 | - /** |
|
10 | - * Add cache related HTTP headers. |
|
11 | - * |
|
12 | - * @param \Illuminate\Http\Request $request |
|
13 | - * @param \Closure $next |
|
14 | - * @param string|array $options |
|
15 | - * @return \Symfony\Component\HttpFoundation\Response |
|
16 | - * |
|
17 | - * @throws \InvalidArgumentException |
|
18 | - */ |
|
19 | - public function handle($request, Closure $next, $options = []) |
|
20 | - { |
|
21 | - $response = $next($request); |
|
9 | + /** |
|
10 | + * Add cache related HTTP headers. |
|
11 | + * |
|
12 | + * @param \Illuminate\Http\Request $request |
|
13 | + * @param \Closure $next |
|
14 | + * @param string|array $options |
|
15 | + * @return \Symfony\Component\HttpFoundation\Response |
|
16 | + * |
|
17 | + * @throws \InvalidArgumentException |
|
18 | + */ |
|
19 | + public function handle($request, Closure $next, $options = []) |
|
20 | + { |
|
21 | + $response = $next($request); |
|
22 | 22 | |
23 | - $response->headers->addCacheControlDirective('no-cache', true); |
|
24 | - $response->headers->addCacheControlDirective('max-age', 0); |
|
25 | - $response->headers->addCacheControlDirective('must-revalidate', true); |
|
26 | - $response->headers->addCacheControlDirective('no-store', true); |
|
23 | + $response->headers->addCacheControlDirective('no-cache', true); |
|
24 | + $response->headers->addCacheControlDirective('max-age', 0); |
|
25 | + $response->headers->addCacheControlDirective('must-revalidate', true); |
|
26 | + $response->headers->addCacheControlDirective('no-store', true); |
|
27 | 27 | |
28 | - return $response; |
|
29 | - } |
|
28 | + return $response; |
|
29 | + } |
|
30 | 30 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | return [['Template', $availablePages[$row[$column]]?? '[' . __('missing: :path', ['path' => $row[$column]]) . ']']]; |
46 | 46 | }]); |
47 | 47 | |
48 | - $this->grid->addDragHandler()->onReorder(function ($order) { |
|
48 | + $this->grid->addDragHandler()->onReorder(function($order) { |
|
49 | 49 | $result = true; |
50 | 50 | foreach ($this->getHomepages() as $homepage) { |
51 | 51 | $homepage->priority = array_search($homepage->id, $order); |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | $result &= $homepage->save(); |
54 | 54 | } |
55 | 55 | |
56 | - return $result? $this->notify(__('Homepages reordered!')): $this->notifyError(__('Error saving order!')); |
|
56 | + return $result ? $this->notify(__('Homepages reordered!')) : $this->notifyError(__('Error saving order!')); |
|
57 | 57 | }); |
58 | 58 | |
59 | - $this->grid->addAction(['icon' => 'red trash'], function ($jschain, $id) { |
|
59 | + $this->grid->addAction(['icon' => 'red trash'], function($jschain, $id) { |
|
60 | 60 | HomePage::find($id)->delete(); |
61 | 61 | |
62 | 62 | return $jschain->closest('tr')->transition('fade left'); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | public function getHomepageForm() |
94 | 94 | { |
95 | - if (! $this->form) { |
|
95 | + if (!$this->form) { |
|
96 | 96 | $this->form = new Form(['buttonSave' => ['Button', __('Save'), 'primary']]); |
97 | 97 | |
98 | 98 | $this->form->addHook('submit', function($form) { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | //TODO: set the skin from admin / user selection |
34 | 34 | $this->skin = config('epesi.app.skin', $this->skin); |
35 | 35 | |
36 | - $this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir?: []); |
|
36 | + $this->template_dir = array_merge(ModuleManager::collect('templates', $this->skin), $this->template_dir ?: []); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | final public static function module() |
@@ -81,35 +81,35 @@ discard block |
||
81 | 81 | //TODO: include below in app.js and app.css |
82 | 82 | // jQuery |
83 | 83 | $urlJs = $this->cdn['jquery']?? 'storage/system/js'; |
84 | - $this->requireJS($urlJs.'/jquery.min.js'); |
|
84 | + $this->requireJS($urlJs . '/jquery.min.js'); |
|
85 | 85 | |
86 | 86 | // Semantic UI |
87 | 87 | $urlJs = $this->cdn['semantic-ui']?? 'storage/system/js'; |
88 | 88 | $urlCss = $this->cdn['semantic-ui']?? 'storage/system/css'; |
89 | - $this->requireJS($urlJs.'/semantic.min.js'); |
|
90 | - $this->requireCSS($urlCss.'/semantic.min.css'); |
|
89 | + $this->requireJS($urlJs . '/semantic.min.js'); |
|
90 | + $this->requireCSS($urlCss . '/semantic.min.css'); |
|
91 | 91 | |
92 | 92 | // Serialize Object |
93 | 93 | $urlJs = $this->cdn['serialize-object']?? 'storage/system/js'; |
94 | - $this->requireJS($urlJs.'/jquery.serialize-object.min.js'); |
|
94 | + $this->requireJS($urlJs . '/jquery.serialize-object.min.js'); |
|
95 | 95 | |
96 | 96 | // Agile UI |
97 | 97 | $urlJs = $this->cdn['atk']?? 'storage/system/js'; |
98 | 98 | $urlCss = $this->cdn['atk']?? 'storage/system/css'; |
99 | - $this->requireJS($urlJs.'/atkjs-ui.min.js'); |
|
100 | - $this->requireCSS($urlCss.'/agileui.css'); |
|
99 | + $this->requireJS($urlJs . '/atkjs-ui.min.js'); |
|
100 | + $this->requireCSS($urlCss . '/agileui.css'); |
|
101 | 101 | |
102 | 102 | // Draggable |
103 | 103 | $urlJs = $this->cdn['draggable']?? 'storage/system/js'; |
104 | - $this->requireJS($urlJs.'/draggable.bundle.js'); |
|
104 | + $this->requireJS($urlJs . '/draggable.bundle.js'); |
|
105 | 105 | |
106 | 106 | // jQuery UI |
107 | 107 | $urlJs = $this->cdn['jquery-ui']?? 'storage/system/js'; |
108 | - $this->requireJS($urlJs.'/jquery-ui.js'); |
|
108 | + $this->requireJS($urlJs . '/jquery-ui.js'); |
|
109 | 109 | |
110 | 110 | // jQuery niceScroll |
111 | 111 | $urlJs = $this->cdn['jquery-nicescroll']?? 'storage/system/js'; |
112 | - $this->requireJS($urlJs.'/jquery.nicescroll.js'); |
|
112 | + $this->requireJS($urlJs . '/jquery.nicescroll.js'); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | public function addCsrfToken() |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | |
182 | 182 | $key = md5(serialize(func_get_args())); |
183 | 183 | |
184 | - if (! isset($cache[$key])) { |
|
184 | + if (!isset($cache[$key])) { |
|
185 | 185 | $cache[$key] = true; |
186 | 186 | |
187 | 187 | parent::requireJS($url, $isAsync, $isDefer); |
@@ -6,8 +6,8 @@ |
||
6 | 6 | { |
7 | 7 | public $defaultTemplate = 'launch_button.html'; |
8 | 8 | |
9 | - public $ui = 'basic launch pjax button'; |
|
9 | + public $ui = 'basic launch pjax button'; |
|
10 | 10 | |
11 | - public $container = 'View'; |
|
11 | + public $container = 'View'; |
|
12 | 12 | |
13 | 13 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | } |
33 | 33 | } |
34 | 34 | |
35 | - if (! $view) abort(404); |
|
35 | + if (!$view) abort(404); |
|
36 | 36 | |
37 | 37 | $epesi->add($view)->displayModuleContent($method, $args); |
38 | 38 |
@@ -32,7 +32,9 @@ |
||
32 | 32 | } |
33 | 33 | } |
34 | 34 | |
35 | - if (! $view) abort(404); |
|
35 | + if (! $view) { |
|
36 | + abort(404); |
|
37 | + } |
|
36 | 38 | |
37 | 39 | $epesi->add($view)->displayModuleContent($method, $args); |
38 | 40 |
@@ -10,58 +10,58 @@ |
||
10 | 10 | |
11 | 11 | class EpesiServiceProvider extends ServiceProvider |
12 | 12 | { |
13 | - /** |
|
14 | - * Booting the package. |
|
15 | - */ |
|
16 | - public function boot() |
|
17 | - { |
|
18 | - $this->ensureHttps(); |
|
13 | + /** |
|
14 | + * Booting the package. |
|
15 | + */ |
|
16 | + public function boot() |
|
17 | + { |
|
18 | + $this->ensureHttps(); |
|
19 | 19 | |
20 | - Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() { |
|
21 | - Route::any('/', 'SystemController@index'); |
|
22 | - Route::get('logo', 'SystemController@logo'); |
|
23 | - Route::any('install', 'SystemController@install'); |
|
20 | + Route::group(['namespace' => 'Epesi\Core\Controllers', 'middleware' => 'web'], function() { |
|
21 | + Route::any('/', 'SystemController@index'); |
|
22 | + Route::get('logo', 'SystemController@logo'); |
|
23 | + Route::any('install', 'SystemController@install'); |
|
24 | 24 | |
25 | - Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() { |
|
26 | - Route::any('home', 'SystemController@home')->name('home'); |
|
25 | + Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() { |
|
26 | + Route::any('home', 'SystemController@home')->name('home'); |
|
27 | 27 | |
28 | - Route::any('view/{alias}/{method?}/{args?}', 'ModuleController@view'); |
|
29 | - }); |
|
30 | - }); |
|
28 | + Route::any('view/{alias}/{method?}/{args?}', 'ModuleController@view'); |
|
29 | + }); |
|
30 | + }); |
|
31 | 31 | |
32 | - // call boot methods on all modules |
|
33 | - ModuleManager::call('boot'); |
|
32 | + // call boot methods on all modules |
|
33 | + ModuleManager::call('boot'); |
|
34 | 34 | |
35 | 35 | foreach (ModuleManager::collect('translations') as $path) { |
36 | 36 | $this->loadJsonTranslationsFrom($path); |
37 | 37 | } |
38 | 38 | |
39 | - // Register admin service provider if in admin mode or in console |
|
40 | - // TODO: apply access restriction to admin mode |
|
39 | + // Register admin service provider if in admin mode or in console |
|
40 | + // TODO: apply access restriction to admin mode |
|
41 | 41 | // if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) { |
42 | - if ($this->app->runningInConsole() || request('admin', false)) { |
|
43 | - $this->app->register(AdminServiceProvider::class); |
|
44 | - } |
|
45 | - } |
|
42 | + if ($this->app->runningInConsole() || request('admin', false)) { |
|
43 | + $this->app->register(AdminServiceProvider::class); |
|
44 | + } |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Register the provider. |
|
49 | - */ |
|
50 | - public function register() |
|
51 | - { |
|
52 | - $this->app->singleton(App::class); |
|
53 | - } |
|
47 | + /** |
|
48 | + * Register the provider. |
|
49 | + */ |
|
50 | + public function register() |
|
51 | + { |
|
52 | + $this->app->singleton(App::class); |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Force to set https scheme if https enabled. |
|
57 | - * |
|
58 | - * @return void |
|
59 | - */ |
|
60 | - protected function ensureHttps() |
|
61 | - { |
|
62 | - if (config('epesi.https') || config('epesi.secure')) { |
|
63 | - url()->forceScheme('https'); |
|
64 | - $this->app['request']->server->set('HTTPS', true); |
|
65 | - } |
|
66 | - } |
|
55 | + /** |
|
56 | + * Force to set https scheme if https enabled. |
|
57 | + * |
|
58 | + * @return void |
|
59 | + */ |
|
60 | + protected function ensureHttps() |
|
61 | + { |
|
62 | + if (config('epesi.https') || config('epesi.secure')) { |
|
63 | + url()->forceScheme('https'); |
|
64 | + $this->app['request']->server->set('HTTPS', true); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | } |
@@ -8,33 +8,33 @@ |
||
8 | 8 | |
9 | 9 | class User extends Authenticatable |
10 | 10 | { |
11 | - use Notifiable; |
|
12 | - use HasRoles; |
|
11 | + use Notifiable; |
|
12 | + use HasRoles; |
|
13 | 13 | |
14 | - /** |
|
15 | - * The attributes that are mass assignable. |
|
16 | - * |
|
17 | - * @var array |
|
18 | - */ |
|
19 | - protected $fillable = [ |
|
20 | - 'name', 'email', 'password', |
|
21 | - ]; |
|
14 | + /** |
|
15 | + * The attributes that are mass assignable. |
|
16 | + * |
|
17 | + * @var array |
|
18 | + */ |
|
19 | + protected $fillable = [ |
|
20 | + 'name', 'email', 'password', |
|
21 | + ]; |
|
22 | 22 | |
23 | - /** |
|
24 | - * The attributes that should be hidden for arrays. |
|
25 | - * |
|
26 | - * @var array |
|
27 | - */ |
|
28 | - protected $hidden = [ |
|
29 | - 'password', 'remember_token', |
|
30 | - ]; |
|
23 | + /** |
|
24 | + * The attributes that should be hidden for arrays. |
|
25 | + * |
|
26 | + * @var array |
|
27 | + */ |
|
28 | + protected $hidden = [ |
|
29 | + 'password', 'remember_token', |
|
30 | + ]; |
|
31 | 31 | |
32 | - /** |
|
33 | - * The attributes that should be cast to native types. |
|
34 | - * |
|
35 | - * @var array |
|
36 | - */ |
|
37 | - protected $casts = [ |
|
38 | - 'email_verified_at' => 'datetime', |
|
39 | - ]; |
|
32 | + /** |
|
33 | + * The attributes that should be cast to native types. |
|
34 | + * |
|
35 | + * @var array |
|
36 | + */ |
|
37 | + protected $casts = [ |
|
38 | + 'email_verified_at' => 'datetime', |
|
39 | + ]; |
|
40 | 40 | } |