Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- Update to Larave commit: f0de9fd9967d4e1b4427d8458bf8983bc2cde201
  • Loading branch information
rappasoft committed Feb 20, 2021
1 parent 2657e1a commit 2c2fac0
Show file tree
Hide file tree
Showing 13 changed files with 6,738 additions and 93 deletions.
3 changes: 3 additions & 0 deletions .env.example
Expand Up @@ -26,6 +26,9 @@ DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=

# Cache
MEMCACHED_HOST=127.0.0.1

# Queue
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Expand Up @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [8.0.3] - 2021-02-20

### Changed

- Updated composer
- Updated yarn
- Make minimum PHP version 7.4
- Update to Laravel commit:

### Removed

- Google Analytics tag and config since it's done differently since that was added

## [8.0.2] - 2020-12-15

### Changed
Expand Down
1 change: 1 addition & 0 deletions app/Exceptions/Handler.php
Expand Up @@ -28,6 +28,7 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontFlash = [
'current_password',
'password',
'password_confirmation',
];
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/TrustProxies.php
Expand Up @@ -22,5 +22,5 @@ class TrustProxies extends Middleware
*
* @var int
*/
protected $headers = Request::HEADER_X_FORWARDED_ALL;
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
}
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -37,7 +37,7 @@
"facade/ignition": "^2.5",
"friendsofphp/php-cs-fixer": "^2.16",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^0.0.5",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3.3"
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/broadcasting.php
Expand Up @@ -11,7 +11,7 @@
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
| Supported: "pusher", "redis", "log", "null"
| Supported: "pusher", "ably", "redis", "log", "null"
|
*/

Expand Down
8 changes: 5 additions & 3 deletions config/cache.php
Expand Up @@ -13,9 +13,6 @@
| using this caching library. This connection is used when another is
| not explicitly specified when executing a given caching function.
|
| Supported drivers: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb", "null"
|
*/

'default' => env('CACHE_DRIVER', 'file'),
Expand All @@ -29,6 +26,9 @@
| well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches.
|
| Supported drivers: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb", "null"
|
*/

'stores' => [
Expand All @@ -46,6 +46,7 @@
'driver' => 'database',
'table' => 'cache',
'connection' => null,
'lock_connection' => null,
],

'file' => [
Expand Down Expand Up @@ -75,6 +76,7 @@
'redis' => [
'driver' => 'redis',
'connection' => 'cache',
'lock_connection' => 'default',
],

'dynamodb' => [
Expand Down
74 changes: 0 additions & 74 deletions docker-composer.yml

This file was deleted.

13 changes: 7 additions & 6 deletions package.json
Expand Up @@ -2,12 +2,12 @@
"private": true,
"scripts": {
"dev": "npm run development",
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --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 --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --config=node_modules/laravel-mix/setup/webpack.config.js"
"production": "mix --production"
},
"devDependencies": {
"@coreui/coreui": "^3.0.0",
Expand All @@ -19,10 +19,11 @@
"bootstrap": "^4.5.0",
"cross-env": "^7.0",
"jquery": "^3.5.1",
"laravel-mix": "^5.0.1",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"perfect-scrollbar": "^1.5.0",
"popper.js": "^1.16.1",
"postcss": "^8.1.14",
"resolve-url-loader": "^3.1.0",
"sass": "^1.20.1",
"sass-loader": "^8.0.0",
Expand Down
28 changes: 28 additions & 0 deletions public/web.config
@@ -0,0 +1,28 @@
<!--
Rewrites requires Microsoft URL Rewrite Module for IIS
Download: https://www.iis.net/downloads/microsoft/url-rewrite
Debug Help: https://docs.microsoft.com/en-us/iis/extensions/url-rewrite-module/using-failed-request-tracing-to-trace-rewrite-rules
-->
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="Imported Rule 1" stopProcessing="true">
<match url="^(.*)/$" ignoreCase="false" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
</conditions>
<action type="Redirect" redirectType="Permanent" url="/{R:1}" />
</rule>
<rule name="Imported Rule 2" stopProcessing="true">
<match url="^" ignoreCase="false" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
<add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
</conditions>
<action type="Rewrite" url="index.php" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>
2 changes: 1 addition & 1 deletion resources/lang/en/validation.php
Expand Up @@ -90,7 +90,7 @@
'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.',
],
'multiple_of' => 'The :attribute must be a multiple of :value',
'multiple_of' => 'The :attribute must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
Expand Down

0 comments on commit 2c2fac0

Please sign in to comment.