diff --git a/.gitignore b/.gitignore
index f681820..17417ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
/storage/*.key
/vendor
/modules
+/development/
.env
.phpunit.result.cache
Homestead.json
diff --git a/composer.json b/composer.json
index b557a5b..4725c03 100755
--- a/composer.json
+++ b/composer.json
@@ -11,10 +11,10 @@
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"kalnoy/nestedset": "^5.0",
- "laravel/framework": "6.3.*",
+ "laravel/framework": "6.*",
"laravel/passport": "^7.3",
"laravel/tinker": "^1.0",
- "spatie/laravel-medialibrary": "^7.14",
+ "spatie/laravel-medialibrary": "^7.0.0",
"wm/common": "dev-master",
"wm/core": "dev-master",
"wm/crm": "dev-master",
@@ -26,7 +26,8 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^7.0",
+ "zircote/swagger-php": "^3.0"
},
"config": {
"optimize-autoloader": true,
diff --git a/composer.lock b/composer.lock
index 811d1a3..b6446a0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5,8 +5,7 @@
"This file is @generated automatically"
],
"content-hash": "ba1140d918fa8f2fc159bcd7e5416b0f",
- "packages": [
- {
+ "packages": [{
"name": "defuse/php-encryption",
"version": "v2.2.1",
"source": {
@@ -42,8 +41,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Taylor Hornby",
"email": "taylor@defuse.ca",
"homepage": "https://defuse.ca/"
@@ -137,8 +135,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
@@ -206,8 +203,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
@@ -266,8 +262,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
@@ -327,11 +322,9 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Eduardo Gulias Davis"
- }
- ],
+ "authors": [{
+ "name": "Eduardo Gulias Davis"
+ }],
"description": "A library for validating emails against several RFCs",
"homepage": "https://github.com/egulias/EmailValidator",
"keywords": [
@@ -374,13 +367,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Emanuil Rusev",
- "email": "hello@erusev.com",
- "homepage": "http://erusev.com"
- }
- ],
+ "authors": [{
+ "name": "Emanuil Rusev",
+ "email": "hello@erusev.com",
+ "homepage": "http://erusev.com"
+ }],
"description": "Parser for Markdown.",
"homepage": "http://parsedown.org",
"keywords": [
@@ -429,12 +420,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Chris Fidao",
- "email": "fideloper@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Chris Fidao",
+ "email": "fideloper@gmail.com"
+ }],
"description": "Set trusted proxies for Laravel",
"keywords": [
"load balancing",
@@ -473,8 +462,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Neuman Vong",
"email": "neuman+pear@twilio.com",
"role": "Developer"
@@ -535,13 +523,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- }
- ],
+ "authors": [{
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }],
"description": "Guzzle is a PHP HTTP client library",
"homepage": "http://guzzlephp.org/",
"keywords": [
@@ -593,13 +579,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- }
- ],
+ "authors": [{
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }],
"description": "Guzzle promises library",
"keywords": [
"promise"
@@ -653,8 +637,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
@@ -728,13 +711,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Oliver Vogel",
- "email": "oliver@olivervogel.com",
- "homepage": "http://olivervogel.com/"
- }
- ],
+ "authors": [{
+ "name": "Oliver Vogel",
+ "email": "oliver@olivervogel.com",
+ "homepage": "http://olivervogel.com/"
+ }],
"description": "Image handling and manipulation library with support for Laravel integration",
"homepage": "http://image.intervention.io/",
"keywords": [
@@ -781,12 +762,10 @@
"license": [
"BSD-2-Clause"
],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Jakub Onderka",
+ "email": "jakub.onderka@gmail.com"
+ }],
"time": "2018-09-29T17:23:10+00:00"
},
{
@@ -825,13 +804,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Jakub Onderka",
- "email": "acci@acci.cz",
- "homepage": "http://www.acci.cz/"
- }
- ],
+ "authors": [{
+ "name": "Jakub Onderka",
+ "email": "acci@acci.cz",
+ "homepage": "http://www.acci.cz/"
+ }],
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
@@ -878,12 +855,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Alexander Kalnoy",
- "email": "lazychaser@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Alexander Kalnoy",
+ "email": "lazychaser@gmail.com"
+ }],
"description": "Nested Set Model for Laravel 5.7 and up",
"keywords": [
"database",
@@ -1026,12 +1001,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylor@laravel.com"
- }
- ],
+ "authors": [{
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }],
"description": "The Laravel Framework.",
"homepage": "https://laravel.com",
"keywords": [
@@ -1097,12 +1070,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylor@laravel.com"
- }
- ],
+ "authors": [{
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }],
"description": "Laravel Passport provides OAuth2 server support to Laravel.",
"keywords": [
"laravel",
@@ -1159,12 +1130,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylor@laravel.com"
- }
- ],
+ "authors": [{
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }],
"description": "Powerful REPL for the Laravel framework.",
"keywords": [
"REPL",
@@ -1215,13 +1184,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Luís Otávio Cobucci Oblonczyk",
- "email": "lcobucci@gmail.com",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Luís Otávio Cobucci Oblonczyk",
+ "email": "lcobucci@gmail.com",
+ "role": "Developer"
+ }],
"description": "A simple library to work with JSON Web Token and JSON Web Signature",
"keywords": [
"JWS",
@@ -1265,12 +1232,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Frank de Jonge",
- "email": "info@frenky.net"
- }
- ],
+ "authors": [{
+ "name": "Frank de Jonge",
+ "email": "info@frenky.net"
+ }],
"description": "Event package",
"keywords": [
"emitter",
@@ -1335,12 +1300,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Frank de Jonge",
- "email": "info@frenky.net"
- }
- ],
+ "authors": [{
+ "name": "Frank de Jonge",
+ "email": "info@frenky.net"
+ }],
"description": "Filesystem abstraction: Many filesystems, one API.",
"keywords": [
"Cloud Files",
@@ -1403,13 +1366,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Jonathan Reinink",
- "email": "jonathan@reinink.ca",
- "homepage": "http://reinink.ca"
- }
- ],
+ "authors": [{
+ "name": "Jonathan Reinink",
+ "email": "jonathan@reinink.ca",
+ "homepage": "http://reinink.ca"
+ }],
"description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.",
"homepage": "http://glide.thephpleague.com",
"keywords": [
@@ -1468,8 +1429,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Alex Bilbie",
"email": "hello@alexbilbie.com",
"homepage": "http://www.alexbilbie.com",
@@ -1537,8 +1497,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Paul Duncan",
"email": "pabs@pablotron.org"
},
@@ -1627,13 +1586,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
+ "authors": [{
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }],
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
"homepage": "http://github.com/Seldaek/monolog",
"keywords": [
@@ -1675,12 +1632,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP Enum contributors",
- "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
- }
- ],
+ "authors": [{
+ "name": "PHP Enum contributors",
+ "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
+ }],
"description": "PHP Enum implementation",
"homepage": "http://github.com/myclabs/php-enum",
"keywords": [
@@ -1735,8 +1690,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
@@ -1795,11 +1749,9 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Nikita Popov"
- }
- ],
+ "authors": [{
+ "name": "Nikita Popov"
+ }],
"description": "A PHP parser written in PHP",
"keywords": [
"parser",
@@ -1846,8 +1798,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Marius Sarca",
"email": "marius.sarca@gmail.com"
},
@@ -1897,13 +1848,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "security@paragonie.com",
- "homepage": "https://paragonie.com"
- }
- ],
+ "authors": [{
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }],
"description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
"keywords": [
"csprng",
@@ -1948,12 +1897,10 @@
"license": [
"Apache2"
],
- "authors": [
- {
- "name": "Johannes M. Schmitt",
- "email": "schmittjoh@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Johannes M. Schmitt",
+ "email": "schmittjoh@gmail.com"
+ }],
"description": "Option Type for PHP",
"keywords": [
"language",
@@ -2005,8 +1952,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
@@ -2087,12 +2033,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
+ "authors": [{
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }],
"description": "Common Container Interface (PHP FIG PSR-11)",
"homepage": "https://github.com/php-fig/container",
"keywords": [
@@ -2137,12 +2081,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
+ "authors": [{
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }],
"description": "Common interfaces for PSR-7 HTTP message factories",
"keywords": [
"factory",
@@ -2188,12 +2130,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
+ "authors": [{
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }],
"description": "Common interface for HTTP messages",
"homepage": "https://github.com/php-fig/http-message",
"keywords": [
@@ -2238,12 +2178,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
+ "authors": [{
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
@@ -2285,12 +2223,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
+ "authors": [{
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }],
"description": "Common interfaces for simple caching",
"keywords": [
"cache",
@@ -2358,13 +2294,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Justin Hileman",
- "email": "justin@justinhileman.info",
- "homepage": "http://justinhileman.com"
- }
- ],
+ "authors": [{
+ "name": "Justin Hileman",
+ "email": "justin@justinhileman.info",
+ "homepage": "http://justinhileman.com"
+ }],
"description": "An interactive shell for modern PHP.",
"homepage": "http://psysh.org",
"keywords": [
@@ -2406,12 +2340,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Ralph Khattar",
- "email": "ralph.khattar@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }],
"description": "A polyfill for getallheaders.",
"time": "2019-03-08T08:55:37+00:00"
},
@@ -2473,8 +2405,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Marijn Huizendveld",
"email": "marijn.huizendveld@gmail.com"
},
@@ -2534,14 +2465,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }],
"description": "Manipulate images with an expressive API",
"homepage": "https://github.com/spatie/image",
"keywords": [
@@ -2584,14 +2513,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }],
"description": "Easily optimize images using PHP",
"homepage": "https://github.com/spatie/image-optimizer",
"keywords": [
@@ -2662,14 +2589,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://murze.be",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://murze.be",
+ "role": "Developer"
+ }],
"description": "Associate files with Eloquent models",
"homepage": "https://github.com/spatie/laravel-medialibrary",
"keywords": [
@@ -2715,14 +2640,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Freek Van der Herten",
- "email": "freek@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Freek Van der Herten",
+ "email": "freek@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }],
"description": "Convert a pdf to an image",
"homepage": "https://github.com/spatie/pdf-to-image",
"keywords": [
@@ -2764,14 +2687,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Alex Vanderbist",
- "email": "alex@spatie.be",
- "homepage": "https://spatie.be",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Alex Vanderbist",
+ "email": "alex@spatie.be",
+ "homepage": "https://spatie.be",
+ "role": "Developer"
+ }],
"description": "Easily create, use and destroy temporary directories",
"homepage": "https://github.com/spatie/temporary-directory",
"keywords": [
@@ -2824,8 +2745,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Chris Corbyn"
},
{
@@ -2903,8 +2823,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -2952,8 +2871,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3012,8 +2930,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3082,8 +2999,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3132,8 +3048,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -3189,8 +3104,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3244,8 +3158,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3336,8 +3249,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3391,8 +3303,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3447,8 +3358,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
},
@@ -3505,8 +3415,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -3566,8 +3475,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Laurent Bassin",
"email": "laurent@bassin.info"
},
@@ -3626,8 +3534,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -3682,8 +3589,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -3740,8 +3646,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -3795,8 +3700,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3854,8 +3758,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
@@ -3930,8 +3833,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -3986,8 +3888,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -4070,8 +3971,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
@@ -4119,8 +4019,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -4199,8 +4098,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
@@ -4255,13 +4153,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Tijs Verkoyen",
- "email": "css_to_inline_styles@verkoyen.eu",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Tijs Verkoyen",
+ "email": "css_to_inline_styles@verkoyen.eu",
+ "role": "Developer"
+ }],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2019-10-24T08:53:34+00:00"
@@ -4303,8 +4199,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"homepage": "https://gjcampbell.co.uk/"
@@ -4329,7 +4224,11 @@
"dist": {
"type": "path",
"url": "./modules/wm-common",
- "reference": "050f444e7eca87923e89b9720c7bef69225486af"
+ <<
+ << << < HEAD "reference": "050f444e7eca87923e89b9720c7bef69225486af" ===
+ === =
+ "reference": "94c64d08ddf0e2fe2df443559e255b8ac1053109" >>>
+ >>> > 4585 c2bcaf8f0602858320f596af444fc03c7818
},
"require": {
"php": "^7.1.3",
@@ -4372,7 +4271,11 @@
"dist": {
"type": "path",
"url": "./modules/wm-core",
- "reference": "7d5a1a7a36502482ef6d39c00e6d77ce4a11c5da"
+ <<
+ << << < HEAD "reference": "7d5a1a7a36502482ef6d39c00e6d77ce4a11c5da" ===
+ === =
+ "reference": "a134a6228fd1dd22ef09f0124aeffcf78bb116e2" >>>
+ >>> > 4585 c2bcaf8f0602858320f596af444fc03c7818
},
"require": {
"php": "^7.1.3"
@@ -4414,7 +4317,11 @@
"dist": {
"type": "path",
"url": "./modules/wm-crm",
- "reference": "286739cee040ddf6db4d6d7a346f498b568e9fbb"
+ <<
+ << << < HEAD "reference": "286739cee040ddf6db4d6d7a346f498b568e9fbb" ===
+ === =
+ "reference": "dab977301d306066e1186227ee1a6432178fe493" >>>
+ >>> > 4585 c2bcaf8f0602858320f596af444fc03c7818
},
"require": {
"php": "^7.1.3",
@@ -4458,12 +4365,15 @@
"dist": {
"type": "path",
"url": "./modules/wm-reservation",
- "reference": "032d8c064ee8038661df316a995f908dccbe9ede"
+ "reference": "efc73be821c7a1027caa8095c21121325182627a"
},
- "require": {
- "php": "^7.1.3",
+ "require": { <<
+ << << < HEAD "php": "^7.1.3",
"wm/common": "dev-master",
- "wm/core": "dev-master"
+ "wm/core": "dev-master" ===
+ === =
+ "wm/common": "dev-master" >>>
+ >>> > 4585 c2bcaf8f0602858320f596af444fc03c7818
},
"require-dev": {
"orchestra/testbench": "~3.6.0",
@@ -4560,8 +4470,7 @@
"time": "2019-10-10T17:38:20+00:00"
}
],
- "packages-dev": [
- {
+ "packages-dev": [{
"name": "beyondcode/laravel-dump-server",
"version": "1.3.0",
"source": {
@@ -4606,14 +4515,12 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Marcel Pociot",
- "email": "marcel@beyondco.de",
- "homepage": "https://beyondco.de",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Marcel Pociot",
+ "email": "marcel@beyondco.de",
+ "homepage": "https://beyondco.de",
+ "role": "Developer"
+ }],
"description": "Symfony Var-Dump Server for Laravel",
"homepage": "https://github.com/beyondcode/laravel-dump-server",
"keywords": [
@@ -4622,6 +4529,73 @@
],
"time": "2019-08-11T13:17:40+00:00"
},
+ {
+ "name": "doctrine/annotations",
+ "version": "v1.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/annotations.git",
+ "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc",
+ "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/lexer": "1.*",
+ "php": "^7.1"
+ },
+ "require-dev": {
+ "doctrine/cache": "1.*",
+ "phpunit/phpunit": "^7.5"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [{
+ "name": "Guilherme Blanco",
+ "email": "guilhermeblanco@gmail.com"
+ },
+ {
+ "name": "Roman Borschel",
+ "email": "roman@code-factory.org"
+ },
+ {
+ "name": "Benjamin Eberlei",
+ "email": "kontakt@beberlei.de"
+ },
+ {
+ "name": "Jonathan Wage",
+ "email": "jonwage@gmail.com"
+ },
+ {
+ "name": "Johannes Schmitt",
+ "email": "schmittjoh@gmail.com"
+ }
+ ],
+ "description": "Docblock Annotations Parser",
+ "homepage": "http://www.doctrine-project.org",
+ "keywords": [
+ "annotations",
+ "docblock",
+ "parser"
+ ],
+ "time": "2019-10-01T18:55:10+00:00"
+ },
{
"name": "doctrine/instantiator",
"version": "1.2.0",
@@ -4663,13 +4637,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
- }
- ],
+ "authors": [{
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com",
+ "homepage": "http://ocramius.github.com/"
+ }],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
"homepage": "https://www.doctrine-project.org/projects/instantiator.html",
"keywords": [
@@ -4720,13 +4692,11 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Filipe Dobreira",
- "homepage": "https://github.com/filp",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Filipe Dobreira",
+ "homepage": "https://github.com/filp",
+ "role": "Developer"
+ }],
"description": "php error handling for cool kids",
"homepage": "https://filp.github.io/whoops/",
"keywords": [
@@ -4776,11 +4746,9 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "François Zaninotto"
- }
- ],
+ "authors": [{
+ "name": "François Zaninotto"
+ }],
"description": "Faker is a PHP library that generates fake data for you.",
"keywords": [
"data",
@@ -4874,8 +4842,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Pádraic Brady",
"email": "padraic.brady@gmail.com",
"homepage": "http://blog.astrumfutura.com"
@@ -4993,12 +4960,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Nuno Maduro",
- "email": "enunomaduro@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Nuno Maduro",
+ "email": "enunomaduro@gmail.com"
+ }],
"description": "Cli error handling for console/command-line PHP applications.",
"keywords": [
"artisan",
@@ -5049,8 +5014,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Arne Blankerts",
"email": "arne@blankerts.de",
"role": "Developer"
@@ -5096,8 +5060,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Arne Blankerts",
"email": "arne@blankerts.de",
"role": "Developer"
@@ -5151,12 +5114,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Jaap van Otterdijk",
- "email": "opensource@ijaap.nl"
- }
- ],
+ "authors": [{
+ "name": "Jaap van Otterdijk",
+ "email": "opensource@ijaap.nl"
+ }],
"description": "Common reflection classes used by phpdocumentor to reflect the code structure",
"homepage": "http://www.phpdoc.org",
"keywords": [
@@ -5210,12 +5171,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
+ "authors": [{
+ "name": "Mike van Riel",
+ "email": "me@mikevanriel.com"
+ }],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2019-09-12T14:27:41+00:00"
},
@@ -5257,12 +5216,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Mike van Riel",
- "email": "me@mikevanriel.com"
- }
- ],
+ "authors": [{
+ "name": "Mike van Riel",
+ "email": "me@mikevanriel.com"
+ }],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"time": "2019-08-22T18:11:29+00:00"
},
@@ -5306,8 +5263,7 @@
"license": [
"MIT"
],
- "authors": [
- {
+ "authors": [{
"name": "Konstantin Kudryashov",
"email": "ever.zet@gmail.com",
"homepage": "http://everzet.com"
@@ -5376,13 +5332,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
"homepage": "https://github.com/sebastianbergmann/php-code-coverage",
"keywords": [
@@ -5427,13 +5381,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
"homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
"keywords": [
@@ -5469,13 +5421,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "Simple template engine.",
"homepage": "https://github.com/sebastianbergmann/php-text-template/",
"keywords": [
@@ -5518,13 +5468,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "Utility class for timing",
"homepage": "https://github.com/sebastianbergmann/php-timer/",
"keywords": [
@@ -5568,12 +5516,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Wrapper around PHP's tokenizer extension.",
"homepage": "https://github.com/sebastianbergmann/php-token-stream/",
"keywords": [
@@ -5649,13 +5595,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "The PHP Unit Testing framework.",
"homepage": "https://phpunit.de/",
"keywords": [
@@ -5700,12 +5644,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2017-03-04T06:30:41+00:00"
@@ -5747,8 +5689,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Jeff Welch",
"email": "whatthejeff@gmail.com"
},
@@ -5810,8 +5751,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
},
@@ -5868,12 +5808,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Provides functionality to handle HHVM/PHP environments",
"homepage": "http://www.github.com/sebastianbergmann/environment",
"keywords": [
@@ -5920,8 +5858,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
@@ -5988,12 +5925,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Snapshotting of global state",
"homepage": "http://www.github.com/sebastianbergmann/global-state",
"keywords": [
@@ -6038,12 +5973,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2017-08-03T12:35:26+00:00"
@@ -6083,12 +6016,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
"time": "2017-03-29T09:07:27+00:00"
@@ -6128,8 +6059,7 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
+ "authors": [{
"name": "Jeff Welch",
"email": "whatthejeff@gmail.com"
},
@@ -6178,12 +6108,10 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ }],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2018-10-04T04:07:39+00:00"
@@ -6220,17 +6148,73 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
+ "authors": [{
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00"
},
+ {
+ "name": "symfony/yaml",
+ "version": "v4.3.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
+ "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.1.3",
+ "symfony/polyfill-ctype": "~1.8"
+ },
+ "conflict": {
+ "symfony/console": "<3.4"
+ },
+ "require-dev": {
+ "symfony/console": "~3.4|~4.0"
+ },
+ "suggest": {
+ "symfony/console": "For validating YAML files using the lint command"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Yaml\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [{
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Yaml Component",
+ "homepage": "https://symfony.com",
+ "time": "2019-09-11T15:41:19+00:00"
+ },
{
"name": "theseer/tokenizer",
"version": "1.1.3",
@@ -6261,13 +6245,11 @@
"license": [
"BSD-3-Clause"
],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- }
- ],
+ "authors": [{
+ "name": "Arne Blankerts",
+ "email": "arne@blankerts.de",
+ "role": "Developer"
+ }],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"time": "2019-06-13T22:48:21+00:00"
},
@@ -6307,12 +6289,10 @@
"license": [
"MIT"
],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
+ "authors": [{
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
@@ -6320,6 +6300,68 @@
"validate"
],
"time": "2019-08-24T08:43:50+00:00"
+ },
+ {
+ "name": "zircote/swagger-php",
+ "version": "3.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zircote/swagger-php.git",
+ "reference": "f10ab7f81d89dba97653a980cc90cf4b7b73f543"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zircote/swagger-php/zipball/f10ab7f81d89dba97653a980cc90cf4b7b73f543",
+ "reference": "f10ab7f81d89dba97653a980cc90cf4b7b73f543",
+ "shasum": ""
+ },
+ "require": {
+ "doctrine/annotations": "*",
+ "php": ">=7.0",
+ "symfony/finder": ">=2.2",
+ "symfony/yaml": ">=3.3"
+ },
+ "require-dev": {
+ "phpunit/phpunit": ">=6.3",
+ "squizlabs/php_codesniffer": ">=3.3",
+ "zendframework/zend-form": "<2.8"
+ },
+ "bin": [
+ "bin/openapi"
+ ],
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "OpenApi\\": "src"
+ },
+ "files": [
+ "src/functions.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [{
+ "name": "Robert Allen",
+ "email": "zircote@gmail.com",
+ "homepage": "http://www.zircote.com"
+ },
+ {
+ "name": "Bob Fanger",
+ "email": "bfanger@gmail.com",
+ "homepage": "http://bfanger.nl"
+ }
+ ],
+ "description": "swagger-php - Generate interactive documentation for your RESTful API using phpdoc annotations",
+ "homepage": "https://github.com/zircote/swagger-php/",
+ "keywords": [
+ "api",
+ "json",
+ "rest",
+ "service discovery"
+ ],
+ "time": "2018-11-16T15:04:29+00:00"
}
],
"aliases": [],
diff --git a/config/filesystems.php b/config/filesystems.php
index 77fa5de..eff4862 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -64,6 +64,11 @@ return [
'url' => env('AWS_URL'),
],
+ 'media' => [
+ 'driver' => 'local',
+ 'root' => public_path('uploads'),
+ ],
+
],
];
diff --git a/config/medialibrary.php b/config/medialibrary.php
new file mode 100644
index 0000000..afb616f
--- /dev/null
+++ b/config/medialibrary.php
@@ -0,0 +1,156 @@
+ env('MEDIA_DISK', 'media'),
+
+ /*
+ * The maximum file size of an item in bytes.
+ * Adding a larger file will result in an exception.
+ */
+ 'max_file_size' => 1024 * 1024 * 10,
+
+ /*
+ * This queue will be used to generate derived and responsive images.
+ * Leave empty to use the default queue.
+ */
+ 'queue_name' => '',
+
+ /*
+ * The fully qualified class name of the media model.
+ */
+ 'media_model' => WM\Common\Models\Media::class,
+
+ 's3' => [
+ /*
+ * The domain that should be prepended when generating urls.
+ */
+ 'domain' => 'https://'.env('AWS_BUCKET').'.s3.amazonaws.com',
+ ],
+
+ 'remote' => [
+ /*
+ * Any extra headers that should be included when uploading media to
+ * a remote disk. Even though supported headers may vary between
+ * different drivers, a sensible default has been provided.
+ *
+ * Supported by S3: CacheControl, Expires, StorageClass,
+ * ServerSideEncryption, Metadata, ACL, ContentEncoding
+ */
+ 'extra_headers' => [
+ 'CacheControl' => 'max-age=604800',
+ ],
+ ],
+
+ 'responsive_images' => [
+
+ /*
+ * This class is responsible for calculating the target widths of the responsive
+ * images. By default we optimize for filesize and create variations that each are 20%
+ * smaller than the previous one. More info in the documentation.
+ *
+ * https://docs.spatie.be/laravel-medialibrary/v7/advanced-usage/generating-responsive-images
+ */
+ 'width_calculator' => Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator::class,
+
+ /*
+ * By default rendering media to a responsive image will add some javascript and a tiny placeholder.
+ * This ensures that the browser can already determine the correct layout.
+ */
+ 'use_tiny_placeholders' => true,
+
+ /*
+ * This class will generate the tiny placeholder used for progressive image loading. By default
+ * the medialibrary will use a tiny blurred jpg image.
+ */
+ 'tiny_placeholder_generator' => Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
+ ],
+
+ /*
+ * When urls to files get generated, this class will be called. Leave empty
+ * if your files are stored locally above the site root or on s3.
+ */
+ 'url_generator' => null,
+
+ /*
+ * Whether to activate versioning when urls to files get generated.
+ * When activated, this attaches a ?v=xx query string to the URL.
+ */
+ 'version_urls' => false,
+
+ /*
+ * The class that contains the strategy for determining a media file's path.
+ */
+ 'path_generator' => null,
+
+ /*
+ * Medialibrary will try to optimize all converted images by removing
+ * metadata and applying a little bit of compression. These are
+ * the optimizers that will be used by default.
+ */
+ 'image_optimizers' => [
+ Spatie\ImageOptimizer\Optimizers\Jpegoptim::class => [
+ '--strip-all', // this strips out all text information such as comments and EXIF data
+ '--all-progressive', // this will make sure the resulting image is a progressive one
+ ],
+ Spatie\ImageOptimizer\Optimizers\Pngquant::class => [
+ '--force', // required parameter for this package
+ ],
+ Spatie\ImageOptimizer\Optimizers\Optipng::class => [
+ '-i0', // this will result in a non-interlaced, progressive scanned image
+ '-o2', // this set the optimization level to two (multiple IDAT compression trials)
+ '-quiet', // required parameter for this package
+ ],
+ Spatie\ImageOptimizer\Optimizers\Svgo::class => [
+ '--disable=cleanupIDs', // disabling because it is known to cause troubles
+ ],
+ Spatie\ImageOptimizer\Optimizers\Gifsicle::class => [
+ '-b', // required parameter for this package
+ '-O3', // this produces the slowest but best results
+ ],
+ ],
+
+ /*
+ * These generators will be used to create an image of media files.
+ */
+ 'image_generators' => [
+ Spatie\MediaLibrary\ImageGenerators\FileTypes\Image::class,
+ Spatie\MediaLibrary\ImageGenerators\FileTypes\Webp::class,
+ Spatie\MediaLibrary\ImageGenerators\FileTypes\Pdf::class,
+ Spatie\MediaLibrary\ImageGenerators\FileTypes\Svg::class,
+ Spatie\MediaLibrary\ImageGenerators\FileTypes\Video::class,
+ ],
+
+ /*
+ * The engine that should perform the image conversions.
+ * Should be either `gd` or `imagick`.
+ */
+ 'image_driver' => 'gd',
+
+ /*
+ * FFMPEG & FFProbe binaries paths, only used if you try to generate video
+ * thumbnails and have installed the php-ffmpeg/php-ffmpeg composer
+ * dependency.
+ */
+ 'ffmpeg_path' => env('FFMPEG_PATH', '/usr/bin/ffmpeg'),
+ 'ffprobe_path' => env('FFPROBE_PATH', '/usr/bin/ffprobe'),
+
+ /*
+ * The path where to store temporary files while performing image conversions.
+ * If set to null, storage_path('medialibrary/temp') will be used.
+ */
+ 'temporary_directory_path' => null,
+
+ /*
+ * Here you can override the class names of the jobs used by this package. Make sure
+ * your custom jobs extend the ones provided by the package.
+ */
+ 'jobs' => [
+ 'perform_conversions' => Spatie\MediaLibrary\Jobs\PerformConversions::class,
+ 'generate_responsive_images' => Spatie\MediaLibrary\Jobs\GenerateResponsiveImages::class,
+ ],
+];
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..f4ea718
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,19 @@
+{
+ "compilerOptions": {
+ "module": "es6",
+ "target": "es2017",
+ "allowSyntheticDefaultImports": true,
+ "baseUrl": "./",
+ "paths": {
+ "@JS/*": ["./resources/js/*"],
+ "@Global/*": ["./resources/js/Global/*"],
+ "@Home/*": ["./resources/js/Home/*"],
+ "@CRM/*": ["./modules/wm-crm/resources/js/*"],
+ "@Common/*": ["./modules/wm-common/resources/js/*"],
+ "@Core/*": ["./modules/wm-core/resources/js/*"],
+ "@User/*": ["./modules/wm-core/resources/js/Modules/User/*"],
+ "@Auth/*": ["./modules/wm-core/resources/js/Modules/Authentication/*"]
+ }
+ },
+ "exclude": ["node_modules"]
+ }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9681d6b..9b80022 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3965,6 +3965,11 @@
"integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
"dev": true
},
+ "dropzone": {
+ "version": "5.5.1",
+ "resolved": "https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz",
+ "integrity": "sha512-3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA=="
+ },
"duplexer3": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -11602,6 +11607,14 @@
"vue-template-compiler": "^2.5.13"
}
},
+ "vue2-dropzone": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/vue2-dropzone/-/vue2-dropzone-3.6.0.tgz",
+ "integrity": "sha512-YXC1nCWIZvfa98e/i6h+EshZCkFSxFEh0Sxr9ODfThAPPDVhAzLLlz/4XIx0NGO1QeSy6htwSstte47R7vVhLQ==",
+ "requires": {
+ "dropzone": "^5.5.1"
+ }
+ },
"vuetify": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.1.tgz",
diff --git a/package.json b/package.json
index 04f7597..a34f859 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
"vue-scroll-reveal": "^1.0.11",
"vue-the-mask": "^0.11.1",
"vue-tinymce-editor": "^1.6.2",
+ "vue2-dropzone": "^3.6.0",
"vuetify": "^2.0.19"
},
"devDependencies": {
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 48e5f4e..f528624 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
{
- "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=819b3d17d481c306f180",
- "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=039099abb3e02beeaee8",
- "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=690f40fe1935f237b5e5",
- "/js/vue/User/app.js": "/js/vue/User/app.js?id=bbe2a8c4869dfd0e6a86"
+ "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=5ecd9d63d69524aa5d59",
+ "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7919d02b13503006b63e",
+ "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=847452875db92e8b7b3b",
+ "/js/vue/User/app.js": "/js/vue/User/app.js?id=18aa487b7bff671e9e13"
}
diff --git a/resources/js/Global/components/Inputs/Checkbox.vue b/resources/js/Global/components/Inputs/Checkbox.vue
index 2cf8ea1..43e3006 100644
--- a/resources/js/Global/components/Inputs/Checkbox.vue
+++ b/resources/js/Global/components/Inputs/Checkbox.vue
@@ -1,52 +1,103 @@
-
-
-
-
+
+
+
+
diff --git a/resources/js/Global/components/Inputs/Dropzone.vue b/resources/js/Global/components/Inputs/Dropzone.vue
new file mode 100644
index 0000000..fbb0501
--- /dev/null
+++ b/resources/js/Global/components/Inputs/Dropzone.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
diff --git a/resources/js/Global/mixins/commingSoon.js b/resources/js/Global/mixins/commingSoon.js
index f713f4d..407282e 100644
--- a/resources/js/Global/mixins/commingSoon.js
+++ b/resources/js/Global/mixins/commingSoon.js
@@ -3,14 +3,11 @@ var CommingSoonArray = [
"discount",
"transaction",
"email",
- // "sms",
"prescription",
"user_sms",
"crm-setting",
- // "crm-client-filter",
"crm-statistics",
- // "user-list-filter",
];
const commingSoon = {
methods: {
diff --git a/resources/js/Global/scss/style.scss b/resources/js/Global/scss/style.scss
index 5ae10cc..923f493 100644
--- a/resources/js/Global/scss/style.scss
+++ b/resources/js/Global/scss/style.scss
@@ -234,6 +234,10 @@ a:hover {
border-radius: 5px;
}
+.PreFormatted {
+ white-space: pre;
+}
+
input:-webkit-autofill,
input:-webkit-autofill:hover,
input:-webkit-autofill:focus,
diff --git a/resources/js/Global/utils/common/CreateFilterObject.js b/resources/js/Global/utils/common/CreateFilterObject.js
index 32c5be8..5127602 100644
--- a/resources/js/Global/utils/common/CreateFilterObject.js
+++ b/resources/js/Global/utils/common/CreateFilterObject.js
@@ -10,7 +10,7 @@ const createFilterObject = filters => {
}
}
}
- return filterObject;
+ return {filters: filterObject};
};
window['between'] = function (filter) {
var value = null;
diff --git a/resources/js/Global/utils/common/math.js b/resources/js/Global/utils/common/math.js
new file mode 100644
index 0000000..7cd245f
--- /dev/null
+++ b/resources/js/Global/utils/common/math.js
@@ -0,0 +1,10 @@
+const makeid = function makeid(length) {
+ var text = "";
+ var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+ for (var i = 0; i < length; i++)
+ text += possible.charAt(Math.floor(Math.random() * possible.length));
+
+ return text;
+}
+export { makeid };
\ No newline at end of file
diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue
index 9ef85f7..27c2935 100644
--- a/resources/js/Home/views/Home.vue
+++ b/resources/js/Home/views/Home.vue
@@ -18,7 +18,7 @@
>
-
+
fas fa-plus
@@ -31,8 +31,12 @@