Browse Source

Fixed app search and search by category

lllllllillllllillll 1 năm trước cách đây
mục cha
commit
82273d1fc1
2 tập tin đã thay đổi với 36 bổ sung22 xóa
  1. 9 1
      controllers/apps.js
  2. 27 21
      views/apps.html

+ 9 - 1
controllers/apps.js

@@ -2,7 +2,6 @@ import { readFileSync, readdirSync, renameSync, mkdirSync, unlinkSync, read, exi
 import { parse } from 'yaml';
 import { parse } from 'yaml';
 import multer from 'multer';
 import multer from 'multer';
 import AdmZip from 'adm-zip';
 import AdmZip from 'adm-zip';
-import { json } from 'sequelize';
 
 
 const upload = multer({storage: multer.diskStorage({
 const upload = multer({storage: multer.diskStorage({
   destination: function (req, file, cb) { cb(null, 'templates/tmp/') },
   destination: function (req, file, cb) { cb(null, 'templates/tmp/') },
@@ -146,6 +145,13 @@ export const appSearch = async (req, res) => {
   templates = templates.sort((a, b) => {
   templates = templates.sort((a, b) => {
       if (a.name < b.name) { return -1; }
       if (a.name < b.name) { return -1; }
   });
   });
+
+  let pages = `<li class="page-item"><a class="page-link" href="/apps/1/${template_param}">1</a></li>
+  <li class="page-item"><a class="page-link" href="/apps/2/${template_param}">2</a></li>
+  <li class="page-item"><a class="page-link" href="/apps/3/${template_param}">3</a></li>
+  <li class="page-item"><a class="page-link" href="/apps/4/${template_param}">4</a></li>
+  <li class="page-item"><a class="page-link" href="/apps/5/${template_param}">5</a></li>`
+
   
   
   let list_start = (page-1)*28;
   let list_start = (page-1)*28;
   let list_end = (page*28);
   let list_end = (page*28);
@@ -218,6 +224,8 @@ export const appSearch = async (req, res) => {
       apps_list: apps_list,
       apps_list: apps_list,
       alert: alert,
       alert: alert,
       template_list: '',
       template_list: '',
+      json_templates: json_templates,
+      pages: pages,
   });
   });
 }
 }
 
 

+ 27 - 21
views/apps.html

@@ -45,30 +45,36 @@
                 <div class="card">
                 <div class="card">
                   <div class="card-body text-center">
                   <div class="card-body text-center">
                     <div class="d-flex align-items-center">
                     <div class="d-flex align-items-center">
-                      <div class="btn me-2">Category:</div>
+                      <div class="btn me-2">
+                        Category:
+                      </div>
                       <div class="dropdown">
                       <div class="dropdown">
                         <button class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">Everything</button>
                         <button class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">Everything</button>
-                        <ul class="dropdown-menu">
-                          <li><a class="dropdown-item" href="#">Other</a></li>
-                          <li><a class="dropdown-item" href="#">Productivity</a></li>
-                          <li><a class="dropdown-item" href="#">Tools</a></li>
-                          <li><a class="dropdown-item" href="#">Dashboard</a></li>
-                          <li><a class="dropdown-item" href="#">Communication</a></li>
-                          <li><a class="dropdown-item" href="#">Media</a></li>
-                          <li><a class="dropdown-item" href="#">CMS</a></li>
-                          <li><a class="dropdown-item" href="#">Monitoring</a></li>
-                          <li><a class="dropdown-item" href="#">LDAP</a></li>
-                          <li><a class="dropdown-item" href="#">Arr</a></li>
-                          <li><a class="dropdown-item" href="#">Paid</a></li>
-                          <li><a class="dropdown-item" href="#">Database</a></li>
-                          <li><a class="dropdown-item" href="#">Gaming</a></li>
-                          <li><a class="dropdown-item" href="#">Finance</a></li>
-                          <li><a class="dropdown-item" href="#">Networking</a></li>
-                          <li><a class="dropdown-item" href="#">Authentication</a></li>
-                          <li><a class="dropdown-item" href="#">Development</a></li>
-                          <li><a class="dropdown-item" href="#">Downloader</a></li>
-                        </ul>
+                        <form action="/apps" method="POST">
+                          <ul class="dropdown-menu">
+                            <li><input type="submit" class="dropdown-item" name="search" value="Other"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Productivity"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Tools"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Dashboard"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Communication"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Media"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="CMS"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Monitoring"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="LDAP"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Arr"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Paid"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Database"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Gaming"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Finance"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Networking"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Authentication"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Development"></li>
+                            <li><input type="submit" class="dropdown-item" name="search" value="Downloader"></li>
+                          </ul>
+                        </form>
+
                       </div>
                       </div>
+
                     </div>
                     </div>
                   </div>
                   </div>
                 </div>
                 </div>