x-systems / epesi-base

src/Dashboard/Database/Migrations/2019_09_18_173148_create_dashboard_tables.php

Indentation +34 added lines, -34 removed lines

@@ -6,42 +6,42 @@
 
 class CreateDashboardTables extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-    	$this->down();
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		$this->down();
     	
-    	Schema::create('dashboards', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('user_id');
-            $table->string('name', 64);
-            $table->smallInteger('position');
-        });
+		Schema::create('dashboards', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('user_id');
+			$table->string('name', 64);
+			$table->smallInteger('position');
+		});
 
-    	Schema::create('dashboard_applets', function (Blueprint $table) {
-    		$table->increments('id');
-    		$table->unsignedInteger('dashboard_id');
-            $table->string('class', 512);            
-            $table->smallInteger('column');
-            $table->smallInteger('row');
-            $table->text('options');
+		Schema::create('dashboard_applets', function (Blueprint $table) {
+			$table->increments('id');
+			$table->unsignedInteger('dashboard_id');
+			$table->string('class', 512);            
+			$table->smallInteger('column');
+			$table->smallInteger('row');
+			$table->text('options');
             
-            $table->foreign('dashboard_id')->references('id')->on('dashboards');
-        });
-    }
+			$table->foreign('dashboard_id')->references('id')->on('dashboards');
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-    	Schema::dropIfExists('dashboard_applets');
-    	Schema::dropIfExists('dashboards');    	
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('dashboard_applets');
+		Schema::dropIfExists('dashboards');    	
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -15,14 +15,14 @@
     {
     	$this->down();
     	
-    	Schema::create('dashboards', function (Blueprint $table) {
+    	Schema::create('dashboards', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('user_id');
             $table->string('name', 64);
             $table->smallInteger('position');
         });
 
-    	Schema::create('dashboard_applets', function (Blueprint $table) {
+    	Schema::create('dashboard_applets', function(Blueprint $table) {
     		$table->increments('id');
     		$table->unsignedInteger('dashboard_id');
             $table->string('class', 512);            

src/Dashboard/DashboardView.php

Braces +9 added lines, -3 removed lines

@@ -142,7 +142,9 @@ 
 		
 	public function addMenu()
 	{
-		if ($this->isLocked()) return;
+		if ($this->isLocked()) {
+			return;
+		}
 		
 		$dashboardId = $this->dashboard()->id;
 		
@@ -165,14 +167,18 @@ 
 		$dashboardMenu->addItem([__('Rename dashboard'), 'icon' => 'i cursor'])->on('click', $modal->show());
 		
 		// there is only one admin default dashboard
-		if ($this->admin) return;
+		if ($this->admin) {
+			return;
+		}
 		
 		// ***** add ***** //		
 		$modal = $this->add(['Modal', 'title' => __('Add Dashboard')])->set(\Closure::fromCallable([$this, 'addDashboard']));
 		
 		$dashboardMenu->addItem([__('Add dashboard'), 'icon' => 'add'])->on('click', $modal->show());
 		
-		if ($this->isSingleDashboard()) return;
+		if ($this->isSingleDashboard()) {
+			return;
+		}
 		
 		// ***** reorder ***** //
 		$modal = $this->add(['Modal', 'title' => __('Reorder Dashboards')])->set(\Closure::fromCallable([$this, 'reorderDashboards']));

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 	
 	public function body()
 	{
-		if (! $this->isSingleDashboard()) {
+		if (!$this->isSingleDashboard()) {
 			$this->location($this->dashboard()->name);
 		}
 		
@@ -42,7 +42,7 @@ 
 		
 		$applets = $dashboard->applets()->orderBy('column')->orderBy('row')->get();
 
-		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid'  . ($this->isLocked()? ' locked': '')]);
+		$columns = $this->add(['Columns', 'id' => 'dashboard', 'ui' => 'three stackable grid' . ($this->isLocked() ? ' locked' : '')]);
 		
 		foreach ([1, 2, 3] as $columnId) {
 			/** @scrutinizer ignore-call */
@@ -55,7 +55,7 @@ 
 					]
 			]);
 			
-			foreach ($applets->where('column', $columnId) as $applet ) {
+			foreach ($applets->where('column', $columnId) as $applet) {
 				$col->add([
 						new Applet(),
 						'appletId' => $applet->id,
@@ -66,7 +66,7 @@ 
 			}
 		}
 		
-		if (! $this->isLocked()) {
+		if (!$this->isLocked()) {
 			$columns->js(true)->find('.sortable')->sortable([
 					'cursor' => 'move',
 					'handle' => '.panel-sortable-handle',
@@ -84,7 +84,7 @@ 
 					])
 			]));
 			
-			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' .  __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
+			$columns->js(true)->find('.applet-close')->click(new jsFunction(['e'], [new jsExpression('if (confirm("' . __('Delete this applet?') . '")) {$(e.target).closest(".applet").fadeOut(400, function(){var col = $(this).closest(".column.sortable");this.remove();col.trigger("sortupdate");})}')]));
 		}
 		
 		$this->columns = $columns;
@@ -131,7 +131,7 @@ 
 				]
 		]);
 
-		foreach ( AppletJoint::collect() as $applet ) {
+		foreach (AppletJoint::collect() as $applet) {
 			$col->add([
 					new Applet(),
 					'appletId' => 'new_' . str_ireplace('\\', '-', get_class($applet)),
@@ -260,10 +260,10 @@ 
 	{
 		$dashboard = Dashboard::find($dashboardId);
 
-		return $dashboard->delete()? [
+		return $dashboard->delete() ? [
 				$this->notify(__('Dashboard ":name" deleted, redirecting ...', ['name' => $dashboard->name])),
 				new jsExpression('window.setTimeout(function() {window.location.replace([])}, 1200)', [self::selfLink()])
-		]: $this->notifyError(__('Error deleting dashboard'));
+		] : $this->notifyError(__('Error deleting dashboard'));
 	}
 	
 	public function reorderDashboards($view)
@@ -282,7 +282,7 @@ 
 		$grid = $view->add(['Grid', 'paginator' => false, 'menu' => false]);
 		$grid->setModel(new \atk4\data\Model(new \atk4\data\Persistence_Static($rows)));
 		
-		$grid->addDragHandler()->onReorder(function ($order) use ($dashboards) {
+		$grid->addDragHandler()->onReorder(function($order) use ($dashboards) {
 			$result = true;
 			foreach ($dashboards as $dashboard) {
 				$dashboard->position = array_search($dashboard->id, $order);
@@ -290,7 +290,7 @@ 
 				$result &= $dashboard->save();
 			}
 			
-			return $result? $this->notify(__('Dashboards reordered!')): $this->notifyError(__('Error saving order!'));
+			return $result ? $this->notify(__('Dashboards reordered!')) : $this->notifyError(__('Error saving order!'));
 		});
 			
 		$view->add(['View', 'ui' => 'buttons'])->add(['Button', __('Done'), 'primary'])->on('click', new jsExpression('location.reload()'));
@@ -367,7 +367,7 @@ 
 	
 	public function isLocked()
 	{
-		return $this->locked || ! Auth::user()->can('edit dashboard');
+		return $this->locked || !Auth::user()->can('edit dashboard');
 	}
 	
 	protected function isSingleDashboard()
@@ -383,18 +383,18 @@ 
 	 */
 	protected function dashboard()
 	{
-		if (! is_object($this->dashboard)) {
-			$this->dashboard = $this->dashboard? Dashboard::find($this->dashboard): $this->defaultUserDashboard();
+		if (!is_object($this->dashboard)) {
+			$this->dashboard = $this->dashboard ? Dashboard::find($this->dashboard) : $this->defaultUserDashboard();
 		}
 
-		return $this->dashboard?: abort(404);
+		return $this->dashboard ?: abort(404);
 	}
 	
 	protected function defaultUserDashboard()
 	{
 		$userDashboard = $this->userDashboards()->orderBy('position')->first();
 		
-		if (! $userDashboard) {
+		if (!$userDashboard) {
 			$this->lock();
 			
 			$userDashboard = $this->defaultSystemDashboard();
@@ -418,6 +418,6 @@ 
 	 */
 	protected function userId()
 	{
-		return $this->admin? 0: Auth::id();
+		return $this->admin ? 0 : Auth::id();
 	}
 }

src/Dashboard/Seeds/Applet.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 			$this->set($joint->info())->setAttr('searchkey', strtolower($joint->caption() . ';' . $joint->info()));
 		}
 		else {
-			if (! $this->locked) {
+			if (!$this->locked) {
 				$this->addControl('close', 'applet-close')->setAttr('title', __('Close applet'));
 			}
 			

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 		
 		if ($this->admin) {
 			$this->set($joint->info())->setAttr('searchkey', strtolower($joint->caption() . ';' . $joint->info()));
-		}
-		else {
+		} else {
 			if (! $this->locked) {
 				$this->addControl('close', 'applet-close')->setAttr('title', __('Close applet'));
 			}

src/Dashboard/Integration/DashboardNavMenu.php

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 			];
 		}
 
-		return $ret? [
-				__('DASHBOARD') => count($ret) > 1? [
+		return $ret ? [
+				__('DASHBOARD') => count($ret) > 1 ? [
 						'access' => true,
 						'group' => $ret,
 						'weight' => -10000
-				]: array_merge(reset($ret), ['weight' => -10000]),
-		]: [];
+				] : array_merge(reset($ret), ['weight' => -10000]),
+		] : [];
 	}
 }
\ No newline at end of file

src/Dashboard/DashboardCore.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
+			if (!$defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
 			
 			$userDefaultDashboard = $defaultDashboard->replicate();
 			

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	{
 		// create user default dashboard as copy of the system default
 		User::created(function(User $user) {
-			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) return;
+			if (! $defaultDashboard = Dashboard::where('user_id', 0)->first()) {
+				return;
+			}
 			
 			$userDefaultDashboard = $defaultDashboard->replicate();