Skip to content

Commit

Permalink
Merge pull request #47 from uasoft-indonesia/develop
Browse files Browse the repository at this point in the history
Merge develop to main
  • Loading branch information
rizkiheryandi authored Jun 11, 2021
2 parents 153781e + 1141c2b commit 7df76c3
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/Providers/BadasoContentModuleServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function boot()

$this->publishes([
__DIR__.'/../Swagger' => app_path('Http/Swagger/swagger_models'),
__DIR__.'/../Seeder' => database_path('seeds/Badaso/Content'),
__DIR__.'/../Seeder' => database_path('seeders/Badaso/Content'),
], 'badaso-content-module');
}

Expand Down
2 changes: 2 additions & 0 deletions src/Seeder/ContentFixedMenuItemSeeder.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Database\Seeders\Badaso\Content;

use Illuminate\Database\Seeder;
use Uasoft\Badaso\Models\MenuItem;

Expand Down
2 changes: 2 additions & 0 deletions src/Seeder/ContentMenusSeeder.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Database\Seeders\Badaso\Content;

use Illuminate\Database\Seeder;
use Uasoft\Badaso\Models\Menu;

Expand Down
2 changes: 2 additions & 0 deletions src/Seeder/ContentModuleSeeder.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Database\Seeders\Badaso\Content;

use Illuminate\Database\Seeder;

class ContentModuleSeeder extends Seeder
Expand Down
2 changes: 2 additions & 0 deletions src/Seeder/ContentPermissionsSeeder.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Database\Seeders\Badaso\Content;

use Illuminate\Database\Seeder;
use Uasoft\Badaso\Models\Permission;

Expand Down
2 changes: 2 additions & 0 deletions src/Seeder/ContentRolePermissionsSeeder.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Database\Seeders\Badaso\Content;

use Illuminate\Database\Seeder;
use Uasoft\Badaso\Models\Permission;
use Uasoft\Badaso\Models\Role;
Expand Down
16 changes: 8 additions & 8 deletions src/Swagger/content_module.php → src/Swagger/content.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* @OA\Get(
* path="/v1/module/content",
* path="module/content/v1/content",
* operationId="browseModuleContentV1Content",
* tags={"Module Content"},
* tags={"content"},
* summary="Browse Content",
* description="Browse Content",
* @OA\Response(response=200, description="Successful operation"),
Expand All @@ -19,9 +19,9 @@

/**
* @OA\Get(
* path="/v1/module/content/read",
* path="module/content/v1/content/read",
* operationId="browseModuleContentV1ContentRead",
* tags={"Module Content"},
* tags={"content"},
* summary="Read Content",
* description="Read Content",
* @OA\Parameter(
Expand All @@ -44,9 +44,9 @@

/**
* @OA\Get(
* path="/v1/module/content/fetch",
* path="module/content/v1/content/fetch",
* operationId="browseModuleContentV1ContentFetch",
* tags={"Module Content"},
* tags={"content"},
* summary="Fetch Content",
* description="Fetch Content",
* @OA\Parameter(
Expand All @@ -66,9 +66,9 @@

/**
* @OA\Get(
* path="/v1/module/content/fetch-multiple",
* path="module/content/v1/content/fetch-multiple",
* operationId="browseModuleContentV1ContentFetchMultiple",
* tags={"Module Content"},
* tags={"content"},
* summary="Fetch Multiple Content",
* description="Fetch Multiple Content",
* @OA\Parameter(
Expand Down
2 changes: 1 addition & 1 deletion src/resources/js/router/routes.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Pages from "./../pages/index";
import Pages from "./../pages/index.vue";

let prefix = process.env.MIX_ADMIN_PANEL_ROUTE_PREFIX
? "/" + process.env.MIX_ADMIN_PANEL_ROUTE_PREFIX
Expand Down

0 comments on commit 7df76c3

Please sign in to comment.