Skip to content

Beautiful Open-Source Form Builder

Fix template limit slider (#239)

formsdeve99a0552bbd4
diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php
index 1137a5da8..151f0d6c5 100644
--- a/app/Http/Controllers/TemplateController.php
+++ b/app/Http/Controllers/TemplateController.php
@@ -13,18 +13,10 @@ class TemplateController extends Controller
{
public function index(Request $request)
{
- $limit = null;
- if ($request->offsetExists('limit') && $request->get('limit') > 0) {
- $limit = (int)$request->get('limit');
- }
+ $limit = (int)$request->get('limit', 0);
+ $onlyMy = (bool)$request->get('onlymy', false);
- $onlyMy = false;
- if ($request->offsetExists('onlymy') && $request->get('onlymy')) {
- $onlyMy = true;
- }
-
- $templates = Template::limit($limit)
- ->when(Auth::check(), function ($query) use ($onlyMy) {
+ $templates = Template::when(Auth::check(), function ($query) use ($onlyMy) {
if ($onlyMy) {
$query->where('creator_id', Auth::id());
} else {
@@ -37,6 +29,9 @@ class TemplateController extends Controller
->when(!Auth::check(), function ($query) {
$query->where('publicly_listed', true);
})
+ ->when($limit > 0, function ($query) use ($limit) {
+ $query->limit($limit);
+ })
->orderByDesc('created_at')
->get();
diff --git a/resources/js/components/pages/welcome/TemplatesSlider.vue b/resources/js/components/pages/welcome/TemplatesSlider.vue
index 1f0309ae8..eb8286808 100644
--- a/resources/js/components/pages/welcome/TemplatesSlider.vue
+++ b/resources/js/components/pages/welcome/TemplatesSlider.vue
@@ -21,7 +21,7 @@
class="w-full inline-flex flex-nowrap overflow-hidden [mask-image:_linear-gradient(to_right,transparent_0,_black_128px,_black_calc(100%-128px),transparent_100%)]"
>
<ul ref="templates-slider" class="flex justify-center md:justify-start animate-infinite-scroll">
- <li v-for="(template, i) in templates" :key="template.id" class="mx-4 w-72 h-auto">
+ <li v-for="(template, i) in sliderTemplates" :key="template.id" class="mx-4 w-72 h-auto">
<single-template :slug="template.slug" />
</li>
</ul>
@@ -42,7 +42,10 @@ export default {
computed: {
...mapState({
templates: state => state['open/templates'].content
- })
+ }),
+ sliderTemplates () {
+ return this.templates.slice(0, 20)
+ }
},
watch: {
@@ -54,7 +57,7 @@ export default {
},
mounted() {
- store.dispatch('open/templates/loadAll', {'limit':10})
+ store.dispatch('open/templates/loadAll', { limit: 20 })
},
methods: {