lllllllillllllillll před 1 rokem
rodič
revize
1893be7efc
4 změnil soubory, kde provedl 11 přidání a 5 odebrání
  1. 1 1
      app.js
  2. 7 1
      controllers/dashboard.js
  3. 2 2
      views/pages/dashboard.ejs
  4. 1 1
      views/partials/footer.ejs

+ 1 - 1
app.js

@@ -12,7 +12,7 @@ app.locals.site_list = '';
 
 
 const redisClient = require('redis').createClient({
 const redisClient = require('redis').createClient({
     url: 'redis://DweebCache:6379',
     url: 'redis://DweebCache:6379',
-    password:'eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81',
+    password: process.env.REDIS_PASS,
     legacyMode:true
     legacyMode:true
 });
 });
 redisClient.connect().catch(console.log);
 redisClient.connect().catch(console.log);

+ 7 - 1
controllers/dashboard.js

@@ -1,6 +1,5 @@
 const User = require('../database/UserModel');
 const User = require('../database/UserModel');
 
 
-
 exports.Dashboard = async function (req, res) {
 exports.Dashboard = async function (req, res) {
 
 
     if (req.session.role == "admin") {
     if (req.session.role == "admin") {
@@ -8,6 +7,12 @@ exports.Dashboard = async function (req, res) {
         // get user data with matching UUID from sqlite database
         // get user data with matching UUID from sqlite database
         let user = await User.findOne({ where: { UUID: req.session.UUID } });
         let user = await User.findOne({ where: { UUID: req.session.UUID } });
 
 
+        let caddy = 'd-none';
+
+        if (process.env.Proxy_Manager == 'enabled') {
+            caddy = '';
+        }
+
         // Render the home page
         // Render the home page
         res.render("pages/dashboard", {
         res.render("pages/dashboard", {
             name: user.first_name + ' ' + user.last_name,
             name: user.first_name + ' ' + user.last_name,
@@ -15,6 +20,7 @@ exports.Dashboard = async function (req, res) {
             avatar: user.avatar,
             avatar: user.avatar,
             isLoggedIn: true,
             isLoggedIn: true,
             site_list: req.app.locals.site_list,
             site_list: req.app.locals.site_list,
+            caddy: caddy
         });
         });
     } else {
     } else {
         // Redirect to the login page
         // Redirect to the login page

+ 2 - 2
views/pages/dashboard.ejs

@@ -126,7 +126,7 @@
                 </div>
                 </div>
               </div>
               </div>
 
 
-              <div class="col-12 mt-12">
+              <div class="col-12 mt-12 <%- caddy %>">
                 <div class="card">
                 <div class="card">
                   <div class="card-header">
                   <div class="card-header">
                     <h3 class="card-title">Caddy Proxy Manager</h3>
                     <h3 class="card-title">Caddy Proxy Manager</h3>
@@ -248,7 +248,7 @@
 
 
                   </form>
                   </form>
                                         
                                         
-                    <p class="m-0 text-muted ms-auto">./caddyfiles/Caddyfile</p>
+                    <p class="m-0 text-muted ms-auto">caddy:/etc/caddy</p>
 
 
                   </div>
                   </div>
                 </div>
                 </div>

+ 1 - 1
views/partials/footer.ejs

@@ -24,7 +24,7 @@
           </li>
           </li>
           <li class="list-inline-item">
           <li class="list-inline-item">
             <a href="#" class="link-secondary" rel="noopener">
             <a href="#" class="link-secondary" rel="noopener">
-              v0.05
+              v0.06
             </a>
             </a>
           </li>
           </li>
         </ul>
         </ul>