Skip to content

Commit 58f0ca1

Browse files
ddraykoddrayko
authored
Merge branch 'beta' into main
2 parents c967956 + b873c28 commit 58f0ca1

17 files changed

Lines changed: 4193 additions & 2255 deletions

File tree

‎.github/workflows/deploy-beta.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
name: Deploy Beta
2-
3-
on:
4-
push:
5-
branches: [beta]
6-
7-
jobs:
8-
deploy:
9-
runs-on: ubuntu-latest
10-
steps:
11-
- name: SSH and deploy
12-
uses: appleboy/ssh-action@v1.2.0
13-
with:
14-
host: ${{ secrets.SSH_HOST }}
15-
username: ${{ secrets.SSH_USER }}
16-
password: ${{ secrets.SSH_PASSWORD }}
17-
port: ${{ secrets.SSH_PORT || 22 }}
18-
script: |
19-
cd ${{ secrets.BETA_PATH }}
20-
cp .env /tmp/beta.env 2>/dev/null; cp port.txt /tmp/beta.port.txt 2>/dev/null
21-
git fetch origin --prune
22-
git checkout beta
23-
git reset --hard origin/beta
24-
cp /tmp/beta.env .env 2>/dev/null; cp /tmp/beta.port.txt port.txt 2>/dev/null
25-
grep 'discord.zero-host.org' public/js/app.js || echo "⚠ DISCORD LINK NOT FOUND IN FILE"
26-
head -20 port.txt 2>/dev/null || echo "⚠ port.txt missing or empty"
27-
npm install
28-
pm2 restart beta
1+
name: Deploy Beta
2+
3+
on:
4+
push:
5+
branches: [beta]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: SSH and deploy
12+
uses: appleboy/ssh-action@v1.2.0
13+
with:
14+
host: ${{ secrets.SSH_HOST }}
15+
username: ${{ secrets.SSH_USER }}
16+
password: ${{ secrets.SSH_PASSWORD }}
17+
port: ${{ secrets.SSH_PORT || 22 }}
18+
script: |
19+
cd ${{ secrets.BETA_PATH }}
20+
cp .env /tmp/beta.env 2>/dev/null; cp port.txt /tmp/beta.port.txt 2>/dev/null
21+
git fetch origin --prune
22+
git checkout beta
23+
git reset --hard origin/beta
24+
cp /tmp/beta.env .env 2>/dev/null; cp /tmp/beta.port.txt port.txt 2>/dev/null
25+
grep 'discord.zero-host.org' public/js/app.js || echo "⚠ DISCORD LINK NOT FOUND IN FILE"
26+
head -20 port.txt 2>/dev/null || echo "⚠ port.txt missing or empty"
27+
npm install
28+
pm2 restart beta

‎.github/workflows/deploy-main.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
name: Deploy Main
2-
3-
on:
4-
push:
5-
branches: [main]
6-
7-
jobs:
8-
deploy:
9-
runs-on: ubuntu-latest
10-
steps:
11-
- name: SSH and deploy
12-
uses: appleboy/ssh-action@v1.2.0
13-
with:
14-
host: ${{ secrets.SSH_HOST }}
15-
username: ${{ secrets.SSH_USER }}
16-
password: ${{ secrets.SSH_PASSWORD }}
17-
port: ${{ secrets.SSH_PORT || 22 }}
18-
script: |
19-
cd ${{ secrets.MAIN_PATH }}
20-
cp .env /tmp/main.env 2>/dev/null; cp port.txt /tmp/main.port.txt 2>/dev/null
21-
git fetch origin --prune
22-
git checkout main
23-
git reset --hard origin/main
24-
cp /tmp/main.env .env 2>/dev/null; cp /tmp/main.port.txt port.txt 2>/dev/null
25-
npm install
26-
pm2 restart zerohost-dashboard
1+
name: Deploy Main
2+
3+
on:
4+
push:
5+
branches: [main]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: SSH and deploy
12+
uses: appleboy/ssh-action@v1.2.0
13+
with:
14+
host: ${{ secrets.SSH_HOST }}
15+
username: ${{ secrets.SSH_USER }}
16+
password: ${{ secrets.SSH_PASSWORD }}
17+
port: ${{ secrets.SSH_PORT || 22 }}
18+
script: |
19+
cd ${{ secrets.MAIN_PATH }}
20+
cp .env /tmp/main.env 2>/dev/null; cp port.txt /tmp/main.port.txt 2>/dev/null
21+
git fetch origin --prune
22+
git checkout main
23+
git reset --hard origin/main
24+
cp /tmp/main.env .env 2>/dev/null; cp /tmp/main.port.txt port.txt 2>/dev/null
25+
npm install
26+
pm2 restart zerohost-dashboard

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Contributing
2-
3-
All pull requests **must** target the `beta` branch.
4-
5-
Any PR targeting `main` directly will be closed without review.
6-
7-
Once changes are validated on `beta`, they are merged into `main` by the maintainers.
1+
# Contributing
2+
3+
All pull requests **must** target the `beta` branch.
4+
5+
Any PR targeting `main` directly will be closed without review.
6+
7+
Once changes are validated on `beta`, they are merged into `main` by the maintainers.

‎README.md‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# ZeroHost Dashboard
22

3-
Game server management dashboard for the ZeroHost platform. Provides user-facing server lifecycle management (creation, renewal, suspension, deletion) backed by a Pyrodactyl/Pterodactyl panel API.
3+
Game server management dashboard for the ZeroHost platform. Provides user-facing server lifecycle management (creation, renewal, suspension, deletion) backed by a panel API.
4+
5+
[![ZeroHost](https://img.zero-host.org/assets/github.png)](https://github.com/ZeroHost-Code/legal/blob/main/zhsl.md)
46

57
<img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/3bf1a711-9923-4089-8a12-94bbc134c41b" />
68

79
---
810

911
## Table of Contents
1012

13+
- [Panel Compatibility](#panel-compatibility)
1114
- [Architecture Overview](#architecture-overview)
1215
- [Tech Stack](#tech-stack)
1316
- [Project Structure](#project-structure)
@@ -22,6 +25,15 @@ Game server management dashboard for the ZeroHost platform. Provides user-facing
2225

2326
---
2427

28+
## Panel Compatibility
29+
30+
| Panel | Status |
31+
|---|---|
32+
| Pterodactyl | ⚠️ Not fully tested |
33+
| Pyrodactyl | ✅ Tested — working |
34+
| Hydrodactyl | ✅ Tested — working |
35+
| Pelican | ❓ Not tested |
36+
2537
## Architecture Overview
2638

2739
```mermaid
@@ -543,9 +555,3 @@ Two deployment workflows are configured:
543555
- **deploy-main.yml**: Triggered on push to `main` branch.
544556

545557
Both use SSH credentials configured as GitHub repository secrets (`SSH_HOST`, `SSH_USER`, `SSH_PASSWORD`, `SSH_PORT`).
546-
547-
---
548-
549-
## GH Stats
550-
551-
![Alt](https://repobeats.axiom.co/api/embed/2f957f930d36f4a2913f8aeb07712cedbd4b38c5.svg "Repobeats analytics image")

0 commit comments

Comments
 (0)