Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cafdf0f
Updated: trying to fix content-types blade.php issue
wri-abinash-s001 Mar 16, 2023
d15abbf
Updated: Cms Module issue resolved
wri-abinash-s001 Mar 17, 2023
119d419
Updated: UI issue fixed in content structure
wri-abinash-s001 Mar 17, 2023
238691c
Updated: research on content structure data save issue
wri-abinash-s001 Mar 17, 2023
2f5a775
Updated: Drag & drop issue resolved
wri-abinash-s001 Mar 17, 2023
d626ed1
Updated: content save issue fixed
wri-abinash-s001 Mar 17, 2023
e4da46f
Updated: research on content structure data save issue
wri-abinash-s001 Mar 17, 2023
511390e
Merge remote-tracking branch 'origin/2.x-feature/Contenttype-developm…
wri-abinash-s001 Mar 17, 2023
990f943
Updated: content remove issue fixed
wri-abinash-s001 Mar 17, 2023
6a1829a
Updated: research on group.fields.meta
wri-abinash-s001 Mar 17, 2023
3762758
Updated: trying to fix content-types blade.php issue
wri-abinash-s001 Mar 16, 2023
377d938
Updated: Cms Module issue resolved
wri-abinash-s001 Mar 17, 2023
470843a
Updated: UI issue fixed in content structure
wri-abinash-s001 Mar 17, 2023
2e91134
Updated: research on content structure data save issue
wri-abinash-s001 Mar 17, 2023
09eea9b
Updated: Drag & drop issue resolved
wri-abinash-s001 Mar 17, 2023
69f7415
Updated: content save issue fixed
wri-abinash-s001 Mar 17, 2023
74f7434
Updated: content remove issue fixed
wri-abinash-s001 Mar 17, 2023
f4d86a8
Updated: research on group.fields.meta
wri-abinash-s001 Mar 17, 2023
8e7563c
Merge remote-tracking branch 'origin/2.x-feature/Contenttype-developm…
we-vikram-wri231 Mar 18, 2023
fda84a0
Fixed: structure error
we-vikram-wri231 Mar 18, 2023
bdbb47e
Added: menu api
we-vikram-wri231 Mar 18, 2023
2617f61
Updated: content type structure
wri-tanmoy-d001 Mar 18, 2023
5bb0cf1
Updated: content sturcture
wri-tanmoy-d001 Mar 20, 2023
6e9b4a9
removed: unnecessary condition
wri-tanmoy-d001 Mar 20, 2023
28820eb
Updated: improve UI and conditional rendering of input fields
wri-tanmoy-d001 Mar 21, 2023
b2264ab
Updated: trashed badge on table
wri-tanmoy-d001 Mar 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions Http/Controllers/Api/MenusController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php namespace VaahCms\Modules\Cms\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Controller;
use VaahCms\Modules\Cms\Entities\Content;
use VaahCms\Modules\Cms\Entities\ContentFormField;
use VaahCms\Modules\Cms\Entities\ContentTypeBase;
use WebReinvent\VaahCms\Models\ThemeLocation;

class MenusController extends Controller
{

public function __construct()
{
}

//----------------------------------------------------------
//----------------------------------------------------------

public static function getList(Request $request, $menu_slug)
{

return ThemeLocation::getLocationData($menu_slug);

}

}
4 changes: 2 additions & 2 deletions Http/Controllers/Backend/ExtendController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Illuminate\Http\Response;
use Illuminate\Routing\Controller;
use VaahCms\Modules\Cms\Entities\ContentTypeBase;
use WebReinvent\VaahCms\Entities\TaxonomyType;
use WebReinvent\VaahCms\Models\TaxonomyType;

class ExtendController extends Controller
{
Expand Down Expand Up @@ -37,7 +37,7 @@ public static function getCmsContentRelations()
$list = [
[
"name" => "Taxonomy",
"namespace" => "WebReinvent\\VaahCms\\Entities\\Taxonomy",
"namespace" => "WebReinvent\\VaahCms\\Models\\Taxonomy",
"options" => TaxonomyType::getListInTreeFormat(),
"filter_by" => 'vh_taxonomy_type_id',
"add_url" => route('vh.backend')."#/vaah/manage/taxonomies/create",
Expand Down
1 change: 0 additions & 1 deletion Models/ContentTypeBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ public static function getItemWithRelations($id)
}])
->withTrashed()
->first();

$response['status'] = 'success';
$response['data'] = $item;

Expand Down
111 changes: 111 additions & 0 deletions Models/FieldType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?php namespace VaahCms\Modules\Cms\Models;

use DateTimeInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use WebReinvent\VaahCms\Models\User;
use WebReinvent\VaahCms\Traits\CrudWithUuidObservantTrait;

class FieldType extends Model {

use SoftDeletes;
use CrudWithUuidObservantTrait;

//-------------------------------------------------
protected $table = 'vh_cms_field_types';
//-------------------------------------------------
protected $dates = [
'created_at',
'updated_at',
'deleted_at'
];
//-------------------------------------------------
protected $dateFormat = 'Y-m-d H:i:s';
//-------------------------------------------------
protected $fillable = [
'name',
'slug',
'excerpt',
'meta',
'created_by',
'updated_by',
'deleted_by'
];

//-------------------------------------------------
protected $appends = [
];

//-------------------------------------------------



//-------------------------------------------------
protected function serializeDate(DateTimeInterface $date)
{
$date_time_format = config('settings.global.datetime_format');

return $date->format($date_time_format);

}
//-------------------------------------------------
//-------------------------------------------------
public function setMetaAttribute($value)
{
if($value)
{
$this->attributes['meta'] = json_encode($value);
} else{
$this->attributes['meta'] = null;
}
}
//-------------------------------------------------
public function getMetaAttribute($value)
{
if($value)
{
return json_decode($value);
}
return null;
}
//-------------------------------------------------
public function getTableColumns() {
return $this->getConnection()->getSchemaBuilder()
->getColumnListing($this->getTable());
}
//-------------------------------------------------
public function scopeExclude($query, $columns)
{
return $query->select( array_diff( $this->getTableColumns(),$columns) );
}
//-------------------------------------------------
public function scopeIsPublished($query)
{
return $query->where( 'is_published', 1 );
}
//-------------------------------------------------
public function createdByUser()
{
return $this->belongsTo(User::class,
'created_by', 'id'
)->select('id', 'uuid', 'first_name', 'last_name', 'email');
}

//-------------------------------------------------
public function updatedByUser()
{
return $this->belongsTo(User::class,
'updated_by', 'id'
)->select('id', 'uuid', 'first_name', 'last_name', 'email');
}
//-------------------------------------------------
public function deletedByUser()
{
return $this->belongsTo(User::class,
'deleted_by', 'id'
)->select('id', 'uuid', 'first_name', 'last_name', 'email');
}
//-------------------------------------------------
//-------------------------------------------------

}
1 change: 0 additions & 1 deletion Models/FormGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ public static function syncWithFormFields(FormGroup $group, $fields_array)
->first();



if(isset($field['type']) && isset($field['type']['slug']) )
{
$type = FieldType::where('slug', $field['type']['slug'])->first();
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/backend/pages/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@if(env('MODULE_CMS_ENV') == 'develop')
<script type="module" src="http://localhost:8367/Vue/main.js"></script>
@else
<script type="module" src="{{vh_module_assets_url("Cms", "build/index.js")}}"></script>
<script type="module" src="{{vh_module_assets_url("Cms", "build/main.js")}}"></script>
@endif

@endsection
Expand Down
2 changes: 2 additions & 0 deletions Routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ function () {
Route::any( '/contents/{singular_slug}/{content_slug}', 'ContentsController@getContentItem' );
//------------------------------------------------
});

include('api/api-routes-menus.php');
53 changes: 2 additions & 51 deletions Routes/api/api-routes-menus.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,15 @@
Route::group(
[
'prefix' => 'cms/menus',
'namespace' => 'Backend',
'namespace' => 'Api',
],
function () {

/**
* Get Assets
*/
Route::get('/assets', 'MenusController@getAssets')
->name('vh.backend.cms.api.menus.assets');
/**
* Get List
*/
Route::get('/', 'MenusController@getList')
Route::get('/{menu_slug}', 'MenusController@getList')
->name('vh.backend.cms.api.menus.list');
/**
* Update List
*/
Route::match(['put', 'patch'], '/', 'MenusController@updateList')
->name('vh.backend.cms.api.menus.list.update');
/**
* Delete List
*/
Route::delete('/', 'MenusController@deleteList')
->name('vh.backend.cms.api.menus.list.delete');


/**
* Create Item
*/
Route::post('/', 'MenusController@createItem')
->name('vh.backend.cms.api.menus.create');
/**
* Get Item
*/
Route::get('/{id}', 'MenusController@getItem')
->name('vh.backend.cms.api.menus.read');
/**
* Update Item
*/
Route::match(['put', 'patch'], '/{id}', 'MenusController@updateItem')
->name('vh.backend.cms.api.menus.update');
/**
* Delete Item
*/
Route::delete('/{id}', 'MenusController@deleteItem')
->name('vh.backend.cms.api.menus.delete');

/**
* List Actions
*/
Route::any('/action/{action}', 'MenusController@listAction')
->name('vh.backend.cms.api.menus.list.action');

/**
* Item actions
*/
Route::any('/{id}/action/{action}', 'MenusController@itemAction')
->name('vh.backend.cms.api.menus.item.action');



Expand Down
Loading