- {!! nl2br($review->text) !!} -
-diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 016e912d4..dbc11a14d 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -302,4 +302,27 @@ class Item extends Controller return redirect('apps/' . $alias); } + + public function reviews($alias, Request $request) + { + $page = $request['page']; + + $data = [ + 'query' => [ + 'page' => ($page) ? $page : 1, + ] + ]; + + $reviews = $this->getModuleReviews($alias, $data); + + $html = view('partials.modules.reviews', compact('reviews'))->render(); + + return response()->json([ + 'success' => true, + 'error' => false, + 'data' => null, + 'message' => null, + 'html' => $html, + ]); + } } diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php index f910bea5b..75dc30f4c 100644 --- a/app/Http/Controllers/Modules/Tiles.php +++ b/app/Http/Controllers/Modules/Tiles.php @@ -23,7 +23,15 @@ class Tiles extends Controller { $this->checkApiToken(); - $data = $this->getModulesByCategory($alias); + $page = request('page', 1); + + $request = [ + 'query' => [ + 'page' => $page, + ] + ]; + + $data = $this->getModulesByCategory($alias, $request); $title = $data->category->name; $modules = $data->modules; @@ -41,8 +49,16 @@ class Tiles extends Controller { $this->checkApiToken(); + $page = request('page', 1); + + $data = [ + 'query' => [ + 'page' => $page, + ] + ]; + $title = trans('modules.top_paid'); - $modules = $this->getPaidModules(); + $modules = $this->getPaidModules($data); $installed = Module::all()->pluck('status', 'alias')->toArray(); return view('modules.tiles.index', compact('title', 'modules', 'installed')); @@ -57,8 +73,16 @@ class Tiles extends Controller { $this->checkApiToken(); + $page = request('page', 1); + + $data = [ + 'query' => [ + 'page' => $page, + ] + ]; + $title = trans('modules.new'); - $modules = $this->getNewModules(); + $modules = $this->getNewModules($data); $installed = Module::all()->pluck('status', 'alias')->toArray(); return view('modules.tiles.index', compact('title', 'modules', 'installed')); @@ -73,8 +97,16 @@ class Tiles extends Controller { $this->checkApiToken(); + $page = request('page', 1); + + $data = [ + 'query' => [ + 'page' => $page, + ] + ]; + $title = trans('modules.top_free'); - $modules = $this->getFreeModules(); + $modules = $this->getFreeModules($data); $installed = Module::all()->pluck('status', 'alias')->toArray(); return view('modules.tiles.index', compact('title', 'modules', 'installed')); @@ -90,10 +122,12 @@ class Tiles extends Controller $this->checkApiToken(); $keyword = $request['keyword']; + $page = request('page', 1); $data = [ 'query' => [ 'keyword' => $keyword, + 'page' => $page, ] ]; diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 5ff860f2b..ec1c56bed 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -57,6 +57,17 @@ trait Modules return []; } + public function getModuleReviews($alias, $data = []) + { + $response = $this->getRemote('apps/' . $alias . '/reviews', 'GET', $data); + + if ($response && ($response->getStatusCode() == 200)) { + return json_decode($response->getBody())->data; + } + + return []; + } + public function getCategories() { $response = $this->getRemote('apps/categories'); @@ -68,9 +79,9 @@ trait Modules return []; } - public function getModulesByCategory($alias) + public function getModulesByCategory($alias, $data = []) { - $response = $this->getRemote('apps/categories/' . $alias); + $response = $this->getRemote('apps/categories/' . $alias, 'GET', $data); if ($response && ($response->getStatusCode() == 200)) { return json_decode($response->getBody())->data; diff --git a/public/css/app.css b/public/css/app.css index c84672263..1e3737f8f 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -676,4 +676,12 @@ input[type="number"] { .pull-right.rating { margin-top: -30px; -} \ No newline at end of file +} + +.pager { + margin: inherit !important; +} + +.pager li>a, .pager li>span { + border-radius: 3px !important; +} diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php index 3a2b992f1..f875744ae 100644 --- a/resources/views/modules/home/index.blade.php +++ b/resources/views/modules/home/index.blade.php @@ -16,7 +16,7 @@
- {!! nl2br($review->text) !!} -
-+ {!! nl2br($review->text) !!} +
+