x-systems / epesi-core

src/helpers.php

Indentation +15 added lines, -15 removed lines

@@ -2,35 +2,35 @@
 
 if (! function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
-    {
-    	return resolve(Epesi\Core\UI::class);
-    }
+	{
+		return resolve(Epesi\Core\UI::class);
+	}
 }
 
 if (! function_exists('eval_css')) {
 	function eval_css($css)
-    {
-    	ui()->addStyle($css);
-    }
+	{
+		ui()->addStyle($css);
+	}
 }
 
 if (! function_exists('eval_js')) {
 	function eval_js($js, $args = [])
-    {
-    	ui()->addJS($js, $args);
-    }
+	{
+		ui()->addJS($js, $args);
+	}
 }
 
 if (! function_exists('load_css')) {
 	function load_css($url)
-    {
-    	return ui()->requireCSS($url);
-    }
+	{
+		return ui()->requireCSS($url);
+	}
 }
 
 if (! function_exists('load_js')) {
 	function load_js($url)
-    {
-    	return ui()->requireJS($url);
-    }
+	{
+		return ui()->requireJS($url);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-if (! function_exists('epesi')) {
+if (!function_exists('epesi')) {
 	function ui() : Epesi\Core\UI
     {
     	return resolve(Epesi\Core\UI::class);
     }
 }
 
-if (! function_exists('eval_css')) {
+if (!function_exists('eval_css')) {
 	function eval_css($css)
     {
     	ui()->addStyle($css);
     }
 }
 
-if (! function_exists('eval_js')) {
+if (!function_exists('eval_js')) {
 	function eval_js($js, $args = [])
     {
     	ui()->addJS($js, $args);
     }
 }
 
-if (! function_exists('load_css')) {
+if (!function_exists('load_css')) {
 	function load_css($url)
     {
     	return ui()->requireCSS($url);
     }
 }
 
-if (! function_exists('load_js')) {
+if (!function_exists('load_js')) {
 	function load_js($url)
     {
     	return ui()->requireJS($url);

src/Layout/LayoutView.php

Indentation +68 added lines, -68 removed lines

@@ -30,36 +30,36 @@ 
  */
 class LayoutView extends ModuleView
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
-    public $actionBar;   
-    public $locationBar;
+	public $menuLeft;    // vertical menu
+	public $menu;        // horizontal menu
+	public $menuRight;   // vertical pull-down
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
 
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();        
-        $this->setMenuRight();
+		$this->setMenuLeft();        
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -68,26 +68,26 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see \Epesi\Core\Controller::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see \Epesi\Core\Controller::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	/** @scrutinizer ignore-call */
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			/** @scrutinizer ignore-call */
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see \Epesi\Core\Controller::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -130,50 +130,50 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
 
-    	$this->actionBar = $this->add(Seeds\ActionBar::class, 'ActionBar');
-    }
+		$this->actionBar = $this->add(Seeds\ActionBar::class, 'ActionBar');
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

src/Layout/Seeds/NavMenu.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 		$this->addHeader($this->app->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -34,13 +34,13 @@ 
 	
 	public static function addItems($menu, Collection $items)
 	{
-		$items->sort(function ($entry1, $entry2) {
+		$items->sort(function($entry1, $entry2) {
 			$weight1 = $entry1['weight']?? 10;
 			$weight2 = $entry2['weight']?? 10;
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (!($entry['access'] ?? true)) return;
 			
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];

Braces +5 added lines, -5 removed lines

@@ -40,7 +40,9 @@ 
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (! ($entry['access'] ?? true)) {
+				return;
+			}
 			
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];
@@ -56,13 +58,11 @@ 
 				$submenu = $menu->addMenu($entry['item']);
 				
 				self::addItems($submenu, collect($subitems));
-			}
-			elseif ($subitems = $entry['group'] ?? []) {
+			} elseif ($subitems = $entry['group'] ?? []) {
 			    $subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
-			}
-			else {
+			} else {
 			    $menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});

src/Controller.php

Indentation +43 added lines, -43 removed lines

@@ -10,66 +10,66 @@
 
 class Controller extends BaseController
 {
-    public function index()
-    {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
-    }
+	public function index()
+	{
+		return SystemCore::isInstalled()? redirect('home'): redirect('install');
+	}
     
-    public function install(UI $ui)
-    {
-    	// make sure the installation information is fresh
-    	ModuleManager::clearCache();
+	public function install(UI $ui)
+	{
+		// make sure the installation information is fresh
+		ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+		if (SystemCore::isInstalled()) return redirect('home');
     	
-    	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
+		$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
-    	$ui->initLayout('Centered');
+		$ui->initLayout('Centered');
     	
-    	$ui->layout->set('logo', url('logo'));
-    	$ui->layout->template->setHTML('copyright', config('epesi.app.copyright'));
+		$ui->layout->set('logo', url('logo'));
+		$ui->layout->template->setHTML('copyright', config('epesi.app.copyright'));
     	
-    	$ui->add(new \Epesi\Core\System\SystemInstallWizard());
+		$ui->add(new \Epesi\Core\System\SystemInstallWizard());
     	
-    	return $ui->response();
-    }
+		return $ui->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+	}
     
-    public function logo()
-    { 
-    	$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
+	public function logo()
+	{ 
+		$logoFile = \Epesi\Core\System\Logo\LogoSettings::getLogoFile();
 
-    	return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
-    }
+		return response(File::get($logoFile), 200, ['Content-type' => File::mimeType($logoFile)])->setMaxAge(604800)->setPublic();
+	}
     
-    public function view(UI $ui, $module, $method = 'body', $args = [])
-    {
-    	$ui->initLayout(new LayoutView());
+	public function view(UI $ui, $module, $method = 'body', $args = [])
+	{
+		$ui->initLayout(new LayoutView());
     	
-    	$alias = explode(':', $module);
+		$alias = explode(':', $module);
     	
-    	$moduleAlias = $alias[0];
-    	$viewAlias = $alias[1]?? null;
+		$moduleAlias = $alias[0];
+		$viewAlias = $alias[1]?? null;
     	
-    	$view = null;
-    	if ($module = ModuleManager::getClass($moduleAlias, true)) {
-    		$viewClass = $module::view($viewAlias);
+		$view = null;
+		if ($module = ModuleManager::getClass($moduleAlias, true)) {
+			$viewClass = $module::view($viewAlias);
 
-    		if (class_exists($viewClass)) {
-    			$view = new $viewClass();
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = new $viewClass();
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$ui->add($view)->displayModuleContent($method, $args);
+		$ui->add($view)->displayModuleContent($method, $args);
     	
-    	$ui->setLocation($view->location());
+		$ui->setLocation($view->location());
     	
-    	return $ui->response();
-    }
+		return $ui->response();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function index()
     {
-    	return SystemCore::isInstalled()? redirect('home'): redirect('install');
+    	return SystemCore::isInstalled() ? redirect('home') : redirect('install');
     }
     
     public function install(UI $ui)
@@ -36,7 +36,7 @@ 
     
     public function home()
     {
-    	return redirect(SystemCore::isInstalled()? \Epesi\Core\HomePage\Models\HomePage::pathOfUser(): 'install');
+    	return redirect(SystemCore::isInstalled() ? \Epesi\Core\HomePage\Models\HomePage::pathOfUser() : 'install');
     }
     
     public function logo()
@@ -64,7 +64,7 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (!$view) abort(404);
     	
     	$ui->add($view)->displayModuleContent($method, $args);
     	

Braces +6 added lines, -2 removed lines

@@ -20,7 +20,9 @@ 
     	// make sure the installation information is fresh
     	ModuleManager::clearCache();
     	
-    	if (SystemCore::isInstalled()) return redirect('home');
+    	if (SystemCore::isInstalled()) {
+    		return redirect('home');
+    	}
     	
     	$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.app.title')]);
     	
@@ -64,7 +66,9 @@ 
     		}
     	}
 
-    	if (! $view) abort(404);
+    	if (! $view) {
+    		abort(404);
+    	}
     	
     	$ui->add($view)->displayModuleContent($method, $args);
     	

src/Providers/EpesiServiceProvider.php

Indentation +54 added lines, -54 removed lines

@@ -12,73 +12,73 @@
 
 class EpesiServiceProvider extends ServiceProvider
 {
-    /**
-     * Booting the package.
-     */
-    public function boot()
-    {
-    	$this->ensureHttps();
+	/**
+	 * Booting the package.
+	 */
+	public function boot()
+	{
+		$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+		if (env('APP_DEBUG', false)) ModuleManager::clearCache();
     	
-    	Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
-    		Route::any('/', 'Controller@index');
-    		Route::get('logo', 'Controller@logo');
-    		Route::any('install', 'Controller@install');
+		Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
+			Route::any('/', 'Controller@index');
+			Route::get('logo', 'Controller@logo');
+			Route::any('install', 'Controller@install');
     		
-    		Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
-    			Route::any('home', 'Controller@home')->name('home');
+			Route::group(['middleware' => ['auth', NoCacheHeaders::class]], function() {
+				Route::any('home', 'Controller@home')->name('home');
     			
-    			Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
-    		});
-    	});
+				Route::any('view/{alias}/{method?}/{args?}', 'Controller@view');
+			});
+		});
 
-    	// call boot methods on all modules
-    	ModuleManager::call('boot');
+		// call boot methods on all modules
+		ModuleManager::call('boot');
     		
 		foreach (ModuleManager::collect('translations') as $path) {
 			$this->loadJsonTranslationsFrom($path);
 		}
 		
-    	// Register admin service provider if in admin mode or in console
-    	// TODO: apply access restriction to admin mode
+		// Register admin service provider if in admin mode or in console
+		// TODO: apply access restriction to admin mode
 //     	if ($this->app->runningInConsole() || (request('admin', false) && Auth::user()->can('modify system'))) {
-    	if ($this->app->runningInConsole() || request('admin', false)) {
-    		$this->app->register(AdminServiceProvider::class);
-    	}
-    }
+		if ($this->app->runningInConsole() || request('admin', false)) {
+			$this->app->register(AdminServiceProvider::class);
+		}
+	}
 
-    /**
-     * Register the provider.
-     */
-    public function register()
-    {
-    	$this->app->singleton(UI::class);
+	/**
+	 * Register the provider.
+	 */
+	public function register()
+	{
+		$this->app->singleton(UI::class);
     	
-    	$this->app->singleton(
-    			SQL::class,
-    			function ($app) {
-    				/**
-    				 * Database Manager
-    				 *
-    				 * @var \Illuminate\Database\DatabaseManager $db
-    				 */
-    				$db = DB::getFacadeRoot();
+		$this->app->singleton(
+				SQL::class,
+				function ($app) {
+					/**
+					 * Database Manager
+					 *
+					 * @var \Illuminate\Database\DatabaseManager $db
+					 */
+					$db = DB::getFacadeRoot();
     				
-    				return new SQL($db);
-    			});
-    }
+					return new SQL($db);
+				});
+	}
     
-    /**
-     * Force to set https scheme if https enabled.
-     *
-     * @return void
-     */
-    protected function ensureHttps()
-    {
-    	if (config('epesi.https') || config('epesi.secure')) {
-    		url()->forceScheme('https');
-    		$this->app['request']->server->set('HTTPS', true);
-    	}
-    }
+	/**
+	 * Force to set https scheme if https enabled.
+	 *
+	 * @return void
+	 */
+	protected function ensureHttps()
+	{
+		if (config('epesi.https') || config('epesi.secure')) {
+			url()->forceScheme('https');
+			$this->app['request']->server->set('HTTPS', true);
+		}
+	}
 }

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
     {
     	$this->ensureHttps();
     	
-    	if (env('APP_DEBUG', false)) ModuleManager::clearCache();
+    	if (env('APP_DEBUG', false)) {
+    		ModuleManager::clearCache();
+    	}
     	
     	Route::group(['namespace' => 'Epesi\Core', 'middleware' => 'web'], function() {
     		Route::any('/', 'Controller@index');

src/System/Modules/Concerns/HasAssetsAccess.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	}
 	
 	final public static function requireJS($file = 'default.js', $isAsync = false, $isDefer = false) {
-		return ui()->requireJS(self::assetUrl('js/'. $file), $isAsync, $isDefer);
+		return ui()->requireJS(self::assetUrl('js/' . $file), $isAsync, $isDefer);
 	}
 	
 	final public static function requireCSS($file = 'default.css') {
-		return ui()->requireCSS(self::assetUrl('css/'. $file));
+		return ui()->requireCSS(self::assetUrl('css/' . $file));
 	}
 	
 	/**

src/Facades/UI.php

Indentation +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@
 
 class UI extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
-    {
-        return App::class;
-    }
+	/**
+	 * Get the registered name of the component.
+	 *
+	 * @return string
+	 */
+	protected static function getFacadeAccessor()
+	{
+		return App::class;
+	}
 }