From 73dda8df5628acccda09ea0f94fa7dcf3b984d90 Mon Sep 17 00:00:00 2001 From: Saeid Date: Wed, 30 Oct 2019 10:42:12 +0330 Subject: [PATCH 1/4] dropzone and update comming soon --- jsconfig.json | 19 +++++++ package-lock.json | 13 +++++ package.json | 1 + public/mix-manifest.json | 8 +-- .../js/Global/components/Inputs/Dropzone.vue | 54 +++++++++++++++++++ resources/js/Global/mixins/commingSoon.js | 3 -- 6 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 jsconfig.json create mode 100644 resources/js/Global/components/Inputs/Dropzone.vue 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 6e45844..295b52a 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=979ca3cbe3ae6f2f6648", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=952eba47f3c87b27c8e4", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=2438d0b19611c164de10", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=90b3808d13f34c14baac" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=b727d2fdd4ae9b2599ca", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=73deaff9655f8ee55fcb", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=d94428e8a2e4f40c46c8", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=2b834de4476db0e81b1b" } diff --git a/resources/js/Global/components/Inputs/Dropzone.vue b/resources/js/Global/components/Inputs/Dropzone.vue new file mode 100644 index 0000000..db1d870 --- /dev/null +++ b/resources/js/Global/components/Inputs/Dropzone.vue @@ -0,0 +1,54 @@ + + + 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: { From b16bf87c05db1b8038d538e06eaf55f5ff9ceac8 Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 31 Oct 2019 21:07:46 +0330 Subject: [PATCH 2/4] work in office --- composer.json | 3 +- composer.lock | 522 +++++++++++++++++- public/mix-manifest.json | 8 +- .../js/Global/components/Inputs/Dropzone.vue | 50 +- .../Global/utils/common/CreateFilterObject.js | 2 +- resources/js/Global/utils/common/math.js | 10 + 6 files changed, 570 insertions(+), 25 deletions(-) create mode 100644 resources/js/Global/utils/common/math.js diff --git a/composer.json b/composer.json index 47435a3..4725c03 100755 --- a/composer.json +++ b/composer.json @@ -9,11 +9,12 @@ "license": "MIT", "require": { "php": "^7.1.3", - "kalnoy/nestedset": "^5.0", "fideloper/proxy": "^4.0", + "kalnoy/nestedset": "^5.0", "laravel/framework": "6.*", "laravel/passport": "^7.3", "laravel/tinker": "^1.0", + "spatie/laravel-medialibrary": "^7.0.0", "wm/common": "dev-master", "wm/core": "dev-master", "wm/crm": "dev-master", diff --git a/composer.lock b/composer.lock index 1bfab58..b175b56 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "0a26b53029eed85894d6f45cc5bb36d3", + "content-hash": "40be9045e2b8a425ef001b08f362c834", "packages": [ { "name": "defuse/php-encryption", @@ -676,6 +676,76 @@ ], "time": "2019-07-01T23:21:34+00:00" }, + { + "name": "intervention/image", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/Intervention/image.git", + "reference": "39eaef720d082ecc54c64bf54541c55f10db546d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/image/zipball/39eaef720d082ecc54c64bf54541c55f10db546d", + "reference": "39eaef720d082ecc54c64bf54541c55f10db546d", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.2", + "phpunit/phpunit": "^4.8 || ^5.7" + }, + "suggest": { + "ext-gd": "to use GD library based image processing.", + "ext-imagick": "to use Imagick based image processing.", + "intervention/imagecache": "Caching extension for the Intervention Image library" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + }, + "laravel": { + "providers": [ + "Intervention\\Image\\ImageServiceProvider" + ], + "aliases": { + "Image": "Intervention\\Image\\Facades\\Image" + } + } + }, + "autoload": { + "psr-4": { + "Intervention\\Image\\": "src/Intervention/Image" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "gd", + "image", + "imagick", + "laravel", + "thumbnail", + "watermark" + ], + "time": "2019-06-24T14:06:31+00:00" + }, { "name": "jakub-onderka/php-console-color", "version": "v0.2", @@ -1292,6 +1362,67 @@ ], "time": "2019-10-16T21:01:05+00:00" }, + { + "name": "league/glide", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/glide.git", + "reference": "a5477e9e822ed57b39861a17092b92553634932d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/a5477e9e822ed57b39861a17092b92553634932d", + "reference": "a5477e9e822ed57b39861a17092b92553634932d", + "shasum": "" + }, + "require": { + "intervention/image": "^2.4", + "league/flysystem": "^1.0", + "php": "^5.5 | ^7.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "mockery/mockery": "~0.9", + "phpunit/php-token-stream": "^1.4", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Glide\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "ImageMagick", + "editing", + "gd", + "image", + "imagick", + "league", + "manipulation", + "processing" + ], + "time": "2019-04-03T23:46:42+00:00" + }, { "name": "league/oauth2-server", "version": "7.4.0", @@ -1369,6 +1500,67 @@ ], "time": "2019-05-05T09:22:01+00:00" }, + { + "name": "maennchen/zipstream-php", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/maennchen/ZipStream-PHP.git", + "reference": "6373eefe0b3274d7b702d81f2c99aa977ff97dc2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6373eefe0b3274d7b702d81f2c99aa977ff97dc2", + "reference": "6373eefe0b3274d7b702d81f2c99aa977ff97dc2", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "myclabs/php-enum": "^1.5", + "php": ">= 7.1", + "psr/http-message": "^1.0" + }, + "require-dev": { + "ext-zip": "*", + "guzzlehttp/guzzle": ">= 6.3", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": ">= 7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "ZipStream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paul Duncan", + "email": "pabs@pablotron.org" + }, + { + "name": "Jesse Donat", + "email": "donatj@gmail.com" + }, + { + "name": "Jonatan Männchen", + "email": "jonatan@maennchen.ch" + }, + { + "name": "András Kolesár", + "email": "kolesar@kolesar.hu" + } + ], + "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.", + "keywords": [ + "stream", + "zip" + ], + "time": "2019-07-17T11:01:58+00:00" + }, { "name": "monolog/monolog", "version": "2.0.0", @@ -1450,6 +1642,51 @@ ], "time": "2019-08-30T09:56:44+00:00" }, + { + "name": "myclabs/php-enum", + "version": "1.7.2", + "source": { + "type": "git", + "url": "https://github.com/myclabs/php-enum.git", + "reference": "45f01adf6922df6082bcda36619deb466e826acf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/45f01adf6922df6082bcda36619deb466e826acf", + "reference": "45f01adf6922df6082bcda36619deb466e826acf", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "squizlabs/php_codesniffer": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "enum" + ], + "time": "2019-08-19T13:53:00+00:00" + }, { "name": "nesbot/carbon", "version": "2.25.3", @@ -2258,6 +2495,289 @@ ], "time": "2018-07-19T23:38:55+00:00" }, + { + "name": "spatie/image", + "version": "1.7.4", + "source": { + "type": "git", + "url": "https://github.com/spatie/image.git", + "reference": "19ed0a6322e3f700d40d5b84b05c76b58323385c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/image/zipball/19ed0a6322e3f700d40d5b84b05c76b58323385c", + "reference": "19ed0a6322e3f700d40d5b84b05c76b58323385c", + "shasum": "" + }, + "require": { + "ext-exif": "*", + "league/glide": "^1.4", + "php": "^7.0", + "spatie/image-optimizer": "^1.0", + "spatie/temporary-directory": "^1.0.0", + "symfony/process": "^3.0|^4.0" + }, + "require-dev": { + "larapack/dd": "^1.1", + "phpunit/phpunit": "^6.0|^7.0", + "symfony/var-dumper": "^3.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Image\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "image", + "spatie" + ], + "time": "2019-08-28T12:40:25+00:00" + }, + { + "name": "spatie/image-optimizer", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/image-optimizer.git", + "reference": "e7527edc984c98ab61db092742856fb15cf71e68" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/e7527edc984c98ab61db092742856fb15cf71e68", + "reference": "e7527edc984c98ab61db092742856fb15cf71e68", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "php": "^7.2", + "psr/log": "^1.0", + "symfony/process": "^4.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.0", + "symfony/var-dumper": "^4.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\ImageOptimizer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "image-optimizer", + "spatie" + ], + "time": "2019-08-28T14:33:06+00:00" + }, + { + "name": "spatie/laravel-medialibrary", + "version": "7.14.2", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-medialibrary.git", + "reference": "f96fd75f70e893b1b2c85224526e6d4a2c235ef8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/f96fd75f70e893b1b2c85224526e6d4a2c235ef8", + "reference": "f96fd75f70e893b1b2c85224526e6d4a2c235ef8", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/pipeline": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0", + "league/flysystem": "^1.0.8", + "maennchen/zipstream-php": "^0.4|^1.0", + "php": "^7.2", + "spatie/image": "^1.4.0", + "spatie/pdf-to-image": "^1.2", + "spatie/temporary-directory": "^1.1" + }, + "conflict": { + "php-ffmpeg/php-ffmpeg": "<0.6.1" + }, + "require-dev": { + "doctrine/dbal": "^2.5.2", + "ext-pdo_sqlite": "*", + "guzzlehttp/guzzle": "^6.3", + "league/flysystem-aws-s3-v3": "^1.0.13", + "mockery/mockery": "^1.0.0", + "orchestra/testbench": "~3.8.0|^4.0", + "phpunit/phpunit": "^8.0", + "spatie/phpunit-snapshot-assertions": "^2.0" + }, + "suggest": { + "league/flysystem-aws-s3-v3": "Required to use AWS S3 file storage", + "php-ffmpeg/php-ffmpeg": "Required for generating video thumbnails" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\MediaLibrary\\MediaLibraryServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\MediaLibrary\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "cms", + "conversion", + "downloads", + "images", + "laravel", + "laravel-medialibrary", + "media", + "spatie" + ], + "time": "2019-10-16T13:46:56+00:00" + }, + { + "name": "spatie/pdf-to-image", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/spatie/pdf-to-image.git", + "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/pdf-to-image/zipball/9a5cb264a99e87e010c65d4ece03b51f821d55bd", + "reference": "9a5cb264a99e87e010c65d4ece03b51f821d55bd", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*", + "scrutinizer/ocular": "~1.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\PdfToImage\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "convert", + "image", + "pdf", + "pdf-to-image", + "spatie" + ], + "time": "2016-12-14T15:37:00+00:00" + }, + { + "name": "spatie/temporary-directory", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/spatie/temporary-directory.git", + "reference": "3e51af9a8361f85cffc1fb2c52135f3e064758cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/3e51af9a8361f85cffc1fb2c52135f3e064758cc", + "reference": "3e51af9a8361f85cffc1fb2c52135f3e064758cc", + "shasum": "" + }, + "require": { + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\TemporaryDirectory\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "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": [ + "spatie", + "temporary-directory" + ], + "time": "2019-08-28T06:53:51+00:00" + }, { "name": "swiftmailer/swiftmailer", "version": "v6.2.1", diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 295b52a..3363674 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=b727d2fdd4ae9b2599ca", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=73deaff9655f8ee55fcb", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=d94428e8a2e4f40c46c8", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=2b834de4476db0e81b1b" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=42d1ece5793850ca1789", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=94ebb67c763feaa650b5", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=9820a359fba47610e03a", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=16732452589586a065c2" } diff --git a/resources/js/Global/components/Inputs/Dropzone.vue b/resources/js/Global/components/Inputs/Dropzone.vue index db1d870..09d11cb 100644 --- a/resources/js/Global/components/Inputs/Dropzone.vue +++ b/resources/js/Global/components/Inputs/Dropzone.vue @@ -1,49 +1,63 @@