We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
DweebUI
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

moved footer, navbar, sidebar to partials folder

lllllllillllllillll 1 year ago
parent
308538f579
commit
a841fed064
15 changed files with 38 additions and 35 deletions
Split View Show Diff Stats
  1. 11 8
      controllers/dashboard.js
  2. 3 3
      views/account.html
  3. 2 2
      views/apps.html
  4. 4 4
      views/dashboard.html
  5. 2 2
      views/images.html
  6. 2 2
      views/networks.html
  7. 0 0
      views/partials/footer.html
  8. 0 0
      views/partials/navbar.html
  9. 0 0
      views/partials/sidebar.html
  10. 2 2
      views/portal.html
  11. 3 3
      views/settings.html
  12. 3 3
      views/supporters.html
  13. 2 2
      views/syslogs.html
  14. 2 2
      views/users.html
  15. 2 2
      views/volumes.html

+ 11 - 8
controllers/dashboard.js
View File 

@@ -257,6 +257,15 @@ export const Card = (req, res) => {
 
     containerId.inspect().then(data => {
 
 
         let state = data.State.Status;
 
+
 
+        let state_indicator = 'green';
 
+        if (state == 'exited') {
 
+            state = 'stopped';
 
+            state_indicator = 'red';
 
+        } else if (state == 'paused') {
 
+            state_indicator = 'orange';
 
+        }
 
+
 
         let wrapped = name;
 
         let disable = "";
 
         let chartName = name.replace(/-/g, '');
 
@@ -269,13 +278,7 @@ export const Card = (req, res) => {
 
         // if ( external_port == undefined ) { external_port = 0; }
 
         // if ( internal_port == undefined ) { internal_port = 0; }
 
         
-        let state_indicator = 'green';
 
-        if (state == 'exited') {
 
-            state = 'stopped';
 
-            state_indicator = 'red';
 
-        } else if (state == 'paused') {
 
-            state_indicator = 'orange';
 
-        }
 
+
 
         
         let trigger = 'data-hx-trigger="load, every 2s"';
 
         if (state != 'running') {  trigger = 'data-hx-trigger="load"'; }
 
@@ -301,7 +304,7 @@ export const Card = (req, res) => {
 
         newCard = newCard.replace(/AppName/g, name);
 
         newCard = newCard.replace(/AppShortName/g, wrapped);
 
         newCard = newCard.replace(/AppIcon/g, service);
 
-        newCard = newCard.replace(/AppState/g, data.State.Status);
 
+        newCard = newCard.replace(/AppState/g, state);
 
         newCard = newCard.replace(/AppImage/g, data.Config.Image.split('/'));
 
         newCard = newCard.replace(/StateColor/g, state_indicator);
 
         newCard = newCard.replace(/ChartName/g, chartName);

+ 3 - 3
views/account.html
View File 

@@ -21,7 +21,7 @@
 
 	<body >
 
 		<div class="page">
 
 			<!-- Navbar -->
 
-			<%- include('navbar.html') %>
 
+			<%- include('/partials/navbar.html') %>
 
 			<div class="page-wrapper">
 
 				<!-- Page header -->
 
 				<div class="page-header d-print-none">
 
@@ -41,7 +41,7 @@
 
 						<div class="card">
 
 							<div class="row g-0">
 
 								
-								<%- include('sidebar.html') %>
 
+								<%- include('/partials/sidebar.html') %>
 
 								
 								<div class="col d-flex flex-column">
 
 								<div class="card-body">
 
@@ -120,7 +120,7 @@
 
 						</div>
 
 					</div>
 
 				</div>
 
-				<%- include('footer.html') %>
 
+				<%- include('/partials/footer.html') %>
 
 			</div>
 
 		</div>
 
 		<!-- Libs JS -->

+ 2 - 2
views/apps.html
View File 

@@ -22,7 +22,7 @@
 
     <div class="page">
 
       <!-- Navbar -->
 
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
 
       <div class="page-wrapper">
 
         <!-- Page header -->
 
@@ -107,7 +107,7 @@
 
           </div>
 
         </div>
 
         
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
 
       </div>
 
     </div>

+ 4 - 4
views/dashboard.html
View File 

@@ -24,7 +24,7 @@
 
   
   <div class="page">
 
 
-    <%- include('navbar.html') %>
 
+    <%- include('partials/navbar.html') %>
 
     
     <div class="page-wrapper">
 
 
@@ -142,13 +142,13 @@
 
             
             <!-- HTMX -->
 
             <div class="col-12">
 
-              <div class="row row-cards" data-hx-get="/containers" data-hx-trigger="load" data-hx-swap="innerHTML" id="containers">
 
+              <div class="row row-cards" data-hx-get="/containers" data-hx-trigger="" data-hx-swap="innerHTML" id="containers">
 
               </div>
 
             </div>
 
 
             <!-- HTMX -->
 
             <div class="col-12">
 
-              <div class="row row-cards" data-hx-get="/new_cards" data-hx-trigger="sse:update" data-hx-swap="beforeend" hx-target="#containers">
 
+              <div class="row row-cards" data-hx-get="/new_cards" data-hx-trigger="load, sse:update" data-hx-swap="beforeend" hx-target="#containers">
 
               </div>
 
             </div>
 
             
@@ -197,7 +197,7 @@
 
         </div>
 
       </div>
 
       
-    <%- include('footer.html') %>
 
+    <%- include('partials/footer.html') %>
 
       
     </div>
 
   </div>

+ 2 - 2
views/images.html
View File 

@@ -20,7 +20,7 @@
 
   <body >
 
     <div class="page">
 
       <!-- Navbar -->
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
       <div class="page-wrapper">
 
         <!-- Page header -->
 
         
@@ -72,7 +72,7 @@
 
           </div>
 
         </div>
 
         
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
         
       </div>
 
     </div>

+ 2 - 2
views/networks.html
View File 

@@ -20,7 +20,7 @@
 
   <body >
 
     <div class="page">
 
       <!-- Navbar -->
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
       <div class="page-wrapper">
 
         <!-- Page header -->
 
         
@@ -87,7 +87,7 @@
 
           </div>
 
         </div>
 
         
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
         
       </div>
 
     </div>

+ 0 - 0
views/footer.html → views/partials/footer.html
View File


+ 0 - 0
views/navbar.html → views/partials/navbar.html
View File


+ 0 - 0
views/sidebar.html → views/partials/sidebar.html
View File


+ 2 - 2
views/portal.html
View File 

@@ -21,7 +21,7 @@
 
   <body >
 
     <div class="page">
 
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
       <div class="page-wrapper">
 
   
         <div class="page-body">
 
@@ -131,7 +131,7 @@
 
           </div>
 
         </div>
 
         
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
         
       </div>
 
     </div>

+ 3 - 3
views/settings.html
View File 

@@ -21,7 +21,7 @@
 
 	<body >
 
 		<div class="page">
 
 		<!-- Navbar -->
 
-		<%- include('navbar.html') %>
 
+		<%- include('partials/navbar.html') %>
 
 		<div class="page-wrapper">
 
 			<!-- Page header -->
 
 			<div class="page-header d-print-none">
 
@@ -40,7 +40,7 @@
 
 				<div class="container-xl">
 
 				  <div class="card">
 
 					<div class="row g-0">
 
-						<%- include('sidebar.html') %>
 
+						<%- include('partials/sidebar.html') %>
 
 					  	<div class="col d-flex flex-column">
 
 					  
 							<div class="card-body">
 
@@ -109,7 +109,7 @@
 
 				</div>
 
 			  </div>
 
 
-			<%- include('footer.html') %>
 
+			<%- include('partials/footer.html') %>
 
 		</div>
 
 		</div>
 
 		<!-- Libs JS -->

+ 3 - 3
views/supporters.html
View File 

@@ -22,7 +22,7 @@
 
 	<body >
 
 	<div class="page">
 
 		<!-- Navbar -->
 
-		<%- include('navbar.html') %>
 
+		<%- include('partials/navbar.html') %>
 
 		<div class="page-wrapper">
 
 			<!-- Page header -->
 
 			<div class="page-header d-print-none">
 
@@ -41,7 +41,7 @@
 
 				<div class="container-xl">
 
 					<div class="card">
 
 						<div class="row g-0">
 
-							<%- include('sidebar.html') %>
 
+							<%- include('partials/sidebar.html') %>
 
 							<div class="col d-flex flex-column">
 
 					
 								<div class="card-body">
 
@@ -74,7 +74,7 @@
 
 				</div>
 
 			</div>
 
 
-				<%- include('footer.html') %>
 
+				<%- include('partials/footer.html') %>
 
 		</div>
 
 	</div>
 
 		<!-- Libs JS -->

+ 2 - 2
views/syslogs.html
View File 

@@ -21,7 +21,7 @@
 
     <div class="page">
 
 
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
 
       <div class="page-wrapper">
 
 
@@ -68,7 +68,7 @@
 
 
           </div>
 
         </div>
 
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
       </div>
 
     </div>
 
     <!-- Libs JS -->

+ 2 - 2
views/users.html
View File 

@@ -21,7 +21,7 @@
 
     <div class="page">
 
 
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
 
       <div class="page-wrapper">
 
 
@@ -59,7 +59,7 @@
 
             </div>
 
           </div>
 
         </div>
 
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
       </div>
 
     </div>
 
     <!-- Libs JS -->

+ 2 - 2
views/volumes.html
View File 

@@ -20,7 +20,7 @@
 
   <body >
 
     <div class="page">
 
       <!-- Navbar -->
 
-      <%- include('navbar.html') %>
 
+      <%- include('partials/navbar.html') %>
 
       <div class="page-wrapper">
 
         <!-- Page header -->
 
         
@@ -86,7 +86,7 @@
 
           </div>
 
         </div>
 
         
-        <%- include('footer.html') %>
 
+        <%- include('partials/footer.html') %>
 
         
       </div>
 
     </div>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5