diff --git a/.editorconfig b/.editorconfig index 8791d9f29..9a9710a90 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,5 +12,4 @@ trim_trailing_whitespace = true trim_trailing_whitespace = false [*.yml] -indent_style = space indent_size = 2 \ No newline at end of file diff --git a/Changelog b/Changelog index 0d11168de..ce97ab65a 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-01 DariusIII + * Chg: Update configuration files * Chg: Update hashing.php, add argon2id support * Chg: Update orangehill/iseed to version 2.6 * Chg: Update extension regexes in NZB class diff --git a/bootstrap/app.php b/bootstrap/app.php index fe237456f..c65a86001 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -12,7 +12,7 @@ */ $app = new Illuminate\Foundation\Application( - dirname(__DIR__).'/' + dirname(__DIR__) ); /* diff --git a/composer.json b/composer.json index 7d81d2729..1bcd9e961 100755 --- a/composer.json +++ b/composer.json @@ -193,7 +193,7 @@ "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" ], "post-create-project-cmd": [ - "@php artisan key:generate" + "@php artisan key:generate --ansi" ], "post-install-cmd": [ "Blacklight\\build\\ComposerScripts::postInstall", @@ -201,12 +201,12 @@ ], "post-update-cmd": [ "Blacklight\\build\\ComposerScripts::postUpdate", - "php artisan ide-helper:generate", - "php artisan ide-helper:meta" + "@php artisan ide-helper:generate --ansi", + "@php artisan ide-helper:meta --ansi" ], "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover" + "@php artisan package:discover --ansi" ] }, "suggest": { diff --git a/config/database.php b/config/database.php index 56e522520..37a5a8ec8 100644 --- a/config/database.php +++ b/config/database.php @@ -128,16 +128,19 @@ return [ */ 'redis' => [ - 'client' => 'predis', - 'default' => [ - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_DB', 0), + ], + 'cache' => [ + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_CACHE_DB', 1), ], - ], ]; diff --git a/config/hashing.php b/config/hashing.php index b99841c92..ece3f27cd 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -12,7 +12,7 @@ return [ | Supported: "bcrypt", "argon", "argon2id" | */ - 'driver' => 'argon2id', + 'driver' => 'argon', /* |-------------------------------------------------------------------------- | Bcrypt Options diff --git a/config/services.php b/config/services.php index 27867915c..47fe72806 100644 --- a/config/services.php +++ b/config/services.php @@ -17,23 +17,22 @@ return [ 'mailgun' => [ 'domain' => env('MAILGUN_DOMAIN'), 'secret' => env('MAILGUN_SECRET'), + 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), ], - 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), - 'region' => 'us-east-1', + 'region' => env('SES_REGION', 'us-east-1'), ], - 'sparkpost' => [ 'secret' => env('SPARKPOST_SECRET'), ], - 'stripe' => [ - 'model' => App\Models\User::class, + 'model' => App\User::class, 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], + 'igdb' => [ 'key' => env('IGDB_KEY', ''), 'url' => 'https://api-endpoint.igdb.com', diff --git a/config/session.php b/config/session.php index 7eeda1431..63aff1578 100644 --- a/config/session.php +++ b/config/session.php @@ -1,5 +1,7 @@ env( 'SESSION_COOKIE', - str_slug(env('APP_NAME', 'nntmux'), '_').'_session' + Str::slug(env('APP_NAME', 'nntmux'), '_').'_session' ), /* diff --git a/package.json b/package.json index e3b37fef4..c7372366d 100644 --- a/package.json +++ b/package.json @@ -3,20 +3,20 @@ "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", "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": { - "axios": "^0.17", - "bootstrap": "^4.0.0-beta.2", - "popper.js": "^1.12", + "axios": "^0.18", + "bootstrap": "^4.0.0", "cross-env": "^5.1", "jquery": "^3.2", "laravel-mix": "^2.0", - "lodash": "^4.17.4", + "lodash": "^4.17.5", + "popper.js": "^1.12", "vue": "^2.5.7" } } \ No newline at end of file diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore index d6b7ef32c..869804c2a 100755 --- a/storage/framework/cache/.gitignore +++ b/storage/framework/cache/.gitignore @@ -1,2 +1,3 @@ * -!.gitignore +!data/ +!.gitignore \ No newline at end of file diff --git a/webpack.mix.js b/webpack.mix.js index da45935f8..73495662f 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,4 +1,4 @@ -let mix = require('laravel-mix'); +const mix = require('laravel-mix'); /* |-------------------------------------------------------------------------- @@ -11,5 +11,5 @@ let mix = require('laravel-mix'); | */ -mix.js('resources/assets/js/app.js', 'public/js') - .sass('resources/assets/sass/app.scss', 'public/css'); \ No newline at end of file +mix.js('resources/js/app.js', 'public/js') + .sass('resources/sass/app.scss', 'public/css'); \ No newline at end of file