Working on multi user

This commit is contained in:
Kode
2018-10-14 16:17:55 +01:00
parent e8b47776ce
commit 46bb073001
27 changed files with 184 additions and 38 deletions

View File

@@ -36,4 +36,9 @@ class LoginController extends Controller
{
$this->middleware('guest')->except('logout');
}
public function index()
{
$data =[];
return view('userselect', $data);
}
}

View File

@@ -6,8 +6,26 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Support\Facades\Auth;
use App\User;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
protected $user;
public function __construct()
{
$this->user = $this->user();
}
public function user()
{
if (Auth::check()) { // if logged in, set this user
return Auth::user();
} else { // not logged in, get first user
return User::first();
}
}
}

View File

@@ -31,6 +31,7 @@ class SettingsController extends Controller
public function edit($id)
{
$setting = Setting::find($id);
//die("s: ".$setting->label);
if((bool)$setting->system === true) return abort(404);
@@ -55,6 +56,7 @@ class SettingsController extends Controller
public function update(Request $request, $id)
{
$setting = Setting::find($id);
$user = $this->user();
if (!is_null($setting)) {
$data = Setting::getInput();
@@ -64,17 +66,14 @@ class SettingsController extends Controller
if($request->hasFile('value')) {
$path = $request->file('value')->store('backgrounds');
$setting->value = $path;
$setting_value = $path;
}
} else {
$setting->value = $data->value;
$setting_value = $data->value;
}
$setting->save();
$user->settings()->updateExistingPivot($setting->id, ['value' => $setting_value]);
$route = route('settings.index', [], false);
return redirect($route)
->with([