lllllllillllllillll 1 năm trước cách đây
mục cha
commit
d4211f72c6

+ 12 - 6
CHANGELOG.md

@@ -1,9 +1,15 @@
-## v0.08 (dev)
-* Added SECRET field to register page as a simple security measure.
-* dashCard links now use server IP.
-* Added option to hide containers.
-* Added 'Reset View' option.
-* Removed the VPN, Firewall, and VNC placeholders.
+## v0.08 (Dec 15th 2023)
+* Updates to compose file and instructions from [steveiliop56](https://github.com/steveiliop56)
+* Added SECRET field to compose file as a basic security measure.
+* Visibility button to hide containers or reset view.
+* Container link now uses server IP address.
+* More compact container card, with style options planned.
+* Improved log view.
+* Removed VPN, Firewall, and VNC buttons.
+* Updated dependencies (Sequelize 6.35.2)
+* Fixed web pages not using the "public" static folder.
+* Small tweaks to router.
+* Replaced the default icon shown for missing icons (docker.png).
 
 
 ## v0.07 (Dec 8th 2023)
 ## v0.07 (Dec 8th 2023)
 * View container logs.
 * View container logs.

+ 4 - 5
README.md

@@ -4,13 +4,12 @@ DweebUI is a simple Docker web interface created using Javascript, Node.JS, and
 Pre-Pre-Pre-Pre-Pre Alpha v0.08 ( :fire: Experimental. Don't install on any servers you care about :fire: )
 Pre-Pre-Pre-Pre-Pre Alpha v0.08 ( :fire: Experimental. Don't install on any servers you care about :fire: )
 
 
 [![GitHub Stars](https://img.shields.io/github/stars/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll)
 [![GitHub Stars](https://img.shields.io/github/stars/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll)
-[![GitHub License](https://img.shields.io/github/license/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll/DweebUI/blob/main/LICENSE)
 [![GitHub Activity](https://img.shields.io/github/commit-activity/y/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll)
 [![GitHub Activity](https://img.shields.io/github/commit-activity/y/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll)
 [![Docker Pulls](https://img.shields.io/docker/pulls/lllllllillllllillll/dweebui)](https://hub.docker.com/repository/docker/lllllllillllllillll/dweebui)
 [![Docker Pulls](https://img.shields.io/docker/pulls/lllllllillllllillll/dweebui)](https://hub.docker.com/repository/docker/lllllllillllllillll/dweebui)
+[![GitHub License](https://img.shields.io/github/license/lllllllillllllillll/DweebUI)](https://github.com/lllllllillllllillll/DweebUI/blob/main/LICENSE)
 
 
 
 
-* This is a personal project that I decided to share.
-* This is the first project I've ever released and I'm sure it's full of plenty of bugs and mistakes.
+* This is a personal project that I decided to share. I'm sure it has plenty of bugs and mistakes.
 * I haven't used Github very much and I'm still new to Javascript.
 * I haven't used Github very much and I'm still new to Javascript.
 * I probably should have waited a lot longer to share this :|
 * I probably should have waited a lot longer to share this :|
 
 
@@ -34,7 +33,7 @@ Pre-Pre-Pre-Pre-Pre Alpha v0.08 ( :fire: Experimental. Don't install on any serv
 * [x] Templates.json maintains compatability with Portainer, allowing you to use the template without needing to use DweebUI.
 * [x] Templates.json maintains compatability with Portainer, allowing you to use the template without needing to use DweebUI.
 * [x] Automatically persists data in docker volumes if bind mount isn't used.
 * [x] Automatically persists data in docker volumes if bind mount isn't used.
 * [ ] Preset variables (planned).
 * [ ] Preset variables (planned).
-* [ ] Offline/Local Only (planned).
+* [ ] Offline/Local Icons (planned).
 
 
 
 
 ## Setup
 ## Setup
@@ -46,7 +45,7 @@ services:
 
 
   dweebui:
   dweebui:
     container_name: dweebui
     container_name: dweebui
-    image: lllllllillllllillll/dweebui:v0.08-dev
+    image: lllllllillllllillll/dweebui:v0.08
     # build:
     # build:
     #   context: .
     #   context: .
     environment:
     environment:

+ 3 - 3
components/dashCard.js

@@ -6,8 +6,8 @@ module.exports.dashCard = function dashCard(data) {
 
 
   if (style == "Large") {
   if (style == "Large") {
     iconSize = 'width="150px"'
     iconSize = 'width="150px"'
-  } else if (style == "Compact") {
-    iconSize = 'width="110px"'
+  } else if ((style == "Compact") || (style == undefined)) {
+    iconSize = 'width="100px"'
     margin = 'style="margin-bottom: 0;"'
     margin = 'style="margin-bottom: 0;"'
   } else if (style == "Row") {
   } else if (style == "Row") {
     iconSize = 'width="50px"'
     iconSize = 'width="50px"'
@@ -128,7 +128,7 @@ module.exports.dashCard = function dashCard(data) {
       <div class="card">
       <div class="card">
         <div class="card-body">
         <div class="card-body">
           <div class="card-stamp card-stamp-sm">
           <div class="card-stamp card-stamp-sm">
-            <img ${iconSize} src="https://raw.githubusercontent.com/lllllllillllllillll/DweebUI-Icons/main/${service}.png" onerror="this.onerror=null;this.src='https://raw.githubusercontent.com/lllllllillllllillll/DweebUI-Icons/main/dweebui.png';"></img>
+            <img ${iconSize} src="https://raw.githubusercontent.com/lllllllillllllillll/DweebUI-Icons/main/${service}.png" onerror="this.onerror=null;this.src='https://raw.githubusercontent.com/lllllllillllllillll/DweebUI-Icons/main/docker.png';"></img>
           </div>
           </div>
           <div class="d-flex align-items-center">
           <div class="d-flex align-items-center">
             <div class="subheader text-yellow">${external_port}:${internal_port}</div>
             <div class="subheader text-yellow">${external_port}:${internal_port}</div>

+ 1 - 4
docker-compose.yaml

@@ -1,9 +1,8 @@
 version: "3.9"
 version: "3.9"
 services:
 services:
-
   dweebui:
   dweebui:
     container_name: dweebui
     container_name: dweebui
-    image: lllllllillllllillll/dweebui:v0.08-dev
+    image: lllllllillllllillll/dweebui:v0.08
     # build:
     # build:
     #   context: .
     #   context: .
     environment:
     environment:
@@ -22,12 +21,10 @@ services:
     networks:
     networks:
       - dweeb_network
       - dweeb_network
 
 
-
 volumes:
 volumes:
   dweebui:
   dweebui:
   caddyfiles:
   caddyfiles:
 
 
-
 networks:
 networks:
   dweeb_network:
   dweeb_network:
     driver: bridge
     driver: bridge

+ 1 - 6
functions/package_manager.js

@@ -1,7 +1,7 @@
 const { writeFileSync, mkdirSync, readFileSync } = require("fs");
 const { writeFileSync, mkdirSync, readFileSync } = require("fs");
 const yaml = require('js-yaml');
 const yaml = require('js-yaml');
 
 
-const { exec, execSync } = require("child_process");
+const { execSync } = require("child_process");
 
 
 const { docker } = require('./system');
 const { docker } = require('./system');
 
 
@@ -18,11 +18,6 @@ module.exports.install = async function (data) {
         let { env0, env1, env2, env3, env4, env5, env6, env7, env8, env9, env10, env11 } = data;
         let { env0, env1, env2, env3, env4, env5, env6, env7, env8, env9, env10, env11 } = data;
         let { label0, label1, label2, label3, label4, label5, label6, label7, label8, label9, label10, label11 } = data;
         let { label0, label1, label2, label3, label4, label5, label6, label7, label8, label9, label10, label11 } = data;
 
 
-
-        if ((service_name.includes('caddy')) || (name.includes('caddy'))) {
-            req.app.locals.caddy = 'enabled';
-        }
-
         let docker_volumes = [];
         let docker_volumes = [];
 
 
         if (image.startsWith('https://')){
         if (image.startsWith('https://')){