Merge branch 'release/v0.0.6'

Author: themodernpk

README.md

@@ -132,28 +132,54 @@ npm install --save-dev fs
 
 Replace the content of `webpack.mix.fs`
 ```bash
-const mix = require('laravel-mix');
-var fs = require('fs');
+var admin_path = 'resources/assets/vendor/vaahcms/admin/';
+var admin_default_theme_path = admin_path+'default/';
 
-/*
- |--------------------------------------------------------------------------
- | 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.setPublicPath(admin_default_theme_path);
+
+var admin_assets_json = JSON.parse(fs.readFileSync(admin_default_theme_path+'assets.json'));
 
-var admin_assets_json = JSON.parse(fs.readFileSync('resources/assets/vendor/vaahcms/admin/default/assets.json'));
+//console.log(admin_assets_json);
 
-console.log(admin_assets_json);
+var admin_copy_path = './resources/assets/vendor/vaahcms/admin/';
+var admin_copy_path_des = './packages/vaahcms/src/Resources/assets/admin/';
 
-mix.combine(admin_assets_json['css'], 'public/css/vaahcms-admin.css')
-    .combine(admin_assets_json['js'], 'public/js/vaahcms-admin.js')
+fs_extra.removeSync(admin_copy_path_des);
+
+mix.combine(admin_assets_json['css'], admin_default_theme_path+'builds/vaahcms.css')
+    .combine(admin_assets_json['js'], admin_default_theme_path+'builds/vaahcms.js')
+    .js(admin_default_theme_path+'vue/app-setup.js',  './builds')
+    .js(admin_default_theme_path+'vue/app-dashboard.js',  './builds')
+    .js(admin_default_theme_path+'vue/app-modules.js',  './builds')
+    .copyDirectory(admin_copy_path, admin_copy_path_des, false)
     .version();
 
+
+//mix.copyDirectory(admin_copy_path, admin_copy_path_des, false);
+
+
+mix.webpackConfig({
+    watchOptions: {
+        aggregateTimeout: 2000,
+        poll: 20,
+        ignored: [
+            '/app/',
+            '/bootstrap/',
+            '/config/',
+            '/database/',
+            '/packages/',
+            '/public/',
+            '/routes/',
+            '/storage/',
+            '/tests/',
+            '/vaahcms/',
+            '/node_modules/',
+            '/vendor/',
+
+        ]
+    }
+});
+
 ```
 
 

composer.json

@@ -1,10 +1,10 @@
 {
   "name": "webreinvent/vaahcms",
-  "description": "Laravel Based Rapid Development CMS Framework",
+  "description": "Laravel Based Rapid Application Development CMS Framework",
   "keywords": ["laravel", "cms"],
   "homepage": "https://www.webreinvent.com",
   "license": "MIT",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "authors": [
     {
       "name": "Pradeep",

src/Config/vaahcms.php

@@ -12,8 +12,9 @@
     'modules_path' => 'vaahcms/Modules',
     'plugins_path' => 'vaahcms/Plugins',
     'per_page' => 20,
-    'minified' => 1,
-    'show_console_logs' => 1,
+    'minified' => 0,
+    'api_route' => 'https://cms.vaah.dev/api/modules',
+    'debug' => 1,
 ];
 
 return $settings;

src/Database/Migrations/2019_05_20_192222_create_vh_modules_table.php

@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateVhModulesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    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('thumbnail')->nullable();
+            $table->string('excerpt')->nullable();
+            $table->string('description')->nullable();
+            $table->string('github_url')->nullable();
+            $table->string('author_name')->nullable();
+            $table->string('author_website')->nullable();
+            $table->string('version')->nullable();
+            $table->integer('version_number')->nullable();
+            $table->integer('db_table_prefix')->nullable();
+            $table->boolean('is_sample_data_available')->nullable();
+            $table->boolean('is_update_available')->nullable();
+            $table->dateTime('update_checked_at')->nullable();
+
+            $table->boolean('is_active')->nullable();
+
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('vh_modules');
+    }
+}

src/Database/Migrations/2019_05_20_192251_create_vh_module_settings_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateVhModuleSettingsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('vh_module_settings', function (Blueprint $table) {
+            $table->increments('id');
+
+            $table->string('module_id')->nullable();
+            $table->string('label')->nullable();
+            $table->string('excerpt')->nullable();
+            $table->string('type')->nullable();
+            $table->string('key')->nullable();
+            $table->text('value')->nullable();
+
+
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('vh_module_settings');
+    }
+}

src/Database/Migrations/2019_05_21_173458_create_vh_modules_migrations_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateVhModulesMigrationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('vh_modules_migrations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('migration_id')->nullable();
+            $table->integer('module_id')->nullable();
+            $table->string('module_slug')->nullable();
+            $table->integer('batch')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('vh_modules_migrations');
+    }
+}