Merge branch 'release/v1.0.0'

.gitignore

@@ -1,5 +1,6 @@
 .git/
+.idea/
 vendor/
 node_modules/
 npm-debug.log
-package-lock.json
+package-lock.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/Resources/assets/backend/vaahone/scss/vaahscss"]
+	path = src/Resources/assets/backend/vaahone/scss/vaahscss
+	url = [email protected]:webreinvent/vaahscss.git

README.md

@@ -1,4 +1,4 @@
-# vaahcms
+# vaahcms v1.0.0
 > Laravel Based Rapid Development CMS
 
 Please consider starring the project to show your :heart: and support.
@@ -208,9 +208,13 @@ mix.webpackConfig({
 
 - Step 2) Run `php artisan dusk:install`
 
-- Step 2) To do browser based test, open file `tests/DuskTestCase.php` and comment `static::startChromeDriver();` 
+- Step 3) Download `chromdriver` from `https://sites.google.com/a/chromium.org/chromedriver/downloads`
 
-- Step 3) In tests/DuskTestCase.php file comment `'--headless',`:
+- Step 4) Unzip and open `chromedriver.exe` and keep it running.
+
+- Step 5) To do browser based test, open file `tests/DuskTestCase.php` and comment `static::startChromeDriver();` 
+
+- Step 6) In tests/DuskTestCase.php file comment `'--headless',`:
 ```php
 ...
 $options = (new ChromeOptions)->addArguments([
@@ -222,17 +226,15 @@ $options = (new ChromeOptions)->addArguments([
 
 ```
 
-- Step 4) Make sure your `APP_URL` in `.env` is as per the the xampp or actual application url
+- Step 7) Make sure your `APP_URL` in `.env` is as per the the xampp or actual application url
 
-- Step 5) Run `php artisan dusk`, it may show `Warning: TTY mode is not supported on Windows platform.` error
-  you can ignore this error. If it run successfully, it will  will open chrome and run your tests.
 
-If it does works then:
-- Download latest chrome driver from https://sites.google.com/a/chromium.org/chromedriver/downloads
+- Step 8) Run `php artisan dusk`, it may show `Warning: TTY mode is not supported on Windows platform.` error
+  you can ignore this error. If it run successfully, it will  will open chrome and run your tests.
 
-- Unzip and run chromedriver.exe
+- Step 9) Install `composer require beyondcode/dusk-dashboard --dev`
 
-- Then run `php artisan dusk`
+- Step 10) Run `php artisan dusk:dashboard`
 
 #### Create Tests for VaahCms Modules:
 - Change path of dusk in `phpunit.dusk.xml` to following:
@@ -263,6 +265,16 @@ https://packagist.org/api/github?username=PACKAGIST_USERNAME
 - Choose `Let me select individual events.` and select `Pushes`
 - Click on `Save`
 
+
+### For running `composer update`:
+```php
+
+$process = new Process('cd .. && php artisan dusk --group=bkkrishna');
+$process->setPTY(true);
+$process->run();
+
+```
+
 ## Support us
 
 [WebReinvent](https://www.webreinvent.com) is a web agency based in Delhi, India. You'll find an overview of all our open source projects [on github](https://github.com/webreinvent).

composer.json

@@ -4,7 +4,7 @@
   "keywords": ["laravel", "cms"],
   "homepage": "https://www.webreinvent.com",
   "license": "MIT",
-  "version": "0.4.4",
+  "version": "1.0.0",
   "authors": [
     {
       "name": "WebReinvent",
@@ -13,24 +13,31 @@
   ],
   "require": {
     "php": "^7.2",
-    "zanysoft/laravel-zip": "*",
-    "doctrine/dbal": "*",
     "webreinvent/laravel-nestable": "*",
-    "barryvdh/laravel-dompdf": "*",
-    "berkayk/onesignal-laravel": "*",
-    "bugsnag/bugsnag-laravel": "*",
-    "composer/composer": "^1.8",
+    "barryvdh/laravel-dompdf": "^0.8.6",
+    "berkayk/onesignal-laravel": "^1.0.5",
+    "composer/composer": "^1.10.6",
     "creativeorange/gravatar": "^1.0",
-    "intervention/image": "*",
-    "maatwebsite/excel": "*",
-    "ixudra/curl": "*",
-    "nahid/linkify": "*",
-    "php-imap/php-imap": "*",
-    "stevebauman/purify": "*",
-    "zanysoft/laravel-zip": "*",
-    "doctrine/dbal": "*"
+    "intervention/image": "^2.5",
+    "maatwebsite/excel": "^3.1.19",
+    "ixudra/curl": "^6.19.0",
+    "nahid/linkify": "^1.0.0",
+    "zanysoft/laravel-zip": "^1.0.3",
+    "doctrine/dbal": "^2.10.2"
   },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "WebReinvent\\VaahCms\\VaahCmsServiceProvider"
+            ],
+            "aliases": {
+            }
+        }
+    },
   "autoload": {
+      "classmap": [
+          "src/"
+      ],
     "psr-4": {
       "WebReinvent\\VaahCms\\": "src/"
     },

src/.gitignore

@@ -0,0 +1,6 @@
+.git/
+.idea/
+vendor/
+node_modules/
+npm-debug.log
+package-lock.json

src/Config/vaahcms.php

@@ -5,19 +5,22 @@
  */
 
 $settings =  [
-    'app_name' => 'VaahCms',
+    'app_name' => 'VaahCMS',
     'app_slug' => 'vaahcms',
-    'admin_theme' => 'default',
-    'public_theme' => 'default',
-    'public_theme_template' => 'default',
+    'website' => 'https://vaah.dev/cms',
+    'documentation' => 'https://vaah.dev/cms/docs',
+    'backend_theme' => 'vaahone',
+    'frontend_theme' => 'vaahone',
+    'frontend_theme_template' => 'vaahone',
     'root_folder' => 'VaahCms',
+    'allowed_file_upload_size' => '50',
     'root_folder_path' => base_path().'/VaahCms',
     'modules_path' => base_path().'/VaahCms/Modules',
     'themes_path' => base_path().'/VaahCms/Themes',
     'plugins_path' => base_path().'/VaahCms/Plugins',
     'per_page' => 20,
     'minified' => 0,
-    'api_route' => 'https://cms.vaah.dev/api',
+    'api_route' => 'https://api.vaah.dev/cms/',
     'debug' => 1,
     'uploads' => [
         'allowed_extensions' => ["jpg", "jpeg", 'png', "gif", "csv"]

src/Database/Migrations/2019_05_14_201806_create_vh_registrations_table.php

@@ -17,14 +17,15 @@ public function up()
             $table->increments('id');
 
             $table->string('uid')->nullable();
-            $table->string('email')->nullable();
-            $table->string('username')->nullable();
+            $table->uuid('uuid')->nullable();
+            $table->string('email',150)->nullable();
+            $table->string('username',150)->nullable();
             $table->string('password')->nullable();
-            $table->string('display_name')->nullable();
-            $table->string('title', 5)->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('display_name',50)->nullable();
+            $table->string('title',200)->nullable();
+            $table->string('first_name',150)->nullable();
             $table->string('middle_name')->nullable();
-            $table->string('last_name')->nullable();
+            $table->string('last_name',150)->nullable();
             $table->string('gender', 15)->nullable();
             $table->integer('country_calling_code')->nullable();
             $table->bigInteger('phone')->nullable();

src/Database/Migrations/2019_05_14_202430_create_vh_users_table.php

@@ -15,18 +15,20 @@ public function up()
     {
         Schema::create('vh_users', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('uid')->nullable();
-            $table->string('email')->nullable();
-            $table->string('username')->nullable();
+            $table->uuid('uuid')->nullable();
+            $table->string('email',150)->nullable();
+            $table->string('username',150)->nullable();
             $table->string('password')->nullable();
-            $table->string('display_name')->nullable();
-            $table->string('title', 5)->nullable();
-            $table->string('first_name')->nullable();
+            $table->string('display_name',50)->nullable();
+            $table->string('title',200)->nullable();
+            $table->string('first_name',150)->nullable();
             $table->string('middle_name')->nullable();
-            $table->string('last_name')->nullable();
+            $table->string('last_name',150)->nullable();
             $table->string('gender', 15)->nullable();
             $table->integer('country_calling_code')->nullable();
             $table->bigInteger('phone')->nullable();
+            $table->mediumText('bio')->nullable();
+            $table->string('website')->nullable();
             $table->string('timezone')->nullable();
             $table->string('alternate_email')->nullable();
             $table->string('avatar_url')->nullable();
@@ -49,6 +51,7 @@ public function up()
             $table->dateTime('reset_password_code_sent_at')->nullable();
             $table->dateTime('reset_password_code_used_at')->nullable();
 
+            $table->integer('registration_id')->nullable();
             $table->text('meta')->nullable();
 
             $table->ipAddress('created_ip')->nullable();

src/Database/Migrations/2019_05_14_202442_create_vh_roles_table.php

@@ -15,10 +15,10 @@ public function up()
     {
         Schema::create('vh_roles', function (Blueprint $table) {
             $table->increments('id');
-
-            $table->string('name')->nullable();
-            $table->string('slug')->nullable();
-            $table->string('details')->nullable();
+            $table->uuid('uuid')->nullable();
+            $table->string('name',150)->nullable();
+            $table->string('slug',150)->nullable();
+            $table->string('details',255)->nullable();
             $table->integer('count_users')->nullable();
             $table->integer('count_permissions')->nullable();
             $table->boolean('is_active')->nullable();

src/Database/Migrations/2019_05_14_202449_create_vh_permissions_table.php

@@ -15,13 +15,14 @@ public function up()
     {
         Schema::create('vh_permissions', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name')->nullable();
-            $table->string('slug')->nullable();
+            $table->uuid('uuid')->nullable();
+            $table->string('name',150)->nullable();
+            $table->string('slug',150)->nullable();
 
             $table->string('module')->nullable();
             $table->string('section')->nullable();
 
-            $table->string('details')->nullable();
+            $table->string('details',255)->nullable();
             $table->integer('count_users')->nullable();
             $table->integer('count_roles')->nullable();
             $table->boolean('is_active')->nullable();

src/Database/Migrations/2019_05_14_220712_create_vh_user_authorizations_table.php

@@ -17,8 +17,8 @@ public function up()
             $table->increments('id');
 
             $table->integer('vh_user_id')->nullable();
-            $table->string('name')->nullable();
-            $table->string('slug')->nullable();
+            $table->string('name',150)->nullable();
+            $table->string('slug',150)->nullable();
             $table->string('authorization_id')->nullable();
             $table->dateTime('last_authorization_at')->nullable();
             $table->text('meta')->nullable();

src/Database/Migrations/2019_05_20_192222_create_vh_modules_table.php

@@ -15,15 +15,16 @@ public function up()
     {
         Schema::create('vh_modules', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name')->nullable();
-            $table->string('title')->nullable();
-            $table->string('slug')->nullable();
+            $table->string('name',150)->nullable();
+            $table->string('title',200)->nullable();
+            $table->string('slug',150)->nullable();
             $table->string('thumbnail')->nullable();
             $table->string('excerpt')->nullable();
             $table->string('description')->nullable();
-            $table->string('github_url')->nullable();
+            $table->string('download_link')->nullable();
             $table->string('author_name')->nullable();
             $table->string('author_website')->nullable();
+            $table->string('vaah_url')->nullable();
             $table->string('version')->nullable();
             $table->integer('version_number')->nullable();
             $table->string('db_table_prefix')->nullable();
@@ -32,7 +33,6 @@ public function up()
             $table->boolean('is_update_available')->nullable();
             $table->boolean('is_assets_published')->nullable();
             $table->dateTime('update_checked_at')->nullable();
-
             $table->boolean('is_active')->nullable();
 
             $table->timestamps();

src/Database/Migrations/2019_05_24_001930_create_vh_settings_table.php

@@ -19,11 +19,15 @@ public function up()
             $table->integer('settingable_id')->nullable();
             $table->string('settingable_type')->nullable();
 
+            $table->string('category')->nullable()->index();
+
             $table->string('label')->nullable();
             $table->string('excerpt')->nullable();
             $table->string('type')->nullable();
             $table->string('key')->nullable();
             $table->text('value')->nullable();
+            $table->json('meta')->nullable();
+
             $table->timestamps();
 
         });