x-systems / epesi-core

src/Controller.php

Indentation +42 added lines, -42 removed lines

@@ -11,64 +11,64 @@
 
 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.ui.title')]);
+		$ui->title = __(':epesi > Installation', ['epesi' => config('epesi.ui.title')]);
     	
-    	$ui->initLayout(new Layout\Centered());
+		$ui->initLayout(new Layout\Centered());
     	
-    	$ui->layout->set('logo', url('logo'));
-    	$ui->layout->template->dangerouslySetHTML('copyright', config('epesi.ui.copyright'));
+		$ui->layout->set('logo', url('logo'));
+		$ui->layout->template->dangerouslySetHTML('copyright', config('epesi.ui.copyright'));
     	
-    	$ui->add(new System\SystemInstallWizard());
+		$ui->add(new System\SystemInstallWizard());
     	
-    	return $ui->response();
-    }
+		return $ui->response();
+	}
     
-    public function home()
-    {
-    	return redirect(SystemCore::isInstalled()? HomePage\Model\HomePage::pathOfUser(): 'install');
-    }
+	public function home()
+	{
+		return redirect(SystemCore::isInstalled()? HomePage\Model\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 = [$viewClass];
-    		}
-    	}
+			if (class_exists($viewClass)) {
+				$view = [$viewClass];
+			}
+		}
 
-    	if (! $view) abort(404);
+		if (! $view) abort(404);
     	
-    	$location = $ui->add($view)->displayModuleContent($method, $args)->location();
+		$location = $ui->add($view)->displayModuleContent($method, $args)->location();
     	
-    	return $ui->setLocation($location)->response();
-    }
+		return $ui->setLocation($location)->response();
+	}
 }

src/Layout/View/RightMenu.php

Spacing +7 added lines, -7 removed lines

@@ -47,12 +47,12 @@ 
 				'icon' => 'th'
 		], Launchpad::addTo($this)->getJsModal());
 		
-		foreach(UserMenuJoint::collect() as $joint) {
-			foreach ($joint->tools()?: [] as $tool) {
+		foreach (UserMenuJoint::collect() as $joint) {
+			foreach ($joint->tools() ?: [] as $tool) {
 				$this->addTool($tool);
 			}
 
-			foreach ($joint->entries()?: [] as $entry) {
+			foreach ($joint->entries() ?: [] as $entry) {
 				$this->addEntry($entry);
 			}			
 		}
@@ -70,7 +70,7 @@ 
 				'item' => ['Logout', 'icon' => 'sign out', 'attr' => ['onclick' => "event.preventDefault();$('#logout-form').submit();"]],
 				'action' => url('logout'), 
 				'group' => '10000:user',
-				'callback' => function ($item) {
+				'callback' => function($item) {
 					$logoutForm = View::addTo($item, [
 							'id' => 'logout-form', 
 							'attr' => [
@@ -99,14 +99,14 @@ 
 	
 	public function getUserMenuLabel()
 	{
-		return $this->userMenuLabel?: Auth::user()->name;
+		return $this->userMenuLabel ?: Auth::user()->name;
 	}
 	
 	public function addEntry($entry)
 	{
 		$entry = collect(array_merge(['item' => $entry, 'group' => '00500:general', 'weight' => 10], $entry));
 		
-		if (! $entry->get('item')) return;
+		if (!$entry->get('item')) return;
 		
 		$this->entries->add($entry);
 	}
@@ -134,7 +134,7 @@ 
 				
 				$item = $this->userMenu->addItem($entry['item'], $entry->get('action'));
 				
-				if (! $callback = $entry->get('callback')) continue;
+				if (!$callback = $entry->get('callback')) continue;
 					
 				$callback($item);
 			}

src/Layout/View/Launchpad.php

Indentation +21 added lines, -21 removed lines

@@ -27,27 +27,27 @@
 		return new JsModal($this->title, $this->virtualPage);
 	}
 	
-    protected function getContents(VirtualPage $vp)
-    {
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 1',
-    					'icon' => 'user'
-    			])
-    	])->link(URL::to('/'));
+	protected function getContents(VirtualPage $vp)
+	{
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 1',
+						'icon' => 'user'
+				])
+		])->link(URL::to('/'));
     	
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 2',
-    					'icon' => 'car'
-    			])
-    	]);
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 2',
+						'icon' => 'car'
+				])
+		]);
     	
-    	$vp->add([
-    			new LaunchButton([
-    					'label' => 'Test Button 3',
-    					'icon' => 'bus'
-    			])
-    	]);
-    }
+		$vp->add([
+				new LaunchButton([
+						'label' => 'Test Button 3',
+						'icon' => 'bus'
+				])
+		]);
+	}
 }

src/Layout/LayoutView.php

Indentation +62 added lines, -62 removed lines

@@ -10,53 +10,53 @@ 
 
 class LayoutView extends \atk4\ui\Layout
 {
-    use SessionTrait;
+	use SessionTrait;
     
-    /**
-     * @var View\NavMenu
-     */
-    public $menuLeft;    // vertical menu
+	/**
+	 * @var View\NavMenu
+	 */
+	public $menuLeft;    // vertical menu
        
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuTop;        // horizontal menu
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuTop;        // horizontal menu
     
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuRight;   // vertical pull-down
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuRight;   // vertical pull-down
        
-    /**
-     * @var View\ActionBar
-     */
-    public $actionBar;   
-    public $locationBar;
+	/**
+	 * @var View\ActionBar
+	 */
+	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;
 
-    protected function init(): void
-    {
-        parent::init();
+	protected function init(): void
+	{
+		parent::init();
         
-        $this->initMenuTop();
-        $this->initActionBar();
+		$this->initMenuTop();
+		$this->initActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->initMenuLeft();  
-        $this->initMenuRight();
+		$this->initMenuLeft();  
+		$this->initMenuRight();
         
-        $this->template->trySet('version', $this->getApp()->version);
+		$this->template->trySet('version', $this->getApp()->version);
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -65,7 +65,7 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
 	/**
 	 * @return static 
@@ -127,40 +127,40 @@ 
 		$this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    protected function initMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	protected function initMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
+		$this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if ($this->burger) {
-        	$this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
+		if ($this->burger) {
+			$this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         	
-        	$this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [
-        			(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        			(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        			(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        			\atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) {
-        				$this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
-        			}, [$this->menuLeft->js(true)->hasClass('visible')])
-        	]);
-        }
-    }
+			$this->burger->add([\atk4\ui\Icon::class, 'content'])->on('click', [
+					(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+					(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+					(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+					\atk4\ui\JsCallback::addTo($this->burger)->set(function($jsCallback, $visible) {
+						$this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
+					}, [$this->menuLeft->js(true)->hasClass('visible')])
+			]);
+		}
+	}
     
-    protected function initActionBar()
-    {
-    	if (!$this->actionBar) {
-    		$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
-    	}
+	protected function initActionBar()
+	{
+		if (!$this->actionBar) {
+			$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
+		}
     	
-    	return $this;
-    }
+		return $this;
+	}
 
-    public function renderView(): void
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView(): void
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -15,17 +15,17 @@ 
     /**
      * @var View\NavMenu
      */
-    public $menuLeft;    // vertical menu
+    public $menuLeft; // vertical menu
        
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuTop;        // horizontal menu
+    public $menuTop; // horizontal menu
     
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuRight;   // vertical pull-down
+    public $menuRight; // vertical pull-down
        
     /**
      * @var View\ActionBar
@@ -33,7 +33,7 @@ 
     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.

Braces +9 added lines, -3 removed lines

@@ -100,7 +100,9 @@ 
 	
 	protected function initMenuTop()
 	{
-		if ($this->menuTop) return;
+		if ($this->menuTop) {
+			return;
+		}
 		
 		$this->menuTop = Menu::addTo($this, ['atk-topMenu fixed horizontal', 'element' => 'header'], ['TopMenu']);
 		
@@ -122,14 +124,18 @@ 
 
 	protected function initMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menuTop->add(new View\RightMenu(['ui' => false]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
     protected function initMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 

src/System/Logo/LogoSettings.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 		$form->addControl('custom_logo', [\atk4\ui\Form\Control\Checkbox::class, 'caption' => __('Use custom logo')]);
 		
 		$form->model->setMulti([
-		        'title' => Variable::recall('system.title'),
-		        'custom_logo' => (bool) Variable::recall('system.logo')
+				'title' => Variable::recall('system.title'),
+				'custom_logo' => (bool) Variable::recall('system.logo')
 		]);
 		
 		$logo = $form->addControl('logo', [
@@ -76,7 +76,7 @@ 
 				$storage->move($from, $to);
 			}
 
-	        Variable::memorize('system.logo', $logo);
+			Variable::memorize('system.logo', $logo);
 			
 			Variable::memorize('system.title', $form->model->get('title'));
 			

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	public function body()
 	{
 		$layout = View::addTo($this)->addStyle('max-width:1200px;margin:auto;');
-		\atk4\ui\Header::addTo($layout, [ __($this->label)]);
+		\atk4\ui\Header::addTo($layout, [__($this->label)]);
 		$segment = View::addTo($layout, ['ui' => 'segment']);
 
 		$form = Form::addTo($segment);
@@ -53,7 +53,7 @@ 
 			$logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo));
 		});
 
-		$logo->onUpload(function ($files) use ($form, $logo) {
+		$logo->onUpload(function($files) use ($form, $logo) {
 			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];