* Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting
This commit is contained in:
Nabeel S
@@ -1,92 +1,98 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<title>@yield('title') - {{ config('app.name') }} admin</title>
|
||||
<title>@yield('title') - {{ config('app.name') }} admin</title>
|
||||
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<meta charset="utf-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
|
||||
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport'/>
|
||||
<meta name="viewport" content="width=device-width"/>
|
||||
|
||||
{{-- Start of required lines block. DON'T REMOVE THESE LINES! They're required or might break things --}}
|
||||
<meta name="base-url" content="{{ url('') }}">
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
<meta name="api-key" content="{{ Auth::check() ? Auth::user()->api_key: '' }}">
|
||||
{{-- End the required lines block --}}
|
||||
{{-- Start of required lines block. DON'T REMOVE THESE LINES! They're required or might break things --}}
|
||||
<meta name="base-url" content="{{ url('') }}">
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
<meta name="api-key" content="{{ Auth::check() ? Auth::user()->api_key: '' }}">
|
||||
{{-- End the required lines block --}}
|
||||
|
||||
<script src="{{ public_asset('/assets/global/js/jquery.js') }}"></script>
|
||||
<script src="{{ public_asset('/assets/global/js/jquery.js') }}"></script>
|
||||
|
||||
<link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
|
||||
<link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
|
||||
|
||||
<link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'/>
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"/>
|
||||
<link href='https://fonts.googleapis.com/css?family=Muli:400,300' rel='stylesheet' type='text/css'/>
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"/>
|
||||
|
||||
<link rel="stylesheet" href="{{ public_mix('/assets/global/css/vendor.css') }}"/>
|
||||
<link rel="stylesheet" href="{{ public_mix('/assets/admin/css/vendor.css') }}"/>
|
||||
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}"/>
|
||||
<link rel="stylesheet" href="{{ public_mix('/assets/global/css/vendor.css') }}"/>
|
||||
<link rel="stylesheet" href="{{ public_mix('/assets/admin/css/vendor.css') }}"/>
|
||||
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}"/>
|
||||
|
||||
<style type="text/css">
|
||||
<style type="text/css">
|
||||
@yield('css')
|
||||
</style>
|
||||
</style>
|
||||
|
||||
<script>
|
||||
const BASE_URL ='{{ url('/') }}';
|
||||
@if (Auth::user())
|
||||
const PHPVMS_USER_API_KEY = "{{ Auth::user()->api_key }}";
|
||||
@else
|
||||
const PHPVMS_USER_API_KEY = false;
|
||||
<script>
|
||||
const BASE_URL = '{{ url('/') }}';
|
||||
@if (Auth::user())
|
||||
const PHPVMS_USER_API_KEY = "{{ Auth::user()->api_key }}";
|
||||
@else
|
||||
const PHPVMS_USER_API_KEY = false;
|
||||
@endif
|
||||
@yield('scripts_head')
|
||||
</script>
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="wrapper">
|
||||
@include('admin.sidebar')
|
||||
@include('admin.sidebar')
|
||||
|
||||
<div class="main-panel">
|
||||
<nav class="navbar navbar-default">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar bar1"></span>
|
||||
<span class="icon-bar bar2"></span>
|
||||
<span class="icon-bar bar3"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">@yield('title')</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
@yield('actions')
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@include('admin.flash.message')
|
||||
@yield('content')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main-panel">
|
||||
<nav class="navbar navbar-default">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar bar1"></span>
|
||||
<span class="icon-bar bar2"></span>
|
||||
<span class="icon-bar bar3"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="#">@yield('title')</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
@yield('actions')
|
||||
</ul>
|
||||
|
||||
<footer class="footer">
|
||||
<div class="container-fluid">
|
||||
<nav class="pull-left">
|
||||
<ul>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
@if(\App\Support\Utils::installerEnabled())
|
||||
<div class="col-lg-12 alert alert-danger alert-important">
|
||||
<p>Remove the modules/Installer folder or set the module to disabled! It's a security risk</p>
|
||||
</div>
|
||||
</footer>
|
||||
@endif
|
||||
|
||||
<div class="col-12">
|
||||
@include('admin.flash.message')
|
||||
@yield('content')
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="footer">
|
||||
<div class="container-fluid">
|
||||
<nav class="pull-left">
|
||||
<ul>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -95,59 +101,59 @@
|
||||
<script defer src="{{ public_mix('/assets/admin/js/app.js') }}"></script>
|
||||
|
||||
<script>
|
||||
/**
|
||||
* Initialize any plugins on the page
|
||||
*/
|
||||
const initPlugins = () => {
|
||||
$('.select2').select2({width: 'resolve'});
|
||||
$('input').iCheck({
|
||||
checkboxClass: 'icheckbox_square-blue',
|
||||
radioClass: 'icheckbox_square-blue'
|
||||
});
|
||||
};
|
||||
/**
|
||||
* Initialize any plugins on the page
|
||||
*/
|
||||
const initPlugins = () => {
|
||||
$('.select2').select2({width: 'resolve'});
|
||||
$('input').iCheck({
|
||||
checkboxClass: 'icheckbox_square-blue',
|
||||
radioClass: 'icheckbox_square-blue'
|
||||
});
|
||||
};
|
||||
|
||||
$(document).ready(function () {
|
||||
$(document).ready(function () {
|
||||
initPlugins();
|
||||
|
||||
//let storage = getStorage('phpvms.admin');
|
||||
const storage = new phpvms.Storage('phpvms.admin', {
|
||||
"menu": [],
|
||||
"menu": [],
|
||||
});
|
||||
|
||||
// see what menu items should be open
|
||||
const menu = storage.getList('menu');
|
||||
for (const id of menu) {
|
||||
console.log('found '+id);
|
||||
const elem = $(".collapse#" + id);
|
||||
elem.addClass("in").trigger("show.bs.collapse");
|
||||
console.log('found ' + id);
|
||||
const elem = $(".collapse#" + id);
|
||||
elem.addClass("in").trigger("show.bs.collapse");
|
||||
|
||||
const caret = $("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
const caret = $("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
}
|
||||
|
||||
$(".collapse").on("hide.bs.collapse", function() {
|
||||
const id = $(this).attr('id');
|
||||
const elem = $("a." + id + " b");
|
||||
elem.removeClass("pe-7s-angle-down");
|
||||
elem.addClass("pe-7s-angle-right");
|
||||
$(".collapse").on("hide.bs.collapse", function () {
|
||||
const id = $(this).attr('id');
|
||||
const elem = $("a." + id + " b");
|
||||
elem.removeClass("pe-7s-angle-down");
|
||||
elem.addClass("pe-7s-angle-right");
|
||||
|
||||
// console.log('hiding ' + id);
|
||||
storage.removeFromList('menu', id);
|
||||
storage.save();
|
||||
// console.log('hiding ' + id);
|
||||
storage.removeFromList('menu', id);
|
||||
storage.save();
|
||||
});
|
||||
|
||||
$(".collapse").on("show.bs.collapse", function() {
|
||||
const id = $(this).attr('id');
|
||||
const caret = $("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
$(".collapse").on("show.bs.collapse", function () {
|
||||
const id = $(this).attr('id');
|
||||
const caret = $("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
|
||||
// console.log('showing ' + id);
|
||||
storage.addToList('menu', id);
|
||||
storage.save();
|
||||
// console.log('showing ' + id);
|
||||
storage.addToList('menu', id);
|
||||
storage.save();
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@yield('scripts')
|
||||
|
||||
@@ -1,59 +1,59 @@
|
||||
@extends('admin.app')
|
||||
@section('title', 'Dashboard')
|
||||
@section('content')
|
||||
<div class="content">
|
||||
<div class="content">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-7">
|
||||
@include('admin.dashboard.news')
|
||||
</div>
|
||||
<div class="col-md-5">
|
||||
@component('admin.components.infobox')
|
||||
@slot('icon', 'pe-7s-users')
|
||||
@slot('type', 'Pilots')
|
||||
@slot('pending', $pending_users)
|
||||
@slot('link', route('admin.users.index').'?state='.UserState::PENDING)
|
||||
@endcomponent
|
||||
<div class="row">
|
||||
<div class="col-md-7">
|
||||
@include('admin.dashboard.news')
|
||||
</div>
|
||||
<div class="col-md-5">
|
||||
@component('admin.components.infobox')
|
||||
@slot('icon', 'pe-7s-users')
|
||||
@slot('type', 'Pilots')
|
||||
@slot('pending', $pending_users)
|
||||
@slot('link', route('admin.users.index').'?state='.UserState::PENDING)
|
||||
@endcomponent
|
||||
|
||||
@component('admin.components.infobox')
|
||||
@slot('icon', 'pe-7s-cloud-upload')
|
||||
@slot('type', 'PIREPs')
|
||||
@slot('pending', $pending_pireps)
|
||||
@slot('link', route('admin.pireps.index').'?search=state:'.PirepState::PENDING)
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
{{--@include('admin.dashboard.pirep_chart')--}}
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@component('admin.components.infobox')
|
||||
@slot('icon', 'pe-7s-cloud-upload')
|
||||
@slot('type', 'PIREPs')
|
||||
@slot('pending', $pending_pireps)
|
||||
@slot('link', route('admin.pireps.index').'?search=state:'.PirepState::PENDING)
|
||||
@endcomponent
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
{{--@include('admin.dashboard.pirep_chart')--}}
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@section('scripts')
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$(document).on('submit', 'form.pjax_news_form', function (event) {
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$(document).on('submit', 'form.pjax_news_form', function (event) {
|
||||
event.preventDefault();
|
||||
$.pjax.submit(event, '#pjax_news_wrapper', {push: false});
|
||||
});
|
||||
});
|
||||
|
||||
/*$(document).on('pjax:complete', function () {
|
||||
$(".select2").select2();
|
||||
});*/
|
||||
});
|
||||
</script>
|
||||
/*$(document).on('pjax:complete', function () {
|
||||
$(".select2").select2();
|
||||
});*/
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
Reference in New Issue
Block a user