WIP: Road to 1.0.0 #1

Draft
miguel456 wants to merge 123 commits from develop into master
2 changed files with 17 additions and 9 deletions
Showing only changes of commit bc8570019c - Show all commits

View File

@ -22,11 +22,13 @@
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use Illuminate\Support\Collection;
use Spatie\Permission\Models\Permission;
use Spatie\Permission\Models\Role;
class TeamSeeder extends Seeder
{
/**
* Run the database seeds.
*
@ -54,13 +56,23 @@ class TeamSeeder extends Seeder
$admin = Role::where('name', 'admin')->first();
$reviewer = Role::where('name', 'reviewer')->first();
foreach($teamPermissions as $permission)
foreach($teamPermissions as $permission)
{
foreach ($teamUserPermissions as $userPermission)
{
Permission::create(['name' => $permission]);
Permission::create(['name' => $userPermission]);
$permCheck = Permission::where('name', $permission)->get()->all();
if (empty($permCheck))
{
Permission::create(['name' => $permission]);
}
$userPermCheck = Permission::where('name', $userPermission)->get()->all();
if (empty($userPermCheck))
{
Permission::create(['name' => $userPermission]);
}
}
}
@ -68,9 +80,5 @@ class TeamSeeder extends Seeder
$reviewer->givePermissionTo($teamUserPermissions);
}
}

View File

@ -25,7 +25,7 @@
<nav class="navbar navbar-expand-md navbar-dark navbar-style shadow-sm">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
Raspberry Network
{{ config('app.name') }}
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<span class="navbar-toggler-icon"></span>