test

Reviewed-on: WillaEngine-Project/WillaEngine#152

.dockerignore

@@ -2,3 +2,4 @@
 vendor
 node_modules
 modules
+composer.lock

.drone.yml

@@ -0,0 +1,53 @@
+kind: pipeline
+type: exec
+name: default
+
+steps:
+  - name: build to production
+    commands:
+      - docker build -t registry.willaspace.com/willaspace/willaengine-test:latest --build-arg COMPOSER_FILE_NAME=composer-prod .
+    when:
+      branch:
+        - master
+
+  - name: deploy to production
+    commands:
+      - cd /apps/willaengine/ ; docker-compose up -d
+      - docker exec willaengine-test bash -c "COMPOSER=composer-prod.json composer update"
+      - docker exec willaengine-test php artisan config:cache
+      - docker exec willaengine-test php artisan route:cache
+#      - docker exec willaengine_worker bash -c "COMPOSER=composer-prod.json composer update"
+#      - docker exec willaengine_worker service supervisor start
+#      - docker network connect nginx_default willaengine
+    when:
+      branch:
+        - master
+
+
+  - name: build to staging
+    commands:
+      - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest  --build-arg COMPOSER_FILE_NAME=composer-staging -f Dockerfile.staging .
+      - docker build -t registry.willaspace.com/willaspace/willaengine-staging-nginx:latest -f Dockerfile.nginx .
+    when:
+      branch:
+        - dev
+
+  - name: deploy to staging
+    commands:
+      - cd /apps/willaengine-staging/ ; docker-compose up -d
+      - docker exec willaengine-staging_php bash -c "COMPOSER=composer-staging.json composer update"
+      - docker exec willaengine-staging_php bash -c "php artisan route:cache"
+      - docker exec willaengine-staging_php bash -c "php artisan config:cache"
+      - docker exec willaengine-staging_worker bash -c "COMPOSER=composer-staging.json composer update"
+      - docker exec willaengine-staging_worker service supervisor start
+      - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations --force
+      - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/store/database/migrations --force
+    when:
+      branch:
+        - dev
+
+trigger:
+  branch:
+    - master
+    - dev
+

.gitattributes

@@ -3,3 +3,4 @@
 *.scss linguist-vendored
 *.js linguist-vendored
 CHANGELOG.md export-ignore
+

.gitignore

@@ -2,7 +2,9 @@
 /development/
 
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm
-# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm
+# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs, phpstorm
+
+resources/views/sites
 
 ### Laravel ###
 /vendor/

BuildDocker

@@ -0,0 +1,38 @@
+#!/bin/bash
+# rsync script
+
+git pull origin master
+
+cd modules
+for f in *
+do
+  cd $f && git pull origin master && cd ..
+done
+cd ..
+
+npm install
+
+rm -r /home/administrator/apps/willaengine/public/js/vue
+
+npm run prod
+
+rm -r /home/administrator/apps/nginx/www/willaengine/public/js/vue
+rm -r /home/administrator/apps/nginx/www/willamall/public/js/vue
+rm -r /home/administrator/apps/nginx/www/willaarts/public/js/vue
+
+cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaengine/public/js/
+
+cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willamall/public/js/
+
+cp -r /home/administrator/apps/willaengine/public/js/vue /home/administrator/apps/nginx/www/willaarts/public/js/
+
+cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaengine/public/
+
+cp /home/administrator/apps/willaengine/public/mix-manifest.json /home/administrator/apps/nginx/www/willaarts/public/
+
+
+sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaarts/public
+
+sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willamall/public
+
+sudo chown -R www-data:www-data /home/administrator/apps/nginx/www/willaengine

Dockerfile

@@ -1,23 +1,28 @@
-FROM dfs1368/laravel-php-fpm:7.4
+FROM willaengine/standard-laravel:7.4
 
-WORKDIR /var/www
+ARG COMPOSER_FILE_NAME=composer
 
-RUN apt install -y sendmail libpng-dev
-RUN docker-php-ext-install gd
-RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
+WORKDIR /var/www/html
 
-COPY database /var/www/database
-COPY composer.* /var/www/
+#####################################
+# Composer:
+#####################################
 
-RUN composer clearcache && composer update --no-scripts
+COPY database /var/www/html/database
 
-COPY . /var/www
+COPY $COMPOSER_FILE_NAME.* /var/www/html/
+
+RUN COMPOSER=$COMPOSER_FILE_NAME.json composer install --no-scripts
+
+COPY . /var/www/html
 
 RUN chown -R www-data:www-data \
-        /var/www/public \
-        /var/www/storage \
-        /var/www/bootstrap/cache
+        /var/www/html/public \
+        /var/www/html/storage \
+        /var/www/html/bootstrap/cache \
+        /var/www/.ssh \
+        /var/www/html/storage/letsencrypt  && \
+    chmod 755 /var/www/html/storage/letsencrypt/Bash/auth-hook.sh
 
-RUN mv .env.prod .env
 
-RUN php artisan optimize
+RUN php artisan morphmap:cache

Dockerfile.nginx

@@ -0,0 +1,3 @@
+FROM nginx:1.21.1
+
+COPY public /var/www/html/public

Dockerfile.staging

@@ -0,0 +1,6 @@
+FROM fsaravi/standard-laravel:7.4
+
+WORKDIR /var/www/html
+RUN php artisan morphmap:cache
+
+

Jenkinsfile

@@ -0,0 +1,42 @@
+pipeline {
+    agent {
+        node {
+            label 'willa'
+        }
+    }
+    stages {
+        stage('build') {
+            when {
+                branch 'master'
+            }
+            steps {
+                sh 'cd /home/administrator/apps/${IMAGE_NAME}/;docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest .'
+                sh 'cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker'
+            }
+        }
+        stage('deploy to production') {
+            when {
+                branch 'master'
+            }
+            steps {
+                sh 'cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d'
+                sh 'docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"'
+                sh 'docker exec willaengine service cron start'
+                sh 'docker exec willaengine php artisan config:cache'
+                sh 'docker exec willaengine php artisan route:cache'
+            }
+        }
+        stage('deploy to staging') {
+            when {
+                branch 'dev'
+            }
+            steps {
+                sh 'echo ${IMAGE_NAME}-staging comming soon ...'
+            }
+        }
+    }
+    environment {
+        IMAGE_NAME = 'willaengine'
+    }
+}
+

app/Console/Commands/UserChangeInformation.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use WM\Core\Models\Business;
+use WM\Core\Models\User;
+
+class UserChangeInformation extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'transport:user';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'transport users';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    private function firstNameLengthUpdate(User $user)
+    {
+        $fistName = $user->first_name;
+
+        $fistNameLength = strlen(utf8_decode($fistName));
+
+        $user->update([
+            'first_name_length' => $fistNameLength
+        ]);
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+
+        $users = User::all();
+
+        foreach ($users as $user) {
+
+            $business = Business::find($user->business_id);
+
+            if (!is_null($business)) {
+
+                if ($business->user_id == $user->id) {
+
+                    $this->firstNameLengthUpdate($user);
+                    $business->user()->attach($user->id, [
+                        'responsibility' => $user->responsibility,
+                        'is_owner' => 1
+                    ]);
+                    $this->info("add and update user : $user->id");
+
+                } else {
+
+                    $this->firstNameLengthUpdate($user);
+                    $business->user()->attach($user->id, [
+                        'responsibility' => $user->responsibility
+                    ]);
+                    $this->info("add and update user : $user->id");
+                }
+            }
+
+        }
+
+
+    }
+}

app/Console/Kernel.php

@@ -26,8 +26,10 @@ class Kernel extends ConsoleKernel
     {
         $schedule->command('today:schedule')->daily();
         $schedule->command('today:run')->everyMinute();
+        $schedule->command('sms:update:status rahyab')->everyTwoHours();
         $schedule->command('domain:update_ssl_expiry_date')->daily(); # update SSL expired_at
         $schedule->command('domain:update_domain_expiry_date')->daily(); # update domain expired_at
+        $schedule->command('make:sitemap')->daily(); # make sitemap
     }
 
     /**

app/Exceptions/Handler.php

@@ -2,10 +2,12 @@
 
 namespace App\Exceptions;
 
-use Throwable;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
+use WM\Core\Exceptions\HasRelationException;
 use WM\Core\Exceptions\ValidationErrorException;
 use WM\Core\Services\Responser;
+use WM\WebBuilder\Exceptions\SiteBannedException;
 
 class Handler extends ExceptionHandler
 {
@@ -31,7 +33,7 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Throwable  $exception
+     * @param \Throwable $exception
      * @return void
      */
     public function report(Throwable $exception)
@@ -46,15 +48,24 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Throwable  $exception
+     * @param \Illuminate\Http\Request $request
+     * @param \Throwable $exception
      * @return \Illuminate\Http\Response
      */
     public function render($request, Throwable $exception)
     {
         if ($exception instanceof ValidationErrorException) {
             return response()->json(Responser::error($exception->getMessageBody(), $exception->getMessageInfo()), 422);
+        } elseif ($exception instanceof SiteBannedException) {
+            return response()->view('webBuilder::errors.template_disabled', ['error' => 'business banned']);
+        } elseif ($exception instanceof HasRelationException) {
+            return response()->json(Responser::error([$exception->getMessage()]), 422);
+        } elseif ($this->isHttpException($exception)) {
+            if ($exception->getStatusCode() == 404 and in_array("web",$request->route()->middleware())) {
+                return response()->view('webBuilder::errors.404', [], 404);
+            }
         }
+
         return parent::render($request, $exception);
     }
 }

app/Http/Middleware/VerifyCsrfToken.php

@@ -19,6 +19,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        '/verify-payment'
     ];
 }

composer-prod.json

@@ -0,0 +1,168 @@
+{
+    "name": "willaengine/laravel",
+    "type": "project",
+    "description": "The WillaEngine Applications.",
+    "keywords": [
+        "framework",
+        "laravel",
+        "WillaEngine"
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^7.4",
+        "coraxster/flysystem-aws-s3-v3-minio": "^1.0",
+        "fideloper/proxy": "^4.0",
+        "io-developer/php-whois": "^4.0",
+        "kalnoy/nestedset": "^6.0",
+        "laravel/framework": "^8.0",
+        "laravel/passport": "^10",
+        "laravel/tinker": "^2.0",
+        "maatwebsite/excel": "^3.1",
+        "owen-it/laravel-auditing": "^13.5",
+        "sentry/sentry-laravel": "^2.3",
+        "silber/bouncer": "v1.0.0-rc.10",
+        "spatie/laravel-medialibrary": "^8.0.0",
+        "wm/admin": "dev-master",
+        "wm/app-management": "dev-master",
+        "wm/blog": "dev-master",
+        "wm/common": "dev-master",
+        "wm/contact-us": "dev-master",
+        "wm/core": "dev-master",
+        "wm/crm": "dev-master",
+        "wm/finance": "dev-master",
+        "wm/lms": "dev-master",
+        "wm/notification": "dev-master",
+        "wm/portfolio": "dev-master",
+        "wm/product": "dev-master",
+        "wm/roll-call": "dev-master",
+        "wm/service": "dev-master",
+        "wm/service-store": "dev-master",
+        "wm/store": "dev-master",
+        "wm/web-builder": "dev-master",
+        "zircote/swagger-php": "^3.0"
+    },
+    "provide": {
+        "ext-imagick": "*"
+    },
+    "require-dev": {
+        "facade/ignition": "^2.3.6",
+        "fzaninotto/faker": "^1.4",
+        "mockery/mockery": "^1.0",
+        "nunomaduro/collision": "^5.0",
+        "phpunit/phpunit": "^9.0"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Modules\\": "Modules/"
+        },
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi",
+            "@php artisan morphmap:cache"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    },
+
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/crm.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/common.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/core.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/blog.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/portfolio.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/product.git"
+        },
+        {
+            c            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/service.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/store.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/notification.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/roll-call.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/app-management.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/web-builder.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/finance.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/service-store.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/admin.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/lms.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git"
+        }
+    ]
+}

composer-staging.json

@@ -0,0 +1,166 @@
+{
+    "name": "laravel/laravel",
+    "type": "project",
+    "description": "The Laravel Framework.",
+    "keywords": [
+        "framework",
+        "laravel"
+    ],
+    "license": "MIT",
+    "require": {
+        "php": "^7.4",
+        "coraxster/flysystem-aws-s3-v3-minio": "^1.0",
+        "fideloper/proxy": "^4.0",
+        "laravel/framework": "^8.0",
+        "laravel/passport": "^10",
+        "laravel/tinker": "^2.0",
+        "maatwebsite/excel": "^3.1",
+        "matthiasmullie/minify": "^1.3",
+        "kalnoy/nestedset": "^6.0",
+        "sentry/sentry-laravel": "^2.3",
+        "spatie/laravel-medialibrary": "^8.0.0",
+        "io-developer/php-whois": "^4.0",
+        "silber/bouncer": "v1.0.0-rc.10",
+        "wm/blog": "dev-dev",
+        "wm/common": "dev-dev",
+        "wm/core": "dev-dev",
+        "wm/crm": "dev-dev",
+        "wm/portfolio": "dev-dev",
+        "wm/product": "dev-dev",
+        "wm/service": "dev-dev",
+        "wm/store": "dev-dev",
+        "wm/finance": "dev-dev",
+        "wm/admin": "dev-dev",
+        "wm/web-builder": "dev-dev",
+        "wm/app-management": "dev-dev",
+        "wm/notification": "dev-dev",
+        "wm/roll-call": "dev-dev",
+        "wm/lms": "dev-dev",
+        "wm/service-store": "dev-dev",
+        "predis/predis": "^1.1",
+        "wm/contact-us": "dev-dev",
+        "zircote/swagger-php": "^3.0"
+    },
+    "provide": {
+        "ext-imagick": "*"
+    },
+    "require-dev": {
+        "facade/ignition": "^2.3.6",
+        "fzaninotto/faker": "^1.4",
+        "mockery/mockery": "^1.0",
+        "nunomaduro/collision": "^5.0",
+        "phpunit/phpunit": "^9.0"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app/",
+            "Modules\\": "Modules/"
+        },
+        "classmap": [
+            "database/seeds",
+            "database/factories"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "scripts": {
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover --ansi",
+            "@php artisan morphmap:cache"
+        ],
+        "post-root-package-install": [
+            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+        ],
+        "post-create-project-cmd": [
+            "@php artisan key:generate --ansi"
+        ]
+    },
+
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/crm.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/common.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/core.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/blog.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/portfolio.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/product.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/service.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/store.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/notification.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/roll-call.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/app-management.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/web-builder.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/finance.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/service-store.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/admin.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/lms.git"
+        },
+        {
+            "type": "vcs",
+            "url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git"
+        }
+
+    ]
+}

composer.json

@@ -11,22 +11,31 @@
         "php": "^7.4",
         "coraxster/flysystem-aws-s3-v3-minio": "^1.0",
         "fideloper/proxy": "^4.0",
+        "io-developer/php-whois": "^4.0",
+        "kalnoy/nestedset": "^6.0",
         "laravel/framework": "^8.0",
         "laravel/passport": "^10",
         "laravel/tinker": "^2.0",
         "maatwebsite/excel": "^3.1",
-        "nestedset/willaarts": "^5.0.7",
+        "matthiasmullie/minify": "^1.3",
+        "owen-it/laravel-auditing": "^13.0",
+        "predis/predis": "^1.1",
         "sentry/sentry-laravel": "^2.3",
+        "silber/bouncer": "v1.0.0-rc.10",
         "spatie/laravel-medialibrary": "^8.0.0",
-        "io-developer/php-whois": "^4.0",
+        "wm/admin": "dev-master",
         "wm/blog": "dev-master",
         "wm/common": "dev-master",
         "wm/core": "dev-master",
         "wm/crm": "dev-master",
+        "wm/finance": "dev-master",
+        "wm/notification": "dev-master",
         "wm/portfolio": "dev-master",
         "wm/product": "dev-master",
+        "wm/roll-call": "dev-master",
         "wm/service": "dev-master",
         "wm/store": "dev-master",
+        "wm/web-builder": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {
@@ -69,7 +78,8 @@
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover --ansi"
+            "@php artisan package:discover --ansi",
+            "@php artisan morphmap:cache"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
@@ -81,40 +91,56 @@
 
     "repositories": [
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/crm.git"
+            "type": "path",
+            "url": "./modules/wm-crm"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-common"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-core"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-blog"
+        },
+        {
+            "type": "path",
+            "url": "./modules/wm-portfolio"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/common.git"
+            "type": "path",
+            "url": "./modules/wm-product"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/core.git"
+            "type": "path",
+            "url": "./modules/wm-service"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git"
+            "type": "path",
+            "url": "./modules/wm-store"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git"
+            "type": "path",
+            "url": "./modules/wm-notification"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git"
+            "type": "path",
+            "url": "./modules/wm-roll-call"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git"
+            "type": "path",
+            "url": "./modules/wm-web-builder"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
+            "type": "path",
+            "url": "./modules/wm-finance"
         },
         {
-            "type": "vcs",
-            "url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/admin.git"
+            "type": "path",
+            "url": "./modules/wm-admin"
         }
     ]
 }

config/activitylog.php

@@ -0,0 +1,52 @@
+<?php
+
+return [
+
+    /*
+     * If set to false, no activities will be saved to the database.
+     */
+    'enabled' => env('ACTIVITY_LOGGER_ENABLED', true),
+
+    /*
+     * When the clean-command is executed, all recording activities older than
+     * the number of days specified here will be deleted.
+     */
+    'delete_records_older_than_days' => 365,
+
+    /*
+     * If no log name is passed to the activity() helper
+     * we use this default log name.
+     */
+    'default_log_name' => 'default',
+
+    /*
+     * You can specify an auth driver here that gets user models.
+     * If this is null we'll use the default Laravel auth driver.
+     */
+    'default_auth_driver' => null,
+
+    /*
+     * If set to true, the subject returns soft deleted models.
+     */
+    'subject_returns_soft_deleted_models' => false,
+
+    /*
+     * This model will be used to log activity.
+     * It should be implements the Spatie\Activitylog\Contracts\Activity interface
+     * and extend Illuminate\Database\Eloquent\Model.
+     */
+    'activity_model' => \Spatie\Activitylog\Models\Activity::class,
+
+    /*
+     * This is the name of the table that will be created by the migration and
+     * used by the Activity model shipped with this package.
+     */
+    'table_name' => 'activity_log',
+
+    /*
+     * This is the database connection that will be used by the migration and
+     * the Activity model shipped with this package. In case it's not set
+     * Laravel database.default will be used instead.
+     */
+    'database_connection' => env('ACTIVITY_LOGGER_DB_CONNECTION'),
+];

config/audit.php

@@ -0,0 +1,171 @@
+<?php
+
+return [
+
+    'enabled' => env('AUDITING_ENABLED', true),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Implementation
+    |--------------------------------------------------------------------------
+    |
+    | Define which Audit model implementation should be used.
+    |
+    */
+
+    'implementation' => OwenIt\Auditing\Models\Audit::class,
+
+    /*
+    |--------------------------------------------------------------------------
+    | User Morph prefix & Guards
+    |--------------------------------------------------------------------------
+    |
+    | Define the morph prefix and authentication guards for the User resolver.
+    |
+    */
+
+    'user'      => [
+        'morph_prefix' => 'user',
+        'guards'       => [
+            'web',
+            'api',
+            'apicore'
+        ],
+        'resolver'     => OwenIt\Auditing\Resolvers\UserResolver::class
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Resolvers
+    |--------------------------------------------------------------------------
+    |
+    | Define the User, IP Address, User Agent and URL resolver implementations.
+    |
+    */
+    'resolvers' => [
+        'ip_address' => OwenIt\Auditing\Resolvers\IpAddressResolver::class,
+        'user_agent' => OwenIt\Auditing\Resolvers\UserAgentResolver::class,
+        'url'        => OwenIt\Auditing\Resolvers\UrlResolver::class,
+        'business_id'=> WM\Common\Services\Audit\BusinessResolver::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Events
+    |--------------------------------------------------------------------------
+    |
+    | The Eloquent events that trigger an Audit.
+    |
+    */
+
+    'events' => [
+        'created',
+        'updated',
+        'deleted',
+        'restored'
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Strict Mode
+    |--------------------------------------------------------------------------
+    |
+    | Enable the strict mode when auditing?
+    |
+    */
+
+    'strict' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Global exclude
+    |--------------------------------------------------------------------------
+    |
+    | Have something you always want to exclude by default? - add it here.
+    | Note that this is overwritten (not merged) with local exclude
+    |
+    */
+
+    'exclude' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Empty Values
+    |--------------------------------------------------------------------------
+    |
+    | Should Audit records be stored when the recorded old_values & new_values
+    | are both empty?
+    |
+    | Some events may be empty on purpose. Use allowed_empty_values to exclude
+    | those from the empty values check. For example when auditing
+    | model retrieved events which will never have new and old values.
+    |
+    |
+    */
+
+    'empty_values'         => true,
+    'allowed_empty_values' => [
+        'retrieved'
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Timestamps
+    |--------------------------------------------------------------------------
+    |
+    | Should the created_at, updated_at and deleted_at timestamps be audited?
+    |
+    */
+
+    'timestamps' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Threshold
+    |--------------------------------------------------------------------------
+    |
+    | Specify a threshold for the amount of Audit records a model can have.
+    | Zero means no limit.
+    |
+    */
+
+    'threshold' => 0,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Driver
+    |--------------------------------------------------------------------------
+    |
+    | The default audit driver used to keep track of changes.
+    |
+    */
+
+    'driver' => 'database',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Driver Configurations
+    |--------------------------------------------------------------------------
+    |
+    | Available audit drivers and respective configurations.
+    |
+    */
+
+    'drivers' => [
+        'database' => [
+            'table'      => 'audits',
+            'connection' => null,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Audit Console
+    |--------------------------------------------------------------------------
+    |
+    | Whether console events should be audited (eg. php artisan db:seed).
+    |
+    */
+
+    'console' => true,
+];

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),
+        ],
+
     ],
 
     /*
@@ -119,7 +127,7 @@ return [
 
     'redis' => [
 
-        'client' => env('REDIS_CLIENT', 'phpredis'),
+        'client' => env('REDIS_CLIENT', 'predis'),
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),

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'
         ],
 

config/logging.php

@@ -99,6 +99,11 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
+        'sentry' => [
+            'driver' => 'sentry',
+            'level'  => 'debug',
+            'bubble' => true,
+        ],
     ],
 
 ];

config/media-library.php

@@ -170,5 +170,5 @@ return [
         'generate_responsive_images' => Spatie\MediaLibrary\ResponsiveImages\Jobs\GenerateResponsiveImagesJob::class,
     ],
 
-    'wm-cdn' => 'https://cdn.willaspace.com',
+    'wm-cdn' => 'https://cdn.willaspace.com/static.willaengine',
 ];

database/seeds/DatabaseSeeder.php

@@ -12,15 +12,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->call(UserSeeder::class);
-        $this->call(BusinessSeeder::class);
-        $this->call(CategorySeeder::class);
-        $this->call(CitySeeder::class);
-        $this->call(DistrictSeeder::class);
-        $this->call(DomainSeeder::class);
-        $this->call(HelpSeeder::class);
-        $this->call(ModuleSeeder::class);
-        $this->call(PermissionCategorySeeder::class);
-        $this->call(RoleSeeder::class);
+        $this->call(CoreSeeder::class);
+        $this->call(CommonSeeder::class);
+        $this->call(CRMSeeder::class);
+        $this->call(ProductSeeder::class);
+        $this->call(StoreSeeder::class);
+        $this->call(ServiceSeeder::class);
+        $this->call(FinanceSeeder::class);
     }
 }

package.json

@@ -2,89 +2,69 @@
     "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",
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=webpack.config.js",
-        "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=webpack.config.js"
+        "development": "mix",
+        "staging": "npm run production -- --mix-config=webpack.mix.staging",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
+        "prod": "npm run production  -- --mix-config=webpack.mix.production",
+        "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",
-        "apexcharts": "^3.8.3",
-        "apollo-boost": "^0.4.3",
-        "apollo-cache-inmemory": "^1.6.2",
-        "apollo-link-context": "^1.0.18",
-        "axios": "^0.18.1",
+        "apexcharts": "^3.27.1",
+        "axios": "^0.21.1",
         "babel-polyfill": "^6.26.0",
-        "bootstrap": "^4.3.1",
-        "bootstrap-select": "^1.13.3",
-        "bootstrap-v4-rtl": "^4.1.1-0",
-        "bootstrap-vue": "^2.0.0-rc.19",
-        "chart.js": "^2.7.3",
-        "graphql": "^14.4.2",
-        "graphql-tag": "^2.10.1",
+        "codemirror": "^5.60.0",
+        "dedent": "^0.7.0",
+        "fslightbox-vue": "^1.2.0",
         "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",
-        "v-mask": "^2.2.3",
-        "vee-validate": "^2.2.15",
+        "quill": "^1.3.7",
+        "vee-validate": "^3.4.10",
         "vue-advanced-cropper": "^0.14.1",
-        "vue-apexcharts": "^1.4.0",
-        "vue-apollo": "^3.0.0-alpha.3",
+        "vue-apexcharts": "^1.6.1",
         "vue-chartjs": "^3.4.0",
-        "vue-ckeditor5": "^0.4.1",
-        "vue-cropperjs": "^4.0.1",
+        "vue-codemirror": "^4.0.6",
+        "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-the-mask": "^0.11.1",
+        "vue-select": "^3.11.2",
         "vue-tinymce-editor": "^1.6.2",
         "vue2-dropzone": "^3.6.0",
-        "vuetify": "^2.3.17"
+        "vuetify": "^2.5.4",
+        "willatoast": "^1.1.1"
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/preset-env": "^7.6.2",
-        "@ckeditor/ckeditor5-alignment": "^16.0.0",
-        "@mdi/font": "^3.9.97",
-        "cross-env": "^5.1",
-        "deepmerge": "^4.0.0",
-        "fibers": "^4.0.1",
-        "jquery": "^3.5.1",
-        "laravel-mix": "^5.0.9",
-        "material-design-icons-iconfont": "^4.0.3",
-        "node-sass": "^4.14.1",
+        "@babel/preset-env": "^7.14.5",
+        "cross-env": "^5.2.1",
+        "laravel-mix": "^6.0.24",
+        "minimist": "^1.2.5",
+        "node-sass": "^6.0.0",
         "popper.js": "^2.0.0-next.4",
-        "pug": "^2.0.3",
-        "pug-loader": "^2.4.0",
-        "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",
+        "sass": "^1.35.1",
+        "sass-loader": "^12.1.0",
+        "vue": "^2.6.14",
+        "vue-loader": "^15.9.7",
         "vue-masonry-css": "^1.0.3",
         "vue-meta": "^1.5.2",
-        "vue-resource": "^1.5.1",
-        "vue-template-compiler": "^2.6.10",
+        "vue-template-compiler": "^2.6.14",
         "vuex": "^3.0.1",
         "vuex-router-sync": "^5.0.0"
     }

readme.md

@@ -66,6 +66,6 @@ or generate your own password by https://bcrypt-generator.com/
 
  ## Composer Section:
  1. please install and restart vscode
- 1. add to environment in path in windows
+ 2. add to environment in path in windows
 
  good luck

resources/js/Default/services/storage.text

@@ -1,7 +1,7 @@
 import { Paginate, Sort } from '@Global/services/storage.|-module-|';
 const |-MODULE-| = '|-module-|';
 
-const |-Module-|Paginate =  {
+const |-module-|Paginate =  {
     get() {
         return Paginate.get(|-MODULE-|);
     },
@@ -39,4 +39,4 @@ const SortPaginate = {
 }
 
 
-export { |-Module-|Paginate, SortPaginate }
+export { |-module-|Paginate, SortPaginate }

resources/js/Default/store/category/getters.text

@@ -9,6 +9,5 @@ export default {
     isFiltered|-Module-|: state =>state.is_filtered,
     getFilter|-Module-|: state =>state.filter,
     get|-Module-|Loading: state => state.loading,
-	get|-Module-|Selected: state => state.selected,
 
 };

resources/js/Default/store/store/getters.text

@@ -1,10 +1,9 @@
 export default {
 	get|-Module-|s: state => state.|-module-|_list,
-	get|-Module-|: state => product => state.product_list.find(item => item.id == |-module-|),
     get|-Module-|Loading: state => state.loading,
 	get|-Module-|Pagination: state => state.pagination,
 	getRowsPerPageItems: state => state.rowsPerPageItems,
-	get|-Module-|Selected: state => state.selected,
+	get|-Module-|Selected: state => state.|-module-|_selected,
     isFiltered|-Module-|: state => state.is_filtered,
 
 };

resources/js/Default/store/store/mutations.text

@@ -6,33 +6,35 @@ export default {
 	},
 
 	UPDATE_|-MODULE-|(state, |-module-|) {
-        const index = state.|-module-|.findIndex(x => x.id === |-module-|.id);
-        |-module-| = {...state.|-module-|[index], ...|-module-|};
-		Vue.set(state.|-module-|, index, |-module-|);
+        const index = state.|-module-|_list.findIndex(x => x.id === |-module-|.id);
+        |-module-| = {...state.|-module-|_list[index], ...|-module-|};
+		Vue.set(state.|-module-|_list, index, |-module-|);
 	},
 
     SET_|-MODULE-|_PAGINATION(state, pagination) {
-        Vue.set(state, "pagination", pagination);
+        Vue.set(state, "pagination", {...state.pagination, ...pagination});
+        //|-module-|Paginate.save(pagination);
 	},
 
 	REMOVE_|-MODULE-|(state, id) {
-        const Index = state.|-module-|.findIndex(x => x.id === id);
+        const Index = state.|-module-|_list.findIndex(x => x.id === id);
         const selectedIndex = state.|-module-|_selected.findIndex(x => x.id === id);
-        Vue.delete(state.|-module-|, Index);
+        Vue.delete(state.|-module-|_list, Index);
         Vue.delete(state.|-module-|_selected, selectedIndex);
         Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength - 1);
         Vue.set(state.pagination, 'pageStop', state.pagination.pageStop - 1);
 	},
 
 	ADD_|-MODULE-|(state, |-module-|) {
-        state.|-module-|.unshift(|-module-|);
-        Vue.set(state, '|-module-|', state.|-module-|);
+        state.|-module-|_list.unshift(|-module-|);
+        Vue.set(state, '|-module-|_list', state.|-module-|_list);
+
 		Vue.set(state.pagination, 'itemsLength', state.pagination.itemsLength + 1);
         Vue.set(state.pagination, 'pageStop', state.pagination.pageStop + 1);
 	},
 
 	ADD_|-MODULE-|_SELECTED(state, |-module-|Id) {
-        const |-module-| = state.|-module-|.find(x => x.id === |-module-|Id);
+        const |-module-| = state.|-module-|_list.find(x => x.id === |-module-|Id);
 		Vue.set(state.|-module-|_selected, state.|-module-|_selected.length, |-module-|);
 	},
 
@@ -41,6 +43,6 @@ export default {
 	},
 
     SET_LOADING(state, value) {
-	    Vue.set(state, 'loading', value);
+        Vue.set(state, 'loading', value);
     }
 };

resources/js/Home/App.vue

@@ -1,49 +1,49 @@
 <template>
-	<v-app>
-		<div id="app" class="we-dark">
-			<wm-background C1="fff" C2="f1f1f1" C3="fff"/>
-			<app-menu/>
-			<v-main>
-				<v-container fluid class="Login">
-					<div class="Tile">
-						<router-view/>
-						<!-- <wm-tiles-layout></wm-tiles-layout> -->
-					</div>
-				</v-container>
-			</v-main>
-		</div>
-	</v-app>
+    <v-app>
+        <div id="app" class="we-dark">
+            <wm-background C1="fff" C2="f1f1f1" C3="fff"/>
+            <app-menu/>
+            <v-main>
+                <v-container fluid class="Login">
+                    <div class="Tile">
+                        <router-view/>
+                    </div>
+                </v-container>
+            </v-main>
+        </div>
+    </v-app>
 </template>
 
 
 <script>
-import Background from "@Global/components/Body/Backgrounds/Gradient-CSS";
-import Menu from "@Global/components/Drawer/SideBar";
-import { mapMutations } from "vuex";
+    import Background from "@Global/components/Body/Backgrounds/Gradient-CSS";
+    import Menu from "@Global/components/Drawer/SideBar";
+    import {mapMutations} from "vuex";
 
-export default {
-	components: {
-		"wm-background": Background,
-		appMenu: Menu
-    },
-    methods: {
-        ...mapMutations("common", ["SET_CURRENT_MODULE"])
-    },
-	created() {
-		this.SET_CURRENT_MODULE("");
-	}
-};
+    export default {
+        components: {
+            "wm-background": Background,
+            appMenu: Menu
+        },
+        methods: {
+            ...mapMutations("common", ["SET_CURRENT_MODULE"])
+        },
+        created() {
+            this.SET_CURRENT_MODULE("product");
+        }
+    };
 </script>
 
 <style lang="scss">
-#app {
-	background-color: transparent;
-	// -webkit-font-smoothing: antialiased;
-	// -moz-osx-font-smoothing: grayscale;
-}
-.WM-Container-Fluid {
-	width: 100%;
-	height: 100%;
-}
+    #app {
+        background-color: transparent;
+        // -webkit-font-smoothing: antialiased;
+        // -moz-osx-font-smoothing: grayscale;
+    }
+
+    .WM-Container-Fluid {
+        width: 100%;
+        height: 100%;
+    }
 
 </style>

resources/js/Home/app.js

@@ -6,23 +6,21 @@ import store from './store'
 //vuetify
 import vuetify from '@Global/plugins/vuetify'
 
+//Policy
+import './policy'
+
+
+//veeValidate => 0.3MB
+import "@Global/plugins/veeValidate";
 
 //components
 import '@Global/plugins/globalComponent.js'
 
-//Policy
-import './policy'
-
 
 //hint text
 import HintText from "@Global/components/Texts/Hint.vue";
 Vue.component('wm-hint-text', HintText)
 
-
-//vue
-window.Vue = Vue;
-
-
 //mixin
 import { global } from "@Global/mixins/global";
 import { commingSoon } from "@Global/mixins/commingSoon";

resources/js/Home/views/Home.vue

@@ -1,28 +1,24 @@
 <template>
-    <v-container>
+    <v-container class="not-fluid">
         <v-row class="reverse">
             <v-col xl="8" lg="8" offset-xl="2" offset-lg="2" class="fade-in fast delay-01">
-                <big-section-title title_fa="سیستم مدیریت یک پارچه" title_en="Integrated Management System" desc="هر آنچه مربوط به مدیریت مجموعه ی شما می باشد." />
+                <big-section-title title_fa="سیستم مدیریت یک پارچه" title_en="Integrated Management System" desc="هر آنچه مربوط به مدیریت مجموعه ی شما می باشد."/>
             </v-col>
         </v-row>
         <v-row>
             <a
-                :href="module.href"
-                :class="'flex fade-in fast ' + module.main_class"
-                v-for="( module ,key ) in getModules"
+                :href="module.hasModule ? module.href : 'javascript:void(0)'"
+                :class="`module col col-xl-2 col-md-2 col-sm-4 col-xs-6 pa-0 fade-in fast flex-justified-center ${module.main_class}`"
+                v-for="( module ,key ) in modules"
                 :key="key"
                 :style="`animation-delay: ${key * 0.1}s;`"
             >
-
                 <icon-tile
-                    :theme="module.title_class +' Shadowed'"
+                    :theme="module.title_class"
+                    :class="module.hasModule ? '' : 'has-blur'"
                     :TitleEn="module.title_en"
                     :TitleFa="module.title_fa"
-                    :GradientBegin="module.gradient_begin"
-                    :GradientEnd="module.gradient_end"
                     :icon="module.img_url"
-                    :height="module.img_height"
-                    :Desc="module.description"
                 />
             </a>
         </v-row>
@@ -35,39 +31,48 @@
 </template>
 
 
-
 <script>
-import Tile from "@Global/components/Tiles/Tile";
-import IconTile from '@Global/components/Tiles/Icon-Tile';
-import { mapGetters, mapActions } from "vuex";
-import routes from '@Global/utils/common/routes';
-import BigSectionTitle from '@Global/components/Dividers/Section-Title-Big';
+    import IconTile from '@Global/components/Tiles/Icon-Tile';
+    import {mapGetters, mapActions} from "vuex";
+    import routes from '@Global/utils/common/routes';
+    import BigSectionTitle from '@Global/components/Dividers/Section-Title-Big';
 
-
-export default {
-    data: () => ({
-        hostname : window.location.hostname,
-        originHostName : routes.originHostName()
-    }),
-    components: {
-        IconTile,
-        BigSectionTitle
-    },
-    computed: {
-        ...mapGetters("rolePermission", ["getModules"]),
-        ...mapGetters("auth", ["getAuthUser"]),
-    },
-    methods: {
-        ...mapActions("rolePermission", ["loadModules"]),
-    },
-    created() {
-        this.loadModules({ home_page: true });
-    }
-};
+    export default {
+        data: () => ({
+            hostname: window.location.hostname,
+            originHostName: routes.originHostName()
+        }),
+        components: {
+            IconTile,
+            BigSectionTitle
+        },
+        computed: {
+            ...mapGetters("rolePermission", ["getModules", "getAllModules"]),
+            ...mapGetters("auth", ["getAuthUser"]),
+            modules() {
+                let modules = this.getAllModules.filter(x => x.load_in_home === "yes");
+                return modules.map(x => {
+                    if (this.getModules.map(y => y.id).includes(x.id)) {
+                        x.hasModule = true;
+                    } else {
+                        x.hasModule = false;
+                    }
+                    return x;
+                });
+            }
+        },
+        methods: {
+            ...mapActions("rolePermission", ["loadModules", "loadAllModules"]),
+        },
+        created() {
+            this.loadModules();
+            this.loadAllModules();
+        }
+    };
 </script>
 
 <style scoped lang="scss">
-    .container {
-        max-width: 1785px;
+    .module.border-left {
+        border-left: 1px solid #d4d4d4;
     }
 </style>

resources/lang/fa/validation.php

@@ -27,6 +27,7 @@ return [
         "string"  => ":attribute باید بین :min و :max کاراکتر باشد.",
         "array"   => ":attribute باید بین :min و :max آیتم باشد.",
     ],
+    "after_or_equal"          => ":attribute باید بزرگتر یا مساوی :date باشد.",
     "boolean"          => "The :attribute field must be true or false",
     "confirmed"        => ":attribute با تاییدیه مطابقت ندارد.",
     "date"             => ":attribute یک تاریخ معتبر نیست.",
@@ -35,7 +36,7 @@ return [
     "digits"           => ":attribute باید :digits رقم باشد.",
     "digits_between"   => ":attribute باید بین :min و :max رقم باشد.",
     "email"            => "فرمت :attribute معتبر نیست.",
-    "exists"           => "این  :attribute  وجود دارد.",
+    "exists"           => "این  :attribute  معتبر نمی باشد.",
     "image"            => ":attribute باید تصویر باشد.",
     "in"               => ":attribute انتخاب شده، معتبر نیست.",
     "integer"          => ":attribute باید نوع داده ای عددی  باشد.",
@@ -109,6 +110,7 @@ return [
     */
 
     'attributes' => [
+        'today' => 'امروز',
         'blog_category_id' => 'دسته بندی',
         'slug' => 'نام انگلیسی',
         'email' => 'آدرس پست الکترونیکی',

routes/web.php

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

tests/TestCase.php

@@ -3,8 +3,17 @@
 namespace Tests;
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Support\Facades\Http;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
+
+    /**
+     * @return \WM\Core\Services\HttpTestProvider Http request provider for test enviroment
+     */
+    public function makeHttpReqeust($url)
+    {
+        return \WM\Core\Services\HttpTestProvider::init($url);
+    }
 }

webpack.mix.js

@@ -1,4 +1,5 @@
 const mix = require('laravel-mix');
+const path = require('path');
 /*
  |--------------------------------------------------------------------------
  | Mix Asset Management
@@ -32,20 +33,26 @@ 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');
 require('./modules/wm-crm/webpack.mix');
 require('./modules/wm-blog/webpack.mix');
 require('./modules/wm-portfolio/webpack.mix');
-require('./modules/wm-finance/webpack.mix');
 require('./modules/wm-product/webpack.mix');
 require('./modules/wm-service/webpack.mix');
 require('./modules/wm-store/webpack.mix');
-require('./modules/wm-warehouse/webpack.mix');
 require('./modules/wm-admin/webpack.mix');
-// require('./modules/wm-web-builder/webpack.mix');
+require('./modules/wm-notification/webpack.mix');
+require('./modules/wm-roll-call/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-lms/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();

webpack.mix.production.js

@@ -0,0 +1,58 @@
+const mix = require('laravel-mix');
+const path = require('path');
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+mix.webpackConfig({
+    resolve: {
+        extensions: ["*", ".js", ".jsx", ".vue", ".ts", ".tsx", '.json', '.d.ts'],
+        alias: {
+            '@JS': path.resolve(__dirname, 'resources/js'),
+            '@Home': path.resolve(__dirname, 'resources/js/Home'),
+        },
+    },
+    output: {
+        chunkFilename: 'js/vue/chunks/[name].[chunkhash].js',
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                loader: "ts-loader",
+                options: { appendTsSuffixTo: [/\.vue$/] },
+                exclude: /node_modules/
+            }
+        ]
+    }
+});
+
+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');
+require('./modules/wm-crm/webpack.mix');
+require('./modules/wm-blog/webpack.mix');
+require('./modules/wm-portfolio/webpack.mix');
+require('./modules/wm-product/webpack.mix');
+require('./modules/wm-service/webpack.mix');
+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-app-management/webpack.mix');
+require('./modules/wm-web-builder/webpack.mix');
+require('./modules/wm-lms/webpack.mix');
+require('./modules/wm-service-store/webpack.mix');
+require('./modules/wm-contact-us/webpack.mix');
+// require('./modules/wm-warehouse/webpack.mix');
+// require('./modules/wm-reservation/webpack.mix');
+
+mix.version();

webpack.mix.staging.js

@@ -0,0 +1,59 @@
+const mix = require('laravel-mix');
+const path = require('path');
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+mix.webpackConfig({
+    resolve: {
+        extensions: ["*", ".js", ".jsx", ".vue", ".ts", ".tsx", '.json', '.d.ts'],
+        alias: {
+            '@JS': path.resolve(__dirname, 'resources/js'),
+            '@Home': path.resolve(__dirname, 'resources/js/Home'),
+        },
+    },
+    output: {
+        chunkFilename: 'js/vue/chunks/[name].[chunkhash].js',
+    },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                loader: "ts-loader",
+                options: { appendTsSuffixTo: [/\.vue$/] },
+                exclude: /node_modules/
+            }
+        ]
+    }
+});
+
+mix.js('resources/js/Home/app.js', 'public/js/vue/Home').vue({version: 2});
+
+require('./vendeor/wm/core/webpack.mix');
+require('./vendeor/wm/common/webpack.mix');
+require('./vendeor/wm/crm/webpack.mix');
+require('./vendeor/wm/blog/webpack.mix');
+require('./vendeor/wm/portfolio/webpack.mix');
+require('./vendeor/wm/product/webpack.mix');
+require('./vendeor/wm/service/webpack.mix');
+require('./vendeor/wm/store/webpack.mix');
+require('./vendeor/wm/admin/webpack.mix');
+require('./vendeor/wm/notification/webpack.mix');
+require('./vendeor/wm/roll-call/webpack.mix');
+require('./vendeor/wm/finance/webpack.mix');
+require('./vendeor/wm/app-management/webpack.mix');
+require('./vendeor/wm/web-builder/webpack.mix');
+require('./vendeor/wm/service-store/webpack.mix');
+require('./vendeor/wm/lms/webpack.mix');
+require('./vendeor/wm/service-store/webpack.mix');
+require('./vendeor/wm/contact-us/webpack.mix');
+// require('./vendeor/wm/warehouse/webpack.mix');
+// require('./vendeor/wm/reservation/webpack.mix');
+
+mix.version();

worker.conf

@@ -0,0 +1,55 @@
+[supervisord]
+nodaemon=true
+user = root
+[supervisorctl]
+[inet_http_server]
+port = 127.0.0.1:9001
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[program:scheduler]
+process_name=%(program_name)s_%(process_num)02d
+command=/bin/sh -c "while [ true ]; do (php /var/www/html/artisan schedule:run --verbose --no-interaction &); sleep 60; done"
+autostart=true
+autorestart=true
+numprocs=1
+user=www-data
+redirect_stderr=true
+stdout_logfile=/var/log/supervisor/scheduler.log
+
+[program:change-store-order-status]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:work redis --queue=change_to_successful_store_order  --sleep=3 --tries=3 --max-time=3600
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stopwaitsecs=3600
+stdout_logfile=/var/log/supervisor/change-store-order-status.log
+
+[program:create-store-product]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:work redis --queue=create_store_product  --sleep=3 --tries=3 --max-time=3600
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stopwaitsecs=3600
+stdout_logfile=/var/log/supervisor/create-store-product.log
+
+
+# [program:check-sms-status]
+# command=php /var/www/html/artisan queue:work redis --queue=check-sms-status --tries=3
+# process_name=%(program_name)s_%(process_num)02d
+# autostart=true
+# autorestart=true
+# user=www-data
+# numprocs=3
+# redirect_stderr=true
+# stdout_logfile=/var/log/supervisor/sms-status.log