Reactivate NPM, updates from peer projects

This commit is contained in:
Deon George 2020-01-21 21:06:09 +11:00
parent e62603a1b3
commit b42f9990b5
13 changed files with 11039 additions and 59990 deletions

View File

@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
class LoginController extends Controller class LoginController extends Controller
@ -25,7 +26,7 @@ class LoginController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = '/home'; protected $redirectTo = RouteServiceProvider::HOME;
/** /**
* Create a new controller instance. * Create a new controller instance.

View File

@ -2,8 +2,8 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider class RouteServiceProvider extends ServiceProvider
{ {
@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
*/ */
protected $namespace = 'App\Http\Controllers'; protected $namespace = 'App\Http\Controllers';
/**
* The path to the "home" route for your application.
*
* @var string
*/
public const HOME = '/u/home';
/** /**
* Define your route model bindings, pattern filters, etc. * Define your route model bindings, pattern filters, etc.
* *

View File

@ -10,6 +10,7 @@
"require": { "require": {
"php": "^7.2", "php": "^7.2",
"barryvdh/laravel-snappy": "^0.4.6", "barryvdh/laravel-snappy": "^0.4.6",
"beyondcode/laravel-websockets": "^1.3",
"clarkeash/doorman": "^4.0", "clarkeash/doorman": "^4.0",
"eduardokum/laravel-mail-auto-embed": "^1.0", "eduardokum/laravel-mail-auto-embed": "^1.0",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",

985
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -15,7 +15,7 @@ return [
'name' => env('APP_NAME', 'Laravel'), 'name' => env('APP_NAME', 'Laravel'),
'name_html_long' => env('APP_NAME_HTML_LONG', '<b>Laravel</b>Application'), 'name_html_long' => env('APP_NAME_HTML_LONG', '<b>Laravel</b>Application'),
'name_html_short' => env('APP_NAME_HTML_SHORT', '<b>L</b>A'), 'admins' => env('APP_ADMINS',[]) ? explode(';',env('APP_ADMINS')) : [],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -56,6 +56,8 @@ return [
'url' => env('APP_URL', 'http://localhost'), 'url' => env('APP_URL', 'http://localhost'),
'asset_url' => env('ASSET_URL', null),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Timezone | Application Timezone

10048
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -10,19 +10,20 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.18", "cross-env": "^5.2.1",
"bootstrap": "^4.0.0", "laravel-mix": "^5.0.1",
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^4.0.7",
"less": "^3.9.0",
"less-loader": "^5.0.0",
"lodash": "^4.17.5",
"popper.js": "^1.12",
"resolve-url-loader": "^2.3.1", "resolve-url-loader": "^2.3.1",
"sass": "^1.15.2", "sass": "^1.15.2",
"sass-loader": "^7.1.0", "sass-loader": "^8.0.0",
"vue": "^2.5.17", "vue-template-compiler": "^2.6.11"
"vue-template-compiler": "^2.6.10" },
"dependencies": {
"axios": "^0.19",
"bootstrap": "^4.4.1",
"jquery": "^3.4.1",
"laravel-echo": "^1.6.1",
"lodash": "^4.17.13",
"popper.js": "^1.16.0",
"pusher-js": "^5.0.3"
} }
} }

10660
public/css/app.css vendored

File diff suppressed because one or more lines are too long

View File

@ -59,6 +59,9 @@ div.login-box .input-group .input-group-append span.fa {
cursor: pointer; cursor: pointer;
} }
.card-header h3.card-title {
font-size: 1.0rem;
}
body { body {
font-size: 0.85em; font-size: 0.85em;
} }

49191
public/js/app.js vendored

File diff suppressed because one or more lines are too long

32
resources/js/app.js vendored
View File

@ -1,33 +1 @@
/**
* First we will load all of this project's JavaScript dependencies which
* includes Vue and other libraries. It is a great starting point when
* building robust, powerful web applications using Vue and Laravel.
*/
require('./bootstrap'); require('./bootstrap');
window.Vue = require('vue');
/**
* The following block of code may be used to automatically register your
* Vue components. It will recursively scan this directory for the Vue
* components and automatically register them with their "basename".
*
* Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
*/
// const files = require.context('./', true, /\.vue$/i);
// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default));
Vue.component('example-component', require('./components/ExampleComponent.vue').default);
/**
* Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application
* or customize the JavaScript scaffolding to fit your unique needs.
*/
const app = new Vue({
el: '#app'
});

View File

@ -1,19 +1,6 @@
window.$ = window.jQuery = require('jquery');
window._ = require('lodash'); window._ = require('lodash');
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* 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) {}
/** /**
* We'll load the axios HTTP library which allows us to easily issue requests * We'll load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the * to our Laravel back-end. This library automatically handles sending the
@ -24,33 +11,25 @@ window.axios = require('axios');
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Next we will register the CSRF Token as a common header with Axios so that
* all outgoing HTTP requests automatically have it attached. This is just
* a simple convenience so we don't have to attach every token manually.
*/
let token = document.head.querySelector('meta[name="csrf-token"]');
if (token) {
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
} else {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
}
/** /**
* Echo exposes an expressive API for subscribing to channels and listening * Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting * for events that are broadcast by Laravel. Echo and event broadcasting
* allows your team to easily build robust real-time web applications. * 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({ window.Echo = new Echo({
// broadcaster: 'pusher', broadcaster: 'pusher',
// key: process.env.MIX_PUSHER_APP_KEY, key: process.env.MIX_PUSHER_APP_KEY,
// cluster: process.env.MIX_PUSHER_APP_CLUSTER, wsHost: window.location.hostname,
// encrypted: true wsPort: 6001,
// }); disableStats: true,
useTLS: false,
});
*/
require('bootstrap');

View File

@ -1,14 +1 @@
@import "node_modules/bootstrap/scss/bootstrap";
// Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');
// Variables
@import 'variables';
// Bootstrap
@import '~bootstrap/scss/bootstrap';
.navbar-laravel {
background-color: #fff;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
}