Fix dropdown and npm run production

This commit is contained in:
dev 2021-08-06 15:57:45 -07:00
parent 934a34f004
commit e6cc674ee8
11 changed files with 58 additions and 69780 deletions

View file

@ -6,12 +6,12 @@ window._ = require('lodash');
* code may be modified to fit the specific needs of your application.
*/
try {
window.Popper = require('popper.js').default;
window.$ = window.jQuery = require('jquery');
require('bootstrap');
} catch (e) {}
// try {
// window.Popper = require('popper.js').default;
// window.$ = window.jQuery = require('jquery');
//
// require('bootstrap');
// } catch (e) {}
/**
* We'll load the axios HTTP library which allows us to easily issue requests

View file

@ -11,6 +11,7 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<script src="{{ url('js/bootstrap.bundle.min.js') }}"></script>
<!-- Styles -->
@if (Session::get('theme'))
<link href="{{ url('') . mix('css/app_' . Session::get('theme') . '.css') }}" rel="stylesheet">
@ -24,7 +25,7 @@
<nav class="navbar navbar-expand-md navbar-light bg-light shadow-sm">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
<img class="img-logo" src="{{ url('logo.png') }}" alt="">
<img class="img-logo" src="{{ url('logo.png') }}" alt="Monero Logo">
</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>
@ -72,7 +73,7 @@
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }}
</a>
@ -80,18 +81,12 @@
<a class="dropdown-item" href="{{ route('dashboard') }}">
{{ __('Dashboard') }}
</a>
{{-- <a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a> --}}
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
<a class="dropdown-item" href="{{ url('user/' . Auth::user()->id) }}">
{{ __('Profile') }}
</a>
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
@csrf
</form>