We use cookies to ensure you get the best experience on our website
Inicio Explorar Axuda
Rexistro Iniciar sesión
0ct0pu5
/
DweebUI
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

a bunch of small tweaks

lllllllillllllillll hai 1 ano
pai
9d9d5dac2e
achega
f3c6e6f155
Modificáronse 12 ficheiros con 59 adicións e 76 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 5 11
      controllers/apps.js
  2. 16 15
      routes/index.js
  3. 5 5
      views/pages/account.ejs
  4. 5 5
      views/pages/apps.ejs
  5. 7 7
      views/pages/dashboard.ejs
  6. 5 5
      views/pages/login.ejs
  7. 5 5
      views/pages/register.ejs
  8. 5 5
      views/pages/settings.ejs
  9. 5 5
      views/pages/users.ejs
  10. 1 1
      views/partials/navbar.ejs
  11. 0 0
      views/partials/site_list.ejs
  12. 0 12
      views/partials/users_list.ejs

+ 5 - 11
controllers/apps.js
Ver ficheiro 

@@ -1,11 +1,8 @@
 
 const User = require('../database/UserModel');
 
 const { appCard } = require('../components/appCard')
 
 const { dashCard } = require('../components/dashCard');
 
-
 
 const { install, uninstall } = require('../functions/package_manager');
 
 
-// import { install, uninstall } from '../functions/package_manager';
 
-
 
 const templates_json = require('../templates.json');
 
 let templates = templates_json.templates;
 
 
@@ -19,26 +16,23 @@ templates = templates.sort((a, b) => {
 
 
 exports.Apps = async function(req, res) {
 
 
-    console.log(req.params.page);
 
-
 
-
 
     if (req.session.role == "admin") {
 
 
         // Get the user.
 
         let user = await User.findOne({ where: { UUID: req.session.UUID }});
 
 
-        let page = Number(req.query.page) || 1;
 
+        let page = Number(req.params.page) || 1;
 
         let list_start = (page - 1) * 28;
 
         let list_end = (page * 28);
 
         let last_page = Math.ceil(templates.length / 28);
 
 
-        let prev = '/apps?page=' + (page - 1);
 
-        let next = '/apps?page=' + (page + 1);
 
+        let prev = '/apps/' + (page - 1);
 
+        let next = '/apps/' + (page + 1);
 
         if (page == 1) {
 
-            prev = '/apps?page=' + (page);
 
+            prev = '/apps/' + (page);
 
         }
 
         if (page == last_page) {
 
-            next = '/apps?page=' + (page);
 
+            next = '/apps/' + (page);
 
         }
 
 
         let apps_list = '';

+ 16 - 15
routes/index.js
Ver ficheiro 

@@ -3,14 +3,14 @@ const router = express.Router();
 
 
 const { Dashboard, AddSite, RemoveSite, RefreshSites, DisableSite, EnableSite } = require("../controllers/dashboard");
 
 const { Login, processLogin, Logout, Register, processRegister } = require("../controllers/auth");
 
-
 
 const { Apps, searchApps, Install, Uninstall } = require("../controllers/apps");
 
+
 
 const { Users } = require("../controllers/users");
 
 const { Account } = require("../controllers/account");
 
 const { Settings } = require("../controllers/settings");
 
 
 
-
 
+// Dashboard
 
 router.get("/", Dashboard);
 
 router.post("/addsite", AddSite)
 
 router.post("/removesite", RemoveSite)
 
@@ -18,30 +18,31 @@ router.get("/refreshsites", RefreshSites)
 
 router.post("/disablesite", DisableSite)
 
 router.post("/enablesite", EnableSite)
 
 
+// Auth
 
+router.get("/login",Login);
 
+router.post("/login",processLogin);
 
+router.get("/register", Register);
 
+router.post("/register",processRegister);
 
+router.get("/logout",Logout);
 
 
-router.post("/install", Install)
 
-router.post("/uninstall", Uninstall)
 
-
 
-
 
-
 
-router.get("/users", Users);
 
-
 
+// Apps page
 
 router.get("/apps", Apps);
 
 router.get("/apps/:page", Apps);
 
+router.get("/apps/:template/:page", Apps);
 
 router.post("/apps", searchApps);
 
 
+
 
+
 
+// Settings page
 
 router.get("/settings", Settings);
 
 router.get("/account", Account);
 
 
-router.get("/login",Login); // Login page
 
-router.post("/login",processLogin); // Process login
 
 
-router.get("/register", Register); // Register page
 
-router.post("/register",processRegister); // Process Register
 
-
 
-router.get("/logout",Logout); // Logout
 
 
+router.post("/install", Install)
 
+router.post("/uninstall", Uninstall)
 
 
+router.get("/users", Users);
 
 
 
 module.exports = router;

+ 5 - 5
views/pages/account.ejs
Ver ficheiro 

@@ -6,8 +6,8 @@
 
 		<meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
 		<title>Settings - Tabler - Premium and Open Source dashboard template with responsive and high quality UI.</title>
 
 		<!-- CSS files -->
 
-		<link href="./css/tabler.min.css?1684106062" rel="stylesheet"/>
 
-		<link href="./css/demo.min.css?1684106062" rel="stylesheet"/>
 
+		<link href="/css/tabler.min.css?1684106062" rel="stylesheet"/>
 
+		<link href="/css/demo.min.css?1684106062" rel="stylesheet"/>
 
 		<style>
 
 		@import url('https://rsms.me/inter/inter.css');
 
 		:root {
 
@@ -19,7 +19,7 @@
 
 		</style>
 
 	</head>
 
 	<body >
 
-		<script src="./js/demo-theme.min.js?1684106062"></script>
 
+		<script src="/js/demo-theme.min.js?1684106062"></script>
 
 		<div class="page">
 
 		<!-- Navbar -->
 
 		<%- include('../partials/navbar.ejs') %>
 
@@ -139,7 +139,7 @@
 
 		</div>
 
 		<!-- Libs JS -->
 
 		<!-- Tabler Core -->
 
-		<script src="./js/tabler.min.js?1684106062" defer></script>
 
-		<script src="./js/demo.min.js?1684106062" defer></script>
 
+		<script src="/js/tabler.min.js?1684106062" defer></script>
 
+		<script src="/js/demo.min.js?1684106062" defer></script>
 
 	</body>
 
 	</html>

+ 5 - 5
views/pages/apps.ejs
Ver ficheiro 

@@ -6,8 +6,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
     <title>Apps list.</title>
 
     <!-- CSS files -->
 
-    <link href="./css/tabler.min.css?1685973381" rel="stylesheet"/>
 
-    <link href="./css/demo.min.css?1685973381" rel="stylesheet"/>
 
+    <link href="/css/tabler.min.css?1685973381" rel="stylesheet"/>
 
+    <link href="/css/demo.min.css?1685973381" rel="stylesheet"/>
 
     <style>
 
       @import url('https://rsms.me/inter/inter.css');
 
       :root {
 
@@ -19,7 +19,7 @@
 
     </style>
 
   </head>
 
   <body >
 
-    <script src="./js/demo-theme.min.js?1685973381"></script>
 
+    <script src="/js/demo-theme.min.js?1685973381"></script>
 
     <div class="page">
 
       <!-- Navbar -->
 
 
@@ -105,7 +105,7 @@
 
     </div>
 
     <!-- Libs JS -->
 
     <!-- Tabler Core -->
 
-    <script src="./js/tabler.min.js?1685973381" defer></script>
 
-    <script src="./js/demo.min.js?1685973381" defer></script>
 
+    <script src="/js/tabler.min.js?1685973381" defer></script>
 
+    <script src="/js/demo.min.js?1685973381" defer></script>
 
   </body>
 
 </html>

+ 7 - 7
views/pages/dashboard.ejs
Ver ficheiro 

@@ -6,9 +6,9 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
     <title>Dashboard.</title>
 
     <!-- CSS files -->
 
-    <link href="./css/tabler.min.css?1684106062" rel="stylesheet"/>
 
-    <link href="./css/demo.min.css?1684106062" rel="stylesheet"/>
 
-    <link href="./css/meters.css" rel="stylesheet"/>
 
+    <link href="/css/tabler.min.css?1684106062" rel="stylesheet"/>
 
+    <link href="/css/demo.min.css?1684106062" rel="stylesheet"/>
 
+    <link href="/css/meters.css" rel="stylesheet"/>
 
     <style>
 
       @import url('https://rsms.me/inter/inter.css');
 
       :root {
 
@@ -294,13 +294,13 @@
 
     
 
     <!-- Libs JS -->
 
-    <script src="./libs/apexcharts/dist/apexcharts.min.js?1684106062" defer></script>
 
+    <script src="/libs/apexcharts/dist/apexcharts.min.js?1684106062" defer></script>
 
     <!-- Tabler Core -->
 
-    <script src="./js/tabler.min.js?1684106062" defer></script>
 
-    <script src="./js/demo.min.js?1684106062" defer></script>
 
+    <script src="/js/tabler.min.js?1684106062" defer></script>
 
+    <script src="/js/demo.min.js?1684106062" defer></script>
 
     <!-- Socket.io -->
 
     <script src="/socket.io/socket.io.js"></script>
 
-    <script src="./js/main.js"></script>
 
+    <script src="/js/main.js"></script>
 
     
   </body>
 
 </html>

+ 5 - 5
views/pages/login.ejs
Ver ficheiro 

@@ -6,8 +6,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
     <title>DweebUI - Login</title>
 
     <!-- CSS files -->
 
-    <link href="./css/tabler.min.css?1674944402" rel="stylesheet"/>
 
-    <link href="./css/demo.min.css?1674944402" rel="stylesheet"/>
 
+    <link href="/css/tabler.min.css?1674944402" rel="stylesheet"/>
 
+    <link href="/css/demo.min.css?1674944402" rel="stylesheet"/>
 
     <style>
 
       @import url('https://rsms.me/inter/inter.css');
 
       :root {
 
@@ -19,7 +19,7 @@
 
     </style>
 
   </head>
 
   <body  class=" d-flex flex-column">
 
-    <script src="./js/demo-theme.js?1674944402"></script>
 
+    <script src="/js/demo-theme.js?1674944402"></script>
 
     <div class="page page-center">
 
       <div class="container container-tight py-4">
 
         <div class="text-center mb-4">
 
@@ -75,7 +75,7 @@
 
     </div>
 
     <!-- Libs JS -->
 
     <!-- Tabler Core -->
 
-    <script src="./js/tabler.min.js?1674944402" defer></script>
 
-    <script src="./js/demo.min.js?1674944402" defer></script>
 
+    <script src="/js/tabler.min.js?1674944402" defer></script>
 
+    <script src="/js/demo.min.js?1674944402" defer></script>
 
   </body>
 
 </html>

+ 5 - 5
views/pages/register.ejs
Ver ficheiro 

@@ -6,8 +6,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
     <title>DweebUI - Register</title>
 
     <!-- CSS files -->
 
-    <link href="./css/tabler.min.css?1684106062" rel="stylesheet"/>
 
-    <link href="./css/demo.min.css?1684106062" rel="stylesheet"/>
 
+    <link href="/css/tabler.min.css?1684106062" rel="stylesheet"/>
 
+    <link href="/css/demo.min.css?1684106062" rel="stylesheet"/>
 
     <style>
 
       @import url('https://rsms.me/inter/inter.css');
 
       :root {
 
@@ -19,7 +19,7 @@
 
     </style>
 
   </head>
 
   <body  class=" d-flex flex-column">
 
-    <script src="./js/demo-theme.js?1684106062"></script>
 
+    <script src="/js/demo-theme.js?1684106062"></script>
 
     <div class="page page-center">
 
 
       
@@ -181,7 +181,7 @@
 
     </div>
 
     <!-- Libs JS -->
 
     <!-- Tabler Core -->
 
-    <script src="./js/tabler.min.js?1684106062" defer></script>
 
-    <script src="./js/demo.min.js?1684106062" defer></script>
 
+    <script src="/js/tabler.min.js?1684106062" defer></script>
 
+    <script src="/js/demo.min.js?1684106062" defer></script>
 
   </body>
 
 </html>

+ 5 - 5
views/pages/settings.ejs
Ver ficheiro 

@@ -14,8 +14,8 @@
 
 		<meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
 		<title>Settings</title>
 
 		<!-- CSS files -->
 
-		<link href="./css/tabler.min.css?1684106062" rel="stylesheet"/>
 
-		<link href="./css/demo.min.css?1684106062" rel="stylesheet"/>
 
+		<link href="/css/tabler.min.css?1684106062" rel="stylesheet"/>
 
+		<link href="/css/demo.min.css?1684106062" rel="stylesheet"/>
 
 		<style>
 
 		@import url('https://rsms.me/inter/inter.css');
 
 		:root {
 
@@ -27,7 +27,7 @@
 
 		</style>
 
 	</head>
 
 	<body >
 
-		<script src="./js/demo-theme.min.js?1684106062"></script>
 
+		<script src="/js/demo-theme.min.js?1684106062"></script>
 
 		<div class="page">
 
 		<!-- Navbar -->
 
 		<%- include('../partials/navbar.ejs') %>
 
@@ -139,7 +139,7 @@
 
 		</div>
 
 		<!-- Libs JS -->
 
 		<!-- Tabler Core -->
 
-		<script src="./js/tabler.min.js?1684106062" defer></script>
 
-		<script src="./js/demo.min.js?1684106062" defer></script>
 
+		<script src="/js/tabler.min.js?1684106062" defer></script>
 
+		<script src="/js/demo.min.js?1684106062" defer></script>
 
 	</body>
 
 	</html>

+ 5 - 5
views/pages/users.ejs
Ver ficheiro 

@@ -14,8 +14,8 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge"/>
 
     <title>Users</title>
 
     <!-- CSS files -->
 
-    <link href="./css/tabler.min.css?1685973381" rel="stylesheet"/>
 
-    <link href="./css/demo.min.css?1685973381" rel="stylesheet"/>
 
+    <link href="/css/tabler.min.css?1685973381" rel="stylesheet"/>
 
+    <link href="/css/demo.min.css?1685973381" rel="stylesheet"/>
 
     <style>
 
       @import url('https://rsms.me/inter/inter.css');
 
       :root {
 
@@ -27,7 +27,7 @@
 
     </style>
 
   </head>
 
   <body >
 
-    <script src="./js/demo-theme.min.js?1685973381"></script>
 
+    <script src="/js/demo-theme.min.js?1685973381"></script>
 
     <div class="page">
 
       <!-- Navbar -->
 
       
@@ -75,7 +75,7 @@
 
     </div>
 
     <!-- Libs JS -->
 
     <!-- Tabler Core -->
 
-    <script src="./js/tabler.min.js?1685973381" defer></script>
 
-    <script src="./js/demo.min.js?1685973381" defer></script>
 
+    <script src="/js/tabler.min.js?1685973381" defer></script>
 
+    <script src="/js/demo.min.js?1685973381" defer></script>
 
   </body>
 
 </html>

+ 1 - 1
views/partials/navbar.ejs
Ver ficheiro 

@@ -53,7 +53,7 @@
 
     </button>
 
     <h1 class="navbar-brand navbar-brand-autodark d-none-navbar-horizontal pe-0 pe-md-3">
 
       <a href="#">
 
-        <img src="./static/logo.svg" width="110" height="32" alt="Tabler" class="navbar-brand-image">
 
+        <img src="/static/logo.svg" width="110" height="32" alt="Tabler" class="navbar-brand-image">
 
       </a>
 
     </h1>
 
     <div class="navbar-nav flex-row order-md-last">

+ 0 - 0
views/partials/site_list.ejs
Ver ficheiro


+ 0 - 12
views/partials/users_list.ejs
Ver ficheiro 

@@ -1,12 +0,0 @@
 
-<tr>
 
-  <td><input class="form-check-input" type="checkbox"></td>
 
-  <td>1</td>
 
-  <td><span class="avatar me-2" style="background-image: url(./static/avatars/burns.jpg)"></span></td>
 
-  <td>John Doe</td>
 
-  <td>JDoe</td>
 
-  <td>JDoe@gmail.com</td>
 
-  <td>685468468465138</td>
 
-  <td>Admin</td>
 
-  <td><span class="badge badge-outline text-green">Active</span></td>
 
-  <td><a href="#" class="btn">Edit</a></td>
 
-</tr>

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