deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Framework update and updates from other projects,remove leenooks/laravel

Browse Source 
Framework updates, and hack to get CI testing working
This commit is contained in:
Deon George
2021-12-03 13:36:25 +11:00
parent 88eb35a567
commit 2ccc1d3b83
33 changed files with 3424 additions and 2184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/js/bootstrap.js vendored
View File

@@ -1,4 +1,3 @@
window.$ = window.jQuery = require('jquery');
window._ = require('lodash');
/**
@@ -17,19 +16,13 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
* allows your team to easily build robust real-time web applications.
*/
import Echo from 'laravel-echo';
// import Echo from 'laravel-echo';
/*
window.Pusher = require('pusher-js');
// window.Pusher = require('pusher-js');
window.Echo = new Echo({
broadcaster: 'pusher',
key: process.env.MIX_PUSHER_APP_KEY,
wsHost: window.location.hostname,
wsPort: 6001,
disableStats: true,
useTLS: false,
});
*/
//require('bootstrap');
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: process.env.MIX_PUSHER_APP_KEY,
// cluster: process.env.MIX_PUSHER_APP_CLUSTER,
// forceTLS: true
// });

6
resources/themes/architect/views/layouts/app.blade.php
View File

@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<!DOCTYPE html>
<html>
@section('htmlheader')
@include('architect::layouts.partials.htmlheader')
@show
@@ -44,4 +44,4 @@
@yield('page-scripts')
@show
</body>
</html>
</html>

29
resources/themes/architect/views/layouts/auth.blade.php
View File

@@ -1,18 +1,21 @@
<!DOCTYPE html>
<html>
@section('htmlheader')
@include('architect::layouts.partials.htmlheader')
@show
@section('htmlheader')
@include('architect::layouts.partials.htmlheader')
@show
<body class="hold-transition login-page">
<div id="app">
@yield('content')
</div>
<body class="hold-transition login-page">
<div id="app">
@yield('content')
</div>
@section('scripts')
@include('architect::auth.partials.scripts')
@section('scripts')
@include('architect::auth.partials.scripts')
@yield('page-scripts')
@show
</body>
</html>
{{-- Scripts --}}
{!! Asset::scripts() !!}
@yield('page-scripts')
@show
</body>
</html>

2
resources/views/widgets/dn.blade.php → resources/views/frames/dn.blade.php
View File

@@ -1,4 +1,4 @@
@extends('architect::layouts.dn')
@extends('layouts.dn')
@section('page_title')
{{ $dn }}

2
resources/themes/architect/views/layouts/dn.blade.php → resources/views/layouts/dn.blade.php
View File

@@ -8,4 +8,4 @@
<!-- Your Page Content Here -->
@yield('main-content')
</div>
</div>
</div>