Procházet zdrojové kódy

feat: ✨ Moved "Configurations" to settings

IceToast před 3 roky
rodič
revize
51c7361d73

+ 3 - 72
app/Http/Controllers/Admin/ConfigurationController.php

@@ -2,81 +2,12 @@
 
 
 namespace App\Http\Controllers\Admin;
 namespace App\Http\Controllers\Admin;
 
 
-use App\Http\Controllers\Controller;
 use App\Models\Configuration;
 use App\Models\Configuration;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\View\Factory;
-use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Http\Response;
 
 
-class ConfigurationController extends Controller
+class ConfigurationController
 {
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return Application|Factory|View|Response
-     */
-    public function index()
-    {
-        return view('admin.configurations.index');
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     * @return Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param Configuration $configuration
-     * @return Response
-     */
-    public function show(Configuration $configuration)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param Configuration $configuration
-     * @return Response
-     */
-    public function edit(Configuration $configuration)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param Request $request
-     * @param Configuration $configuration
-     * @return Response
-     */
-    public function update(Request $request, Configuration $configuration)
-    {
-        //
-    }
-
     /**
     /**
      * @param Request $request
      * @param Request $request
      * @return \Illuminate\Http\RedirectResponse
      * @return \Illuminate\Http\RedirectResponse
@@ -92,7 +23,7 @@ class ConfigurationController extends Controller
 
 
         $configuration->update($request->all());
         $configuration->update($request->all());
 
 
-        return redirect()->route('admin.configurations.index')->with('success', __('configuration has been updated!'));
+        return redirect()->route('admin.settings.index')->with('success', __('configuration has been updated!'));
     }
     }
 
 
     /**
     /**
@@ -112,7 +43,7 @@ class ConfigurationController extends Controller
 
 
         return datatables($query)
         return datatables($query)
             ->addColumn('actions', function (Configuration $configuration) {
             ->addColumn('actions', function (Configuration $configuration) {
-                return '<button data-content="'.__("Edit").'" data-toggle="popover" data-trigger="hover" data-placement="top" onclick="configuration.parse(\'' . $configuration->key . '\',\'' . $configuration->value . '\',\'' . $configuration->type . '\')" data-content="Edit" data-trigger="hover" data-toggle="tooltip" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></button> ';
+                return '<button data-content="' . __("Edit") . '" data-toggle="popover" data-trigger="hover" data-placement="top" onclick="configuration.parse(\'' . $configuration->key . '\',\'' . $configuration->value . '\',\'' . $configuration->type . '\')" data-content="Edit" data-trigger="hover" data-toggle="tooltip" class="btn btn-sm btn-info mr-1"><i class="fas fa-pen"></i></button> ';
             })
             })
             ->editColumn('created_at', function (Configuration $configuration) {
             ->editColumn('created_at', function (Configuration $configuration) {
                 return $configuration->created_at ? $configuration->created_at->diffForHumans() : '';
                 return $configuration->created_at ? $configuration->created_at->diffForHumans() : '';

+ 0 - 63
resources/views/admin/configurations/editModel.blade.php

@@ -1,63 +0,0 @@
-<!-- The Modal -->
-<div class="modal fade" id="editConfigurationModel">
-    <div class="modal-dialog">
-        <div class="modal-content ">
-
-            <form method="post" action="{{route('admin.configurations.updatevalue')}}">
-                @csrf
-                    @method('PATCH')
-                <!-- Modal Header -->
-                <div class="modal-header">
-                    <h4 class="modal-title">{{__('Edit Configuration')}}</h4>
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                </div>
-
-                <!-- Modal body -->
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label id="keyLabel" for="value">{{__('Text Field')}}</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text">
-                                    <i class="fa fa-cog"></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <input hidden id="key" name="key" type="text" class="form-control" required="required">
-                    </div>
-                </div>
-
-                <!-- Modal footer -->
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-danger" data-dismiss="modal">{{__('Cancel')}}</button>
-                    <button type="submit" class="btn btn-primary">{{__('Save')}}</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-
-<script>
-    window.configuration = {
-        parse(key, value, type) {
-            $('#keyLabel').html(key)
-            $('#key').val(key)
-            $('#value').remove();
-            if (type === 'integer') {
-                $('.input-group').append('<input id="value" name="value" type="number" class="form-control" required="required">')
-            } else if (type === 'boolean') {
-                $('.input-group').append('<select id="value" name="value" class="form-control" required=required>' +
-                    '<option value="true">true</option>' +
-                    '<option value="false">false</option>' +
-                    '</select>')
-            } else if (type === 'string') {
-                $('.input-group').append('<input id="value" name="value" type="text" class="form-control" required="required">')
-            }
-            $('#value').val(value)
-            $('#editConfigurationModel').modal('show')
-        }
-    }
-</script>

+ 0 - 91
resources/views/admin/configurations/index.blade.php

@@ -1,91 +0,0 @@
-@extends('layouts.main')
-
-@section('content')
-    <!-- CONTENT HEADER -->
-    <section class="content-header">
-        <div class="container-fluid">
-            <div class="row mb-2">
-                <div class="col-sm-6">
-                    <h1>{{__('Configurations')}}</h1>
-                </div>
-                <div class="col-sm-6">
-                    <ol class="breadcrumb float-sm-right">
-                        <li class="breadcrumb-item"><a href="{{route('home')}}"{{__('Dashboard')}}</a></li>
-                        <li class="breadcrumb-item"><a class="text-muted"
-                                                       href="{{route('admin.configurations.index')}}">{{__('Configurations')}}</a></li>
-                    </ol>
-                </div>
-            </div>
-        </div>
-    </section>
-    <!-- END CONTENT HEADER -->
-
-    <!-- MAIN CONTENT -->
-    <section class="content">
-        <div class="container-fluid">
-
-            <div class="card">
-
-                <div class="card-header">
-                    <div class="d-flex justify-content-between">
-                        <h5 class="card-title"><i class="fas fa-cog mr-2"></i>{{__('Configurations')}}</h5>
-                    </div>
-                </div>
-
-                <div class="card-body table-responsive">
-
-                    <table id="datatable" class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th>{{__('Key')}}</th>
-                            <th>{{__('Value')}}</th>
-                            <th>{{__('Type')}}</th>
-                            <th width="600">{{__('Description')}}</th>
-                            <th>{{__('Created at')}}</th>
-                            <th></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        </tbody>
-                    </table>
-
-                </div>
-            </div>
-
-
-        </div>
-        <!-- END CUSTOM CONTENT -->
-
-    </section>
-    <!-- END CONTENT -->
-
-    @include('admin.configurations.editModel')
-
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            $('#datatable').DataTable({
-                language: {
-                    url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{config("app.datatable_locale")}}.json'
-                },
-                processing: true,
-                serverSide: true,
-                stateSave: true,
-                ajax: "{{route('admin.configurations.datatable')}}",
-                columns: [
-                    {data: 'key'},
-                    {data: 'value'},
-                    {data: 'type'},
-                    {data: 'description'},
-                    {data: 'created_at'},
-                    {data: 'actions', sortable: false},
-                ],
-                fnDrawCallback: function( oSettings ) {
-                    $('[data-toggle="popover"]').popover();
-                }
-            });
-        });
-    </script>
-
-
-
-@endsection

+ 121 - 0
resources/views/admin/settings/tabs/configurations.blade.php

@@ -0,0 +1,121 @@
+<div class="tab-pane mt-3 active" id="configurations">
+    <table id="datatable" class="table table-striped">
+        <thead>
+            <tr>
+                <th>{{ __('Key') }}</th>
+                <th>{{ __('Value') }}</th>
+                <th>{{ __('Type') }}</th>
+                <th width="600">{{ __('Description') }}</th>
+                <th>{{ __('Created at') }}</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+        </tbody>
+    </table>
+</div>
+
+
+
+<!-- The Modal -->
+<div class="modal fade" id="editConfigurationModel">
+    <div class="modal-dialog">
+        <div class="modal-content ">
+
+            <form method="post" action="{{ route('admin.configurations.updatevalue') }}">
+                @csrf
+                @method('PATCH')
+                <!-- Modal Header -->
+                <div class="modal-header">
+                    <h4 class="modal-title">{{ __('Edit Configuration') }}</h4>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+
+                <!-- Modal body -->
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label id="keyLabel" for="value">{{ __('Text Field') }}</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text">
+                                    <i class="fa fa-cog"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <input hidden id="key" name="key" type="text" class="form-control" required="required">
+                    </div>
+                </div>
+
+                <!-- Modal footer -->
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger" data-dismiss="modal">{{ __('Cancel') }}</button>
+                    <button type="submit" class="btn btn-primary">{{ __('Save') }}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+    window.configuration = {
+        parse(key, value, type) {
+            $('#keyLabel').html(key)
+            $('#key').val(key)
+            $('#value').remove();
+            if (type === 'integer') {
+                $('.input-group').append(
+                    '<input id="value" name="value" type="number" class="form-control" required="required">')
+            } else if (type === 'boolean') {
+                $('.input-group').append('<select id="value" name="value" class="form-control" required=required>' +
+                    '<option value="true">true</option>' +
+                    '<option value="false">false</option>' +
+                    '</select>')
+            } else if (type === 'string') {
+                $('.input-group').append(
+                    '<input id="value" name="value" type="text" class="form-control" required="required">')
+            }
+            $('#value').val(value)
+            $('#editConfigurationModel').modal('show')
+        }
+    }
+</script>
+
+<script>
+    document.addEventListener("DOMContentLoaded", function() {
+        $('#datatable').DataTable({
+            language: {
+                url: '//cdn.datatables.net/plug-ins/1.11.3/i18n/{{ config('app.datatable_locale') }}.json'
+            },
+            processing: true,
+            serverSide: true,
+            stateSave: true,
+            ajax: "{{ route('admin.configurations.datatable') }}",
+            columns: [{
+                    data: 'key'
+                },
+                {
+                    data: 'value'
+                },
+                {
+                    data: 'type'
+                },
+                {
+                    data: 'description'
+                },
+                {
+                    data: 'created_at'
+                },
+                {
+                    data: 'actions',
+                    sortable: false
+                },
+            ],
+            fnDrawCallback: function(oSettings) {
+                $('[data-toggle="popover"]').popover();
+            }
+        });
+    });
+</script>

+ 1 - 1
resources/views/admin/settings/tabs/dashboard.blade.php

@@ -1,4 +1,4 @@
-<div class="tab-pane mt-3 active" id="dashboard">
+<div class="tab-pane mt-3" id="dashboard">
     <form method="POST" enctype="multipart/form-data" class="mb-3"
     <form method="POST" enctype="multipart/form-data" class="mb-3"
         action="{{ route('admin.settings.update.icons') }}">
         action="{{ route('admin.settings.update.icons') }}">
         @csrf
         @csrf

+ 398 - 400
resources/views/layouts/main.blade.php

@@ -1,5 +1,6 @@
 <!doctype html>
 <!doctype html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
 <head>
 <head>
     <meta charset="utf-8">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -7,442 +8,439 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>{{ config('app.name', 'Laravel') }}</title>
     <title>{{ config('app.name', 'Laravel') }}</title>
     <link rel="icon"
     <link rel="icon"
-          href="{{\Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico')}}"
-          type="image/x-icon">
+        href="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('favicon.ico') ? asset('storage/favicon.ico') : asset('favicon.ico') }}"
+        type="image/x-icon">
 
 
     <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
     <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
 
 
-    {{--    <link rel="stylesheet" href="{{asset('css/adminlte.min.css')}}">--}}
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.24/datatables.min.css"/>
+    {{-- <link rel="stylesheet" href="{{asset('css/adminlte.min.css')}}"> --}}
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.24/datatables.min.css" />
 
 
-    {{--  summernote --}}
-    <link rel="stylesheet" href="{{asset('plugins/summernote/summernote-bs4.min.css')}}">
+    {{-- summernote --}}
+    <link rel="stylesheet" href="{{ asset('plugins/summernote/summernote-bs4.min.css') }}">
 
 
-    {{--  datetimepicker --}}
-    <link rel="stylesheet" href="{{asset('plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css')}}">
+    {{-- datetimepicker --}}
+    <link rel="stylesheet"
+        href="{{ asset('plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css') }}">
 
 
     {{-- select2 --}}
     {{-- select2 --}}
-    <link rel="stylesheet" href="{{asset('plugins/select2/css/select2.min.css')}}">
+    <link rel="stylesheet" href="{{ asset('plugins/select2/css/select2.min.css') }}">
 
 
-    <link rel="stylesheet" href="{{asset('css/app.css')}}">
-    <link rel="preload" href="{{asset('plugins/fontawesome-free/css/all.min.css')}}" as="style"
-          onload="this.onload=null;this.rel='stylesheet'">
+    <link rel="stylesheet" href="{{ asset('css/app.css') }}">
+    <link rel="preload" href="{{ asset('plugins/fontawesome-free/css/all.min.css') }}" as="style"
+        onload="this.onload=null;this.rel='stylesheet'">
     <noscript>
     <noscript>
-        <link rel="stylesheet" href="{{asset('plugins/fontawesome-free/css/all.min.css')}}">
+        <link rel="stylesheet" href="{{ asset('plugins/fontawesome-free/css/all.min.css') }}">
     </noscript>
     </noscript>
 </head>
 </head>
+
 <body class="sidebar-mini layout-fixed dark-mode" style="height: auto;">
 <body class="sidebar-mini layout-fixed dark-mode" style="height: auto;">
-<div class="wrapper">
-    <!-- Navbar -->
-    <nav class="main-header sticky-top navbar navbar-expand navbar-dark navbar-light">
-        <!-- Left navbar links -->
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
-            </li>
-            <li class="nav-item d-none d-sm-inline-block">
-                <a href="{{route('home')}}" class="nav-link"><i class="fas fa-home mr-2"></i>{{__('Home')}}</a>
-            </li>
-            <li class="nav-item d-none d-sm-inline-block">
-                <a href="{{env('DISCORD_INVITE_URL')}}" class="nav-link" target="__blank"><i
-                        class="fab fa-discord mr-2"></i>{{__('Discord')}}</a>
-            </li>
-            <!-- Language Selection -->
-            <li class="nav-item dropdown">
-                <a class="nav-link" href="#" id="languageDropdown" role="button" data-toggle="dropdown"
-                   aria-haspopup="true"
-                   aria-expanded="false">
-                    <span class="mr-1 d-lg-inline text-gray-600">
-                        <small><i class="fa fa-language mr-2"></i></small>{{__("Languages")}}
-                    </span>
-                </a>
-                <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="changeLocale">
-                    <form method="post" action="{{route('changeLocale')}}" class="nav-item text-center">
-                        @csrf
-                        @foreach (config("app.available_locales") as $key=>$value)
-                            @if(!in_array(strtolower($key),UNSUPPORTED_LANGS))
-                                <button class="dropdown-item" name="inputLocale" value="{{$value}}">
-                                    {{$key}}
-                                </button>
-                            @endif
+    <div class="wrapper">
+        <!-- Navbar -->
+        <nav class="main-header sticky-top navbar navbar-expand navbar-dark navbar-light">
+            <!-- Left navbar links -->
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i
+                            class="fas fa-bars"></i></a>
+                </li>
+                <li class="nav-item d-none d-sm-inline-block">
+                    <a href="{{ route('home') }}" class="nav-link"><i
+                            class="fas fa-home mr-2"></i>{{ __('Home') }}</a>
+                </li>
+                <li class="nav-item d-none d-sm-inline-block">
+                    <a href="{{ env('DISCORD_INVITE_URL') }}" class="nav-link" target="__blank"><i
+                            class="fab fa-discord mr-2"></i>{{ __('Discord') }}</a>
+                </li>
+                <!-- Language Selection -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link" href="#" id="languageDropdown" role="button" data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="false">
+                        <span class="mr-1 d-lg-inline text-gray-600">
+                            <small><i class="fa fa-language mr-2"></i></small>{{ __('Languages') }}
+                        </span>
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
+                        aria-labelledby="changeLocale">
+                        <form method="post" action="{{ route('changeLocale') }}" class="nav-item text-center">
+                            @csrf
+                            @foreach (config('app.available_locales') as $key => $value)
+                                @if (!in_array(strtolower($key), UNSUPPORTED_LANGS))
+                                    <button class="dropdown-item" name="inputLocale" value="{{ $value }}">
+                                        {{ $key }}
+                                    </button>
+                                @endif
+
+                            @endforeach
+
+                        </form>
+                    </div>
+                </li>
+                <!-- End Language Selection -->
+            </ul>
+
+            <!-- Right navbar links -->
+            <ul class="navbar-nav ml-auto">
+                <!-- Notifications Dropdown Menu -->
+                <li class="nav-item dropdown">
+                    <a class="nav-link" data-toggle="dropdown" href="#">
+                        <i class="far fa-bell"></i>
+                        @if (Auth::user()->unreadNotifications->count() != 0)
+                            <span
+                                class="badge badge-warning navbar-badge">{{ Auth::user()->unreadNotifications->count() }}</span>
+                        @endif
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
+                        <span class="dropdown-item dropdown-header">{{ Auth::user()->unreadNotifications->count() }}
+                            {{ __('Notifications') }}</span>
+                        <div class="dropdown-divider"></div>
 
 
+                        @foreach (Auth::user()->unreadNotifications->sortBy('created_at')->take(5)
+    as $notification)
+                            <a href="{{ route('notifications.show', $notification->id) }}" class="dropdown-item">
+                                <span class="d-inline-block text-truncate" style="max-width: 150px;"><i
+                                        class="fas fa-envelope mr-2"></i>{{ $notification->data['title'] }}</span>
+                                <span
+                                    class="float-right text-muted text-sm">{{ $notification->created_at->longAbsoluteDiffForHumans() }}
+                                    ago</span>
+                            </a>
                         @endforeach
                         @endforeach
 
 
-                    </form>
-                </div>
-            </li>
-            <!-- End Language Selection -->
-        </ul>
-
-        <!-- Right navbar links -->
-        <ul class="navbar-nav ml-auto">
-            <!-- Notifications Dropdown Menu -->
-            <li class="nav-item dropdown">
-                <a class="nav-link" data-toggle="dropdown" href="#">
-                    <i class="far fa-bell"></i>
-                    @if(Auth::user()->unreadNotifications->count() != 0)
-                        <span
-                            class="badge badge-warning navbar-badge">{{Auth::user()->unreadNotifications->count()}}</span>
-                    @endif
-                </a>
-                <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
-                    <span
-                        class="dropdown-item dropdown-header">{{Auth::user()->unreadNotifications->count()}} {{__('Notifications')}}</span>
-                    <div class="dropdown-divider"></div>
-
-                    @foreach(Auth::user()->unreadNotifications->sortBy('created_at')->take(5) as $notification)
-                        <a href="{{route('notifications.show' , $notification->id)}}" class="dropdown-item">
-                            <span class="d-inline-block text-truncate" style="max-width: 150px;"><i
-                                    class="fas fa-envelope mr-2"></i>{{$notification->data['title']}}</span>
-                            <span
-                                class="float-right text-muted text-sm">{{$notification->created_at->longAbsoluteDiffForHumans()}} ago</span>
-                        </a>
-                    @endforeach
-
-                    <div class="dropdown-divider"></div>
-                    <a href="{{route('notifications.index')}}"
-                       class="dropdown-item dropdown-footer">{{__('See all Notifications')}}</a>
-                </div>
-            </li>
-
-            <li class="nav-item dropdown">
-                <a class="nav-link" href="#" id="userDropdown" role="button" data-toggle="dropdown"
-                   aria-haspopup="true"
-                   aria-expanded="false">
-                    <span class="mr-1 d-lg-inline text-gray-600">
-                        <small><i class="fas fa-coins mr-2"></i></small>{{Auth::user()->credits()}}
-                    </span>
-                </a>
-                <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">
-                    <a class="dropdown-item" href="{{route('store.index')}}">
-                        <i class="fas fa-coins fa-sm fa-fw mr-2 text-gray-400"></i>
-                        {{__('Store')}}
-                    </a>
-                    <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" data-toggle="modal" data-target="#redeemVoucherModal"
-                       href="javascript:void(0)">
-                        <i class="fas fa-money-check-alt fa-sm fa-fw mr-2 text-gray-400"></i>
-                        {{__('Redeem code')}}
-                    </a>
-                </div>
-            </li>
-
-            <li class="nav-item dropdown no-arrow">
-                <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown"
-                   aria-haspopup="true"
-                   aria-expanded="false">
-                    <span class="mr-1 d-lg-inline text-gray-600 small">
-                        {{Auth::user()->name}}
-                        <img width="28px" height="28px" class="rounded-circle ml-1" src="{{Auth::user()->getAvatar()}}">
-                    </span>
-                </a>
-                <!-- Dropdown - User Information -->
-                <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in" aria-labelledby="userDropdown">
-                    <a class="dropdown-item" href="{{route('profile.index')}}">
-                        <i class="fas fa-user fa-sm fa-fw mr-2 text-gray-400"></i>
-                        {{__('Profile')}}
-                    </a>
-                    {{--                    <a class="dropdown-item" href="#">--}}
-                    {{--                        <i class="fas fa-list fa-sm fa-fw mr-2 text-gray-400"></i>--}}
-                    {{--                        Activity Log--}}
-                    {{--                    </a>--}}
-                    @if(session()->get('previousUser'))
                         <div class="dropdown-divider"></div>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="{{route('users.logbackin')}}">
-                            <i class="fas fa-sign-in-alt fa-sm fa-fw mr-2 text-gray-400"></i>
-                            {{__('Log back in')}}
+                        <a href="{{ route('notifications.index') }}"
+                            class="dropdown-item dropdown-footer">{{ __('See all Notifications') }}</a>
+                    </div>
+                </li>
+
+                <li class="nav-item dropdown">
+                    <a class="nav-link" href="#" id="userDropdown" role="button" data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="false">
+                        <span class="mr-1 d-lg-inline text-gray-600">
+                            <small><i class="fas fa-coins mr-2"></i></small>{{ Auth::user()->credits() }}
+                        </span>
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
+                        aria-labelledby="userDropdown">
+                        <a class="dropdown-item" href="{{ route('store.index') }}">
+                            <i class="fas fa-coins fa-sm fa-fw mr-2 text-gray-400"></i>
+                            {{ __('Store') }}
                         </a>
                         </a>
-                    @endif
-                    <div class="dropdown-divider"></div>
-                    <form method="post" action="{{route('logout')}}">
-                        @csrf
-                        <button class="dropdown-item" href="#" data-toggle="modal" data-target="#logoutModal">
-                            <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
-                            {{__('Logout')}}
-                        </button>
-                    </form>
-                </div>
-            </li>
-        </ul>
-    </nav>
-    <!-- /.navbar -->
-    <!-- Main Sidebar Container -->
-    <aside class="main-sidebar sidebar-open sidebar-dark-primary elevation-4">
-        <!-- Brand Logo -->
-        <a href="{{route('home')}}" class="brand-link">
-            <img width="64" height="64"
-                 src="{{\Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/bitsec.png')}}"
-                 alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle" style="opacity: .8">
-            <span class="brand-text font-weight-light">{{ config('app.name', 'Laravel') }}</span>
-        </a>
-
-        <!-- Sidebar -->
-        <div class="sidebar" style="overflow-y: auto">
-
-            <!-- Sidebar Menu -->
-            <nav class="my-2">
-                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
-                    data-accordion="false">
-                    <!-- Add icons to the links using the .nav-icon class
-                         with font-awesome or any other icon font library -->
-                    <li class="nav-item">
-                        <a href="{{route('home')}}" class="nav-link @if(Request::routeIs('home')) active @endif">
-                            <i class="nav-icon fa fa-home"></i>
-                            <p>{{__('Dashboard')}}</p>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" data-toggle="modal" data-target="#redeemVoucherModal"
+                            href="javascript:void(0)">
+                            <i class="fas fa-money-check-alt fa-sm fa-fw mr-2 text-gray-400"></i>
+                            {{ __('Redeem code') }}
                         </a>
                         </a>
-                    </li>
-
-                    <li class="nav-item">
-                        <a href="{{route('servers.index')}}"
-                           class="nav-link @if(Request::routeIs('servers.*')) active @endif">
-                            <i class="nav-icon fa fa-server"></i>
-                            <p>{{__('Servers')}}
-                                <span
-                                    class="badge badge-info right">{{Auth::user()->servers()->count()}} / {{Auth::user()->server_limit}}</span>
-                            </p>
+                    </div>
+                </li>
+
+                <li class="nav-item dropdown no-arrow">
+                    <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="false">
+                        <span class="mr-1 d-lg-inline text-gray-600 small">
+                            {{ Auth::user()->name }}
+                            <img width="28px" height="28px" class="rounded-circle ml-1"
+                                src="{{ Auth::user()->getAvatar() }}">
+                        </span>
+                    </a>
+                    <!-- Dropdown - User Information -->
+                    <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
+                        aria-labelledby="userDropdown">
+                        <a class="dropdown-item" href="{{ route('profile.index') }}">
+                            <i class="fas fa-user fa-sm fa-fw mr-2 text-gray-400"></i>
+                            {{ __('Profile') }}
                         </a>
                         </a>
-                    </li>
-
-                    @if(env('PAYPAL_SECRET') && env('PAYPAL_CLIENT_ID') || env('APP_ENV', 'local') == 'local')
-                        <li class="nav-item">
-                            <a href="{{route('store.index')}}"
-                               class="nav-link @if(Request::routeIs('store.*') || Request::routeIs('checkout')) active @endif">
-                                <i class="nav-icon fa fa-coins"></i>
-                                <p>{{__('Store')}}</p>
+                        {{-- <a class="dropdown-item" href="#"> --}}
+                        {{-- <i class="fas fa-list fa-sm fa-fw mr-2 text-gray-400"></i> --}}
+                        {{-- Activity Log --}}
+                        {{-- </a> --}}
+                        @if (session()->get('previousUser'))
+                            <div class="dropdown-divider"></div>
+                            <a class="dropdown-item" href="{{ route('users.logbackin') }}">
+                                <i class="fas fa-sign-in-alt fa-sm fa-fw mr-2 text-gray-400"></i>
+                                {{ __('Log back in') }}
                             </a>
                             </a>
-                        </li>
-                    @endif
-
-                    @if(Auth::user()->role == 'admin')
-
-                        <li class="nav-header">{{__('Administration')}}</li>
-
+                        @endif
+                        <div class="dropdown-divider"></div>
+                        <form method="post" action="{{ route('logout') }}">
+                            @csrf
+                            <button class="dropdown-item" href="#" data-toggle="modal" data-target="#logoutModal">
+                                <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
+                                {{ __('Logout') }}
+                            </button>
+                        </form>
+                    </div>
+                </li>
+            </ul>
+        </nav>
+        <!-- /.navbar -->
+        <!-- Main Sidebar Container -->
+        <aside class="main-sidebar sidebar-open sidebar-dark-primary elevation-4">
+            <!-- Brand Logo -->
+            <a href="{{ route('home') }}" class="brand-link">
+                <img width="64" height="64"
+                    src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png') ? asset('storage/icon.png') : asset('images/bitsec.png') }}"
+                    alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
+                    style="opacity: .8">
+                <span class="brand-text font-weight-light">{{ config('app.name', 'Laravel') }}</span>
+            </a>
+
+            <!-- Sidebar -->
+            <div class="sidebar" style="overflow-y: auto">
+
+                <!-- Sidebar Menu -->
+                <nav class="my-2">
+                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
+                        data-accordion="false">
+                        <!-- Add icons to the links using the .nav-icon class
+                         with font-awesome or any other icon font library -->
                         <li class="nav-item">
                         <li class="nav-item">
-                            <a href="{{route('admin.overview.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.overview.*')) active @endif">
+                            <a href="{{ route('home') }}" class="nav-link @if (Request::routeIs('home')) active @endif">
                                 <i class="nav-icon fa fa-home"></i>
                                 <i class="nav-icon fa fa-home"></i>
-                                <p>{{__('Overview')}}</p>
+                                <p>{{ __('Dashboard') }}</p>
                             </a>
                             </a>
                         </li>
                         </li>
 
 
                         <li class="nav-item">
                         <li class="nav-item">
-                            <a href="{{route('admin.configurations.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.configurations.*')) active @endif">
-                                <i class="nav-icon fas fa-cogs"></i>
-                                <p>{{__('Configurations')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.settings.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.settings.*')) active @endif">
-                                <i class="nav-icon fas fa-tools"></i>
-                                <p>{{__('Settings')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.api.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.api.*')) active @endif">
-                                <i class="nav-icon fa fa-gamepad"></i>
-                                <p>{{__('Application API')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-header">{{__('Management')}}</li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.users.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.users.*')) active @endif">
-                                <i class="nav-icon fas fa-users"></i>
-                                <p>{{__('Users')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.servers.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.servers.*')) active @endif">
-                                <i class="nav-icon fas fa-server"></i>
-                                <p>{{__('Servers')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.products.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.products.*')) active @endif">
-                                <i class="nav-icon fas fa-sliders-h"></i>
-                                <p>{{__('Products')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.store.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.store.*')) active @endif">
-                                <i class="nav-icon fas fa-shopping-basket"></i>
-                                <p>{{__('Store')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.vouchers.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.vouchers.*')) active @endif">
-                                <i class="nav-icon fas fa-money-check-alt"></i>
-                                <p>{{__('Vouchers')}}</p>
-                            </a>
-                        </li>
-
-                        {{--                        <li class="nav-header">Pterodactyl</li>--}}
-
-                        {{--                        <li class="nav-item">--}}
-                        {{--                            <a href="{{route('admin.nodes.index')}}"--}}
-                        {{--                               class="nav-link @if(Request::routeIs('admin.nodes.*')) active @endif">--}}
-                        {{--                                <i class="nav-icon fas fa-sitemap"></i>--}}
-                        {{--                                <p>Nodes</p>--}}
-                        {{--                            </a>--}}
-                        {{--                        </li>--}}
-
-                        {{--                        <li class="nav-item">--}}
-                        {{--                            <a href="{{route('admin.nests.index')}}"--}}
-                        {{--                               class="nav-link @if(Request::routeIs('admin.nests.*')) active @endif">--}}
-                        {{--                                <i class="nav-icon fas fa-th-large"></i>--}}
-                        {{--                                <p>Nests</p>--}}
-                        {{--                            </a>--}}
-                        {{--                        </li>--}}
-
-
-                        <li class="nav-header">{{__('Other')}}</li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.usefullinks.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.usefullinks.*')) active @endif">
-                                <i class="nav-icon fas fa-link"></i>
-                                <p>{{__('Useful Links')}}</p>
-                            </a>
-                        </li>
-
-                        <li class="nav-header">{{__('Logs')}}</li>
-
-                        <li class="nav-item">
-                            <a href="{{route('admin.payments.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.payments.*')) active @endif">
-                                <i class="nav-icon fas fa-money-bill-wave"></i>
-                                <p>{{__('Payments')}}
-                                    <span class="badge badge-success right">{{\App\Models\Payment::count()}}</span>
+                            <a href="{{ route('servers.index') }}" class="nav-link @if (Request::routeIs('servers.*')) active @endif">
+                                <i class="nav-icon fa fa-server"></i>
+                                <p>{{ __('Servers') }}
+                                    <span class="badge badge-info right">{{ Auth::user()->servers()->count() }} /
+                                        {{ Auth::user()->server_limit }}</span>
                                 </p>
                                 </p>
                             </a>
                             </a>
                         </li>
                         </li>
 
 
-                        <li class="nav-item">
-                            <a href="{{route('admin.activitylogs.index')}}"
-                               class="nav-link @if(Request::routeIs('admin.activitylogs.*')) active @endif">
-                                <i class="nav-icon fas fa-clipboard-list"></i>
-                                <p>{{__('Activity Logs')}}</p>
-                            </a>
-                        </li>
-
-                    @endif
-
-                </ul>
-            </nav>
-            <!-- /.sidebar-menu -->
-        </div>
-        <!-- /.sidebar -->
-    </aside>
-
-    <!-- Content Wrapper. Contains page content -->
-
-    <div class="content-wrapper">
-
-        @if(!Auth::user()->hasVerifiedEmail())
-            @if(Auth::user()->created_at->diffInHours(now(), false) > 1)
-                <div class="alert alert-warning p-2 m-2">
-                    <h5><i class="icon fas fa-exclamation-circle"></i> {{__('Warning!')}}</h5>
-                    {{__('You have not yet verified your email address')}} <a class="text-primary"
-                                                                              href="{{route('verification.send')}}">{{__('Click here to resend verification email')}}</a>
-                    <br>
-                    {{__('Please contact support If you didnt receive your verification email.')}}
-                </div>
+                        @if ((env('PAYPAL_SECRET') && env('PAYPAL_CLIENT_ID')) || env('APP_ENV', 'local') == 'local')
+                            <li class="nav-item">
+                                <a href="{{ route('store.index') }}" class="nav-link @if (Request::routeIs('store.*') || Request::routeIs('checkout')) active @endif">
+                                    <i class="nav-icon fa fa-coins"></i>
+                                    <p>{{ __('Store') }}</p>
+                                </a>
+                            </li>
+                        @endif
+
+                        @if (Auth::user()->role == 'admin')
+
+                            <li class="nav-header">{{ __('Administration') }}</li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.overview.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.overview.*')) active @endif">
+                                    <i class="nav-icon fa fa-home"></i>
+                                    <p>{{ __('Overview') }}</p>
+                                </a>
+                            </li>
+
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.settings.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.settings.*')) active @endif">
+                                    <i class="nav-icon fas fa-tools"></i>
+                                    <p>{{ __('Settings') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.api.index') }}" class="nav-link @if (Request::routeIs('admin.api.*')) active @endif">
+                                    <i class="nav-icon fa fa-gamepad"></i>
+                                    <p>{{ __('Application API') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-header">{{ __('Management') }}</li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.users.index') }}" class="nav-link @if (Request::routeIs('admin.users.*')) active @endif">
+                                    <i class="nav-icon fas fa-users"></i>
+                                    <p>{{ __('Users') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.servers.index') }}" class="nav-link @if (Request::routeIs('admin.servers.*')) active @endif">
+                                    <i class="nav-icon fas fa-server"></i>
+                                    <p>{{ __('Servers') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.products.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.products.*')) active @endif">
+                                    <i class="nav-icon fas fa-sliders-h"></i>
+                                    <p>{{ __('Products') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.store.index') }}" class="nav-link @if (Request::routeIs('admin.store.*')) active @endif">
+                                    <i class="nav-icon fas fa-shopping-basket"></i>
+                                    <p>{{ __('Store') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.vouchers.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.vouchers.*')) active @endif">
+                                    <i class="nav-icon fas fa-money-check-alt"></i>
+                                    <p>{{ __('Vouchers') }}</p>
+                                </a>
+                            </li>
+
+                            {{-- <li class="nav-header">Pterodactyl</li> --}}
+
+                            {{-- <li class="nav-item"> --}}
+                            {{-- <a href="{{route('admin.nodes.index')}}" --}}
+                            {{-- class="nav-link @if (Request::routeIs('admin.nodes.*')) active @endif"> --}}
+                            {{-- <i class="nav-icon fas fa-sitemap"></i> --}}
+                            {{-- <p>Nodes</p> --}}
+                            {{-- </a> --}}
+                            {{-- </li> --}}
+
+                            {{-- <li class="nav-item"> --}}
+                            {{-- <a href="{{route('admin.nests.index')}}" --}}
+                            {{-- class="nav-link @if (Request::routeIs('admin.nests.*')) active @endif"> --}}
+                            {{-- <i class="nav-icon fas fa-th-large"></i> --}}
+                            {{-- <p>Nests</p> --}}
+                            {{-- </a> --}}
+                            {{-- </li> --}}
+
+
+                            <li class="nav-header">{{ __('Other') }}</li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.usefullinks.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.usefullinks.*')) active @endif">
+                                    <i class="nav-icon fas fa-link"></i>
+                                    <p>{{ __('Useful Links') }}</p>
+                                </a>
+                            </li>
+
+                            <li class="nav-header">{{ __('Logs') }}</li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.payments.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.payments.*')) active @endif">
+                                    <i class="nav-icon fas fa-money-bill-wave"></i>
+                                    <p>{{ __('Payments') }}
+                                        <span
+                                            class="badge badge-success right">{{ \App\Models\Payment::count() }}</span>
+                                    </p>
+                                </a>
+                            </li>
+
+                            <li class="nav-item">
+                                <a href="{{ route('admin.activitylogs.index') }}"
+                                    class="nav-link @if (Request::routeIs('admin.activitylogs.*')) active @endif">
+                                    <i class="nav-icon fas fa-clipboard-list"></i>
+                                    <p>{{ __('Activity Logs') }}</p>
+                                </a>
+                            </li>
+
+                        @endif
+
+                    </ul>
+                </nav>
+                <!-- /.sidebar-menu -->
+            </div>
+            <!-- /.sidebar -->
+        </aside>
+
+        <!-- Content Wrapper. Contains page content -->
+
+        <div class="content-wrapper">
+
+            @if (!Auth::user()->hasVerifiedEmail())
+                @if (Auth::user()->created_at->diffInHours(now(), false) > 1)
+                    <div class="alert alert-warning p-2 m-2">
+                        <h5><i class="icon fas fa-exclamation-circle"></i> {{ __('Warning!') }}</h5>
+                        {{ __('You have not yet verified your email address') }} <a class="text-primary"
+                            href="{{ route('verification.send') }}">{{ __('Click here to resend verification email') }}</a>
+                        <br>
+                        {{ __('Please contact support If you didnt receive your verification email.') }}
+                    </div>
+                @endif
             @endif
             @endif
-        @endif
 
 
-        @yield('content')
+            @yield('content')
 
 
-        @include('models.redeem_voucher_modal')
+            @include('models.redeem_voucher_modal')
+        </div>
+        <!-- /.content-wrapper -->
+        <footer class="main-footer">
+            <strong>Copyright &copy; 2021-{{ date('Y') }} <a
+                    href="{{ url('/') }}">{{ env('APP_NAME', 'Laravel') }}</a>.</strong>
+            All rights
+            reserved. Powered by <a href="https://controlpanel.gg">ControlPanel</a>. Version
+            <b>{{ config('app')['version'] }}</b>
+        </footer>
+
+        <!-- Control Sidebar -->
+        <aside class="control-sidebar control-sidebar-dark">
+            <!-- Control sidebar content goes here -->
+        </aside>
+        <!-- /.control-sidebar -->
     </div>
     </div>
-    <!-- /.content-wrapper -->
-    <footer class="main-footer">
-        <strong>Copyright &copy; 2021-{{date('Y')}} <a href="{{url('/')}}">{{env('APP_NAME' , 'Laravel')}}</a>.</strong>
-        All rights
-        reserved. Powered by <a href="https://controlpanel.gg">ControlPanel</a>. Version
-        <b>{{config('app')['version']}}</b>
-    </footer>
-
-    <!-- Control Sidebar -->
-    <aside class="control-sidebar control-sidebar-dark">
-        <!-- Control sidebar content goes here -->
-    </aside>
-    <!-- /.control-sidebar -->
-</div>
-<!-- ./wrapper -->
-
-<!-- Scripts -->
-{{--<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>--}}
-{{--<script src="{{ asset('js/adminlte.min.js') }}"></script>--}}
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@10.14.1/dist/sweetalert2.all.min.js"></script>
-<script src="{{asset('js/app.js')}}"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.24/datatables.min.js"></script>
-<!-- Summernote -->
-<script src="{{asset('plugins/summernote/summernote-bs4.min.js')}}"></script>
-<!-- select2 -->
-<script src="{{asset('plugins/select2/js/select2.min.js')}}"></script>
-
-<!-- Moment.js -->
-<script src="{{asset('plugins/moment/moment.min.js')}}"></script>
-
-<!-- Datetimepicker -->
-<script src="{{asset('plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js')}}"></script>
-
-<!-- Select2 -->
-<script src={{asset('plugins/select2/js/select2.min.js')}}>
-
+    <!-- ./wrapper -->
+
+    <!-- Scripts -->
+    {{-- <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> --}}
+    {{-- <script src="{{ asset('js/adminlte.min.js') }}"></script> --}}
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@10.14.1/dist/sweetalert2.all.min.js"></script>
+    <script src="{{ asset('js/app.js') }}"></script>
+    <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/dt-1.10.24/datatables.min.js"></script>
+    <!-- Summernote -->
+    <script src="{{ asset('plugins/summernote/summernote-bs4.min.js') }}"></script>
+    <!-- select2 -->
+    <script src="{{ asset('plugins/select2/js/select2.min.js') }}"></script>
+
+    <!-- Moment.js -->
+    <script src="{{ asset('plugins/moment/moment.min.js') }}"></script>
+
+    <!-- Datetimepicker -->
+    <script src="{{ asset('plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js') }}"></script>
+
+    <!-- Select2 -->
+    <script src={{ asset('plugins/select2/js/select2.min.js') }}>
+        < script >
+            $(document).ready(function() {
+                $('[data-toggle="popover"]').popover();
+
+                $.ajaxSetup({
+                    headers: {
+                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                    }
+                });
+            });
+    </script>
     <script>
     <script>
-        $(document).ready(function () {
-        $('[data-toggle="popover"]').popover();
-
-        $.ajaxSetup({
-        headers: {
-        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-    }
-    });
-    });
-</script>
-<script>
-    @if(Session::has('error'))
-    Swal.fire({
-        icon: 'error',
-        title: 'Oops...',
-        html: '{{Session::get('error')}}',
-    })
-    @endif
-
-    @if(Session::has('success'))
-    Swal.fire({
-        icon: 'success',
-        title: '{{Session::get('success')}}',
-        position: 'top-end',
-        showConfirmButton: false,
-        background: '#343a40',
-        toast: true,
-        timer: 3000,
-        timerProgressBar: true,
-        didOpen: (toast) => {
+        @if (Session::has('error'))
+            Swal.fire({
+            icon: 'error',
+            title: 'Oops...',
+            html: '{{ Session::get('error') }}',
+            })
+        @endif
+
+        @if (Session::has('success'))
+            Swal.fire({
+            icon: 'success',
+            title: '{{ Session::get('success') }}',
+            position: 'top-end',
+            showConfirmButton: false,
+            background: '#343a40',
+            toast: true,
+            timer: 3000,
+            timerProgressBar: true,
+            didOpen: (toast) => {
             toast.addEventListener('mouseenter', Swal.stopTimer)
             toast.addEventListener('mouseenter', Swal.stopTimer)
             toast.addEventListener('mouseleave', Swal.resumeTimer)
             toast.addEventListener('mouseleave', Swal.resumeTimer)
-        }
-    })
-    @endif
-</script>
+            }
+            })
+        @endif
+    </script>
 </body>
 </body>
+
 </html>
 </html>

+ 0 - 2
routes/web.php

@@ -128,8 +128,6 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () {
         #configuration
         #configuration
         Route::get('configurations/datatable', [ConfigurationController::class, 'datatable'])->name('configurations.datatable');
         Route::get('configurations/datatable', [ConfigurationController::class, 'datatable'])->name('configurations.datatable');
         Route::patch('configurations/updatevalue', [ConfigurationController::class, 'updatevalue'])->name('configurations.updatevalue');
         Route::patch('configurations/updatevalue', [ConfigurationController::class, 'updatevalue'])->name('configurations.updatevalue');
-        Route::resource('configurations', ConfigurationController::class);
-        Route::resource('configurations', ConfigurationController::class);
 
 
         #settings
         #settings
         Route::patch('settings/update/icons', [SettingsController::class, 'updateIcons'])->name('settings.update.icons');
         Route::patch('settings/update/icons', [SettingsController::class, 'updateIcons'])->name('settings.update.icons');