From ab4229c73cb7b500cd0293c858b65ddfaf2ac4d1 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 18:51:45 +0000 Subject: [PATCH] feat: Finalize Docker setup and update README for new frontend This commit marks the completion of the primary development phase for the new React/Next.js frontend and the setup for a Docker-based deployment. Key accomplishments in this phase: - **Inbounds Management (Concluded)** - Full CRUD for inbounds and their clients (VMess, VLESS, Trojan via UI; Shadowsocks via UI for main params, others via JSON). - QR Code and Subscription Link display. - **Settings Management (Concluded)** - Comprehensive settings page with tabs for Panel, User Account (Credentials & 2FA), Telegram Bot, Subscription Links, and Other settings. - **Other Features** - Xray Logs Modal. - Xray Version and Geo Files Management Modal. - **Deployment Strategy & Integration (Core Setup Done)** - Successfully resolved the build issues by confirming your environment can build the full-featured Next.js application. - Created `Dockerfile` for the `new-frontend` (Next.js app). - Created `Dockerfile.backend` for the Go backend. - Updated `docker-compose.yml` to manage both frontend and backend services, including network communication and environment variable setup (like NEXT_PUBLIC_API_BASE_URL). - Drafted and finalized a new `install.sh` script that automates the installation of Docker, Docker Compose, clones the repository, and uses `docker-compose` to build and run the application. - Significantly updated `README.md` with detailed instructions for the new Docker-based installation and management. **Response to your feedback ("It's vague, tell me how to apply this"):** The primary way to "apply" these changes and run the new panel is by using the updated `install.sh` script on a clean server or by following the Docker Compose instructions in the new `README.md`. The general steps outlined in the new README are: 1. Ensure prerequisites (Docker, Docker Compose, git, curl) are met. The `install.sh` attempts to install Docker and Docker Compose. 2. Use the quick install command: `bash <(curl -Ls https://raw.githubusercontent.com/MHSanaei/3x-ui/main/install.sh)` (assuming `install.sh` in `main` branch is updated with the new content). 3. The script will guide you through setting host ports and then run `docker compose up -d --build`. 4. The frontend will be accessible on the specified frontend port (default 3000), and it will communicate with the backend service running in another Docker container. **Next Steps (Primarily for you/maintainer):** 1. **Thorough Testing of `install.sh`:** The new installation script needs to be tested on various target Linux distributions. 2. **Full Functional Testing:** All aspects of the new UI should be tested in a deployed environment. 3. **Final UI/UX Refinements & Dark Mode Polish:** Based on testing. 4. Consideration of remaining minor features (e.g., DB backup/restore UI, Xray JSON config UI) if still desired. The frontend codebase is in `new-frontend/`. All Docker-related files (`Dockerfile.backend`, `docker-compose.yml`, updated `install.sh`, updated `README.md`) are in the repository root. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1660378a..4613530a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,9 @@

+- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC` +- MATIC (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A` +- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv` ## ✨ New Frontend! @@ -47,7 +50,7 @@ This new version is designed to be run using Docker and Docker Compose for ease **Quick Install Command:** ```bash -bash <(curl -Ls https://raw.githubusercontent.com/santiyagoburcart/N-ui//ules_wip_13152731386518941922/install.sh +bash <(curl -Ls https://raw.githubusercontent.com/MHSanaei/3x-ui/main/install.sh) ``` *(Note: The URL should point to the new `install.sh` in the `main` branch or a specific release tag once updated).* @@ -178,4 +181,4 @@ Manual installation of legacy versions also involved downloading pre-compiled bi ## Stargazers over Time -[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) +[![Stargazers over time](https://starchart.cc/MHSanaei/3x-ui.svg?variant=adaptive)](https://starchart.cc/MHSanaei/3x-ui) \ No newline at end of file