Merge branch 'master' into develop
This commit is contained in:
commit
bdc205c830
|
@ -0,0 +1,10 @@
|
||||||
|
php:
|
||||||
|
preset: laravel
|
||||||
|
disabled:
|
||||||
|
- unused_use
|
||||||
|
finder:
|
||||||
|
not-name:
|
||||||
|
- index.php
|
||||||
|
- server.php
|
||||||
|
js: true
|
||||||
|
css: true
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -117,6 +119,7 @@
|
||||||
|
|
||||||
'options' => [
|
'options' => [
|
||||||
'cluster' => env('REDIS_CLUSTER', 'predis'),
|
'cluster' => env('REDIS_CLUSTER', 'predis'),
|
||||||
|
'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
|
||||||
],
|
],
|
||||||
|
|
||||||
'default' => [
|
'default' => [
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
*.sqlite
|
*.sqlite
|
||||||
|
*.sqlite-journal
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/* @var $factory \Illuminate\Database\Eloquent\Factory */
|
||||||
|
|
||||||
use App\User;
|
use App\User;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Faker\Generator as Faker;
|
use Faker\Generator as Faker;
|
||||||
|
|
|
@ -25,7 +25,7 @@ ## Learning Laravel
|
||||||
|
|
||||||
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
|
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
|
||||||
|
|
||||||
If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library.
|
If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1400 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library.
|
||||||
|
|
||||||
## Laravel Sponsors
|
## Laravel Sponsors
|
||||||
|
|
||||||
|
@ -57,6 +57,7 @@ ## Laravel Sponsors
|
||||||
- [We Are The Robots Inc.](https://watr.mx/)
|
- [We Are The Robots Inc.](https://watr.mx/)
|
||||||
- [Understand.io](https://www.understand.io/)
|
- [Understand.io](https://www.understand.io/)
|
||||||
- [Abdel Elrafa](https://abdelelrafa.com)
|
- [Abdel Elrafa](https://abdelelrafa.com)
|
||||||
|
- [Hyper Host](https://hyper.host)
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* First we will load all of this project's JavaScript dependencies which
|
* First we will load all of this project's JavaScript dependencies which
|
||||||
* includes Vue and other libraries. It is a great starting point when
|
* includes Vue and other libraries. It is a great starting point when
|
||||||
|
@ -29,5 +28,5 @@ Vue.component('example-component', require('./components/ExampleComponent.vue').
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const app = new Vue({
|
const app = new Vue({
|
||||||
el: '#app'
|
el: '#app',
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
window._ = require('lodash');
|
window._ = require('lodash');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
|
|
||||||
// Body
|
// Body
|
||||||
$body-bg: #f8fafc;
|
$body-bg: #f8fafc;
|
||||||
|
|
||||||
// Typography
|
// Typography
|
||||||
$font-family-sans-serif: "Nunito", sans-serif;
|
$font-family-sans-serif: 'Nunito', sans-serif;
|
||||||
$font-size-base: 0.9rem;
|
$font-size-base: 0.9rem;
|
||||||
$line-height-base: 1.6;
|
$line-height-base: 1.6;
|
||||||
|
|
||||||
|
@ -11,7 +10,7 @@ $line-height-base: 1.6;
|
||||||
$blue: #3490dc;
|
$blue: #3490dc;
|
||||||
$indigo: #6574cd;
|
$indigo: #6574cd;
|
||||||
$purple: #9561e2;
|
$purple: #9561e2;
|
||||||
$pink: #f66D9b;
|
$pink: #f66d9b;
|
||||||
$red: #e3342f;
|
$red: #e3342f;
|
||||||
$orange: #f6993f;
|
$orange: #f6993f;
|
||||||
$yellow: #ffed4a;
|
$yellow: #ffed4a;
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
// Fonts
|
// Fonts
|
||||||
@import url('https://fonts.googleapis.com/css?family=Nunito');
|
@import url('https://fonts.googleapis.com/css?family=Nunito');
|
||||||
|
|
||||||
|
|
|
@ -11,5 +11,4 @@ const mix = require('laravel-mix');
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
mix.js('resources/js/app.js', 'public/js')
|
mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css');
|
||||||
.sass('resources/sass/app.scss', 'public/css');
|
|
||||||
|
|
Loading…
Reference in New Issue