drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored navbar and added roles to wiki to allow renters to register

Browse Source
This commit is contained in:
drkthunder02
2019-02-28 23:30:43 -06:00
parent cfb0126086
commit bd572cc7dc
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/WikiController.php
View File

@@ -48,6 +48,12 @@ class WikiController extends Controller
$password = md5($request->password);
}
if(Auth::user()->hasRole('User')) {
$role = 1; //User role id from wiki_groupname table
} else if(Auth::user()->hasRole('Renter')) {
$role = 8; //Renter role id from wiki_groupname table
}
//Load the model
$user = new DokuUser;
$member = new DokuMember;
@@ -66,7 +72,7 @@ class WikiController extends Controller
//Get the user from the table to get the uid
$uid = DB::select('SELECT id FROM wiki_user WHERE login = ?', [$name]);
$member->uid = $uid[0]->id;
$member->gid = 1;
$member->gid = $role;
$member->save();
//Return to the dashboard view
return redirect('/dashboard')->with('success', 'Registration successful. Your username is: ' . $name);

7
resources/views/layouts/navbar.blade.php
View File

@@ -8,10 +8,7 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Moons</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
@if(auth()->user()->hasRole('Guest'))
<a class="dropdown-item" href="/moons/display">Display Moons</a>
@endif
@if(auth()->user()->hasRole('User'))
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Renter'))
<a class="dropdown-item" href="/moons/display">Display Moons</a>
<a class="dropdown-item" href="/moons/display/worth">Moon Worth</a>
@endif
@@ -24,6 +21,7 @@
@endif
</div>
</li>
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin') || auth()->user()->hasRole('Renter'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Wiki</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
@@ -32,6 +30,7 @@
<a class="dropdown-item" href="/wiki/changepassword">Change Password</a>
</div>
</li>
@endif
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Others</a>