From f6e86cb4bc4d85b6eabc920e13fa788973d82ea5 Mon Sep 17 00:00:00 2001 From: Minhyeok Park Date: Wed, 15 Jan 2025 20:53:34 +0900 Subject: [PATCH] feat: add search and sort feature --- src/WebServer.ts | 16 +- views/index.ejs | 73 ++++--- views/partial/bpset_actions.ejs | 34 ++- views/partial/bpset_details.ejs | 72 +++---- views/partial/bpset_fixdialog.ejs | 91 ++++---- views/partial/bpset_item.ejs | 29 ++- views/partial/bpset_logs.ejs | 27 ++- views/partial/bpset_progress.ejs | 62 +++--- views/partial/page_header.ejs | 36 ++-- views/script.ejs | 333 ++++++++++++++++++++++++++++++ views/style.ejs | 9 + 11 files changed, 584 insertions(+), 198 deletions(-) create mode 100644 views/script.ejs create mode 100644 views/style.ejs diff --git a/src/WebServer.ts b/src/WebServer.ts index dc8d7c8..7b0c22a 100644 --- a/src/WebServer.ts +++ b/src/WebServer.ts @@ -59,6 +59,9 @@ export class WebServer { res.setHeader('Content-Type', 'text/html; charset=utf-8') res.setHeader('Transfer-Encoding', 'chunked') + res.write('') + res.write('') + res.write('
') res.write('') res.write('
Start Checking....\n')
 
@@ -72,7 +75,8 @@ export class WebServer {
     Memorizer.reset()
     await this.bpManager.runCheckOnce(name)
 
-    res.write(`Done. Return to Report Page`)
+    res.write(`Done. Return to Report Page`)
+    res.write(``)
     res.end()
   }
 
@@ -82,6 +86,9 @@ export class WebServer {
 
     const { hidePass } = req.query
 
+    res.write('')
+    res.write('')
+    res.write('
')
     res.write('')
     res.write('
Start Checking....\n')
 
@@ -89,7 +96,8 @@ export class WebServer {
     await this.bpManager.runCheckAll((name) =>
       res.write(`${name} - FINISHED\n`))
 
-    res.write(`Done. Return to Report Page`)
+    res.write(`Done. Return to Report Page`)
+    res.write(``)
     res.end()
   }
 
@@ -97,6 +105,9 @@ export class WebServer {
     res.setHeader('Content-Type', 'text/html; charset=utf-8')
     res.setHeader('Transfer-Encoding', 'chunked')
 
+    res.write('')
+    res.write('')
+    res.write('
')
     res.write('
Start Fixing....\n')
     
     const { name, hidePass } = req.query
@@ -117,6 +128,7 @@ export class WebServer {
       })
 
     res.write(`Done. Return to Report Page`)
+    res.write(``)
     res.end()
   }
 
diff --git a/views/index.ejs b/views/index.ejs
index 782082d..f39a5cb 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,48 +1,71 @@
 
 
   
-    
-    
-    
-    
+    
+    
+    
+    
     BPSets
   
-  
-    

+  
+    

       <%- include('partial/page_header.ejs') %>
 
-      
-        
+      

+        
+        
+      

+
+      

+        
-            
-            
-            
-            
-            
-            
-            
+            
+            
+            
+            
+            
+            
+            
-        
+        
           <% bpStatus.forEach(({ category, metadatas }) => { %>
-            
-              
+            
+              
   
             <% metadatas.forEach((metadata) => { %>
-              <%- include('./partial/bpset_item.ejs', { metadata }) %>
+              <%- include('./partial/bpset_item.ejs', { metadata, category }) %>
               <%- include('./partial/bpset_details.ejs', { metadata }) %>
               <%- include('./partial/bpset_logs.ejs', { metadata }) %>
+              <%- include('./partial/bpset_fixdialog.ejs', { metadata }) %>
             <% }) %>
           <% }) %>
         

           
#NameB.P. CategoryPriorityFail/PassPass PercentAction
+              # 
+            
+              Name 
+            
+              B.P. Category 
+            
+              Priority 
+            Fail/Pass
+              Pass Percent 
+            Action
           
             
         
<%= category %> (<%= metadatas.length %>)

+                <%= category %> (<%= metadatas.length %>)
+              
             

       

     

-
-    
-    
+    
+    <%- include('./style.ejs') %>
+    <%- include('./script.ejs') %>
   
 
diff --git a/views/partial/bpset_actions.ejs b/views/partial/bpset_actions.ejs
index 3ec4315..abae56e 100644
--- a/views/partial/bpset_actions.ejs
+++ b/views/partial/bpset_actions.ejs
@@ -1,8 +1,30 @@
-
-  

-    
-    Recheck
-    
-    
+
+  

+    
+    
+      Recheck
+    
+    
+    
   

 
diff --git a/views/partial/bpset_details.ejs b/views/partial/bpset_details.ejs
index 1b66f76..5eef5a9 100644
--- a/views/partial/bpset_details.ejs
+++ b/views/partial/bpset_details.ejs
@@ -1,57 +1,51 @@
 <%
-  const priorityLabel = ['CRITICAL', 'Required', 'Recommend'][metadata.priority-1] || 'Recommend'
-  const priorityColor = ['danger', 'warning', 'secondary'][metadata.priority-1] || 'secondary'
+  const priorityLabel = ['CRITICAL', 'Required', 'Recommend'][metadata.priority - 1] || 'Recommend';
+  const priorityColor = ['red', 'yellow', 'gray'][metadata.priority - 1] || 'gray';
 %>
 
 
   
-    

-      

-        
<%= metadata.name %>

-        
<%= metadata.description %>

+