removed old navbar and bootstrap template from the user layouts and the admin layouts

This commit is contained in:
2020-05-28 00:02:10 -05:00
parent 0cde363e96
commit 8a21604adb
9 changed files with 144 additions and 287 deletions

View File

@@ -1,70 +0,0 @@
<div class="container-fluid">
<nav class="navbar navbar-expand-sm navbar-light bg-light">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/dashboard">W4RP</a>
<ul class="navbar-nav mr-auto">
@if(auth()->user()->hasRole('Admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspop="true" aria-expanded="false">General Admin</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/admin/dashboard/users">Users</a>
<a class="dropdown-item" href="/admin/dashboard/taxes">Taxes</a>
<a class="dropdown-item" href="/admin/dashboard/logins">Allowed Logins</a>
<a class="dropdown-item" href="/admin/dashboard/wiki">Wiki</a>
<a class="dropdown-item" href="/admin/dashboard/journal">Wallet Journal</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspop="true" aria-expanded="false">Flex Structures</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/flex/display">Display</a>
<a class="dropdown-item" href="/flex/display/add">Add</a>
</div>
</li>
@endif
@if(auth()->user()->hasPermission('moon.admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Moon Admin</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/moons/admin/display/rentals">Display Moons</a>
<a class="dropdown-item" href="/moons/admin/updatemoon">Update Moon</a>
<a class="dropdown-item" href="/moons/admin/display/request">Moon Request</a>
</div>
</li>
@endif
@if(auth()->user()->hasPermission('srp.admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">SRP Admin</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/srp/admin/display">SRP Admin Dashboard</a>
<a class="dropdown-item" href="/srp/admin/statistics">SRP Statistics</a>
<a class="dropdown-item" href="/srp/admin/costcodes/display">SRP Admin Cost Codes</a>
<a class="dropdown-item" href="/srp/admin/display/history">SRP History</a>
</div>
</li>
@endif
@if(auth()->user()->hasPermission('contract.admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contract Admin</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/contracts/admin/display">Admin Dashboard</a>
<a class="dropdown-item" href="/contracts/admin/new">New Contract</a>
</div>
</li>
@endif
</ul>
<ul class="navbar-nav m1-auto">
<li class="nav-item">
<a class="nav-link" href="/scopes/select">Add Esi Scopes</a>
</li>
@if(auth()->user()->hasRole('Admin') || auth()->user()->hasPermission('contract.admin') || auth()->user()->hasPermission('moon.admin') || auth()->user()->hasPermission('srp.admin'))
<li class="nav-item">
<a class="nav-link" href="/dashboard">Dashboard</a>
</li>
@endif
</ul>
</nav>
</div>
<br>

View File

@@ -1,56 +0,0 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-140677389-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-140677389-1');
</script>
<title>{{ config('app.name', 'W4RP Services') }}</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Bootstrap CSS
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous">
-->
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
<link rel="stylesheet" href="{{ asset('css/bootstrap.css') }}">
</head>
<body>
<!-- Top Navbar -->
@include('layouts.admin.navbar')
<!-- Included Messages -->
<div class="container">
@include('inc.messages')
</div>
<!-- Content of the Page -->
@yield('content')
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<!-- Popper.JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<!-- Bootstrap JS -->
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<!-- Icons -->
<script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
<script>
feather.replace()
</script>
</body>
</html>

View File

@@ -0,0 +1,27 @@
<!-- Contract Admin -->
@if(auth()->user()->hasPermission('contract.admin'))
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
Contract Admin<br>
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="/contracts/admin/display" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Admin Dashboard</p>
</a>
</li>
<li class="nav-item">
<a href="/contracts/admin/new" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>New Contract</p>
</a>
</li>
</ul>
</li>
@endif
<!-- End Contract Admin -->

View File

@@ -0,0 +1,45 @@
<!-- General Administrative Stuff -->
@if(auth()->user()->hasRole('Admin'))
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
General<br>
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="/admin/dashboard/users" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Users</p>
</a>
</li>
<li class="nav-item">
<a href="/admin/dashboard/taxes" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Taxes</p>
</a>
</li>
<li class="nav-item">
<a href="/admin/dashboard/logins" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Allowed Logins</p>
</a>
</li>
<li class="nav-item">
<a href="/admin/dashboard/wiki" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Wiki</p>
</a>
</li>
<li class="nav-item">
<a href="/admin/dashboard/journal" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Wallet Journal</p>
</a>
</li>
</ul>
</li>
@endif
<!-- End General Administrative Stuff -->

View File

@@ -0,0 +1,33 @@
<!-- Moon Admin -->
@if(auth()->user()->hasPermission('moon.admin'))
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
Moon Admin<br>
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="/moons/admin/display/rentals" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Display Moons</p>
</a>
</li>
<li class="nav-item">
<a href="/moons/admin/updatemoon" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Update Moon</p>
</a>
</li>
<li class="nav-item">
<a href="/moons/admin/display/request" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>Moon Request</p>
</a>
</li>
</ul>
</li>
@endif
<!-- End Moon Admin -->

View File

@@ -0,0 +1,39 @@
<!-- SRP Admin -->
@if(auth()->user()->hasPermission('srp.admin'))
<li class="nav-item has-treeview">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-tachometer-alt"></i>
<p>
SRP Admin<br>
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="/srp/admin/display" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>SRP Admin Dashboard</p>
</a>
</li>
<li class="nav-item">
<a href="/srp/admin/statistics" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>SRP Statistics</p>
</a>
</li>
<li class="nav-item">
<a href="/srp/admin/costcodes/display" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>SRP Admin Cost Codes</p>
</a>
</li>
<li class="nav-item">
<a href="/srp/admin/display/history" class="nav-link">
<i class="far fa-circle nav-icon"></i>
<p>SRP History</p>
</a>
</li>
</ul>
</li>
@endif
<!-- End SRP Admin -->

View File

@@ -1,40 +0,0 @@
<!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-140677389-1"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-140677389-1');
</script>
<title>{{ config('app.name', 'W4RP Services') }}</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Bootstrap CSS
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/css/bootstrap.min.css" integrity="sha384-Smlep5jCw/wG7hdkwQ/Z5nLIefveQRIY9nfy6xoR1uRYBtpZgI6339F5dgvm/e9B" crossorigin="anonymous">
-->
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
<link rel="stylesheet" href="{{ asset('css/bootstrap.css') }}">
</head>
<body>
@include('layouts.navbar')
<div class="container">
@include('inc.messages')
</div>
@yield('content')
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
</body>
</html>

View File

@@ -1,121 +0,0 @@
<div class="container-fluid">
<nav class="navbar navbar-expand-sm navbar-light bg-light">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="/dashboard">W4RP</a>
<ul class="navbar-nav mr-auto">
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Renter') || 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">Moons</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/moons/display/all">Display All Moons</a>
<a class="dropdown-item" href="/moons/display/rentals">Display Rental Moons</a>
<a class="dropdown-item" href="/moons/display/form/worth">Moon Worth</a>
<a class="dropdown-item" href="/moons/display/request">Moon Reservation</a>
@if(auth()->user()->hasPermission('corp.lead') && auth()->user()->hasEsiScope('esi-industry.read_corporation_mining.v1'))
<a class="dropdown-item" href="/moons/ledger/display/moons">Mining Ledger</a>
@endif
@if(auth()->user()->isMoonRenter())
<a class="dropdown-item" href="/moons/ledger/display/rentals">Moon Rental Ledger</a>
@endif
</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="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">SRP</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/srp/form/display">SRP Form</a>
<a class="dropdown-item" href="/srp/display/costcodes">Cost Codes</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="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Contracts</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/contracts/display/all">Display All Contracts</a>
<a class="dropdown-item" href="/contracts/display/public">Display Public Contracts</a>
<a class="dropdown-item" href="/contracts/display/private">Display Private Contracts</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="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Structures</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
@if(auth()->user()->hasPermission('fc.team'))
<a class="dropdown-item" href="/structures/display/requests">Display Requests</a>
@endif
<a class="dropdown-item" href="/structures/display/form">Request Form</a>
</div>
</li>
@endif
@if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin'))
<a class="nav-link" href="/logistics/fuel/structures">Jump Gate Fuel</a>
@endif
@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="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Wiki</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="https://www.w4rp.space">Wiki</a>
<a class="dropdown-item" href="/wiki/register">Registration</a>
<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="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Others</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="https://buyback.w4rp.space">Buyback Program</a>
<a class="dropdown-item" href="/wormholes/display">Wormholes</a>
<a class="dropdown-item" href="/wormholes/form">Wormhole Form</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="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Blacklist</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/blacklist/display">Display</a>
<a class="dropdown-item" href="/blacklist/display/search">Search</a>
@if(auth()->user()->hasPermission('alliance.recruiter'))
<a class="dropdown-item" href="/blacklist/display/add">Add To</a>
<a class="dropdown-item" href="/blacklist/display/remove">Remove From</a>
@endif
</div>
</li>
@endif
</ul>
<ul class="navbar-nav m1-auto">
<li class="nav-item">
<a class="nav-link" href="/scopes/select">Add Esi Scopes</a>
</li>
@if(auth()->user()->hasPermission('srp.admin'))
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropDownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">SRP Admin</a>
<div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
<a class="dropdown-item" href="/srp/admin/display">SRP Admin Dashboard</a>
<a class="dropdown-item" href="/srp/admin/statistics">SRP Statistics</a>
<a class="dropdown-item" href="/srp/admin/costcodes/display">SRP Admin Cost Codes</a>
<a class="dropdown-item" href="/srp/admin/display/history">SRP History</a>
</div>
</li>
@endif
@if(auth()->user()->hasRole('Admin') || auth()->user()->hasPermission('contract.admin') || auth()->user()->hasPermission('moon.admin'))
<li class="nav-item">
<a class="nav-link" href="/admin/dashboard">Admin Dashboard</a>
</li>
@endif
<li class="nav-item">
<a class="nav-link" href="/profile">Profile</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/logout">Logout</a>
</li>
</ul>
</nav>
</div>
<br>