Merge pull request #69 from uasoft-indonesia/develop

Prepare for release 2.0.0-rc.3

CONTRIBUTING.md

@@ -48,15 +48,16 @@ After getting the license, you can proceed to Badaso installation.
 - Root Laravel Project
   - /packages (Folder Packages)
     - /uasoft-indonesia (Folder Uasoft Indonesia)
-      - badaso (Badaso Library) 
-      - badaso-content-module (Cloud Badaso Content Manager)
+      - core (Badaso Core Library) 
+      - content-module (Cloud Badaso Content Manager)
     - ...
   - ...
 - ...
 
 cd into uasoft-indonesia directory, then run
 ```
-git clone https://github.com/uasoft-indonesia/badaso-content-module.git
+git clone https://github.com/uasoft-indonesia/badaso-content-module.git content-module
+
 ```
 
 2. Add the following Badaso provider to ```/config/app.php```.
@@ -74,14 +75,14 @@ git clone https://github.com/uasoft-indonesia/badaso-content-module.git
 "autoload": {
     "psr-4": {
         "App\\": "app/",
-        "Uasoft\\Badaso\\": "packages/uasoft-indonesia/badaso/src/",
-        "Uasoft\\Badaso\\Module\\Content\\": "packages/uasoft-indonesia/badaso-content-module/src/",
+        "Uasoft\\Badaso\\": "packages/badaso/badaso/src/",
+        "Uasoft\\Badaso\\Module\\Content\\": "packages/badaso/content-module/src/",
     },
     ...
 }
 ```
 
-5. Copy required library from ```packages/uasoft-indonesia/badaso-content-module/composer.json``` to ```/composer.json``` then ```composer install```
+5. Copy required library from ```packages/badaso/content-module/composer.json``` to ```/composer.json``` then ```composer install```
 
 6. Run the following commands in sequence.
 ```
@@ -103,13 +104,13 @@ composer dump-autoload
 ```
 9. Run command 
 ```
-php artisan db:seed --class=ContentModuleSeeder
+php artisan db:seed --class=BadasoContentModuleSeeder
 ```
 11. Open the ```env``` file then add the following lines.
 ```
 MIX_DEFAULT_MENU=admin
-MIX_BADASO_MENU=${MIX_DEFAULT_MENU},badaso-content-module
-MIX_BADASO_MODULES=badaso-content-module
+MIX_BADASO_MENU=${MIX_DEFAULT_MENU},content-module
+MIX_BADASO_MODULES=content-module
 ```
 
 9. In menu item "Role Management" from badaso admin panel, add permission user to fill content

composer.json

@@ -1,7 +1,7 @@
 {
-  "version": "2.0.0-rc.2",
   "name": "badaso/content-module",
-  "description": "Zero development for web page content system on badaso",
+  "version": "2.0.0-rc.3",
+  "description": "Manage website content content through badaso",
   "keywords": [
     "laravel",
     "admin",

src/Commands/BadasoContentSetup.php

@@ -3,6 +3,7 @@
 namespace Uasoft\Badaso\Module\Content\Commands;
 
 use Illuminate\Console\Command;
+use Symfony\Component\VarExporter\VarExporter;
 
 class BadasoContentSetup extends Command
 {
@@ -44,6 +45,7 @@ public function handle()
                 $this->force = true;
             }
             $this->generateSeeder();
+            $this->hiddenTableHandle();
         } catch (\Exception $e) {
             $this->error($e->getMessage());
         }
@@ -58,4 +60,22 @@ private function generateSeeder()
 
         $this->call('l5-swagger:generate');
     }
+
+    private function hiddenTableHandle()
+    {
+        $table_name = 'content';
+        $config_name_file = 'badaso-hidden-tables';
+        $hidden_table = config($config_name_file);
+        if (! in_array($table_name, $hidden_table)) {
+            $hidden_table[] = $table_name;
+            $content_config = VarExporter::export($hidden_table);
+            $content_config = <<<PHP
+            <?php
+            
+            return {$content_config} ;
+            PHP;
+
+            file_put_contents(config_path("{$config_name_file}.php"), $content_config);
+        }
+    }
 }

src/Routes/api.php

@@ -7,9 +7,9 @@
 
 Route::group(
     [
-        'prefix'     => $api_route_prefix,
-        'namespace'  => 'Uasoft\Badaso\Module\Content\Controllers',
-        'as'         => 'badaso.',
+        'prefix' => $api_route_prefix,
+        'namespace' => 'Uasoft\Badaso\Module\Content\Controllers',
+        'as' => 'badaso.',
         'middleware' => [ApiRequest::class],
     ],
     function () {

src/Seeder/ContentFixedMenuItemSeeder.php → src/Seeder/BadasoContentFixedMenuItemSeeder.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Seeder;
 use Uasoft\Badaso\Models\MenuItem;
 
-class ContentFixedMenuItemSeeder extends Seeder
+class BadasoContentFixedMenuItemSeeder extends Seeder
 {
     /**
      * Auto generated seed file.
@@ -19,7 +19,7 @@ public function run()
         \DB::beginTransaction();
 
         try {
-            $menus = \DB::table('menus')->where('key', 'badaso-content-module')->first();
+            $menus = \DB::table('menus')->where('key', 'content-module')->first();
             $menu_id = $menus->id;
 
             $add_menus_item = [

src/Seeder/ContentMenusSeeder.php → src/Seeder/BadasoContentMenusSeeder.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Seeder;
 use Uasoft\Badaso\Models\Menu;
 
-class ContentMenusSeeder extends Seeder
+class BadasoContentMenusSeeder extends Seeder
 {
     /**
      * Auto generated seed file.
@@ -20,7 +20,7 @@ public function run()
 
         try {
             $new_menus = [
-                'key' => 'badaso-content-module',
+                'key' => 'content-module',
                 'display_name' => 'Content Manager',
                 'created_at' => '2021-01-01 15:26:06',
                 'updated_at' => '2021-01-01 15:26:06',

src/Seeder/BadasoContentModuleSeeder.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Database\Seeders\Badaso\Content;
+
+use Illuminate\Database\Seeder;
+
+class BadasoContentModuleSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->call(BadasoContentPermissionsSeeder::class);
+        $this->call(BadasoContentRolePermissionsSeeder::class);
+        $this->call(BadasoContentMenusSeeder::class);
+        $this->call(BadasoContentFixedMenuItemSeeder::class);
+    }
+}

src/Seeder/ContentPermissionsSeeder.php → src/Seeder/BadasoContentPermissionsSeeder.php

@@ -5,7 +5,7 @@
 use Illuminate\Database\Seeder;
 use Uasoft\Badaso\Models\Permission;
 
-class ContentPermissionsSeeder extends Seeder
+class BadasoContentPermissionsSeeder extends Seeder
 {
     /**
      * Auto generated seed file.

src/Seeder/ContentRolePermissionsSeeder.php → src/Seeder/BadasoContentRolePermissionsSeeder.php

@@ -7,7 +7,7 @@
 use Uasoft\Badaso\Models\Role;
 use Uasoft\Badaso\Models\RolePermission;
 
-class ContentRolePermissionsSeeder extends Seeder
+class BadasoContentRolePermissionsSeeder extends Seeder
 {
     /**
      * Auto generated seed file.

src/resources/js/api/modules/badaso-content.js

@@ -1,5 +1,5 @@
-import resource from "../../../../../../badaso/src/resources/js/api/resource";
-import QueryString from "../../../../../../badaso/src/resources/js/api/query-string";
+import resource from "../../../../../../core/src/resources/js/api/resource";
+import QueryString from "../../../../../../core/src/resources/js/api/query-string";
 
 let apiPrefix = process.env.MIX_API_ROUTE_PREFIX
   ? "/" + process.env.MIX_API_ROUTE_PREFIX

src/resources/js/components/BadasoContent.vue

@@ -210,7 +210,7 @@ export default {
         }
       }
       [temp[index], temp[index + 1]] = [temp[index + 1], temp[index]]
-      
+
       tempObject = this.convertArrayToObject(temp, 'name')
       this.items.data = tempObject
     },
@@ -223,7 +223,7 @@ export default {
         }
       }
       [temp[index], temp[index - 1]] = [temp[index - 1], temp[index]]
-      
+
       tempObject = this.convertArrayToObject(temp, 'name')
       this.items.data = tempObject
     },
@@ -257,4 +257,4 @@ export default {
   padding: 0 !important;
   border-top: none !important;
 }
-</style>
+</style>

src/resources/js/components/BadasoContentAddField.vue

@@ -70,20 +70,22 @@ export default {
       },
     },
   },
-  validations: {
-    field: {
-      type: {
-        required,
-      },
-      label: {
-        required,
-      },
-      name: {
-        required,
-        alphaNum,
-        nonNumericOnFirstChar: nonNumericOnFirstChar(this.name)
+  validations() {
+    return {
+      field: {
+        type: {
+          required,
+        },
+        label: {
+          required,
+        },
+        name: {
+          required,
+          alphaNum,
+          nonNumericOnFirstChar: nonNumericOnFirstChar(this.field.name)
+        },
       },
-    },
+    }
   },
   watch: {
     show(val) {
@@ -128,4 +130,4 @@ export default {
     },
   },
 };
-</script>
+</script>

src/resources/js/components/index.js

@@ -1,9 +1,10 @@
-import BadasoContent from "./BadasoContent.vue";
-import BadasoContentAddField from "./BadasoContentAddField.vue";
-import BadasoContentFill from "./BadasoContentFill.vue";
-import BadasoContentRead from "./BadasoContentRead.vue";
+import BadasoContent from "./BadasoContent";
+import BadasoContentAddField from "./BadasoContentAddField";
+import BadasoContentFill from "./BadasoContentFill";
+import BadasoContentRead from "./BadasoContentRead";
 
-export default {
+
+export default  {
   BadasoContent,
   BadasoContentAddField,
   BadasoContentFill,

src/resources/js/pages/content/add.vue

@@ -310,7 +310,7 @@ export default {
         }
       }
       [temp[index], temp[index + 1]] = [temp[index + 1], temp[index]]
-      
+
       tempObject = this.convertArrayToObject(temp, 'name')
       this.items = tempObject
     },
@@ -323,7 +323,7 @@ export default {
         }
       }
       [temp[index], temp[index - 1]] = [temp[index - 1], temp[index]]
-      
+
       tempObject = this.convertArrayToObject(temp, 'name')
       this.items = tempObject
     },

src/resources/js/pages/content/edit.vue

@@ -336,7 +336,7 @@ export default {
         item.data = {};
       }
 
-      if (event === 'text' || event === 'image') {
+      if (event === "text" || event === "image") {
         item.data = "";
       }
 
@@ -348,30 +348,30 @@ export default {
       }
     },
     moveDown(index) {
-      const temp = []
-      var tempObject = {}
+      const temp = [];
+      var tempObject = {};
       for (const item in this.items) {
         if (Object.hasOwnProperty.call(this.items, item)) {
-          temp.push(this.items[item])
+          temp.push(this.items[item]);
         }
       }
-      [temp[index], temp[index + 1]] = [temp[index + 1], temp[index]]
-      
-      tempObject = this.convertArrayToObject(temp, 'name')
-      this.items = tempObject
+      [temp[index], temp[index + 1]] = [temp[index + 1], temp[index]];
+
+      tempObject = this.convertArrayToObject(temp, "name");
+      this.items = tempObject;
     },
     moveUp(index) {
-      const temp = []
-      var tempObject = {}
+      const temp = [];
+      var tempObject = {};
       for (const item in this.items) {
         if (Object.hasOwnProperty.call(this.items, item)) {
-          temp.push(this.items[item])
+          temp.push(this.items[item]);
         }
       }
-      [temp[index], temp[index - 1]] = [temp[index - 1], temp[index]]
-      
-      tempObject = this.convertArrayToObject(temp, 'name')
-      this.items = tempObject
+      [temp[index], temp[index - 1]] = [temp[index - 1], temp[index]];
+
+      tempObject = this.convertArrayToObject(temp, "name");
+      this.items = tempObject;
     },
     convertArrayToObject(array, key) {
       const initialValue = {};
@@ -381,7 +381,7 @@ export default {
           [item[key]]: item,
         };
       }, initialValue);
-    }
+    },
   },
 };
 </script>

src/resources/js/pages/index.vue

@@ -21,7 +21,7 @@ export default {
     ContentManagementFill,
     ContentManagementRead,
   },
-  name: "BlogEntryIndex",
+  name: "ContentEntryIndex",
   data: () => ({
     globalComponentList: {},
     defaultComponent: null,