@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class ActionBar extends Menu |
9 | 9 | { |
10 | - public $ui = 'actionbar menu'; |
|
10 | + public $ui = 'actionbar menu'; |
|
11 | 11 | |
12 | 12 | protected static $buttons = []; |
13 | 13 | |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | public function renderView() |
49 | - { |
|
50 | - $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
51 | - return $element->weight ?? 10; |
|
52 | - })->toArray(); |
|
49 | + { |
|
50 | + $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
51 | + return $element->weight ?? 10; |
|
52 | + })->toArray(); |
|
53 | 53 | |
54 | - return parent::renderView(); |
|
54 | + return parent::renderView(); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | |
82 | 82 | public static function addMenuButton($menu) |
83 | 83 | { |
84 | - return self::instance()->addMenu($menu); |
|
84 | + return self::instance()->addMenu($menu); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | public static function clear() |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | public function renderView() |
49 | 49 | { |
50 | - $this->elements = collect($this->elements)->sortByDesc(function ($element) { |
|
50 | + $this->elements = collect($this->elements)->sortByDesc(function($element) { |
|
51 | 51 | return $element->weight ?? 10; |
52 | 52 | })->toArray(); |
53 | 53 | |
@@ -63,9 +63,9 @@ discard block |
||
63 | 63 | */ |
64 | 64 | public static function addItemButton($button, $defaults = []) |
65 | 65 | { |
66 | - $button = is_string($button)? self::getPredefined($button): $button; |
|
66 | + $button = is_string($button) ? self::getPredefined($button) : $button; |
|
67 | 67 | |
68 | - $button = is_array($button)? new ActionBarItem($button): $button; |
|
68 | + $button = is_array($button) ? new ActionBarItem($button) : $button; |
|
69 | 69 | |
70 | 70 | $actionBar = self::instance(); |
71 | 71 |
@@ -7,40 +7,40 @@ |
||
7 | 7 | |
8 | 8 | class ActionBarItem extends Item |
9 | 9 | { |
10 | - public $weight = 10; |
|
10 | + public $weight = 10; |
|
11 | 11 | |
12 | - public $callback; |
|
12 | + public $callback; |
|
13 | 13 | |
14 | - public $hint; |
|
14 | + public $hint; |
|
15 | 15 | |
16 | - public function renderView() |
|
17 | - { |
|
18 | - $this->addCallback(); |
|
16 | + public function renderView() |
|
17 | + { |
|
18 | + $this->addCallback(); |
|
19 | 19 | |
20 | - if ($this->hint) { |
|
21 | - $this->attr['title'] = $this->hint; |
|
22 | - } |
|
20 | + if ($this->hint) { |
|
21 | + $this->attr['title'] = $this->hint; |
|
22 | + } |
|
23 | 23 | |
24 | - parent::renderView(); |
|
25 | - } |
|
24 | + parent::renderView(); |
|
25 | + } |
|
26 | 26 | |
27 | - public function callback($callable) |
|
28 | - { |
|
29 | - $this->callback = $callable; |
|
27 | + public function callback($callable) |
|
28 | + { |
|
29 | + $this->callback = $callable; |
|
30 | 30 | |
31 | - return $this; |
|
32 | - } |
|
31 | + return $this; |
|
32 | + } |
|
33 | 33 | |
34 | - public function addCallback() |
|
35 | - { |
|
36 | - if (is_callable($callable = $this->callback)) { |
|
37 | - $callable = $this->add('jsCallback')->set($callable); |
|
38 | - } |
|
34 | + public function addCallback() |
|
35 | + { |
|
36 | + if (is_callable($callable = $this->callback)) { |
|
37 | + $callable = $this->add('jsCallback')->set($callable); |
|
38 | + } |
|
39 | 39 | |
40 | - if ($callable instanceof jsCallback) { |
|
41 | - $this->on('click', $callable); |
|
42 | - } |
|
40 | + if ($callable instanceof jsCallback) { |
|
41 | + $this->on('click', $callable); |
|
42 | + } |
|
43 | 43 | |
44 | - return $this; |
|
45 | - } |
|
44 | + return $this; |
|
45 | + } |
|
46 | 46 | } |
@@ -20,10 +20,10 @@ |
||
20 | 20 | | This value is the name of Epesi powered by as displayed. |
21 | 21 | | |
22 | 22 | */ |
23 | - 'credit' => [ |
|
24 | - 'title' => 'EPESI', |
|
25 | - 'link' => 'https://epe.si' |
|
26 | - ], |
|
23 | + 'credit' => [ |
|
24 | + 'title' => 'EPESI', |
|
25 | + 'link' => 'https://epe.si' |
|
26 | + ], |
|
27 | 27 | |
28 | 28 | /* |
29 | 29 | |-------------------------------------------------------------------------- |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | |
9 | 9 | class NavMenu extends BaseMenu |
10 | 10 | { |
11 | - public $ui = 'inverted nav menu'; |
|
11 | + public $ui = 'inverted nav menu'; |
|
12 | 12 | |
13 | 13 | public function init() |
14 | 14 | { |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | self::addItems($submenu, collect($subitems)); |
59 | 59 | } |
60 | 60 | elseif ($subitems = $entry['group'] ?? []) { |
61 | - $subgroup = $menu->addGroup($entry['item']); |
|
61 | + $subgroup = $menu->addGroup($entry['item']); |
|
62 | 62 | |
63 | 63 | self::addItems($subgroup, collect($subitems)); |
64 | 64 | } |
65 | 65 | else { |
66 | - $menu->addItem($entry['item'], $entry['action'] ?? ''); |
|
66 | + $menu->addItem($entry['item'], $entry['action'] ?? ''); |
|
67 | 67 | } |
68 | 68 | }); |
69 | 69 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $this->addHeader($this->app->title); |
18 | 18 | |
19 | 19 | $items = collect(); |
20 | - foreach(NavMenuJoint::collect() as $joint) { |
|
20 | + foreach (NavMenuJoint::collect() as $joint) { |
|
21 | 21 | $items = $items->merge($joint->items()); |
22 | 22 | } |
23 | 23 | |
@@ -34,13 +34,13 @@ discard block |
||
34 | 34 | |
35 | 35 | public static function addItems($menu, Collection $items) |
36 | 36 | { |
37 | - $items->sort(function ($entry1, $entry2) { |
|
37 | + $items->sort(function($entry1, $entry2) { |
|
38 | 38 | $weight1 = $entry1['weight']?? 10; |
39 | 39 | $weight2 = $entry2['weight']?? 10; |
40 | 40 | |
41 | 41 | return $weight1 <=> $weight2; |
42 | 42 | })->map(function($entry, $caption) use ($menu) { |
43 | - if (! ($entry['access'] ?? true)) return; |
|
43 | + if (!($entry['access'] ?? true)) return; |
|
44 | 44 | |
45 | 45 | if (!is_array($entry)) { |
46 | 46 | $entry = ['action' => $entry]; |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | return $weight1 <=> $weight2; |
42 | 42 | })->map(function($entry, $caption) use ($menu) { |
43 | - if (! ($entry['access'] ?? true)) return; |
|
43 | + if (! ($entry['access'] ?? true)) { |
|
44 | + return; |
|
45 | + } |
|
44 | 46 | |
45 | 47 | if (!is_array($entry)) { |
46 | 48 | $entry = ['action' => $entry]; |
@@ -56,13 +58,11 @@ discard block |
||
56 | 58 | $submenu = $menu->addMenu($entry['item']); |
57 | 59 | |
58 | 60 | self::addItems($submenu, collect($subitems)); |
59 | - } |
|
60 | - elseif ($subitems = $entry['group'] ?? []) { |
|
61 | + } elseif ($subitems = $entry['group'] ?? []) { |
|
61 | 62 | $subgroup = $menu->addGroup($entry['item']); |
62 | 63 | |
63 | 64 | self::addItems($subgroup, collect($subitems)); |
64 | - } |
|
65 | - else { |
|
65 | + } else { |
|
66 | 66 | $menu->addItem($entry['item'], $entry['action'] ?? ''); |
67 | 67 | } |
68 | 68 | }); |
@@ -2,35 +2,35 @@ |
||
2 | 2 | |
3 | 3 | if (! function_exists('epesi')) { |
4 | 4 | function ui() : Epesi\Core\UI |
5 | - { |
|
6 | - return resolve(Epesi\Core\UI::class); |
|
7 | - } |
|
5 | + { |
|
6 | + return resolve(Epesi\Core\UI::class); |
|
7 | + } |
|
8 | 8 | } |
9 | 9 | |
10 | 10 | if (! function_exists('eval_css')) { |
11 | 11 | function eval_css($css) |
12 | - { |
|
13 | - ui()->addStyle($css); |
|
14 | - } |
|
12 | + { |
|
13 | + ui()->addStyle($css); |
|
14 | + } |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | if (! function_exists('eval_js')) { |
18 | 18 | function eval_js($js, $args = []) |
19 | - { |
|
20 | - ui()->addJS($js, $args); |
|
21 | - } |
|
19 | + { |
|
20 | + ui()->addJS($js, $args); |
|
21 | + } |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | if (! function_exists('load_css')) { |
25 | 25 | function load_css($url) |
26 | - { |
|
27 | - return ui()->requireCSS($url); |
|
28 | - } |
|
26 | + { |
|
27 | + return ui()->requireCSS($url); |
|
28 | + } |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | if (! function_exists('load_js')) { |
32 | 32 | function load_js($url) |
33 | - { |
|
34 | - return ui()->requireJS($url); |
|
35 | - } |
|
33 | + { |
|
34 | + return ui()->requireJS($url); |
|
35 | + } |
|
36 | 36 | } |
@@ -1,34 +1,34 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (! function_exists('epesi')) { |
|
3 | +if (!function_exists('epesi')) { |
|
4 | 4 | function ui() : Epesi\Core\UI |
5 | 5 | { |
6 | 6 | return resolve(Epesi\Core\UI::class); |
7 | 7 | } |
8 | 8 | } |
9 | 9 | |
10 | -if (! function_exists('eval_css')) { |
|
10 | +if (!function_exists('eval_css')) { |
|
11 | 11 | function eval_css($css) |
12 | 12 | { |
13 | 13 | ui()->addStyle($css); |
14 | 14 | } |
15 | 15 | } |
16 | 16 | |
17 | -if (! function_exists('eval_js')) { |
|
17 | +if (!function_exists('eval_js')) { |
|
18 | 18 | function eval_js($js, $args = []) |
19 | 19 | { |
20 | 20 | ui()->addJS($js, $args); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | -if (! function_exists('load_css')) { |
|
24 | +if (!function_exists('load_css')) { |
|
25 | 25 | function load_css($url) |
26 | 26 | { |
27 | 27 | return ui()->requireCSS($url); |
28 | 28 | } |
29 | 29 | } |
30 | 30 | |
31 | -if (! function_exists('load_js')) { |
|
31 | +if (!function_exists('load_js')) { |
|
32 | 32 | function load_js($url) |
33 | 33 | { |
34 | 34 | return ui()->requireJS($url); |
@@ -28,10 +28,10 @@ discard block |
||
28 | 28 | { |
29 | 29 | parent::__construct([ |
30 | 30 | 'title' => config('epesi.app.title', 'EPESI'), |
31 | - 'cdn' => array_merge($this->cdn, (array) config('epesi.app.cdn')), |
|
31 | + 'cdn' => array_merge($this->cdn, (array) config('epesi.app.cdn')), |
|
32 | 32 | //TODO: set the skin from admin / user selection |
33 | - 'skin' => config('epesi.app.skin', $this->skin), |
|
34 | - 'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir) |
|
33 | + 'skin' => config('epesi.app.skin', $this->skin), |
|
34 | + 'template_dir' => array_merge(ModuleManager::collect('templates', $this->skin), (array) $this->template_dir) |
|
35 | 35 | ]); |
36 | 36 | } |
37 | 37 | |
@@ -73,43 +73,43 @@ discard block |
||
73 | 73 | |
74 | 74 | public function renderException($exception) |
75 | 75 | { |
76 | - ob_start(); |
|
77 | - if ($exception instanceof TokenMismatchException) { |
|
78 | - $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...')); |
|
79 | - } |
|
80 | - elseif ($exception instanceof NotFoundHttpException) { |
|
81 | - $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...')); |
|
82 | - } |
|
83 | - else { |
|
84 | - $this->caughtException($exception); |
|
85 | - } |
|
76 | + ob_start(); |
|
77 | + if ($exception instanceof TokenMismatchException) { |
|
78 | + $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...')); |
|
79 | + } |
|
80 | + elseif ($exception instanceof NotFoundHttpException) { |
|
81 | + $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...')); |
|
82 | + } |
|
83 | + else { |
|
84 | + $this->caughtException($exception); |
|
85 | + } |
|
86 | 86 | |
87 | - return ob_get_clean(); |
|
87 | + return ob_get_clean(); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | public function jsRedirectHomepage($message) |
91 | 91 | { |
92 | - $homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser()); |
|
92 | + $homepageUrl = url(\Epesi\Core\HomePage\Database\Models\HomePage::pathOfUser()); |
|
93 | 93 | |
94 | - $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender(); |
|
94 | + $redirectJs = $this->jsRedirectConfirm($homepageUrl, $message)->jsRender(); |
|
95 | 95 | |
96 | - if ($this->isJsonRequest()) { |
|
97 | - $this->outputResponseJSON([ |
|
98 | - 'success' => true, |
|
99 | - 'message' => $message, |
|
100 | - 'atkjs' => $redirectJs |
|
101 | - ]); |
|
102 | - } |
|
103 | - else { |
|
104 | - $this->outputResponseHTML('<script>' . $redirectJs . '</script>'); |
|
105 | - } |
|
96 | + if ($this->isJsonRequest()) { |
|
97 | + $this->outputResponseJSON([ |
|
98 | + 'success' => true, |
|
99 | + 'message' => $message, |
|
100 | + 'atkjs' => $redirectJs |
|
101 | + ]); |
|
102 | + } |
|
103 | + else { |
|
104 | + $this->outputResponseHTML('<script>' . $redirectJs . '</script>'); |
|
105 | + } |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | public function jsRedirectConfirm($page, $message) |
109 | 109 | { |
110 | - $redirectJs = $this->jsRedirect($page)->jsRender(); |
|
110 | + $redirectJs = $this->jsRedirect($page)->jsRender(); |
|
111 | 111 | |
112 | - return new jsExpression("if (confirm([])) { $redirectJs }", [$message]); |
|
112 | + return new jsExpression("if (confirm([])) { $redirectJs }", [$message]); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -127,35 +127,35 @@ discard block |
||
127 | 127 | |
128 | 128 | // jQuery |
129 | 129 | $urlJs = $this->cdn['jquery']?? $localJs; |
130 | - $this->requireJS($urlJs.'/jquery.min.js'); |
|
130 | + $this->requireJS($urlJs . '/jquery.min.js'); |
|
131 | 131 | |
132 | 132 | // Semantic UI |
133 | 133 | $urlJs = $this->cdn['semantic-ui']?? $localJs; |
134 | 134 | $urlCss = $this->cdn['semantic-ui']?? $localCss; |
135 | - $this->requireJS($urlJs.'/semantic.min.js'); |
|
136 | - $this->requireCSS($urlCss.'/semantic.min.css'); |
|
135 | + $this->requireJS($urlJs . '/semantic.min.js'); |
|
136 | + $this->requireCSS($urlCss . '/semantic.min.css'); |
|
137 | 137 | |
138 | 138 | // Serialize Object |
139 | 139 | $urlJs = $this->cdn['serialize-object']?? $localJs; |
140 | - $this->requireJS($urlJs.'/jquery.serialize-object.min.js'); |
|
140 | + $this->requireJS($urlJs . '/jquery.serialize-object.min.js'); |
|
141 | 141 | |
142 | 142 | // Agile UI |
143 | 143 | $urlJs = $this->cdn['atk']?? $localJs; |
144 | 144 | $urlCss = $this->cdn['atk']?? $localCss; |
145 | - $this->requireJS($urlJs.'/atkjs-ui.min.js'); |
|
146 | - $this->requireCSS($urlCss.'/agileui.css'); |
|
145 | + $this->requireJS($urlJs . '/atkjs-ui.min.js'); |
|
146 | + $this->requireCSS($urlCss . '/agileui.css'); |
|
147 | 147 | |
148 | 148 | // Draggable |
149 | 149 | $urlJs = $this->cdn['draggable']?? $localJs; |
150 | - $this->requireJS($urlJs.'/draggable.bundle.js'); |
|
150 | + $this->requireJS($urlJs . '/draggable.bundle.js'); |
|
151 | 151 | |
152 | 152 | // jQuery niceScroll |
153 | 153 | $urlJs = $this->cdn['jquery-nicescroll']?? $localJs; |
154 | - $this->requireJS($urlJs.'/jquery.nicescroll.js'); |
|
154 | + $this->requireJS($urlJs . '/jquery.nicescroll.js'); |
|
155 | 155 | |
156 | 156 | // clipboard.js |
157 | 157 | $urlJs = $this->cdn['clipboardjs']?? $localJs; |
158 | - $this->requireJS($urlJs.'/clipboard.js'); |
|
158 | + $this->requireJS($urlJs . '/clipboard.js'); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function addCsrfToken() |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | |
233 | 233 | $key = md5(serialize(func_get_args())); |
234 | 234 | |
235 | - if (! isset($cache[$key])) { |
|
235 | + if (!isset($cache[$key])) { |
|
236 | 236 | $cache[$key] = true; |
237 | 237 | |
238 | 238 | parent::requireJS($url, $isAsync, $isDefer); |
@@ -86,11 +86,9 @@ discard block |
||
86 | 86 | ob_start(); |
87 | 87 | if ($exception instanceof TokenMismatchException) { |
88 | 88 | $this->jsRedirectHomepage(__('Session expired! Redirecting to your home page ...')); |
89 | - } |
|
90 | - elseif ($exception instanceof NotFoundHttpException) { |
|
89 | + } elseif ($exception instanceof NotFoundHttpException) { |
|
91 | 90 | $this->jsRedirectHomepage(__('Requested page not found! Redirecting to your home page ...')); |
92 | - } |
|
93 | - else { |
|
91 | + } else { |
|
94 | 92 | $this->caughtException($exception); |
95 | 93 | } |
96 | 94 | |
@@ -109,8 +107,7 @@ discard block |
||
109 | 107 | 'message' => $message, |
110 | 108 | 'atkjs' => $redirectJs |
111 | 109 | ]); |
112 | - } |
|
113 | - else { |
|
110 | + } else { |
|
114 | 111 | $this->outputResponseHTML('<script>' . $redirectJs . '</script>'); |
115 | 112 | } |
116 | 113 | } |
@@ -10,66 +10,66 @@ |
||
10 | 10 | |
11 | 11 | class Controller extends BaseController |
12 | 12 | { |
13 | - public function index() |
|
14 | - { |
|
15 | - return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
16 | - } |
|
13 | + public function index() |
|
14 | + { |
|
15 | + return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
16 | + } |
|
17 | 17 | |
18 | - public function install(UI $ui) |
|
19 | - { |
|
20 | - // make sure the installation information is fresh |
|
21 | - ModuleManager::clearCache(); |
|
18 | + public function install(UI $ui) |
|
19 | + { |
|
20 | + // make sure the installation information is fresh |
|
21 | + ModuleManager::clearCache(); |
|
22 | 22 | |
23 | - if (SystemCore::isInstalled()) return redirect('home'); |
|
23 | + if (SystemCore::isInstalled()) return redirect('home'); |
|
24 | 24 | |
25 | - $ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
|
25 | + $ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
|
26 | 26 | |
27 | - $ui->initLayout('Centered'); |
|
27 | + $ui->initLayout('Centered'); |
|
28 | 28 | |
29 | - $ui->layout->set('logo', url('logo')); |
|
30 | - $ui->layout->template->setHTML('copyright', config('epesi.app.copyright')); |
|
29 | + $ui->layout->set('logo', url('logo')); |
|
30 | + $ui->layout->template->setHTML('copyright', config('epesi.app.copyright')); |
|
31 | 31 | |
32 | - $ui->add(new \Epesi\Core\System\SystemInstallWizard()); |
|
32 | + $ui->add(new \Epesi\Core\System\SystemInstallWizard()); |
|
33 | 33 | |
34 | - return $ui->response(); |
|
35 | - } |
|
34 | + return $ui->response(); |
|
35 | + } |
|
36 | 36 | |
37 | - public function home() |
|
38 | - { |
|
39 | - return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install'); |
|
40 | - } |
|
37 | + public function home() |
|
38 | + { |
|
39 | + return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install'); |
|
40 | + } |
|
41 | 41 | |
42 | - public function logo() |
|
43 | - { |
|
44 | - $logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile(); |
|
42 | + public function logo() |
|
43 | + { |
|
44 | + $logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile(); |
|
45 | 45 | |
46 | - return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic(); |
|
47 | - } |
|
46 | + return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic(); |
|
47 | + } |
|
48 | 48 | |
49 | - public function view(UI $ui, $module, $method = 'body', $args = []) |
|
50 | - { |
|
51 | - $ui->initLayout(new LayoutView()); |
|
49 | + public function view(UI $ui, $module, $method = 'body', $args = []) |
|
50 | + { |
|
51 | + $ui->initLayout(new LayoutView()); |
|
52 | 52 | |
53 | - $alias = explode(':', $module); |
|
53 | + $alias = explode(':', $module); |
|
54 | 54 | |
55 | - $moduleAlias = $alias[0]; |
|
56 | - $viewAlias = $alias[1]?? null; |
|
55 | + $moduleAlias = $alias[0]; |
|
56 | + $viewAlias = $alias[1]?? null; |
|
57 | 57 | |
58 | - $view = null; |
|
59 | - if ($module = ModuleManager::getClass($moduleAlias, true)) { |
|
60 | - $viewClass = $module::view($viewAlias); |
|
58 | + $view = null; |
|
59 | + if ($module = ModuleManager::getClass($moduleAlias, true)) { |
|
60 | + $viewClass = $module::view($viewAlias); |
|
61 | 61 | |
62 | - if (class_exists($viewClass)) { |
|
63 | - $view = new $viewClass(); |
|
64 | - } |
|
65 | - } |
|
62 | + if (class_exists($viewClass)) { |
|
63 | + $view = new $viewClass(); |
|
64 | + } |
|
65 | + } |
|
66 | 66 | |
67 | - if (! $view) abort(404); |
|
67 | + if (! $view) abort(404); |
|
68 | 68 | |
69 | - $ui->add($view)->displayModuleContent($method, $args); |
|
69 | + $ui->add($view)->displayModuleContent($method, $args); |
|
70 | 70 | |
71 | - $ui->setLocation($view->location()); |
|
71 | + $ui->setLocation($view->location()); |
|
72 | 72 | |
73 | - return $ui->response(); |
|
74 | - } |
|
73 | + return $ui->response(); |
|
74 | + } |
|
75 | 75 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | { |
13 | 13 | public function index() |
14 | 14 | { |
15 | - return SystemCore::isInstalled()? redirect('home'): redirect('install'); |
|
15 | + return SystemCore::isInstalled() ? redirect('home') : redirect('install'); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function install(UI $ui) |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | |
37 | 37 | public function home() |
38 | 38 | { |
39 | - return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install'); |
|
39 | + return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\Models\HomePage::pathOfUser() : 'install'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function logo() |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | - if (! $view) abort(404); |
|
67 | + if (!$view) abort(404); |
|
68 | 68 | |
69 | 69 | $ui->add($view)->displayModuleContent($method, $args); |
70 | 70 |
@@ -20,7 +20,9 @@ discard block |
||
20 | 20 | // make sure the installation information is fresh |
21 | 21 | ModuleManager::clearCache(); |
22 | 22 | |
23 | - if (SystemCore::isInstalled()) return redirect('home'); |
|
23 | + if (SystemCore::isInstalled()) { |
|
24 | + return redirect('home'); |
|
25 | + } |
|
24 | 26 | |
25 | 27 | $ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]); |
26 | 28 | |
@@ -64,7 +66,9 @@ discard block |
||
64 | 66 | } |
65 | 67 | } |
66 | 68 | |
67 | - if (! $view) abort(404); |
|
69 | + if (! $view) { |
|
70 | + abort(404); |
|
71 | + } |
|
68 | 72 | |
69 | 73 | $ui->add($view)->displayModuleContent($method, $args); |
70 | 74 |
@@ -12,11 +12,11 @@ |
||
12 | 12 | } |
13 | 13 | |
14 | 14 | final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) { |
15 | - return ui()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer); |
|
15 | + return ui()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | final public static function requireCSS($file = 'default.css') { |
19 | - return ui()->requireCSS(self::assetUrl('css/'. $file)); |
|
19 | + return ui()->requireCSS(self::assetUrl('css/' . $file)); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /** |
@@ -7,13 +7,13 @@ |
||
7 | 7 | |
8 | 8 | class UI extends Facade |
9 | 9 | { |
10 | - /** |
|
11 | - * Get the registered name of the component. |
|
12 | - * |
|
13 | - * @return string |
|
14 | - */ |
|
15 | - protected static function getFacadeAccessor() |
|
16 | - { |
|
17 | - return App::class; |
|
18 | - } |
|
10 | + /** |
|
11 | + * Get the registered name of the component. |
|
12 | + * |
|
13 | + * @return string |
|
14 | + */ |
|
15 | + protected static function getFacadeAccessor() |
|
16 | + { |
|
17 | + return App::class; |
|
18 | + } |
|
19 | 19 | } |