Skip to content

Commit aac6c58

Browse files
themodernpkthemodernpk
committed
Merge branch '2.x-release/v2.0.4' into 2.x
2 parents f53b630 + ad57935 commit aac6c58

File tree

25 files changed

+997
-4295
lines changed

25 files changed

+997
-4295
lines changed

‎Http/Controllers/Backend/BlocksController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public function getAssets(Request $request)
5353
$data['empty_item'][$column] = null;
5454
}
5555

56+
$data['empty_item']['content'] = '';
57+
5658
$data['actions'] = [];
5759

5860
$response['success'] = true;

‎Http/Controllers/Backend/ExtendController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static function getCmsContentRelations()
4545
],
4646
[
4747
"name" => "Role",
48-
"namespace" => "WebReinvent\\VaahCms\\Entities\\Role",
48+
"namespace" => "WebReinvent\\VaahCms\\Models\\Role",
4949
"display_column" => 'name',
5050
"filters" => [
5151
[

‎Http/Controllers/Backend/MenusController.php‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -121,66 +121,6 @@ public function itemAction(Request $request,$id,$action)
121121
//----------------------------------------------------------
122122

123123
//----------------------------------------------------------
124-
public function postActions(Request $request, $action)
125-
{
126-
$rules = array(
127-
'inputs' => 'required',
128-
);
129-
130-
$validator = \Validator::make( $request->all(), $rules);
131-
if ( $validator->fails() ) {
132-
133-
$errors = errorsToArray($validator->errors());
134-
$response['success'] = false;
135-
$response['errors'] = $errors;
136-
return response()->json($response);
137-
}
138-
139-
$response = [];
140-
141-
$response['success'] = true;
142-
143-
$inputs = $request->all();
144-
145-
switch ($action)
146-
{
147-
148-
//------------------------------------
149-
case 'bulk-change-status':
150-
$response = Menu::bulkStatusChange($request);
151-
break;
152-
//------------------------------------
153-
case 'bulk-trash':
154-
155-
$response = Menu::bulkTrash($request);
156-
157-
break;
158-
//------------------------------------
159-
case 'bulk-restore':
160-
161-
$response = Menu::bulkRestore($request);
162-
163-
break;
164-
165-
//------------------------------------
166-
case 'bulk-delete':
167-
168-
$response = Menu::bulkDelete($request);
169-
170-
break;
171-
172-
//------------------------------------
173-
case 'set-as-home-page':
174-
175-
$response = Menu::setAsHomePage($request);
176-
177-
break;
178-
//------------------------------------
179-
}
180-
181-
return response()->json($response);
182-
183-
}
184124
//----------------------------------------------------------
185125
public function getContentList(Request $request)
186126
{

‎Models/Menu.php‎

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,8 @@ public static function createItem($request)
117117

118118
$item = static::getItem($item->id);
119119

120-
$menu = new MenusController();
121-
122120
$response['success'] = true;
123121
$response['data']['item'] =$item['data'];
124-
$response['data']['assets'] = $menu->getAssets($request);
125122
$response['messages'][] = 'Saved successfully.';
126123

127124
return $response;
@@ -323,57 +320,21 @@ public static function deleteList($request): array
323320
//-------------------------------------------------
324321
public static function listAction($request, $type): array
325322
{
323+
326324
$inputs = $request->all();
327325

328-
if(isset($inputs['items']))
329-
{
330-
$items_id = collect($inputs['items'])
331-
->pluck('id')
332-
->toArray();
326+
switch ($type) {
327+
case 'delete':
328+
if(isset($inputs['inputs']) && count($inputs['inputs']) > 0) {
333329

334-
$items = self::whereIn('id', $items_id)
335-
->withTrashed();
336-
}
330+
foreach ($inputs['inputs'] as $id){
331+
MenuItem::where('vh_menu_id', $id)->withTrashed()->forceDelete();
337332

333+
self::where('id',$id)->withTrashed()->forceDelete();
334+
}
338335

339-
switch ($type) {
340-
case 'deactivate':
341-
if($items->count() > 0) {
342-
$items->update(['is_active' => null]);
343-
}
344-
break;
345-
case 'activate':
346-
if($items->count() > 0) {
347-
$items->update(['is_active' => 1]);
348-
}
349-
break;
350-
case 'trash':
351-
if(isset($items_id) && count($items_id) > 0) {
352-
self::whereIn('id', $items_id)->delete();
353-
}
354-
break;
355-
case 'restore':
356-
if(isset($items_id) && count($items_id) > 0) {
357-
self::whereIn('id', $items_id)->restore();
358336
}
359337
break;
360-
case 'delete':
361-
if(isset($items_id) && count($items_id) > 0) {
362-
self::whereIn('id', $items_id)->forceDelete();
363-
}
364-
break;
365-
case 'activate-all':
366-
self::query()->update(['is_active' => 1]);
367-
break;
368-
case 'deactivate-all':
369-
self::query()->update(['is_active' => null]);
370-
break;
371-
case 'trash-all':
372-
self::query()->delete();
373-
break;
374-
case 'restore-all':
375-
self::withTrashed()->restore();
376-
break;
377338
case 'delete-all':
378339
self::withTrashed()->forceDelete();
379340
break;

‎Resources/assets/build/index.js‎

Lines changed: 931 additions & 3519 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Vue/layouts/Default.vue‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ onMounted(async () => {
1616

1717

1818
<template>
19-
<div class="pb-3 pt-2"><Topnav/></div>
20-
<RouterView />
19+
<div>
20+
<div class="pb-3 pt-2"><Topnav/></div>
21+
<RouterView />
22+
23+
</div>
2124

2225
</template>

‎Vue/main.js‎

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -8,99 +8,41 @@ import PrimeVue from "primevue/config";
88
import AutoComplete from 'primevue/autocomplete';
99
import Accordion from 'primevue/accordion';
1010
import AccordionTab from 'primevue/accordiontab';
11-
import Avatar from 'primevue/avatar';
12-
import AvatarGroup from 'primevue/avatargroup';
1311
import Badge from 'primevue/badge';
1412
import BadgeDirective from "primevue/badgedirective";
15-
import BlockUI from 'primevue/blockui';
1613
import Button from 'primevue/button';
17-
import Breadcrumb from 'primevue/breadcrumb';
1814
import Calendar from 'primevue/calendar';
1915
import Card from 'primevue/card';
20-
import CascadeSelect from 'primevue/cascadeselect';
21-
import Carousel from 'primevue/carousel';
2216
import Checkbox from 'primevue/checkbox';
23-
import Chip from 'primevue/chip';
2417
import Chips from 'primevue/chips';
25-
import ColorPicker from 'primevue/colorpicker';
2618
import Column from 'primevue/column';
27-
//import ColumnGroup from 'primevue/columngroup';
2819
import ConfirmDialog from 'primevue/confirmdialog';
29-
import ConfirmPopup from 'primevue/confirmpopup';
3020
import ConfirmationService from 'primevue/confirmationservice';
31-
import ContextMenu from 'primevue/contextmenu';
3221
import DataTable from 'primevue/datatable';
33-
import DataView from 'primevue/dataview';
34-
import DataViewLayoutOptions from 'primevue/dataviewlayoutoptions';
35-
import DeferredContent from 'primevue/deferredcontent';
36-
import Dialog from 'primevue/dialog';
3722
import DialogService from 'primevue/dialogservice'
3823
import Divider from 'primevue/divider';
39-
import Dock from 'primevue/dock';
4024
import Dropdown from 'primevue/dropdown';
41-
import DynamicDialog from 'primevue/dynamicdialog';
4225
import Editor from 'primevue/editor';
43-
import Fieldset from 'primevue/fieldset';
4426
import FileUpload from 'primevue/fileupload';
45-
import Galleria from 'primevue/galleria';
46-
import Image from 'primevue/image';
47-
import InlineMessage from 'primevue/inlinemessage';
48-
import Inplace from 'primevue/inplace';
4927
import InputSwitch from 'primevue/inputswitch';
5028
import InputText from 'primevue/inputtext';
51-
import InputMask from 'primevue/inputmask';
5229
import InputNumber from 'primevue/inputnumber';
53-
import Knob from 'primevue/knob';
54-
import Listbox from 'primevue/listbox';
55-
import MegaMenu from 'primevue/megamenu';
5630
import Menu from 'primevue/menu';
57-
import Menubar from 'primevue/menubar';
5831
import Message from 'primevue/message';
59-
import MultiSelect from 'primevue/multiselect';
60-
import OrderList from 'primevue/orderlist';
61-
import OrganizationChart from 'primevue/organizationchart';
62-
import OverlayPanel from 'primevue/overlaypanel';
6332
import Paginator from 'primevue/paginator';
6433
import Panel from 'primevue/panel';
65-
import PanelMenu from 'primevue/panelmenu';
6634
import Password from 'primevue/password';
67-
import PickList from 'primevue/picklist';
6835
import ProgressBar from 'primevue/progressbar';
69-
import ProgressSpinner from 'primevue/progressspinner';
70-
import Rating from 'primevue/rating';
7136
import RadioButton from 'primevue/radiobutton';
7237
import Ripple from 'primevue/ripple';
73-
import Row from 'primevue/row';
74-
import SelectButton from 'primevue/selectbutton';
75-
import ScrollPanel from 'primevue/scrollpanel';
76-
import ScrollTop from 'primevue/scrolltop';
77-
import Skeleton from 'primevue/skeleton';
78-
import Slider from 'primevue/slider';
7938
import Sidebar from 'primevue/sidebar';
80-
import SpeedDial from 'primevue/speeddial';
81-
import SplitButton from 'primevue/splitbutton';
82-
import Splitter from 'primevue/splitter';
83-
import SplitterPanel from 'primevue/splitterpanel';
84-
import Steps from 'primevue/steps';
8539
import StyleClass from 'primevue/styleclass';
86-
import TabMenu from 'primevue/tabmenu';
87-
import TieredMenu from 'primevue/tieredmenu';
8840
import Textarea from 'primevue/textarea';
8941
import Toast from 'primevue/toast';
9042
import ToastService from 'primevue/toastservice';
91-
import Toolbar from 'primevue/toolbar';
92-
import TabView from 'primevue/tabview';
93-
import TabPanel from 'primevue/tabpanel';
9443
import Tag from 'primevue/tag';
95-
import Terminal from 'primevue/terminal';
96-
import Timeline from 'primevue/timeline';
97-
import ToggleButton from 'primevue/togglebutton';
9844
import Tooltip from 'primevue/tooltip';
99-
import Tree from 'primevue/tree';
10045
import TreeSelect from 'primevue/treeselect';
101-
import TreeTable from 'primevue/treetable';
102-
import TriStateCheckbox from 'primevue/tristatecheckbox';
103-
import VirtualScroller from 'primevue/virtualscroller';
10446
//-------------/PrimeVue Imports
10547

10648

@@ -135,92 +77,34 @@ app.directive('styleclass', StyleClass);
13577
app.component('Accordion', Accordion);
13678
app.component('AccordionTab', AccordionTab);
13779
app.component('AutoComplete', AutoComplete);
138-
app.component('Avatar', Avatar);
139-
app.component('AvatarGroup', AvatarGroup);
14080
app.component('Badge', Badge);
141-
app.component('BlockUI', BlockUI);
142-
app.component('Breadcrumb', Breadcrumb);
14381
app.component('Button', Button);
14482
app.component('Calendar', Calendar);
14583
app.component('Card', Card);
146-
app.component('Carousel', Carousel);
147-
app.component('CascadeSelect', CascadeSelect);
14884
app.component('Checkbox', Checkbox);
149-
app.component('Chip', Chip);
15085
app.component('Chips', Chips);
151-
app.component('ColorPicker', ColorPicker);
15286
app.component('Column', Column);
153-
//app.component('ColumnGroup', ColumnGroup);
15487
app.component('ConfirmDialog', ConfirmDialog);
155-
app.component('ConfirmPopup', ConfirmPopup);
156-
app.component('ContextMenu', ContextMenu);
15788
app.component('DataTable', DataTable);
158-
app.component('DataView', DataView);
159-
app.component('DataViewLayoutOptions', DataViewLayoutOptions);
160-
app.component('DeferredContent', DeferredContent);
161-
app.component('Dialog', Dialog);
16289
app.component('Divider', Divider);
163-
app.component('Dock', Dock);
16490
app.component('Dropdown', Dropdown);
165-
app.component('DynamicDialog', DynamicDialog);
16691
app.component('Editor', Editor);
167-
app.component('Fieldset', Fieldset);
16892
app.component('FileUpload', FileUpload);
169-
app.component('Galleria', Galleria);
170-
app.component('Image', Image);
171-
app.component('InlineMessage', InlineMessage);
172-
app.component('Inplace', Inplace);
173-
app.component('InputMask', InputMask);
17493
app.component('InputNumber', InputNumber);
17594
app.component('InputSwitch', InputSwitch);
17695
app.component('InputText', InputText);
177-
app.component('Knob', Knob);
178-
app.component('Listbox', Listbox);
179-
app.component('MegaMenu', MegaMenu);
18096
app.component('Menu', Menu);
181-
app.component('Menubar', Menubar);
18297
app.component('Message', Message);
183-
app.component('MultiSelect', MultiSelect);
184-
app.component('OrderList', OrderList);
185-
app.component('OrganizationChart', OrganizationChart);
186-
app.component('OverlayPanel', OverlayPanel);
18798
app.component('Paginator', Paginator);
18899
app.component('Panel', Panel);
189-
app.component('PanelMenu', PanelMenu);
190100
app.component('Password', Password);
191-
app.component('PickList', PickList);
192101
app.component('ProgressBar', ProgressBar);
193-
app.component('ProgressSpinner', ProgressSpinner);
194102
app.component('RadioButton', RadioButton);
195-
app.component('Rating', Rating);
196-
app.component('Row', Row);
197-
app.component('SelectButton', SelectButton);
198-
app.component('ScrollPanel', ScrollPanel);
199-
app.component('ScrollTop', ScrollTop);
200-
app.component('Slider', Slider);
201103
app.component('Sidebar', Sidebar);
202-
app.component('Skeleton', Skeleton);
203-
app.component('SpeedDial', SpeedDial);
204-
app.component('SplitButton', SplitButton);
205-
app.component('Splitter', Splitter);
206-
app.component('SplitterPanel', SplitterPanel);
207-
app.component('Steps', Steps);
208-
app.component('TabMenu', TabMenu);
209-
app.component('TabView', TabView);
210-
app.component('TabPanel', TabPanel);
211104
app.component('Tag', Tag);
212105
app.component('Textarea', Textarea);
213-
app.component('Terminal', Terminal);
214-
app.component('TieredMenu', TieredMenu);
215-
app.component('Timeline', Timeline);
216106
app.component('Toast', Toast);
217-
app.component('Toolbar', Toolbar);
218-
app.component('ToggleButton', ToggleButton);
219-
app.component('Tree', Tree);
220107
app.component('TreeSelect', TreeSelect);
221-
app.component('TreeTable', TreeTable);
222-
app.component('TriStateCheckbox', TriStateCheckbox);
223-
app.component('VirtualScroller', VirtualScroller);
224108
//-------------/PrimeVue Use
225109

226110

‎Vue/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
},
88
"dependencies": {
99
"axios": "^0.27.2",
10+
"javascript-time-ago": "^2.5.9",
1011
"jodit": "^3.24.5",
1112
"jodit-vue": "^3.0.0",
1213
"jodit-vue3": "^1.0.5",
1314
"json-editor-vue": "^0.11.0",
14-
"moment-timezone": "^0.5.34",
1515
"pinia": "^2.0.23",
16-
"primevue": "3.35.0",
16+
"primevue": "3.46.0",
1717
"qs": "^6.11.0",
1818
"quill": "^1.3.7",
1919
"uuid": "^9.0.1",

0 commit comments

Comments
 (0)