Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Next Demo version #669

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Homestead.json
/.vscode
/packages
/_volumes
/public/basset
6 changes: 0 additions & 6 deletions app/Http/Controllers/Admin/FluentMonsterCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,6 @@ protected function setupCreateOperation()
->type('summernote')
->label('Summernote editor')
->tab('Big texts');

CRUD::field('wysiwyg')
->type('ckeditor')
->label('CKEditor - also called the WYSIWYG field')
->tab('Big texts');

CRUD::field('tinymce')
->type('tinymce')
->label('TinyMCE')
Expand Down
34 changes: 12 additions & 22 deletions app/Http/Controllers/Admin/MonsterCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class MonsterCrudController extends CrudController
use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\ShowOperation;
use \Backpack\CRUD\app\Http\Controllers\Operations\FetchOperation;
use \Backpack\Pro\Http\Controllers\Operations\DropzoneOperation { dropzoneUpload as traitDropzone; }
use \App\Http\Controllers\Admin\Operations\SMSOperation; //Custom Form Operation Example
use \Backpack\Pro\Http\Controllers\Operations\AjaxUploadOperation { ajaxUpload as traitAjaxUpload; }
use Operations\SMSOperation; //Custom Form Operation Example
use \Backpack\ActivityLog\Http\Controllers\Operations\ModelActivityOperation;
use \Backpack\ActivityLog\Http\Controllers\Operations\EntryActivityOperation;

Expand Down Expand Up @@ -320,13 +320,6 @@ public function setupShowOperation()
'tab' => 'WYSIWYG Editors',
]);

$this->crud->addColumn([
'name' => 'wysiwyg',
'type' => 'wysiwyg',
'label' => 'Wysiwyg'.backpack_pro_badge(),
'tab' => 'WYSIWYG Editors',
]);

$this->crud->addColumn([
'name' => 'features',
'label' => 'Features'.backpack_pro_badge(),
Expand Down Expand Up @@ -1703,10 +1696,11 @@ public static function getFieldsArrayForWysiwygEditorsTab()
'tab' => 'WYSIWYG Editors',
],
[ // Summernote
'name' => 'summernote',
'label' => 'Summernote editor'.backpack_free_badge(),
'type' => 'summernote',
'tab' => 'WYSIWYG Editors',
'name' => 'summernote',
'label' => 'Summernote editor'.backpack_free_badge(),
'type' => 'summernote',
'tab' => 'WYSIWYG Editors',
'withFiles' => true,
],
[ // CKEditor
'name' => 'ckeditor',
Expand All @@ -1720,12 +1714,6 @@ public static function getFieldsArrayForWysiwygEditorsTab()
'type' => 'tinymce',
'tab' => 'WYSIWYG Editors',
],
[ // Wysiwyg
'name' => 'wysiwyg',
'label' => 'Wysiwyg'.backpack_pro_badge(),
'type' => 'wysiwyg',
'tab' => 'WYSIWYG Editors',
],
];
}

Expand Down Expand Up @@ -1837,15 +1825,17 @@ public static function getFieldsArrayForMiscellaneousTab()
];
}

public function dropzoneUpload()
public function ajaxUpload()
{
if (app('env') === 'production') {
return response()->json(['errors' => [
'dropzone' => ['Uploads are disabled in production'],
'dropzone' => ['Uploads are disabled in production'],
'easymde' => ['Uploads are disabled in production'],
'summernote' => ['Uploads are disabled in production'],
],
], 500);
}

return $this->traitDropzone();
return $this->traitAjaxUpload();
}
}
4 changes: 2 additions & 2 deletions app/Http/Controllers/Admin/ProductCrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ protected function setupCreateOperation()
'tab' => 'Texts',
]);

CRUD::addField([ // Wysiwyg
CRUD::addField([ // summernote
'name' => 'details',
'label' => 'Details',
'type' => 'wysiwyg',
'type' => 'summernote',
'tab' => 'Texts',
]);

Expand Down
70 changes: 44 additions & 26 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
{
"name": "backpack/demo",
"description": "A Laravel + Backpack installation to show off most features.",
"keywords": ["backpack", "laravel", "backpack for laravel", "admin panel", "crud"],
"keywords": [
"backpack",
"laravel",
"backpack for laravel",
"admin panel",
"crud"
],
"license": "proprietary",
"type": "project",
"require": {
"php": "^8.2",
"laravel/framework": "^11.0",
"backpack/activity-log": "^2.0.3",
"backpack/backupmanager": "^5.0",
"backpack/calendar-operation": "^1.0",
"backpack/crud": "^6.7",
"backpack/editable-columns": "^3.0",
"backpack/filemanager": "^3.0",
"backpack/language-switcher": "^2.0",
"backpack/logmanager": "^5.0",
"backpack/medialibrary-uploaders": "^1.0",
"backpack/menucrud": "^4.0",
"backpack/newscrud": "^5.0",
"backpack/pagemanager": "^3.0",
"backpack/permissionmanager": "^7.0",
"backpack/pro": "^2.0",
"backpack/revise-operation": "^2.0",
"backpack/settings": "^3.1",
"backpack/theme-coreuiv2": "^1.0",
"backpack/theme-coreuiv4": "^1.0",
"backpack/theme-tabler": "^1.0",
"backpack/translation-manager": "^1.0",
"backpack/crud": "7.0.0-alpha.1",
"backpack/pro": "3.0.0-alpha.2",
"backpack/medialibrary-uploaders": "dev-next as 1.99.99",
"backpack/ckeditor-field": "dev-next as 1.0.0",
"backpack/tinymce-field": "dev-next as 1.0.0",
"backpack/activity-log": "dev-next as 1.0.0",
"backpack/backupmanager": "dev-next as 6.0",
"backpack/calendar-operation": "dev-next as 1.0.0",
"backpack/editable-columns": "dev-next as 1.0.0",
"backpack/filemanager": "dev-next as 3.99.99",
"backpack/language-switcher": "dev-next as 3.99.99",
"backpack/logmanager": "dev-next as 3.99.99",
"backpack/menucrud": "dev-next as 3.99.99",
"backpack/newscrud": "dev-next as 3.99.99",
"backpack/pagemanager": "dev-next as 3.99.99",
"backpack/permissionmanager": "dev-next as 3.99.99",
"backpack/revise-operation": "dev-next as 3.99.99",
"backpack/settings": "dev-next as 3.99.99",
"backpack/theme-coreuiv2": "dev-next as 3.99.99",
"backpack/theme-coreuiv4": "dev-next as 3.99.99",
"backpack/theme-tabler": "dev-next as 3.99.99",
"backpack/translation-manager": "dev-next as 3.99.99",
"consoletvs/charts": "6.*",
"intervention/image": "^2.3",
"laravel/legacy-factories": "^1.0",
Expand All @@ -35,21 +43,29 @@
"mews/purifier": "^3.4",
"spatie/laravel-ignition": "^2.0",
"spatie/laravel-translatable": "^6.0",
"backpack/pan-panel": "^1.0"
"backpack/pan-panel": "dev-next as 3.99.99"
},
"require-dev": {
"fakerphp/faker": "~1.4",
"mockery/mockery": "1.6.*",
"phpunit/phpunit" : "^11",
"phpunit/phpunit": "^11",
"symfony/css-selector": "^7",
"symfony/dom-crawler": "^7",
"backpack/generators": "^4.0",
"backpack/generators": "dev-next as 3.99.99",
"barryvdh/laravel-debugbar": "^3.2"
},
"repositories": [
{
"type": "composer",
"url": "https://repo.backpackforlaravel.com/"
},
{
"type": "vcs",
"url": "https://github.com/Laravel-Backpack/ckeditor-field.git"
},
{
"type": "vcs",
"url": "https://github.com/Laravel-Backpack/tinymce-field.git"
}
],
"autoload": {
Expand All @@ -74,10 +90,12 @@
],
"post-install-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan storage:link -q"
"php artisan storage:link -q",
"@php artisan basset:cache"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate"
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"@php artisan basset:cache"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
Expand Down
Loading