Update composer and move themes to under views

This commit is contained in:
Deon George 2020-04-14 17:14:43 +10:00
parent 26365c57ff
commit 4dfa8f1122
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
61 changed files with 52 additions and 153 deletions

View File

@ -15,8 +15,6 @@
"doctrine/dbal": "^2.10",
"eduardokum/laravel-mail-auto-embed": "^1.0",
"fideloper/proxy": "^4.0",
"h4cc/wkhtmltoimage-amd64": "^0.12.4",
"h4cc/wkhtmltopdf-amd64": "^0.12.4",
"intervention/image": "^2.5",
"laravel/framework": "^6.4",
"laravel/passport": "^8.2",

199
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": "c66583693e58610054b0cb827890548b",
"content-hash": "224d038b28e5caca797e510d07cacf32",
"packages": [
{
"name": "barryvdh/laravel-snappy",
@ -1353,91 +1353,6 @@
],
"time": "2019-07-01T23:21:34+00:00"
},
{
"name": "h4cc/wkhtmltoimage-amd64",
"version": "0.12.4",
"source": {
"type": "git",
"url": "https://github.com/h4cc/wkhtmltoimage-amd64.git",
"reference": "c4e33f635207af89a704205b8902fb5715ca88be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/h4cc/wkhtmltoimage-amd64/zipball/c4e33f635207af89a704205b8902fb5715ca88be",
"reference": "c4e33f635207af89a704205b8902fb5715ca88be",
"shasum": ""
},
"bin": [
"bin/wkhtmltoimage-amd64"
],
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL Version 3"
],
"authors": [
{
"name": "Julius Beckmann",
"email": "github@h4cc.de"
}
],
"description": "Convert html to image using webkit (qtwebkit). Static linked linux binary for amd64 systems.",
"homepage": "http://wkhtmltopdf.org/",
"keywords": [
"binary",
"convert",
"image",
"snapshot",
"thumbnail",
"wkhtmltoimage"
],
"time": "2018-01-15T07:23:40+00:00"
},
{
"name": "h4cc/wkhtmltopdf-amd64",
"version": "0.12.4",
"source": {
"type": "git",
"url": "https://github.com/h4cc/wkhtmltopdf-amd64.git",
"reference": "4e2ab2d032a5d7fbe2a741de8b10b8989523c95b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/h4cc/wkhtmltopdf-amd64/zipball/4e2ab2d032a5d7fbe2a741de8b10b8989523c95b",
"reference": "4e2ab2d032a5d7fbe2a741de8b10b8989523c95b",
"shasum": ""
},
"bin": [
"bin/wkhtmltopdf-amd64"
],
"type": "library",
"autoload": {
"psr-4": {
"h4cc\\WKHTMLToPDF\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL Version 3"
],
"authors": [
{
"name": "Julius Beckmann",
"email": "github@h4cc.de"
}
],
"description": "Convert html to pdf using webkit (qtwebkit). Static linked linux binary for amd64 systems.",
"homepage": "http://wkhtmltopdf.org/",
"keywords": [
"binary",
"convert",
"pdf",
"snapshot",
"thumbnail",
"wkhtmltopdf"
],
"time": "2018-01-15T06:57:33+00:00"
},
{
"name": "igaster/laravel-theme",
"version": "v2.0.15",
@ -1721,16 +1636,16 @@
},
{
"name": "laminas/laminas-zendframework-bridge",
"version": "1.0.2",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-zendframework-bridge.git",
"reference": "faf68f6109ceeff24241226033ab59640c7eb63b"
"reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/faf68f6109ceeff24241226033ab59640c7eb63b",
"reference": "faf68f6109ceeff24241226033ab59640c7eb63b",
"url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
"reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
"shasum": ""
},
"require": {
@ -1769,20 +1684,26 @@
"laminas",
"zf"
],
"time": "2020-03-26T16:07:12+00:00"
"funding": [
{
"url": "https://funding.communitybridge.org/projects/laminas-project",
"type": "community_bridge"
}
],
"time": "2020-04-03T16:01:00+00:00"
},
{
"name": "laravel/framework",
"version": "v6.18.3",
"version": "v6.18.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "4e48acfaba87f08320a2764d36c3b6a4a4112ccf"
"reference": "4ef5f9612c2694c915f53f0cec3e4081e9bfc778"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/4e48acfaba87f08320a2764d36c3b6a4a4112ccf",
"reference": "4e48acfaba87f08320a2764d36c3b6a4a4112ccf",
"url": "https://api.github.com/repos/laravel/framework/zipball/4ef5f9612c2694c915f53f0cec3e4081e9bfc778",
"reference": "4ef5f9612c2694c915f53f0cec3e4081e9bfc778",
"shasum": ""
},
"require": {
@ -1915,7 +1836,7 @@
"framework",
"laravel"
],
"time": "2020-03-24T16:37:50+00:00"
"time": "2020-04-08T15:51:23+00:00"
},
{
"name": "laravel/passport",
@ -2180,16 +2101,16 @@
},
{
"name": "league/commonmark",
"version": "1.3.2",
"version": "1.3.4",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "75542a366ccbe1896ed79fcf3e8e68206d6c4257"
"reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/75542a366ccbe1896ed79fcf3e8e68206d6c4257",
"reference": "75542a366ccbe1896ed79fcf3e8e68206d6c4257",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/dd3261eb9a322e009fa5d96d19b9ae19708ce04b",
"reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b",
"shasum": ""
},
"require": {
@ -2250,21 +2171,7 @@
"md",
"parser"
],
"funding": [
{
"url": "https://github.com/colinodell",
"type": "github"
},
{
"url": "https://www.patreon.com/colinodell",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/league%2fcommonmark",
"type": "tidelift"
}
],
"time": "2020-03-25T19:55:28+00:00"
"time": "2020-04-13T20:52:18+00:00"
},
{
"name": "league/event",
@ -3268,16 +3175,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "2.0.26",
"version": "2.0.27",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "09655fcc1f8bab65727be036b28f6f20311c126c"
"reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/09655fcc1f8bab65727be036b28f6f20311c126c",
"reference": "09655fcc1f8bab65727be036b28f6f20311c126c",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
"reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
"shasum": ""
},
"require": {
@ -3370,7 +3277,7 @@
"type": "tidelift"
}
],
"time": "2020-03-13T04:15:39+00:00"
"time": "2020-04-04T23:17:33+00:00"
},
{
"name": "psr/container",
@ -3674,7 +3581,7 @@
},
{
"name": "quickbooks/v3-php-sdk",
"version": "dev-master",
"version": "5.3.6",
"source": {
"type": "git",
"url": "https://github.com/intuit/QuickBooks-V3-PHP-SDK.git",
@ -4434,30 +4341,30 @@
},
{
"name": "spinen/laravel-quickbooks-client",
"version": "3.1.0",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/spinen/laravel-quickbooks-client.git",
"reference": "2566e98fd5400654ca1f2bf353d37b7b9bc2e55e"
"reference": "5ba3d4b01d0724f71cbeb335bd3a7b2011189096"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spinen/laravel-quickbooks-client/zipball/2566e98fd5400654ca1f2bf353d37b7b9bc2e55e",
"reference": "2566e98fd5400654ca1f2bf353d37b7b9bc2e55e",
"url": "https://api.github.com/repos/spinen/laravel-quickbooks-client/zipball/5ba3d4b01d0724f71cbeb335bd3a7b2011189096",
"reference": "5ba3d4b01d0724f71cbeb335bd3a7b2011189096",
"shasum": ""
},
"require": {
"illuminate/database": "~5.5|~6",
"illuminate/http": "~5.5|~6",
"illuminate/routing": "~5.5|~6",
"illuminate/database": "~5.5|~6|~7",
"illuminate/http": "~5.5|~6|~7",
"illuminate/routing": "~5.5|~6|~7",
"nesbot/carbon": "^1.26.3|^2.0",
"php": ">=7.2",
"quickbooks/v3-php-sdk": "dev-master"
"quickbooks/v3-php-sdk": "^5.3.6"
},
"require-dev": {
"mockery/mockery": "^1",
"phpunit/phpunit": "~7.0.1|~8.0",
"psy/psysh": "^0.9.9",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^8.4|^9.0",
"psy/psysh": "^0.10",
"symfony/thanks": "^1.1"
},
"type": "library",
@ -4491,7 +4398,7 @@
"quickbooks",
"spinen"
],
"time": "2019-10-03T00:35:53+00:00"
"time": "2020-04-03T22:35:29+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@ -6304,16 +6211,16 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v3.6.2",
"version": "v3.6.3",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "786a947e57086cf236cefdee80784634224b99fa"
"reference": "1b3103013797f04521c6cae5560f604649484066"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/786a947e57086cf236cefdee80784634224b99fa",
"reference": "786a947e57086cf236cefdee80784634224b99fa",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066",
"reference": "1b3103013797f04521c6cae5560f604649484066",
"shasum": ""
},
"require": {
@ -6363,13 +6270,7 @@
"env",
"environment"
],
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
"type": "tidelift"
}
],
"time": "2020-03-27T23:36:02+00:00"
"time": "2020-04-12T15:18:03+00:00"
}
],
"packages-dev": [
@ -7147,16 +7048,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.3.0",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
"reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
"reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
"reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
"shasum": ""
},
"require": {
@ -7195,7 +7096,7 @@
"parser",
"php"
],
"time": "2019-11-08T13:50:10+00:00"
"time": "2020-04-10T16:34:50+00:00"
},
{
"name": "nunomaduro/collision",

View File

@ -11,7 +11,7 @@ return [
|--------------------------------------------------------------------------
*/
'themes_path' => realpath(base_path('resources/theme')), // eg: base_path('resources/themes')
'themes_path' => realpath(base_path('resources/views/theme')), // eg: base_path('resources/themes')
/*
|--------------------------------------------------------------------------
@ -20,7 +20,7 @@ return [
|--------------------------------------------------------------------------
*/
'asset_not_found' => 'LOG_ERROR',
'asset_not_found' => 'THROW_EXCEPTION',
/*
|--------------------------------------------------------------------------