Merge branch 'master' into production

This commit is contained in:
Bruno F. Fontes 2021-04-21 07:29:32 -03:00
commit a699738aa8
5 changed files with 536 additions and 14991 deletions

View File

@ -8,6 +8,7 @@
"php": "^7.3.0",
"fideloper/proxy": "^4.0",
"laravel/framework": "^8.0",
"laravel/helpers": "^1.4",
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0"
},

11
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "215431c82d7019b215c308336be36a18",
"content-hash": "59687b3da5d978c883de9f4a82951811",
"packages": [
{
"name": "brick/math",
@ -492,16 +492,16 @@
},
{
"name": "laravel/framework",
"version": "v8.37.0",
"version": "v8.38.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "cf4082973abc796ec285190f0603380021f6d26f"
"reference": "26a73532c54d2c090692bf2e3e64e449669053ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/cf4082973abc796ec285190f0603380021f6d26f",
"reference": "cf4082973abc796ec285190f0603380021f6d26f",
"url": "https://api.github.com/repos/laravel/framework/zipball/26a73532c54d2c090692bf2e3e64e449669053ba",
"reference": "26a73532c54d2c090692bf2e3e64e449669053ba",
"shasum": ""
},
"require": {
@ -656,7 +656,6 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-04-13T13:49:49+00:00"
},
{
"name": "laravel/tinker",

15502
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@
"bootstrap": "^4.6.0",
"cross-env": "^5.2.1",
"jquery": "^3.5.1",
"laravel-mix": "^6.0.16",
"laravel-mix": "^6.0.17",
"lodash": "^4.17.21",
"popper.js": "^1.16.1",
"resolve-url-loader": "^3.1.2",

1
updateCompserNPM.sh Normal file
View File

@ -0,0 +1 @@
ssh homestead -t 'cd code/Bruno\ Fontes/shareit; echo; echo -n "Press enter to update Composer..."; read; composer update; echo; echo -n "Press enter to update NPM..."; read; npm update; echo; echo -n "Press enter to exit..."; read'