diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index e681b74..142251a 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -17,7 +17,12 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.BETA_PATH }} + cp .env /tmp/beta.env 2>/dev/null; cp port.txt /tmp/beta.port.txt 2>/dev/null git fetch origin - git checkout -B beta origin/beta + git reset --hard origin/beta + git checkout -B beta + cp /tmp/beta.env .env 2>/dev/null; cp /tmp/beta.port.txt port.txt 2>/dev/null + grep 'discord.zero-host.org' public/js/app.js || echo "⚠ DISCORD LINK NOT FOUND IN FILE" + head -20 port.txt 2>/dev/null || echo "⚠ port.txt missing or empty" npm install pm2 restart beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index f7102e4..fe910c6 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -17,7 +17,10 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.MAIN_PATH }} + cp .env /tmp/main.env 2>/dev/null; cp port.txt /tmp/main.port.txt 2>/dev/null git fetch origin - git checkout -B main origin/main + git reset --hard origin/main + git checkout -B main + cp /tmp/main.env .env 2>/dev/null; cp /tmp/main.port.txt port.txt 2>/dev/null npm install pm2 restart zerohost-dashboard diff --git a/public/index.html b/public/index.html index 3fdaa5a..7c1c6d6 100644 --- a/public/index.html +++ b/public/index.html @@ -4,6 +4,7 @@ ZeroHost Dashboard + diff --git a/public/js/app.js b/public/js/app.js index d72bc22..7babbbc 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -382,6 +382,10 @@ async function renderDashboard() { View Status + + + Join Discord +
@@ -1552,3 +1556,4 @@ function init() { } init(); + diff --git a/server.js b/server.js index 2b28d50..690ef6f 100644 --- a/server.js +++ b/server.js @@ -20,7 +20,9 @@ import { migrate } from './config/migrate.js'; import { query } from './config/db.js'; const app = express(); -const PORT = process.env.PORT || parseInt(readFileSync(resolve(__dirname, 'port.txt'), 'utf-8').trim(), 10) || 3000; +let portFromFile = 3000; +try { portFromFile = parseInt(readFileSync(resolve(__dirname, 'port.txt'), 'utf-8').trim(), 10) || 3000; } catch {} +const PORT = process.env.PORT || portFromFile; const trustProxy = process.env.NODE_ENV === 'production';