Skip to content

Commit 26c1cac

Browse files
authored
Merge pull request #138 from LukeGus/dev-1.4.0
Dev 1.4.0
2 parents a3db62b + 8dddbaa commit 26c1cac

36 files changed

Lines changed: 4036 additions & 299 deletions

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION=1.3.1
1+
VERSION=1.4.0

CONTRIBUTING.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Contributing
2+
3+
## Prerequisites
4+
5+
- [Node.js](https://nodejs.org/en/download/) (built with v24)
6+
- [NPM](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
7+
- [Git](https://git-scm.com/downloads)
8+
9+
## Installation
10+
11+
1. Clone the repository:
12+
```sh
13+
git clone https://github.com/LukeGus/Termix
14+
```
15+
2. Install the dependencies:
16+
```sh
17+
npm install
18+
```
19+
20+
## Running the development server
21+
22+
Run the following commands:
23+
24+
```sh
25+
npm run dev
26+
npx tsc -p tsconfig.node.json
27+
node ./dist/backend/starter.js
28+
```
29+
30+
This will start the backend and the frontend Vite server. You can access Termix by going to `http://localhost:5174/`.
31+
32+
## Contributing
33+
34+
1. **Fork the repository**: Click the "Fork" button at the top right of
35+
the [repository page](https://github.com/LukeGus/Termix).
36+
2. **Create a new branch**:
37+
```sh
38+
git checkout -b feature/my-new-feature
39+
```
40+
3. **Make your changes**: Implement your feature, fix, or improvement.
41+
4. **Commit your changes**:
42+
```sh
43+
git commit -m "Add feature: my new feature"
44+
```
45+
5. **Push to your fork**:
46+
```sh
47+
git push origin feature/my-new-feature
48+
```
49+
6. **Open a pull request**: Go to the original repository and create a PR with a clear description.
50+
51+
## 📝 Guidelines
52+
53+
- Follow the existing code style. Use Tailwind CSS with shadcn components.
54+
- Place all API routes in the `main-axios.ts` file. Updating the `openapi.json` is unneeded.
55+
- Include meaningful commit messages.
56+
- Link related issues when applicable.

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,17 @@ Termix is an open-source, forever-free, self-hosted all-in-one server management
3737
- **Remote File Editor** - Edit files directly on remote servers with syntax highlighting, file management features (uploading, removing, renaming, deleting files)
3838
- **SSH Host Manager** - Save, organize, and manage your SSH connections with tags and folders
3939
- **Server Stats** - View CPU, memory, and HDD usage on any SSH server
40-
- **User Authentication** - Secure user management with admin controls and OIDC support with more auth types planned
40+
- **User Authentication** - Secure user management with admin controls and OIDC and 2FA (TOTP) support
4141
- **Modern UI** - Clean interface built with React, Tailwind CSS, and Shadcn
4242

4343
# Planned Features
4444
- **Improved Admin Control** - Give more fine-grained control over user and admin permissions, share hosts, etc
45-
- **More auth types** - Add 2FA, TOTP, etc
46-
- **Theming** - Modify themeing for all tools
45+
- **Theming** - Modify theming for all tools
4746
- **Improved Terminal Support** - Add more terminal protocols such as VNC and RDP (anyone who has experience in integrating RDP into a web-application similar to Apache Guacamole, please contact me by creating an issue)
4847
- **Mobile Support** - Support a mobile app or version of the Termix website to manage servers from your phone
4948

5049
# Installation
51-
Visit the Termix [Docs](https://docs.termix.site/docs) for more information on how to install Termix. Otherwise, view a sample docker-compose file here:
50+
Visit the Termix [Docs](https://docs.termix.site/install) for more information on how to install Termix. Otherwise, view a sample docker-compose file here:
5251
```yaml
5352
services:
5453
termix:

0 commit comments

Comments
 (0)