From 82273d1fc18f0ea7830cebd35679d422e6a4e827 Mon Sep 17 00:00:00 2001 From: lllllllillllllillll Date: Fri, 17 May 2024 19:45:38 -0700 Subject: [PATCH] Fixed app search and search by category --- controllers/apps.js | 10 +++++++++- views/apps.html | 48 +++++++++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/controllers/apps.js b/controllers/apps.js index 8ae0b6e..e902839 100644 --- a/controllers/apps.js +++ b/controllers/apps.js @@ -2,7 +2,6 @@ import { readFileSync, readdirSync, renameSync, mkdirSync, unlinkSync, read, exi import { parse } from 'yaml'; import multer from 'multer'; import AdmZip from 'adm-zip'; -import { json } from 'sequelize'; const upload = multer({storage: multer.diskStorage({ destination: function (req, file, cb) { cb(null, 'templates/tmp/') }, @@ -146,6 +145,13 @@ export const appSearch = async (req, res) => { templates = templates.sort((a, b) => { if (a.name < b.name) { return -1; } }); + + let pages = `
  • 1
    • +
  • 2
    • +
  • 3
    • +
  • 4
    • +
  • 5
    • ` + let list_start = (page-1)*28; let list_end = (page*28); @@ -218,6 +224,8 @@ export const appSearch = async (req, res) => { apps_list: apps_list, alert: alert, template_list: '', + json_templates: json_templates, + pages: pages, }); } diff --git a/views/apps.html b/views/apps.html index 139c3bf..872e129 100644 --- a/views/apps.html +++ b/views/apps.html @@ -45,30 +45,36 @@
    -
    Category:
    +
    + Category: +
    - +
    +
      +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    +
    +
    +