Skip to content
This repository has been archived by the owner on Jul 1, 2020. It is now read-only.

Commit

Permalink
aggiornato git ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
BroHPotato committed Apr 2, 2020
1 parent 1b3087f commit a0cb46b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ public/mix-manifest.json

composer.lock
package-lock.json

.php_cs.cache
2 changes: 1 addition & 1 deletion app/Http/Controllers/SensorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct()
public function index($device)
{
$sensors = $this->provider->findAllFromDevice($device);
return view('sensors.index', compact(['sensors', 'device'] ));
return view('sensors.index', compact(['sensors', 'device']));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function store()
unset($data['password_check']);//todo to remove
$data['password'] = "password";
if (!key_exists('entityId', $data)) {
$data['entityId'] =1; //(new EntityServiceProvider())->findFromUser(Auth::id())->entityId;
$data['entityId'] = 1; //(new EntityServiceProvider())->findFromUser(Auth::id())->entityId;
}
if (!key_exists('type', $data)) {
$data['type'] = 0;
Expand Down
1 change: 1 addition & 0 deletions app/Providers/UserServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Auth;

use function config;

/**
Expand Down
4 changes: 2 additions & 2 deletions routes/breadcrumbs.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
// Sensori
Breadcrumbs::for('sensors', function ($trail, $deviceId) {
$trail->parent('device', $deviceId);
$trail->push('Sensori', route('sensors.index', ['deviceId' => $deviceId]));
$trail->push('Sensori', route('sensors.index', ['deviceId' => $deviceId]));
});
Breadcrumbs::for('sensor', function ($trail, $deviceId, $sensorId) {
$trail->parent('sensors', $deviceId);
$trail->push('Sensore ' . $sensorId, route('sensors.index', ['deviceId' => $deviceId, 'sensorId'=> $sensorId]));
$trail->push('Sensore ' . $sensorId, route('sensors.index', ['deviceId' => $deviceId, 'sensorId' => $sensorId]));
});


Expand Down

0 comments on commit a0cb46b

Please sign in to comment.