update

microweber · Sep 14, 2021 · 6fb8d8e · 6fb8d8e
1 parent 2351e9b
commit 6fb8d8e
Show file tree

Hide file tree

Showing 8 changed files with 1,514 additions and 1,553 deletions.
diff --git a/src/MicroweberPackages/App/Http/Controllers/ApiController.php b/src/MicroweberPackages/App/Http/Controllers/ApiController.php
diff --git a/src/MicroweberPackages/App/Http/Controllers/FrontendController.php b/src/MicroweberPackages/App/Http/Controllers/FrontendController.php
diff --git a/src/MicroweberPackages/App/functions/api.php b/src/MicroweberPackages/App/functions/api.php
@@ -18,6 +18,7 @@ function api_expose($function_name, $callback = null)
 
 function api_expose_admin($function_name, $callback = null)
 {
+
     static $index = ' ';
     if (is_bool($function_name)) {
         return $index;
@@ -29,6 +30,8 @@ function api_expose_admin($function_name, $callback = null)
     } else {
         $index .= ' ' . $function_name;
     }
+
+
 }
 
 function api_bind($function_name, $callback = false)

diff --git a/src/MicroweberPackages/App/functions/api_callbacks.php b/src/MicroweberPackages/App/functions/api_callbacks.php
@@ -157,15 +157,7 @@
 
 // media
 
-api_expose('delete_media_file');
-api_expose('upload_progress_check');
-api_expose('upload');
-api_expose('reorder_media');
-api_expose('delete_media');
-api_expose('save_media');
 
-api_expose('pixum_img');
-api_expose('thumbnail_img');
 
 
 \Illuminate\Support\Facades\Route::get('/api/image-generate-tn-request/{cache_id}', function ($mediaId) {
@@ -186,8 +178,8 @@
     return mw()->media_manager->pixum_img();
 });
 
-api_expose('create_media_dir');
-api_expose('media/delete_media_file');
+
+
 
 // queue
 api_expose('queue_dispatch', function () {

diff --git a/src/MicroweberPackages/App/routes/web.php b/src/MicroweberPackages/App/routes/web.php
@@ -161,20 +161,20 @@ function migrateLanguages()
         \MicroweberPackages\App\Http\Middleware\SameSiteRefererMiddleware::class
     ],
 ], function () {
-    Route::any('/module/', '\MicroweberPackages\App\Http\Controllers\FrontendController@module');
-    Route::any('module/{all}', array('as' => 'module', 'uses' => '\MicroweberPackages\App\Http\Controllers\FrontendController@module'))->where('all', '.*');
+    Route::any('/module/', '\MicroweberPackages\App\Http\Controllers\ApiController@module');
+    Route::any('module/{all}', array('as' => 'module', 'uses' => '\MicroweberPackages\App\Http\Controllers\ApiController@module'))->where('all', '.*');
 });
 
 Route::group(['middleware' => ['public.web' ], 'namespace' => '\MicroweberPackages\App\Http\Controllers'], function () {
-    Route::any('/api', 'FrontendController@api');
-    Route::any('/api/{slug}', 'FrontendController@api');
+    Route::any('/api', 'ApiController@api');
+    Route::any('/api/{slug}', 'ApiController@api');
 
-    Route::any('api/{all}', array('as' => 'api', 'uses' => 'FrontendController@api'))->where('all', '.*');
-    Route::any('api_html/{all}', array('as' => 'api', 'uses' => 'FrontendController@api_html'))->where('all', '.*');
-    Route::any('/api_html', 'FrontendController@api_html');
+    Route::any('api/{all}', array('as' => 'api', 'uses' => 'ApiController@api'))->where('all', '.*');
+    Route::any('api_html/{all}', array('as' => 'api', 'uses' => 'ApiController@api_html'))->where('all', '.*');
+    Route::any('/api_html', 'ApiController@api_html');
     //
-    Route::any('/editor_tools', 'FrontendController@editor_tools');
-    Route::any('editor_tools/{all}', array('as' => 'editor_tools', 'uses' => 'FrontendController@editor_tools'))->where('all', '.*');
+    Route::any('/editor_tools', 'ApiController@editor_tools');
+    Route::any('editor_tools/{all}', array('as' => 'editor_tools', 'uses' => 'ApiController@editor_tools'))->where('all', '.*');
 
 });
 // 'middleware' => 'web',

diff --git a/src/MicroweberPackages/ContentFilter/resources/views/admin.php b/src/MicroweberPackages/ContentFilter/resources/views/admin.php
@@ -1,65 +1 @@
-|<div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title"><i class="fa fa-pencil"></i> Добавне на филтър</h3>
-    </div>
-    <div class="panel-body">
-        <form action="https://demo.mycredocart.com/admin/index.php?route=catalog/filter/edit&amp;user_token=CAozggrLhEAbeImxucYkR6kwdRpEBNe5&amp;filter_group_id=1" method="post" enctype="multipart/form-data" id="form-filter" class="form-horizontal">
-            <fieldset id="option-value">
-                <legend>Филтрирай група</legend>
-                <div class="form-group required">
-                    <label class="col-sm-2 control-label">Име на груповия филтър:</label>
-                    <div class="col-sm-10">                 <div class="input-group"><span class="input-group-addon"><img src="language/bg-bg/bg-bg.png" title="Bulgarian"></span>
-                            <input type="text" name="filter_group_description[2][name]" value="Държава" placeholder="Име на груповия филтър:" class="form-control">
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-sm-2 control-label" for="input-sort-order">Подреждане:</label>
-                    <div class="col-sm-10">
-                        <input type="text" name="sort_order" value="0" placeholder="Подреждане:" id="input-sort-order" class="form-control">
-                    </div>
-                </div>
-            </fieldset>
-            <fieldset id="option-value">
-                <legend>Филтрирай стойности</legend>
-                <table id="filter" class="table table-elegant table-hover">
-                    <thead>
-                    <tr>
-                        <td class="text-start required">Име на филтъра:</td>
-                        <td class="text-end">Подреждане:</td>
-                        <td></td>
-                    </tr>
-                    </thead>
-                    <tbody>
-
-                    <tr id="filter-row0">
-                        <td class="text-start" style="width: 70%;"><input type="hidden" name="filter[0][filter_id]" value="1">
-                            <div class="input-group"><span class="input-group-addon"><img src="language/bg-bg/bg-bg.png" title="Bulgarian"></span>
-                                <input type="text" name="filter[0][filter_description][2][name]" value="България" placeholder="Име на филтъра:" class="form-control">
-                            </div>
-                        </td>
-                        <td class="text-end"><input type="text" name="filter[0][sort_order]" value="0" placeholder="Подреждане:" id="input-sort-order" class="form-control"></td>
-                        <td class="text-end"><button type="button" onclick="$('#filter-row0').remove();" data-toggle="tooltip" title="" class="btn btn-danger" data-original-title="Премахване"><i class="fa fa-minus-circle"></i></button></td>
-                    </tr>
-                    <tr id="filter-row1">
-                        <td class="text-start" style="width: 70%;"><input type="hidden" name="filter[1][filter_id]" value="2">
-                            <div class="input-group"><span class="input-group-addon"><img src="language/bg-bg/bg-bg.png" title="Bulgarian"></span>
-                                <input type="text" name="filter[1][filter_description][2][name]" value="Япония" placeholder="Име на филтъра:" class="form-control">
-                            </div>
-                        </td>
-                        <td class="text-end"><input type="text" name="filter[1][sort_order]" value="0" placeholder="Подреждане:" id="input-sort-order" class="form-control"></td>
-                        <td class="text-end"><button type="button" onclick="$('#filter-row1').remove();" data-toggle="tooltip" title="" class="btn btn-danger" data-original-title="Премахване"><i class="fa fa-minus-circle"></i></button></td>
-                    </tr>
-                    </tbody>
-
-                    <tfoot>
-                    <tr>
-                        <td colspan="2"></td>
-                        <td class="text-end"><button type="button" onclick="addFilterRow();" data-toggle="tooltip" title="" class="btn btn-primary" data-original-title="Добави филтър"><i class="fa fa-plus-circle"></i></button></td>
-                    </tr>
-                    </tfoot>
-                </table>
-            </fieldset>
-        </form>
-    </div>
-</div>
+This module does not have admin
diff --git a/src/MicroweberPackages/Event/EventManagerServiceProvider.php b/src/MicroweberPackages/Event/EventManagerServiceProvider.php
@@ -31,6 +31,8 @@ public function boot()
             return new Event();
         });
 
+        include_once __DIR__.'/helpers.php';
+
     }
 
 

diff --git a/src/MicroweberPackages/Media/helpers/media.php b/src/MicroweberPackages/Media/helpers/media.php
@@ -1,25 +1,35 @@
 <?php
-api_expose_admin('get_media_by_id');
-api_expose('upload');
-api_expose('upload_progress_check');
+
 
 api_expose_admin('media/upload', function ($data) {
     return mw()->media_manager->upload($data);
 });
 
+api_expose_admin('get_media_by_id');
 
 api_expose_admin('reorder_media');
-api_expose('delete_media');
 api_expose_admin('save_media');
 api_expose_admin('save_picture');
 api_expose('pixum_img');
 api_expose('thumbnail_img');
 
 api_expose_admin('get_media');
+
+
+
 api_expose_admin('create_media_dir');
 
-api_bind('media/delete_media_file', function ($data) {
-    return mw()->media_manager->delete_media_file($data);
+
+api_expose_admin('upload_progress_check');
+api_expose_admin('upload');
+api_expose_admin('reorder_media');
+api_expose_admin('save_media');
+
+api_expose('pixum_img');
+api_expose('thumbnail_img');
+
+api_expose_admin('media/delete_media_file', function ($data) {
+    return app()->media_manager->delete_media_file($data);
 });