Sets, Parts and Minifigures have pagination now

.env.sample

@@ -184,6 +184,14 @@
 # Default: 25
 # BK_PARTS_PAGINATION_SIZE_MOBILE=25
 
+# Optional: Number of sets to show per page on desktop devices (when server-side pagination is enabled)
+# Should be divisible by 4 for grid layout. Default: 12
+# BK_SETS_PAGINATION_SIZE_DESKTOP=12
+
+# Optional: Number of sets to show per page on mobile devices (when server-side pagination is enabled)
+# Should be divisible by 4 for grid layout. Default: 8
+# BK_SETS_PAGINATION_SIZE_MOBILE=8
+
 # Optional: Port the server will listen on.
 # Default: 3333
 # BK_PORT=3333

bricktracker/config.py

@@ -43,6 +43,8 @@ CONFIG: Final[list[dict[str, Any]]] = [
     {'n': 'PARTS_FOLDER', 'd': 'parts', 's': True},
     {'n': 'PARTS_PAGINATION_SIZE_DESKTOP', 'd': 50, 'c': int},
     {'n': 'PARTS_PAGINATION_SIZE_MOBILE', 'd': 25, 'c': int},
+    {'n': 'SETS_PAGINATION_SIZE_DESKTOP', 'd': 12, 'c': int},
+    {'n': 'SETS_PAGINATION_SIZE_MOBILE', 'd': 8, 'c': int},
     {'n': 'PORT', 'd': 3333, 'c': int},
     {'n': 'PURCHASE_DATE_FORMAT', 'd': '%d/%m/%Y'},
     {'n': 'PURCHASE_CURRENCY', 'd': '€'},

bricktracker/minifigure_list.py

@@ -53,6 +53,48 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
 
         return self
 
+    # Load minifigures with pagination support
+    def all_filtered_paginated(
+        self,
+        owner_id: str | None = None,
+        search_query: str | None = None,
+        page: int = 1,
+        per_page: int = 50,
+        sort_field: str | None = None,
+        sort_order: str = 'asc'
+    ) -> tuple[Self, int]:
+        # Prepare filter context
+        filter_context = {}
+        if owner_id and owner_id != 'all':
+            filter_context['owner_id'] = owner_id
+            list_query = self.all_by_owner_query
+        else:
+            list_query = self.all_query
+
+        if search_query:
+            filter_context['search_query'] = search_query
+
+        # Field mapping for sorting
+        field_mapping = {
+            'name': '"rebrickable_minifigures"."name"',
+            'parts': '"rebrickable_minifigures"."number_of_parts"',
+            'quantity': '"total_quantity"',
+            'missing': '"total_missing"',
+            'damaged': '"total_damaged"',
+            'sets': '"total_sets"'
+        }
+
+        # Use the base pagination method
+        return self.paginate(
+            page=page,
+            per_page=per_page,
+            sort_field=sort_field,
+            sort_order=sort_order,
+            list_query=list_query,
+            field_mapping=field_mapping,
+            **filter_context
+        )
+
     # Minifigures with a part damaged part
     def damaged_part(self, part: str, color: int, /) -> Self:
         # Save the parameters to the fields
@@ -95,16 +137,19 @@ class BrickMinifigureList(BrickRecordList[BrickMinifigure]):
             brickset = None
 
         # Prepare template context for owner filtering
-        context = {}
+        context_vars = {}
         if hasattr(self.fields, 'owner_id') and self.fields.owner_id is not None:
-            context['owner_id'] = self.fields.owner_id
+            context_vars['owner_id'] = self.fields.owner_id
+
+        # Merge with any additional context passed in
+        context_vars.update(context)
 
         # Load the sets from the database
         for record in super().select(
             override_query=override_query,
             order=order,
             limit=limit,
-            **context
+            **context_vars
         ):
             minifigure = BrickMinifigure(brickset=brickset, record=record)
 

bricktracker/pagination_helper.py

@@ -0,0 +1,54 @@
+from flask import current_app, request
+from typing import Any, Dict, Tuple
+
+
+def get_pagination_config(entity_type: str) -> Tuple[int, bool]:
+    """Get pagination configuration for an entity type (sets, parts, minifigures)"""
+    # Check if pagination is enabled
+    use_pagination = current_app.config.get('SERVER_SIDE_PAGINATION', False)
+
+    if not use_pagination:
+        return 0, False
+
+    # Determine page size based on device type and entity
+    user_agent = request.headers.get('User-Agent', '').lower()
+    is_mobile = any(device in user_agent for device in ['mobile', 'android', 'iphone', 'ipad'])
+
+    # Get appropriate config keys based on entity type
+    if entity_type.upper() == 'SETS':
+        desktop_key = 'SETS_PAGINATION_SIZE_DESKTOP'
+        mobile_key = 'SETS_PAGINATION_SIZE_MOBILE'
+    else:  # parts and minifigures use the same config
+        desktop_key = 'PARTS_PAGINATION_SIZE_DESKTOP'
+        mobile_key = 'PARTS_PAGINATION_SIZE_MOBILE'
+
+    per_page = current_app.config[mobile_key] if is_mobile else current_app.config[desktop_key]
+
+    return per_page, is_mobile
+
+
+def build_pagination_context(page: int, per_page: int, total_count: int, is_mobile: bool) -> Dict[str, Any]:
+    """Build pagination context for templates"""
+    total_pages = (total_count + per_page - 1) // per_page if total_count > 0 else 1
+    has_prev = page > 1
+    has_next = page < total_pages
+
+    return {
+        'page': page,
+        'per_page': per_page,
+        'total_count': total_count,
+        'total_pages': total_pages,
+        'has_prev': has_prev,
+        'has_next': has_next,
+        'is_mobile': is_mobile
+    }
+
+
+def get_request_params() -> Tuple[str, str, str, int]:
+    """Extract common request parameters for pagination"""
+    search_query = request.args.get('search', '').strip()
+    sort_field = request.args.get('sort', '')
+    sort_order = request.args.get('order', 'asc')
+    page = int(request.args.get('page', 1))
+
+    return search_query, sort_field, sort_order, page

bricktracker/part_list.py

@@ -24,8 +24,6 @@ class BrickPartList(BrickRecordList[BrickPart]):
     # Queries
     all_query: str = 'part/list/all'
     all_by_owner_query: str = 'part/list/all_by_owner'
-    all_count_query: str = 'part/count/all'
-    all_by_owner_count_query: str = 'part/count/all_by_owner'
     different_color_query = 'part/list/with_different_color'
     last_query: str = 'part/list/last'
     minifigure_query: str = 'part/list/from_minifigure'
@@ -73,8 +71,13 @@ class BrickPartList(BrickRecordList[BrickPart]):
         else:
             query = self.all_query
 
+        # Prepare context for query
+        context = {}
+        if current_app.config.get('SKIP_SPARE_PARTS', False):
+            context['skip_spare_parts'] = True
+
         # Load the parts from the database
-        self.list(override_query=query)
+        self.list(override_query=query, **context)
 
         return self
 
@@ -89,64 +92,42 @@ class BrickPartList(BrickRecordList[BrickPart]):
         sort_field: str | None = None,
         sort_order: str = 'asc'
     ) -> tuple[Self, int]:
-        from .sql import BrickSQL
-
-        # Save the filter parameters
-        if owner_id is not None:
-            self.fields.owner_id = owner_id
-        if color_id is not None:
-            self.fields.color_id = color_id
-        if search_query:
-            self.fields.search_query = search_query
-        if sort_field:
-            self.fields.sort_field = sort_field
-            self.fields.sort_order = sort_order
-
-        # Calculate offset
-        offset = (page - 1) * per_page
-
-        # Get total count first
-        count_context = {}
+        # Prepare filter context
+        filter_context = {}
         if owner_id and owner_id != 'all':
-            count_context['owner_id'] = owner_id
-            count_query = self.all_by_owner_count_query
-            query = self.all_by_owner_query
+            filter_context['owner_id'] = owner_id
+            list_query = self.all_by_owner_query
         else:
-            count_query = self.all_count_query
-            query = self.all_query
+            list_query = self.all_query
 
         if color_id and color_id != 'all':
-            count_context['color_id'] = color_id
+            filter_context['color_id'] = color_id
         if search_query:
-            count_context['search_query'] = search_query
+            filter_context['search_query'] = search_query
+        if current_app.config.get('SKIP_SPARE_PARTS', False):
+            filter_context['skip_spare_parts'] = True
 
-        # Execute count query
-        count_result = BrickSQL().fetchone(count_query, **count_context)
-        total_count = count_result['total_count'] if count_result else 0
+        # Field mapping for sorting
+        field_mapping = {
+            'name': '"rebrickable_parts"."name"',
+            'color': '"rebrickable_parts"."color_name"',
+            'quantity': '"total_quantity"',
+            'missing': '"total_missing"',
+            'damaged': '"total_damaged"',
+            'sets': '"total_sets"',
+            'minifigures': '"total_minifigures"'
+        }
 
-        # Prepare sort order
-        order_clause = None
-        if sort_field:
-            # Map frontend sort field names to SQL column names
-            field_mapping = {
-                'name': '"rebrickable_parts"."name"',
-                'color': '"rebrickable_parts"."color_name"',
-                'quantity': '"total_quantity"',
-                'missing': '"total_missing"',
-                'damaged': '"total_damaged"',
-                'sets': '"total_sets"',
-                'minifigures': '"total_minifigures"'
-            }
-
-            if sort_field in field_mapping:
-                sql_field = field_mapping[sort_field]
-                direction = 'DESC' if sort_order.lower() == 'desc' else 'ASC'
-                order_clause = f'{sql_field} {direction}'
-
-        # Load paginated parts
-        self.list(override_query=query, limit=per_page, offset=offset, order=order_clause)
-
-        return self, total_count
+        # Use the base pagination method
+        return self.paginate(
+            page=page,
+            per_page=per_page,
+            sort_field=sort_field,
+            sort_order=sort_order,
+            list_query=list_query,
+            field_mapping=field_mapping,
+            **filter_context
+        )
 
     # Base part list
     def list(
@@ -181,6 +162,9 @@ class BrickPartList(BrickRecordList[BrickPart]):
         if hasattr(self.fields, 'search_query') and self.fields.search_query:
             context_vars['search_query'] = self.fields.search_query
 
+        # Merge with any additional context passed in
+        context_vars.update(context)
+
         # Load the sets from the database
         for record in super().select(
             override_query=override_query,
@@ -195,9 +179,6 @@ class BrickPartList(BrickRecordList[BrickPart]):
                 record=record,
             )
 
-            if current_app.config['SKIP_SPARE_PARTS'] and part.fields.spare:
-                continue
-
             self.records.append(part)
 
     # List specific parts from a brickset or minifigure

bricktracker/record_list.py

@@ -1,5 +1,6 @@
+from abc import ABC, abstractmethod
 from sqlite3 import Row
-from typing import Any, Generator, Generic, ItemsView, TypeVar, TYPE_CHECKING
+from typing import Any, Generator, Generic, ItemsView, Self, TypeVar, TYPE_CHECKING
 
 from .fields import BrickRecordFields
 from .sql import BrickSQL
@@ -33,7 +34,7 @@ T = TypeVar(
 
 
 # SQLite records
-class BrickRecordList(Generic[T]):
+class BrickRecordList(Generic[T], ABC):
     select_query: str
     records: list[T]
 
@@ -72,6 +73,92 @@ class BrickRecordList(Generic[T]):
             **context
         )
 
+    # Generic pagination method for all record lists
+    def paginate(
+        self,
+        page: int = 1,
+        per_page: int = 50,
+        sort_field: str | None = None,
+        sort_order: str = 'asc',
+        count_query: str | None = None,
+        list_query: str | None = None,
+        field_mapping: dict[str, str] | None = None,
+        **filter_context: Any
+    ) -> tuple['Self', int]:
+        """Generic pagination implementation for all record lists"""
+        from .sql import BrickSQL
+
+        # Use provided queries or fall back to defaults
+        list_query = list_query or getattr(self, 'all_query', None)
+        if not list_query:
+            raise NotImplementedError("Subclass must define all_query")
+
+        # Calculate offset
+        offset = (page - 1) * per_page
+
+        # Get total count by wrapping the main query
+        if count_query:
+            # Use provided count query
+            count_result = BrickSQL().fetchone(count_query, **filter_context)
+            total_count = count_result['total_count'] if count_result else 0
+        else:
+            # Generate count by wrapping the main query (without ORDER BY, LIMIT, OFFSET)
+            count_context = {k: v for k, v in filter_context.items()
+                           if k not in ['order', 'limit', 'offset']}
+
+            # Get the main query SQL without pagination clauses
+            main_sql = BrickSQL().load_query(list_query, **count_context)
+
+            # Remove ORDER BY, LIMIT, OFFSET clauses for counting
+            import re
+            # Remove ORDER BY clause and everything after it that's not part of subqueries
+            count_sql = re.sub(r'\s+ORDER\s+BY\s+[^)]*?(\s+LIMIT|\s+OFFSET|$)', r'\1', main_sql, flags=re.IGNORECASE)
+            # Remove LIMIT and OFFSET
+            count_sql = re.sub(r'\s+LIMIT\s+\d+', '', count_sql, flags=re.IGNORECASE)
+            count_sql = re.sub(r'\s+OFFSET\s+\d+', '', count_sql, flags=re.IGNORECASE)
+
+            # Wrap in COUNT(*)
+            wrapped_sql = f"SELECT COUNT(*) as total_count FROM ({count_sql.strip()})"
+
+            count_result = BrickSQL().raw_execute(wrapped_sql, {}).fetchone()
+            total_count = count_result['total_count'] if count_result else 0
+
+        # Prepare sort order
+        order_clause = None
+        if sort_field and field_mapping and sort_field in field_mapping:
+            sql_field = field_mapping[sort_field]
+            direction = 'DESC' if sort_order.lower() == 'desc' else 'ASC'
+            order_clause = f'{sql_field} {direction}'
+
+        # Build pagination context
+        pagination_context = {
+            'limit': per_page,
+            'offset': offset,
+            'order': order_clause or getattr(self, 'order', None),
+            **filter_context
+        }
+
+        # Load paginated results using the existing list() method
+        # Check if this is a set list that needs do_theme parameter
+        if hasattr(self, 'themes'):  # Only BrickSetList has this attribute
+            self.list(override_query=list_query, do_theme=True, **pagination_context)
+        else:
+            self.list(override_query=list_query, **pagination_context)
+
+        return self, total_count
+
+    # Abstract method that subclasses must implement
+    @abstractmethod
+    def list(
+        self,
+        /,
+        *,
+        override_query: str | None = None,
+        **context: Any,
+    ) -> None:
+        """Load records from database - must be implemented by subclasses"""
+        pass
+
     # Generic SQL parameters from fields
     def sql_parameters(self, /) -> dict[str, Any]:
         parameters: dict[str, Any] = {}

bricktracker/set_list.py

@@ -21,6 +21,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
     order: str
 
     # Queries
+    all_query: str = 'set/list/all'
     damaged_minifigure_query: str = 'set/list/damaged_minifigure'
     damaged_part_query: str = 'set/list/damaged_part'
     generic_query: str = 'set/list/generic'
@@ -48,6 +49,44 @@ class BrickSetList(BrickRecordList[BrickSet]):
 
         return self
 
+    # All sets with pagination and filtering
+    def all_filtered_paginated(
+        self,
+        search_query: str | None = None,
+        page: int = 1,
+        per_page: int = 50,
+        sort_field: str | None = None,
+        sort_order: str = 'asc'
+    ) -> tuple[Self, int]:
+        # Prepare filter context
+        filter_context = {
+            'search_query': search_query,
+            'owners': BrickSetOwnerList.as_columns(),
+            'statuses': BrickSetStatusList.as_columns(),
+            'tags': BrickSetTagList.as_columns(),
+        }
+
+        # Field mapping for sorting
+        field_mapping = {
+            'set': '"rebrickable_sets"."set"',
+            'name': '"rebrickable_sets"."name"',
+            'year': '"rebrickable_sets"."year"',
+            'parts': '"rebrickable_sets"."number_of_parts"'
+        }
+
+        # Use the base pagination method with custom list method
+        result, total_count = self.paginate(
+            page=page,
+            per_page=per_page,
+            sort_field=sort_field,
+            sort_order=sort_order,
+            list_query=self.all_query,
+            field_mapping=field_mapping,
+            **filter_context
+        )
+
+        return result, total_count
+
     # Sets with a minifigure part damaged
     def damaged_minifigure(self, figure: str, /) -> Self:
         # Save the parameters to the fields
@@ -102,9 +141,7 @@ class BrickSetList(BrickRecordList[BrickSet]):
             override_query=override_query,
             order=order,
             limit=limit,
-            owners=BrickSetOwnerList.as_columns(),
-            statuses=BrickSetStatusList.as_columns(),
-            tags=BrickSetTagList.as_columns(),
+            **context
         ):
             brickset = BrickSet(record=record)
 

bricktracker/sql/minifigure/base/base.sql

@@ -35,3 +35,7 @@ ORDER BY {{ order }}
 {% if limit %}
 LIMIT {{ limit }}
 {% endif %}
+
+{% if offset %}
+OFFSET {{ offset }}
+{% endif %}

bricktracker/sql/minifigure/list/all.sql

@@ -34,6 +34,12 @@ ON "bricktracker_minifigures"."id" IS NOT DISTINCT FROM "problem_join"."id"
 AND "rebrickable_minifigures"."figure" IS NOT DISTINCT FROM "problem_join"."figure"
 {% endblock %}
 
+{% block where %}
+{% if search_query %}
+WHERE (LOWER("rebrickable_minifigures"."name") LIKE LOWER('%{{ search_query }}%'))
+{% endif %}
+{% endblock %}
+
 {% block group %}
 GROUP BY
     "rebrickable_minifigures"."figure"

bricktracker/sql/minifigure/list/all_by_owner.sql

@@ -60,8 +60,15 @@ AND "rebrickable_minifigures"."figure" IS NOT DISTINCT FROM "problem_join"."figu
 {% endblock %}
 
 {% block where %}
+{% set conditions = [] %}
 {% if owner_id and owner_id != 'all' %}
-WHERE "bricktracker_set_owners"."owner_{{ owner_id }}" = 1
+  {% set _ = conditions.append('"bricktracker_set_owners"."owner_' ~ owner_id ~ '" = 1') %}
+{% endif %}
+{% if search_query %}
+  {% set _ = conditions.append('(LOWER("rebrickable_minifigures"."name") LIKE LOWER(\'%' ~ search_query ~ '%\'))') %}
+{% endif %}
+{% if conditions %}
+WHERE {{ conditions | join(' AND ') }}
 {% endif %}
 {% endblock %}
 

bricktracker/sql/part/count/all.sql

@@ -1,28 +0,0 @@
-SELECT COUNT(*) as "total_count"
-FROM (
-    SELECT DISTINCT
-        "bricktracker_parts"."part",
-        "bricktracker_parts"."color",
-        "bricktracker_parts"."spare"
-    FROM "bricktracker_parts"
-
-    INNER JOIN "rebrickable_parts"
-    ON "bricktracker_parts"."part" IS NOT DISTINCT FROM "rebrickable_parts"."part"
-    AND "bricktracker_parts"."color" IS NOT DISTINCT FROM "rebrickable_parts"."color_id"
-
-    LEFT JOIN "bricktracker_minifigures"
-    ON "bricktracker_parts"."id" IS NOT DISTINCT FROM "bricktracker_minifigures"."id"
-    AND "bricktracker_parts"."figure" IS NOT DISTINCT FROM "bricktracker_minifigures"."figure"
-
-    {% set conditions = [] %}
-    {% if color_id and color_id != 'all' %}
-      {% set _ = conditions.append('"bricktracker_parts"."color" = ' ~ color_id) %}
-    {% endif %}
-    {% if search_query %}
-      {% set search_condition = '(LOWER("rebrickable_parts"."name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("rebrickable_parts"."color_name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("bricktracker_parts"."part") LIKE LOWER(\'%' ~ search_query ~ '%\'))' %}
-      {% set _ = conditions.append(search_condition) %}
-    {% endif %}
-    {% if conditions %}
-    WHERE {{ conditions | join(' AND ') }}
-    {% endif %}
-)

bricktracker/sql/part/count/all_by_owner.sql

@@ -1,33 +0,0 @@
-SELECT COUNT(*) as "total_count"
-FROM (
-    SELECT DISTINCT
-        "bricktracker_parts"."part",
-        "bricktracker_parts"."color",
-        "bricktracker_parts"."spare"
-    FROM "bricktracker_parts"
-
-    INNER JOIN "bricktracker_sets"
-    ON "bricktracker_parts"."id" IS NOT DISTINCT FROM "bricktracker_sets"."id"
-
-    INNER JOIN "bricktracker_set_owners"
-    ON "bricktracker_sets"."id" IS NOT DISTINCT FROM "bricktracker_set_owners"."id"
-
-    INNER JOIN "rebrickable_parts"
-    ON "bricktracker_parts"."part" IS NOT DISTINCT FROM "rebrickable_parts"."part"
-    AND "bricktracker_parts"."color" IS NOT DISTINCT FROM "rebrickable_parts"."color_id"
-
-    LEFT JOIN "bricktracker_minifigures"
-    ON "bricktracker_parts"."id" IS NOT DISTINCT FROM "bricktracker_minifigures"."id"
-    AND "bricktracker_parts"."figure" IS NOT DISTINCT FROM "bricktracker_minifigures"."figure"
-
-    {% set conditions = [] %}
-    {% set _ = conditions.append('"bricktracker_set_owners"."owner_' ~ owner_id ~ '" = 1') %}
-    {% if color_id and color_id != 'all' %}
-      {% set _ = conditions.append('"bricktracker_parts"."color" = ' ~ color_id) %}
-    {% endif %}
-    {% if search_query %}
-      {% set search_condition = '(LOWER("rebrickable_parts"."name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("rebrickable_parts"."color_name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("bricktracker_parts"."part") LIKE LOWER(\'%' ~ search_query ~ '%\'))' %}
-      {% set _ = conditions.append(search_condition) %}
-    {% endif %}
-    WHERE {{ conditions | join(' AND ') }}
-)

bricktracker/sql/part/list/all.sql

@@ -35,6 +35,9 @@ AND "bricktracker_parts"."figure" IS NOT DISTINCT FROM "bricktracker_minifigures
   {% set search_condition = '(LOWER("rebrickable_parts"."name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("rebrickable_parts"."color_name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("bricktracker_parts"."part") LIKE LOWER(\'%' ~ search_query ~ '%\'))' %}
   {% set _ = conditions.append(search_condition) %}
 {% endif %}
+{% if skip_spare_parts %}
+  {% set _ = conditions.append('"bricktracker_parts"."spare" = 0') %}
+{% endif %}
 {% if conditions %}
 WHERE {{ conditions | join(' AND ') }}
 {% endif %}

bricktracker/sql/part/list/all_by_owner.sql

@@ -67,6 +67,9 @@ AND "bricktracker_parts"."figure" IS NOT DISTINCT FROM "bricktracker_minifigures
   {% set search_condition = '(LOWER("rebrickable_parts"."name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("rebrickable_parts"."color_name") LIKE LOWER(\'%' ~ search_query ~ '%\') OR LOWER("bricktracker_parts"."part") LIKE LOWER(\'%' ~ search_query ~ '%\'))' %}
   {% set _ = conditions.append(search_condition) %}
 {% endif %}
+{% if skip_spare_parts %}
+  {% set _ = conditions.append('"bricktracker_parts"."spare" = 0') %}
+{% endif %}
 {% if conditions %}
 WHERE {{ conditions | join(' AND ') }}
 {% endif %}

bricktracker/sql/set/base/base.sql

@@ -49,3 +49,7 @@ ORDER BY {{ order }}
 {% if limit %}
 LIMIT {{ limit }}
 {% endif %}
+
+{% if offset %}
+OFFSET {{ offset }}
+{% endif %}

bricktracker/sql/set/list/all.sql

@@ -1 +1,8 @@
 {% extends 'set/base/full.sql' %}
+
+{% block where %}
+{% if search_query %}
+WHERE (LOWER("rebrickable_sets"."name") LIKE LOWER('%{{ search_query }}%')
+   OR LOWER("rebrickable_sets"."set") LIKE LOWER('%{{ search_query }}%'))
+{% endif %}
+{% endblock %}

bricktracker/views/minifigure.py

@@ -1,8 +1,9 @@
-from flask import Blueprint, render_template, request
+from flask import Blueprint, current_app, render_template, request
 
 from .exceptions import exception_handler
 from ..minifigure import BrickMinifigure
 from ..minifigure_list import BrickMinifigureList
+from ..pagination_helper import get_pagination_config, build_pagination_context, get_request_params
 from ..set_list import BrickSetList, set_metadata_lists
 from ..set_owner_list import BrickSetOwnerList
 
@@ -13,24 +14,52 @@ minifigure_page = Blueprint('minifigure', __name__, url_prefix='/minifigures')
 @minifigure_page.route('/', methods=['GET'])
 @exception_handler(__file__)
 def list() -> str:
-    # Get owner filter from request
+    # Get filter parameters from request
     owner_id = request.args.get('owner', 'all')
+    search_query, sort_field, sort_order, page = get_request_params()
 
-    # Get minifigures filtered by owner
-    if owner_id == 'all' or owner_id is None or owner_id == '':
-        minifigures = BrickMinifigureList().all()
+    # Get pagination configuration
+    per_page, is_mobile = get_pagination_config('minifigures')
+    use_pagination = per_page > 0
+
+    if use_pagination:
+        # PAGINATION MODE - Server-side pagination with search
+        minifigures, total_count = BrickMinifigureList().all_filtered_paginated(
+            owner_id=owner_id,
+            search_query=search_query,
+            page=page,
+            per_page=per_page,
+            sort_field=sort_field,
+            sort_order=sort_order
+        )
+
+        pagination_context = build_pagination_context(page, per_page, total_count, is_mobile)
     else:
-        minifigures = BrickMinifigureList().all_by_owner(owner_id)
+        # ORIGINAL MODE - Single page with all data for client-side search
+        if owner_id == 'all' or owner_id is None or owner_id == '':
+            minifigures = BrickMinifigureList().all()
+        else:
+            minifigures = BrickMinifigureList().all_by_owner(owner_id)
+
+        pagination_context = None
 
     # Get list of owners for filter dropdown
     owners = BrickSetOwnerList.list()
 
-    return render_template(
-        'minifigures.html',
-        table_collection=minifigures,
-        owners=owners,
-        selected_owner=owner_id,
-    )
+    template_context = {
+        'table_collection': minifigures,
+        'owners': owners,
+        'selected_owner': owner_id,
+        'search_query': search_query,
+        'use_pagination': use_pagination,
+        'current_sort': sort_field,
+        'current_order': sort_order
+    }
+
+    if pagination_context:
+        template_context['pagination'] = pagination_context
+
+    return render_template('minifigures.html', **template_context)
 
 
 # Minifigure details

bricktracker/views/part.py

@@ -1,7 +1,8 @@
-from flask import Blueprint, current_app, render_template, request
+from flask import Blueprint, render_template, request
 
 from .exceptions import exception_handler
 from ..minifigure_list import BrickMinifigureList
+from ..pagination_helper import get_pagination_config, build_pagination_context, get_request_params
 from ..part import BrickPart
 from ..part_list import BrickPartList
 from ..set_list import BrickSetList, set_metadata_lists
@@ -15,28 +16,17 @@ part_page = Blueprint('part', __name__, url_prefix='/parts')
 @part_page.route('/', methods=['GET'])
 @exception_handler(__file__)
 def list() -> str:
-
     # Get filter parameters from request
     owner_id = request.args.get('owner', 'all')
     color_id = request.args.get('color', 'all')
-    search_query = request.args.get('search', '').strip()
-    sort_field = request.args.get('sort', '')
-    sort_order = request.args.get('order', 'asc')
+    search_query, sort_field, sort_order, page = get_request_params()
 
-    # Check if server-side pagination is enabled
-    use_pagination = current_app.config.get('SERVER_SIDE_PAGINATION', False)
+    # Get pagination configuration
+    per_page, is_mobile = get_pagination_config('parts')
+    use_pagination = per_page > 0
 
     if use_pagination:
         # PAGINATION MODE - Server-side pagination with search
-        # Get pagination parameters
-        page = int(request.args.get('page', 1))
-
-        # Determine page size based on device type and configuration
-        user_agent = request.headers.get('User-Agent', '').lower()
-        is_mobile = any(device in user_agent for device in ['mobile', 'android', 'iphone', 'ipad'])
-        per_page = current_app.config['PARTS_PAGINATION_SIZE_MOBILE'] if is_mobile else current_app.config['PARTS_PAGINATION_SIZE_DESKTOP']
-
-        # Get parts with pagination
         parts, total_count = BrickPartList().all_filtered_paginated(
             owner_id=owner_id,
             color_id=color_id,
@@ -47,25 +37,10 @@ def list() -> str:
             sort_order=sort_order
         )
 
-        # Calculate pagination info
-        total_pages = (total_count + per_page - 1) // per_page if total_count > 0 else 1
-        has_prev = page > 1
-        has_next = page < total_pages
-
-        pagination_context = {
-            'page': page,
-            'per_page': per_page,
-            'total_count': total_count,
-            'total_pages': total_pages,
-            'has_prev': has_prev,
-            'has_next': has_next,
-            'is_mobile': is_mobile
-        }
+        pagination_context = build_pagination_context(page, per_page, total_count, is_mobile)
     else:
         # ORIGINAL MODE - Single page with all data for client-side search
-        # Get all parts without pagination but with filters applied
         parts = BrickPartList().all_filtered(owner_id, color_id)
-
         pagination_context = None
 
     # Get list of owners for filter dropdown

bricktracker/views/set.py

@@ -15,6 +15,7 @@ from werkzeug.wrappers.response import Response
 from .exceptions import exception_handler
 from ..exceptions import ErrorException
 from ..minifigure import BrickMinifigure
+from ..pagination_helper import get_pagination_config, build_pagination_context, get_request_params
 from ..part import BrickPart
 from ..rebrickable_set import RebrickableSet
 from ..set import BrickSet
@@ -35,12 +36,43 @@ set_page = Blueprint('set', __name__, url_prefix='/sets')
 @set_page.route('/', methods=['GET'])
 @exception_handler(__file__)
 def list() -> str:
-    return render_template(
-        'sets.html',
-        collection=BrickSetList().all(),
-        brickset_statuses=BrickSetStatusList.list(),
+    # Get filter parameters from request
+    search_query, sort_field, sort_order, page = get_request_params()
+
+    # Get pagination configuration
+    per_page, is_mobile = get_pagination_config('sets')
+    use_pagination = per_page > 0
+
+    if use_pagination:
+        # PAGINATION MODE - Server-side pagination with search
+        sets, total_count = BrickSetList().all_filtered_paginated(
+            search_query=search_query,
+            page=page,
+            per_page=per_page,
+            sort_field=sort_field,
+            sort_order=sort_order
+        )
+
+        pagination_context = build_pagination_context(page, per_page, total_count, is_mobile)
+    else:
+        # ORIGINAL MODE - Single page with all data for client-side search
+        sets = BrickSetList().all()
+        pagination_context = None
+
+    template_context = {
+        'collection': sets,
+        'search_query': search_query,
+        'use_pagination': use_pagination,
+        'current_sort': sort_field,
+        'current_order': sort_order,
+        'brickset_statuses': BrickSetStatusList.list(),
         **set_metadata_lists(as_class=True)
-    )
+    }
+
+    if pagination_context:
+        template_context['pagination'] = pagination_context
+
+    return render_template('sets.html', **template_context)
 
 
 # Change the value of purchase date

static/scripts/minifigures.js

@@ -1,4 +1,11 @@
 // Minifigures page functionality
+
+// Check if we're in pagination mode (server-side) or original mode (client-side)
+function isPaginationMode() {
+  const tableElement = document.querySelector('#minifigures');
+  return tableElement && tableElement.getAttribute('data-table') === 'false';
+}
+
 function filterByOwner() {
   const select = document.getElementById('filter-owner');
   const selectedOwner = select.value;
@@ -10,6 +17,11 @@ function filterByOwner() {
     currentUrl.searchParams.set('owner', selectedOwner);
   }
 
+  // Reset to page 1 when filtering
+  if (isPaginationMode()) {
+    currentUrl.searchParams.set('page', '1');
+  }
+
   window.location.href = currentUrl.toString();
 }
 
@@ -46,29 +58,73 @@ document.addEventListener("DOMContentLoaded", () => {
   }
 
   if (searchInput && searchClear) {
-    // Wait for table to be initialized by setup_tables
-    setTimeout(() => {
-      const tableElement = document.querySelector('table[data-table="true"]');
-      if (tableElement && window.brickTableInstance) {
-        // Enable custom search for minifigures table
-        window.brickTableInstance.table.searchable = true;
+    if (isPaginationMode()) {
+      // PAGINATION MODE - Server-side search
+      const searchForm = document.createElement('form');
+      searchForm.style.display = 'none';
+      searchInput.parentNode.appendChild(searchForm);
+      searchForm.appendChild(searchInput.cloneNode(true));
 
-        // Connect search input to table
-        searchInput.addEventListener('input', (e) => {
-          window.brickTableInstance.table.search(e.target.value);
-        });
+      // Handle Enter key for search
+      searchInput.addEventListener('keydown', (e) => {
+        if (e.key === 'Enter') {
+          e.preventDefault();
+          performServerSearch();
+        }
+      });
 
-        // Clear search
-        searchClear.addEventListener('click', () => {
-          searchInput.value = '';
-          window.brickTableInstance.table.search('');
-        });
-
-        // Setup sort buttons
-        setupSortButtons();
+      // Handle search button click (if exists)
+      const searchButton = document.querySelector('[data-search-trigger]');
+      if (searchButton) {
+        searchButton.addEventListener('click', performServerSearch);
       }
-    }, 100);
+
+      // Clear search
+      searchClear.addEventListener('click', () => {
+        searchInput.value = '';
+        performServerSearch();
+      });
+
+      function performServerSearch() {
+        const currentUrl = new URL(window.location);
+        const searchQuery = searchInput.value.trim();
+
+        if (searchQuery) {
+          currentUrl.searchParams.set('search', searchQuery);
+        } else {
+          currentUrl.searchParams.delete('search');
+        }
+
+        // Reset to page 1 when searching
+        currentUrl.searchParams.set('page', '1');
+        window.location.href = currentUrl.toString();
+      }
+
+    } else {
+      // ORIGINAL MODE - Client-side search with Simple DataTables
+      setTimeout(() => {
+        const tableElement = document.querySelector('table[data-table="true"]');
+        if (tableElement && window.brickTableInstance) {
+          // Enable custom search for minifigures table
+          window.brickTableInstance.table.searchable = true;
+
+          // Connect search input to table
+          searchInput.addEventListener('input', (e) => {
+            window.brickTableInstance.table.search(e.target.value);
+          });
+
+          // Clear search
+          searchClear.addEventListener('click', () => {
+            searchInput.value = '';
+            window.brickTableInstance.table.search('');
+          });
+        }
+      }, 100);
+    }
   }
+
+  // Setup sort buttons for both modes
+  setupSortButtons();
 });
 
 function setupSortButtons() {
@@ -81,67 +137,100 @@ function setupSortButtons() {
       const attribute = button.dataset.sortAttribute;
       const isDesc = button.dataset.sortDesc === 'true';
 
-      // Get column index based on attribute
-      const columnMap = {
-        'name': 1,
-        'parts': 2,
-        'quantity': 3,
-        'missing': 4,
-        'damaged': 5,
-        'sets': 6
-      };
+      if (isPaginationMode()) {
+        // PAGINATION MODE - Server-side sorting
+        const currentUrl = new URL(window.location);
+        const currentSort = currentUrl.searchParams.get('sort');
+        const currentOrder = currentUrl.searchParams.get('order');
 
-      const columnIndex = columnMap[attribute];
-      if (columnIndex !== undefined && window.brickTableInstance) {
-        // Determine sort direction
-        const isCurrentlyActive = button.classList.contains('btn-primary');
-        const currentDirection = button.dataset.currentDirection || (isDesc ? 'desc' : 'asc');
-        const newDirection = isCurrentlyActive ?
-          (currentDirection === 'asc' ? 'desc' : 'asc') :
-          (isDesc ? 'desc' : 'asc');
+        // Determine new sort direction
+        let newOrder = isDesc ? 'desc' : 'asc';
+        if (currentSort === attribute) {
+          // Toggle direction if clicking the same column
+          newOrder = currentOrder === 'asc' ? 'desc' : 'asc';
+        }
 
-        // Clear other active buttons
-        sortButtons.forEach(btn => {
-          btn.classList.remove('btn-primary');
-          btn.classList.add('btn-outline-primary');
-          btn.removeAttribute('data-current-direction');
-        });
+        currentUrl.searchParams.set('sort', attribute);
+        currentUrl.searchParams.set('order', newOrder);
 
-        // Mark this button as active
-        button.classList.remove('btn-outline-primary');
-        button.classList.add('btn-primary');
-        button.dataset.currentDirection = newDirection;
+        // Reset to page 1 when sorting
+        currentUrl.searchParams.set('page', '1');
+        window.location.href = currentUrl.toString();
 
-        // Apply sort using Simple DataTables API
-        window.brickTableInstance.table.columns.sort(columnIndex, newDirection);
+      } else {
+        // ORIGINAL MODE - Client-side sorting with Simple DataTables
+        const columnMap = {
+          'name': 1,
+          'parts': 2,
+          'quantity': 3,
+          'missing': 4,  // Only if visible
+          'damaged': 5,  // Only if visible, adjust based on missing column
+          'sets': 6      // Adjust based on visible columns
+        };
+
+        const columnIndex = columnMap[attribute];
+        if (columnIndex !== undefined && window.brickTableInstance) {
+          // Determine sort direction
+          const isCurrentlyActive = button.classList.contains('btn-primary');
+          const currentDirection = button.dataset.currentDirection || (isDesc ? 'desc' : 'asc');
+          const newDirection = isCurrentlyActive ?
+            (currentDirection === 'asc' ? 'desc' : 'asc') :
+            (isDesc ? 'desc' : 'asc');
+
+          // Clear other active buttons
+          sortButtons.forEach(btn => {
+            btn.classList.remove('btn-primary');
+            btn.classList.add('btn-outline-primary');
+            btn.removeAttribute('data-current-direction');
+          });
+
+          // Mark this button as active
+          button.classList.remove('btn-outline-primary');
+          button.classList.add('btn-primary');
+          button.dataset.currentDirection = newDirection;
+
+          // Apply sort using Simple DataTables API
+          window.brickTableInstance.table.columns.sort(columnIndex, newDirection);
+        }
       }
     });
   });
 
   if (clearButton) {
     clearButton.addEventListener('click', () => {
-      // Clear all sort buttons
-      sortButtons.forEach(btn => {
-        btn.classList.remove('btn-primary');
-        btn.classList.add('btn-outline-primary');
-        btn.removeAttribute('data-current-direction');
-      });
+      if (isPaginationMode()) {
+        // PAGINATION MODE - Clear server-side sorting
+        const currentUrl = new URL(window.location);
+        currentUrl.searchParams.delete('sort');
+        currentUrl.searchParams.delete('order');
+        currentUrl.searchParams.set('page', '1');
+        window.location.href = currentUrl.toString();
 
-      // Reset table sort - remove all sorting
-      if (window.brickTableInstance) {
-        // Destroy and recreate to clear sorting
-        const tableElement = document.querySelector('#minifigures');
-        const currentPerPage = window.brickTableInstance.table.options.perPage;
-        window.brickTableInstance.table.destroy();
+      } else {
+        // ORIGINAL MODE - Clear client-side sorting
+        // Clear all sort buttons
+        sortButtons.forEach(btn => {
+          btn.classList.remove('btn-primary');
+          btn.classList.add('btn-outline-primary');
+          btn.removeAttribute('data-current-direction');
+        });
 
-        setTimeout(() => {
-          // Create new instance using the globally available BrickTable class
-          const newInstance = new window.BrickTable(tableElement, currentPerPage);
-          window.brickTableInstance = newInstance;
+        // Reset table sort - remove all sorting
+        if (window.brickTableInstance) {
+          // Destroy and recreate to clear sorting
+          const tableElement = document.querySelector('#minifigures');
+          const currentPerPage = window.brickTableInstance.table.options.perPage;
+          window.brickTableInstance.table.destroy();
 
-          // Re-enable search functionality
-          newInstance.table.searchable = true;
-        }, 50);
+          setTimeout(() => {
+            // Create new instance using the globally available BrickTable class
+            const newInstance = new window.BrickTable(tableElement, currentPerPage);
+            window.brickTableInstance = newInstance;
+
+            // Re-enable search functionality
+            newInstance.table.searchable = true;
+          }, 50);
+        }
       }
     });
   }

static/scripts/sets.js

@@ -0,0 +1,108 @@
+// Sets page functionality
+
+// Check if we're in pagination mode (server-side) or original mode (client-side)
+function isPaginationMode() {
+  const gridElement = document.querySelector('#grid');
+  return gridElement && gridElement.getAttribute('data-grid') === 'false';
+}
+
+// Setup page functionality
+document.addEventListener("DOMContentLoaded", () => {
+  const searchInput = document.getElementById('grid-search');
+  const searchClear = document.getElementById('grid-search-clear');
+
+  if (searchInput && searchClear) {
+    if (isPaginationMode()) {
+      // PAGINATION MODE - Server-side search
+      const searchForm = document.createElement('form');
+      searchForm.style.display = 'none';
+      searchInput.parentNode.appendChild(searchForm);
+      searchForm.appendChild(searchInput.cloneNode(true));
+
+      // Handle Enter key for search
+      searchInput.addEventListener('keydown', (e) => {
+        if (e.key === 'Enter') {
+          e.preventDefault();
+          performServerSearch();
+        }
+      });
+
+      // Handle search button click (if exists)
+      const searchButton = document.querySelector('[data-search-trigger]');
+      if (searchButton) {
+        searchButton.addEventListener('click', performServerSearch);
+      }
+
+      // Clear search
+      searchClear.addEventListener('click', () => {
+        searchInput.value = '';
+        performServerSearch();
+      });
+
+      function performServerSearch() {
+        const currentUrl = new URL(window.location);
+        const searchQuery = searchInput.value.trim();
+
+        if (searchQuery) {
+          currentUrl.searchParams.set('search', searchQuery);
+        } else {
+          currentUrl.searchParams.delete('search');
+        }
+
+        // Reset to page 1 when searching
+        currentUrl.searchParams.set('page', '1');
+        window.location.href = currentUrl.toString();
+      }
+
+      // Setup sort buttons for pagination mode
+      setupPaginationSortButtons();
+
+    } else {
+      // ORIGINAL MODE - Grid search functionality is handled by existing grid scripts
+      // No additional setup needed here
+    }
+  }
+});
+
+function setupPaginationSortButtons() {
+  // Sort button functionality for pagination mode
+  const sortButtons = document.querySelectorAll('[data-sort-attribute]');
+  const clearButton = document.querySelector('[data-sort-clear]');
+
+  sortButtons.forEach(button => {
+    button.addEventListener('click', () => {
+      const attribute = button.dataset.sortAttribute;
+      const isDesc = button.dataset.sortDesc === 'true';
+
+      // PAGINATION MODE - Server-side sorting
+      const currentUrl = new URL(window.location);
+      const currentSort = currentUrl.searchParams.get('sort');
+      const currentOrder = currentUrl.searchParams.get('order');
+
+      // Determine new sort direction
+      let newOrder = isDesc ? 'desc' : 'asc';
+      if (currentSort === attribute) {
+        // Toggle direction if clicking the same column
+        newOrder = currentOrder === 'asc' ? 'desc' : 'asc';
+      }
+
+      currentUrl.searchParams.set('sort', attribute);
+      currentUrl.searchParams.set('order', newOrder);
+
+      // Reset to page 1 when sorting
+      currentUrl.searchParams.set('page', '1');
+      window.location.href = currentUrl.toString();
+    });
+  });
+
+  if (clearButton) {
+    clearButton.addEventListener('click', () => {
+      // PAGINATION MODE - Clear server-side sorting
+      const currentUrl = new URL(window.location);
+      currentUrl.searchParams.delete('sort');
+      currentUrl.searchParams.delete('order');
+      currentUrl.searchParams.set('page', '1');
+      window.location.href = currentUrl.toString();
+    });
+  }
+}

templates/base.html

@@ -97,6 +97,9 @@
     {% if request.endpoint == 'part.list' %}
     <script src="{{ url_for('static', filename='scripts/parts.js') }}"></script>
     {% endif %}
+    {% if request.endpoint == 'set.list' %}
+    <script src="{{ url_for('static', filename='scripts/sets.js') }}"></script>
+    {% endif %}
     <script type="text/javascript">
       document.addEventListener("DOMContentLoaded", () => {
         setup_grids();

templates/minifigure/table_body.html

@@ -0,0 +1,22 @@
+{% import 'macro/table.html' as table %}
+
+<tbody>
+  {% for minifigure in table_collection %}
+  <tr>
+    {{ table.image(minifigure.url_for_image(), caption=minifigure.fields.name, alt=minifigure.fields.figure) }}
+    <td data-sort="{{ minifigure.fields.name }}">
+      <a class="text-reset" href="{{ minifigure.url() }}">{{ minifigure.fields.name }}</a>
+      {{ table.rebrickable(minifigure) }}
+    </td>
+    <td data-sort="{{ minifigure.fields.number_of_parts }}">{{ minifigure.fields.number_of_parts }}</td>
+    <td data-sort="{{ minifigure.fields.total_quantity }}">{{ minifigure.fields.total_quantity }}</td>
+    {% if not config['HIDE_TABLE_MISSING_PARTS'] %}
+    <td data-sort="{{ minifigure.fields.total_missing }}">{{ minifigure.fields.total_missing }}</td>
+    {% endif %}
+    {% if not config['HIDE_TABLE_DAMAGED_PARTS'] %}
+    <td data-sort="{{ minifigure.fields.total_damaged }}">{{ minifigure.fields.total_damaged }}</td>
+    {% endif %}
+    <td data-sort="{{ minifigure.fields.total_sets }}">{{ minifigure.fields.total_sets }}</td>
+  </tr>
+  {% endfor %}
+</tbody>

templates/minifigures.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% import 'macro/table.html' as table %}
 
 {% block title %} - All minifigures{% endblock %}
 
@@ -10,7 +11,7 @@
       <label class="visually-hidden" for="table-search">Search</label>
       <div class="input-group">
         <span class="input-group-text"><i class="ri-search-line"></i><span class="ms-1 d-none d-md-inline"> Search</span></span>
-        <input id="table-search" class="form-control form-control-sm px-1" type="text" placeholder="Figure name, parts count, sets" value="">
+        <input id="table-search" class="form-control form-control-sm px-1" type="text" placeholder="Figure name, parts count, sets" value="{{ search_query or '' }}">
         <button id="table-search-clear" type="button" class="btn btn-light btn-outline-danger border"><i class="ri-eraser-line"></i></button>
       </div>
     </div>
@@ -21,7 +22,6 @@
         </button>
       </div>
     </div>
-    {% if owners | length > 1 %}
     <div class="col-12">
       <div class="input-group">
         <button class="btn btn-outline-primary" type="button" data-bs-toggle="collapse" data-bs-target="#table-filter" aria-expanded="{% if config['SHOW_GRID_FILTERS'] %}true{% else %}false{% endif %}" aria-controls="table-filter">
@@ -29,14 +29,154 @@
         </button>
       </div>
     </div>
-    {% endif %}
   </div>
   {% include 'minifigure/sort.html' %}
   {% include 'minifigure/filter.html' %}
 
-  {% with all=true %}
-    {% include 'minifigure/table.html' %}
-  {% endwith %}
+  {% if use_pagination %}
+  <!-- PAGINATION MODE -->
+  <div class="table-responsive-sm">
+    <table data-table="false" class="table table-striped align-middle sortable mb-0" id="minifigures">
+      {{ table.header(parts=true, quantity=true, missing=true, damaged=true, sets=true, minifigures=false) }}
+      {% include 'minifigure/table_body.html' %}
+    </table>
+  </div>
+
+  <!-- Pagination -->
+  <div>
+    {% if pagination and pagination.total_pages > 1 %}
+    <div class="row mt-4">
+      <div class="col-12">
+      <!-- Desktop Pagination -->
+      <div class="d-none d-md-block">
+        <nav aria-label="Minifigures pagination">
+          <ul class="pagination justify-content-center">
+            {% if pagination.has_prev %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.page - 1) }}">
+                  <i class="ri-arrow-left-line"></i> Previous
+                </a>
+              </li>
+            {% endif %}
+
+            <!-- Show page numbers (with smart truncation) -->
+            {% set start_page = [1, pagination.page - 2] | max %}
+            {% set end_page = [pagination.total_pages, pagination.page + 2] | min %}
+
+            {% if start_page > 1 %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', 1) }}">1</a>
+              </li>
+              {% if start_page > 2 %}
+                <li class="page-item disabled"><span class="page-link">...</span></li>
+              {% endif %}
+            {% endif %}
+
+            {% for page_num in range(start_page, end_page + 1) %}
+              {% if page_num == pagination.page %}
+                <li class="page-item active">
+                  <span class="page-link">{{ page_num }}</span>
+                </li>
+              {% else %}
+                <li class="page-item">
+                  <a class="page-link" href="{{ request.url | replace_query('page', page_num) }}">{{ page_num }}</a>
+                </li>
+              {% endif %}
+            {% endfor %}
+
+            {% if end_page < pagination.total_pages %}
+              {% if end_page < pagination.total_pages - 1 %}
+                <li class="page-item disabled"><span class="page-link">...</span></li>
+              {% endif %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.total_pages) }}">{{ pagination.total_pages }}</a>
+              </li>
+            {% endif %}
+
+            {% if pagination.has_next %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.page + 1) }}">
+                  Next <i class="ri-arrow-right-line"></i>
+                </a>
+              </li>
+            {% endif %}
+          </ul>
+        </nav>
+      </div>
+
+      <!-- Mobile Pagination -->
+      <div class="d-md-none">
+        <div class="btn-group w-100" role="group" aria-label="Mobile pagination">
+          {% if pagination.has_prev %}
+            <a href="{{ request.url | replace_query('page', pagination.page - 1) }}"
+               class="btn btn-outline-primary">
+              <i class="ri-arrow-left-line"></i> Previous
+            </a>
+          {% else %}
+            <button class="btn btn-outline-secondary" disabled>
+              <i class="ri-arrow-left-line"></i> Previous
+            </button>
+          {% endif %}
+
+          <span class="btn btn-light">
+            Page {{ pagination.page }} of {{ pagination.total_pages }}
+          </span>
+
+          {% if pagination.has_next %}
+            <a href="{{ request.url | replace_query('page', pagination.page + 1) }}"
+               class="btn btn-outline-primary">
+              Next <i class="ri-arrow-right-line"></i>
+            </a>
+          {% else %}
+            <button class="btn btn-outline-secondary" disabled>
+              Next <i class="ri-arrow-right-line"></i>
+            </button>
+          {% endif %}
+        </div>
+      </div>
+
+      <!-- Results Info -->
+      <div class="text-center mt-3">
+        <small class="text-muted">
+          Showing {{ ((pagination.page - 1) * pagination.per_page + 1) }} to
+          {{ [pagination.page * pagination.per_page, pagination.total_count] | min }}
+          of {{ pagination.total_count }} minifigures
+        </small>
+      </div>
+    </div>
+    </div>
+    {% endif %}
+  </div>
+
+  {% else %}
+  <!-- ORIGINAL MODE - Single page with client-side search -->
+  <div class="table-responsive-sm">
+    <table data-table="true" class="table table-striped align-middle {% if not all %}sortable mb-0{% endif %}" id="minifigures">
+      {{ table.header(parts=true, quantity=true, missing=true, damaged=true, sets=true, minifigures=false) }}
+      <tbody>
+        {% for minifigure in table_collection %}
+        <tr>
+          {{ table.image(minifigure.url_for_image(), caption=minifigure.fields.name, alt=minifigure.fields.figure) }}
+          <td data-sort="{{ minifigure.fields.name }}">
+            <a class="text-reset" href="{{ minifigure.url() }}">{{ minifigure.fields.name }}</a>
+            {{ table.rebrickable(minifigure) }}
+          </td>
+          <td data-sort="{{ minifigure.fields.number_of_parts }}">{{ minifigure.fields.number_of_parts }}</td>
+          <td data-sort="{{ minifigure.fields.total_quantity }}">{{ minifigure.fields.total_quantity }}</td>
+          {% if not config['HIDE_TABLE_MISSING_PARTS'] %}
+          <td data-sort="{{ minifigure.fields.total_missing }}">{{ minifigure.fields.total_missing }}</td>
+          {% endif %}
+          {% if not config['HIDE_TABLE_DAMAGED_PARTS'] %}
+          <td data-sort="{{ minifigure.fields.total_damaged }}">{{ minifigure.fields.total_damaged }}</td>
+          {% endif %}
+          <td data-sort="{{ minifigure.fields.total_sets }}">{{ minifigure.fields.total_sets }}</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  {% endif %}
+
 </div>
 {% else %}
   <div class="container-fluid">
@@ -52,4 +192,4 @@
   </div>
 {% endif %}
 
-{% endblock %}
+{% endblock %}

templates/set/sort.html

@@ -2,18 +2,23 @@
   <div class="col-12 flex-grow-1">
     <div class="input-group">
       <span class="input-group-text mb-2"><i class="ri-sort-asc"></i><span class="ms-1 d-none d-md-inline"> Sort</span></span>
-      <button id="sort-number" type="button" class="btn btn-outline-primary mb-2"
-        data-sort-attribute="number" data-sort-natural="true"><i class="ri-hashtag"></i><span class="d-none d-md-inline"> Set</span></button>
+      <button id="sort-set" type="button" class="btn btn-outline-primary mb-2"
+        data-sort-attribute="set" data-sort-natural="true"><i class="ri-hashtag"></i><span class="d-none d-md-inline"> Set</span></button>
       <button id="sort-name" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="name"><i class="ri-pencil-line"></i><span class="d-none d-md-inline"> Name</span></button>
+      {% if not use_pagination %}
       <button id="sort-theme" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="theme"><i class="ri-price-tag-3-line"></i><span class="d-none d-md-inline"> Theme</span></button>
+      {% endif %}
       <button id="sort-year" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="year"><i class="ri-calendar-line"></i><span class="d-none d-md-inline"> Year</span></button>
+      {% if not use_pagination %}
       <button id="sort-minifigure" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="minifigures" data-sort-desc="true"><i class="ri-group-line"></i><span class="d-none d-xl-inline"> Figures</span></button>
+      {% endif %}
       <button id="sort-parts" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="parts" data-sort-desc="true"><i class="ri-shapes-line"></i><span class="d-none d-xl-inline"> Parts</span></button>
+      {% if not use_pagination %}
       {% if not config['HIDE_TABLE_MISSING_PARTS'] %}
       <button id="sort-missing" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="missing" data-sort-desc="true"><i class="ri-question-line"></i><span class="d-none d-xl-inline"> Missing</span></button>
@@ -26,6 +31,7 @@
         data-sort-attribute="purchase-date" data-sort-desc="true"><i class="ri-calendar-line"></i><span class="d-none d-xl-inline"> Date</span></button>
       <button id="sort-purchase-price" type="button" class="btn btn-outline-primary mb-2"
         data-sort-attribute="purchase-price" data-sort-desc="true"><i class="ri-wallet-3-line"></i><span class="d-none d-xl-inline"> Price</span></button>
+      {% endif %}
       <button id="sort-clear" type="button" class="btn btn-outline-dark mb-2"
         data-sort-clear="true"><i class="ri-close-circle-line"></i><span class="d-none d-xl-inline"> Clear</span></button>
     </div>

templates/sets.html

@@ -10,7 +10,7 @@
       <label class="visually-hidden" for="grid-search">Search</label>
       <div class="input-group">
         <span class="input-group-text"><i class="ri-search-line"></i><span class="ms-1 d-none d-md-inline"> Search</span></span>
-        <input id="grid-search" data-search-exact="name,number,parts,searchPurchaseLocation,searchStorage,theme,year" data-search-list="searchOwner,searchTag" class="form-control form-control-sm px-1" type="text" placeholder="Set, name, number of parts, theme, year, owner, purchase location, storage, tag" value="">
+        <input id="grid-search" {% if not use_pagination %}data-search-exact="name,number,parts,searchPurchaseLocation,searchStorage,theme,year" data-search-list="searchOwner,searchTag"{% endif %} class="form-control form-control-sm px-1" type="text" placeholder="Set, name, number of parts, theme, year{% if not use_pagination %}, owner, purchase location, storage, tag{% endif %}" value="{{ search_query or '' }}">
         <button id="grid-search-clear" type="button" class="btn btn-light btn-outline-danger border"><i class="ri-eraser-line"></i></button>
       </div>
     </div>
@@ -21,6 +21,7 @@
         </button>
       </div>
     </div>
+    {% if not use_pagination %}
     <div class="col-12">
       <div class="input-group">
         <button class="btn btn-outline-primary" type="button" data-bs-toggle="collapse" data-bs-target="#grid-filter" aria-expanded="{% if config['SHOW_GRID_FILTERS'] %}true{% else %}false{% endif %}" aria-controls="grid-filter">
@@ -28,9 +29,133 @@
         </button>
       </div>
     </div>
+    {% endif %}
   </div>
   {% include 'set/sort.html' %}
+  {% if not use_pagination %}
   {% include 'set/filter.html' %}
+  {% endif %}
+
+  {% if use_pagination %}
+  <!-- PAGINATION MODE -->
+  <div class="row" data-grid="false" id="grid">
+  {% for item in collection %}
+    <div class="col-md-6 col-xl-3 d-flex align-items-stretch">
+      {% with index=loop.index0 %}
+        {% include 'set/card.html' %}
+      {% endwith %}
+    </div>
+  {% endfor %}
+  </div>
+
+  <!-- Pagination -->
+  <div>
+    {% if pagination and pagination.total_pages > 1 %}
+    <div class="row mt-4">
+      <div class="col-12">
+      <!-- Desktop Pagination -->
+      <div class="d-none d-md-block">
+        <nav aria-label="Sets pagination">
+          <ul class="pagination justify-content-center">
+            {% if pagination.has_prev %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.page - 1) }}">
+                  <i class="ri-arrow-left-line"></i> Previous
+                </a>
+              </li>
+            {% endif %}
+
+            <!-- Show page numbers (with smart truncation) -->
+            {% set start_page = [1, pagination.page - 2] | max %}
+            {% set end_page = [pagination.total_pages, pagination.page + 2] | min %}
+
+            {% if start_page > 1 %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', 1) }}">1</a>
+              </li>
+              {% if start_page > 2 %}
+                <li class="page-item disabled"><span class="page-link">...</span></li>
+              {% endif %}
+            {% endif %}
+
+            {% for page_num in range(start_page, end_page + 1) %}
+              {% if page_num == pagination.page %}
+                <li class="page-item active">
+                  <span class="page-link">{{ page_num }}</span>
+                </li>
+              {% else %}
+                <li class="page-item">
+                  <a class="page-link" href="{{ request.url | replace_query('page', page_num) }}">{{ page_num }}</a>
+                </li>
+              {% endif %}
+            {% endfor %}
+
+            {% if end_page < pagination.total_pages %}
+              {% if end_page < pagination.total_pages - 1 %}
+                <li class="page-item disabled"><span class="page-link">...</span></li>
+              {% endif %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.total_pages) }}">{{ pagination.total_pages }}</a>
+              </li>
+            {% endif %}
+
+            {% if pagination.has_next %}
+              <li class="page-item">
+                <a class="page-link" href="{{ request.url | replace_query('page', pagination.page + 1) }}">
+                  Next <i class="ri-arrow-right-line"></i>
+                </a>
+              </li>
+            {% endif %}
+          </ul>
+        </nav>
+      </div>
+
+      <!-- Mobile Pagination -->
+      <div class="d-md-none">
+        <div class="btn-group w-100" role="group" aria-label="Mobile pagination">
+          {% if pagination.has_prev %}
+            <a href="{{ request.url | replace_query('page', pagination.page - 1) }}"
+               class="btn btn-outline-primary">
+              <i class="ri-arrow-left-line"></i> Previous
+            </a>
+          {% else %}
+            <button class="btn btn-outline-secondary" disabled>
+              <i class="ri-arrow-left-line"></i> Previous
+            </button>
+          {% endif %}
+
+          <span class="btn btn-light">
+            Page {{ pagination.page }} of {{ pagination.total_pages }}
+          </span>
+
+          {% if pagination.has_next %}
+            <a href="{{ request.url | replace_query('page', pagination.page + 1) }}"
+               class="btn btn-outline-primary">
+              Next <i class="ri-arrow-right-line"></i>
+            </a>
+          {% else %}
+            <button class="btn btn-outline-secondary" disabled>
+              Next <i class="ri-arrow-right-line"></i>
+            </button>
+          {% endif %}
+        </div>
+      </div>
+
+      <!-- Results Info -->
+      <div class="text-center mt-3">
+        <small class="text-muted">
+          Showing {{ ((pagination.page - 1) * pagination.per_page + 1) }} to
+          {{ [pagination.page * pagination.per_page, pagination.total_count] | min }}
+          of {{ pagination.total_count }} sets
+        </small>
+      </div>
+    </div>
+    </div>
+    {% endif %}
+  </div>
+
+  {% else %}
+  <!-- ORIGINAL MODE - Single page with client-side search and filters -->
   <div class="row" data-grid="true" id="grid">
   {% for item in collection %}
     <div class="col-md-6 col-xl-3 d-flex align-items-stretch">
@@ -40,6 +165,8 @@
     </div>
   {% endfor %}
   </div>
+  {% endif %}
+
 </div>
 {% else %}
   {% include 'set/empty.html' %}