fix confilit

composer-prod.json

@@ -15,7 +15,7 @@
         "laravel/passport": "^10",
         "laravel/tinker": "^2.0",
         "maatwebsite/excel": "^3.1",
-        "nestedset/willaarts": "^5.0.7",
+        "kalnoy/nestedset": "^6.0",
         "sentry/sentry-laravel": "^2.3",
         "spatie/laravel-medialibrary": "^8.0.0",
         "io-developer/php-whois": "^4.0",
@@ -29,6 +29,8 @@
         "wm/service": "dev-master",
         "wm/store": "dev-master",
 	    "wm/admin": "dev-master",
+        "wm/web-builder": "dev-master",
+        "wm/app-management": "dev-master",
         "wm/notification": "dev-master",
         "wm/roll-call": "dev-master",
         "zircote/swagger-php": "^3.0"
@@ -125,6 +127,14 @@
             "type": "vcs",
             "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/roll-call.git"
         },
+        {
+            "type": "vcs",
+            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/app-management.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/web-builder.git"
+        }, 
         {
             "type": "vcs",
             "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/admin.git"

composer.json

@@ -29,6 +29,9 @@
         "wm/service": "dev-master",
         "wm/store": "dev-master",
 	    "wm/admin": "dev-master",
+	    "wm/service-store": "dev-master",
+	    "wm/finance": "dev-master",
+	    "wm/warehouse": "dev-master",
         "wm/notification": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
@@ -120,6 +123,18 @@
             "type": "path",
             "url": "./modules/wm-notification"
         },
+        {
+            "type": "path",
+            "url": "./modules/wm-service-store"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-finance"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-warehouse"
+        },
         {
             "type": "path",
             "url": "./modules/wm-admin"

config/database.php

@@ -91,6 +91,14 @@ return [
             'prefix_indexes' => true,
         ],
 
+        'site' => [
+            'driver' => 'sqlite',
+            'url' => env('DATABASE_URL'),
+            'database' => env('DB_DATABASE', database_path('database.sqlite')),
+            'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
+        ],
+
     ],
 
     /*

config/filesystems.php

@@ -68,7 +68,14 @@ return [
         'media_dev' => [
             'driver' => 'local',
             'root' => public_path(),
-            'url'   => '',
+            'url'   => env('APP_URL').'/',
+            'visibility'    => 'public'
+        ],
+
+        'site' => [
+            'driver' => 'local',
+            'root' => resource_path('views'),
+            'url'   => env('APP_URL').'/',
             'visibility'    => 'public'
         ],
 

package.json

@@ -2,90 +2,66 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=webpack.config.js",
+        "development": "mix",
-        "watch": "npm run development -- --watch",
+        "watch": "mix watch",
-        "watch-poll": "npm run watch -- --watch-poll",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=webpack.config.js",
+        "hot": "mix watch --hot",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=webpack.config.js"
+        "production": "mix --production"
     },
     "dependencies": {
-        "@ckeditor/ckeditor5-build-classic": "^12.4.0",
-        "@ckeditor/ckeditor5-build-decoupled-document": "^16.0.0",
-        "@ckeditor/ckeditor5-font": "^16.0.0",
-        "@ckeditor/ckeditor5-vue": "^1.0.1",
-        "@fortawesome/fontawesome-free": "^5.5.0",
         "@riophae/vue-treeselect": "^0.4.0",
         "@tinymce/tinymce-vue": "^3.0.1",
-        "ajv": "^6.10.0",
+        "vue-tinymce-editor": "^1.6.2",
-        "apexcharts": "^3.8.3",
+        "apexcharts": "^3.27.1",
-        "apollo-boost": "^0.4.3",
-        "apollo-cache-inmemory": "^1.6.2",
-        "apollo-link-context": "^1.0.18",
         "axios": "^0.21.1",
         "babel-polyfill": "^6.26.0",
-        "bootstrap": "^4.3.1",
+        "codemirror": "^5.60.0",
-        "bootstrap-select": "^1.13.3",
+        "dedent": "^0.7.0",
-        "bootstrap-v4-rtl": "^4.1.1-0",
+        "fslightbox-vue": "^1.2.0",
-        "bootstrap-vue": "^2.0.0-rc.19",
-        "chart.js": "^2.7.3",
-        "graphql": "^14.4.2",
-        "graphql-tag": "^2.10.1",
         "izitoast": "^1.4.0",
         "jalali-moment": "^3.3.3",
-        "loadash": "^1.0.0",
         "moment": "^2.29.1",
         "moment-jalaali": "^0.9.2",
         "object-to-formdata": "^2.1.2",
-        "postcss-loader": "^3.0.0",
         "prismjs": "^1.21.0",
-        "raw-loader": "^0.5.1",
+        "quill": "^1.3.7",
-        "v-mask": "^2.2.3",
+        "vee-validate": "^3.4.10",
-        "vee-validate": "^3.4.5",
         "vue-advanced-cropper": "^0.14.1",
-        "vue-apexcharts": "^1.4.0",
+        "vue-apexcharts": "^1.6.1",
-        "vue-apollo": "^3.0.0-alpha.3",
         "vue-chartjs": "^3.4.0",
-        "vue-ckeditor5": "^0.4.1",
+        "vue-codemirror": "^4.0.6",
-        "vue-cropperjs": "^4.0.1",
+        "vue-color": "^2.8.1",
+        "vue-dialog-drag": "^0.1.29",
+        "vue-directive-tooltip": "^1.6.3",
         "vue-gallery": "^2.0.1",
         "vue-jalali-moment": "^1.0.0",
+        "vue-js-toggle-button": "^1.3.3",
+        "vue-masonry-wall": "^0.3.2",
         "vue-moment": "^4.1.0",
-        "vue-persian-datetime-picker": "^2.4.1",
+        "vue-persian-datetime-picker": "^2.6.1",
         "vue-prism-editor": "^1.2.2",
+        "vue-quill-editor": "^3.0.6",
+        "vue-range-component": "^1.0.3",
         "vue-router": "^3.0.2",
-        "vue-scroll-reveal": "^1.0.11",
+        "vue-select": "^3.11.2",
-        "vue-the-mask": "^0.11.1",
-        "vue-tinymce-editor": "^1.6.2",
         "vue2-dropzone": "^3.6.0",
-        "fslightbox-vue": "^1.2.0",
+        "vuetify": "^2.5.4"
-        "vuetify": "^2.3.17"
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/preset-env": "^7.6.2",
+        "@babel/preset-env": "^7.14.5",
-        "@ckeditor/ckeditor5-alignment": "^16.0.0",
-        "@mdi/font": "^3.9.97",
         "cross-env": "^5.2.1",
-        "deepmerge": "^4.0.0",
+        "laravel-mix": "^6.0.24",
-        "fibers": "^4.0.1",
+        "node-sass": "^6.0.0",
-        "jquery": "^3.5.1",
+        "sass": "^1.35.1",
-        "laravel-mix": "^5.0.9",
+        "sass-loader": "^12.1.0",
-        "material-design-icons-iconfont": "^4.0.3",
-        "node-sass": "^4.14.1",
         "popper.js": "^2.0.0-next.4",
-        "pug": "^2.0.3",
+        "vue": "^2.6.14",
-        "pug-loader": "^2.4.0",
+        "vue-loader": "^15.9.7",
-        "pug-plain-loader": "^1.0.0",
-        "sass": "^1.22.12",
-        "sass-loader": "^7.3.1",
-        "ts-loader": "^8.0.11",
-        "typescript": "^4.1.2",
-        "vue": "^2.6.10",
         "vue-masonry-css": "^1.0.3",
         "vue-meta": "^1.5.2",
-        "vue-resource": "^1.5.1",
+        "vue-template-compiler": "^2.6.14",
-        "vue-template-compiler": "^2.6.10",
         "vuex": "^3.0.1",
         "vuex-router-sync": "^5.0.0"
     }

routes/web.php

@@ -12,5 +12,4 @@
 */
 
 Route::view('main/{any?}', 'Home');
-Route::view('WebsiteManagement/{any?}', 'WebsiteManagement');
 Route::redirect('{any?}/{any1?}/{any3?}', '/main/home');

webpack.mix.js

@@ -1,4 +1,5 @@
 const mix = require('laravel-mix');
+const path = require('path');
 /*
  |--------------------------------------------------------------------------
  | Mix Asset Management
@@ -32,7 +33,7 @@ mix.webpackConfig({
     }
 });
 
-mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
+mix.js('resources/js/Home/app.js', 'public/js/vue/Home').vue({version: 2});
 
 require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
@@ -45,10 +46,12 @@ require('./modules/wm-store/webpack.mix');
 require('./modules/wm-admin/webpack.mix');
 require('./modules/wm-notification/webpack.mix');
 require('./modules/wm-roll-call/webpack.mix');
-
+require('./modules/wm-finance/webpack.mix');
-//require('./modules/wm-finance/webpack.mix');
+require('./modules/wm-app-management/webpack.mix');
-// require('./modules/wm-web-builder/webpack.mix');
+require('./modules/wm-web-builder/webpack.mix');
-//require('./modules/wm-warehouse/webpack.mix');
+// require('./modules/wm-service-store/webpack.mix');
+// require('./modules/wm-warehouse/webpack.mix');
 // require('./modules/wm-reservation/webpack.mix');
+// require('./modules/wm-contact-us/webpack.mix');
 
 mix.version();