Skip to content

Commit

Permalink
docs: random text changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tabarra committed Mar 4, 2023
1 parent 3a97792 commit 0ed944b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 25 deletions.
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Join our Discord Server: &nbsp; <a href="https://discord.gg/AFAAXzq"><img src="https://discordapp.com/api/guilds/577993482761928734/widget.png?style=shield"></img></a>
</h4>
<p align="center">
<b>txAdmin</b> is a <b>full featured</b> web panel to Manage & Monitor your FiveM/RedM Server remotely, in use by over <strong>18000</strong> servers worldwide at any given time.
<b>txAdmin</b> is a <b>full featured</b> web panel to Manage & Monitor your FiveM/RedM Server remotely, in use by over <strong>20.000</strong> servers worldwide at any given time.
</p>
<p align="center">
<a href="https://zap-hosting.com/txadmin4" target="_blank" rel="noopener">
Expand All @@ -26,9 +26,9 @@
- Start/Stop/Restart your server instance or resources
- Server tick time performance chart ([example](https://i.imgur.com/VG8hpzr.gif))
- Full-featured in-game admin menu:
- Player Mode: NoClip, God
- Player Mode: NoClip, God, SuperJump
- Teleport: waypoint, coords and back
- Vehicle: Spawn, Fix, Delete
- Vehicle: Spawn, Fix, Delete, Boost
- Heal: yourself, everyone
- Send Announcements
- Reset World Area
Expand All @@ -43,9 +43,9 @@
- Action logging
- Brute-force protection
- Discord Integration:
- Server status command (`/status`)
- Add to Whitelist command (`/addwl`)
- Command spam prevention
- Server configurable, persistent, auto-updated status embed
- Command to whitelist players
- Command to display player infos
- Monitoring:
- Auto Restart FXServer on crash
- Server’s CPU/RAM consumption
Expand All @@ -55,17 +55,16 @@
- Player Manager:
- [Warning system](https://www.youtube.com/watch?v=DeE0-5vtZ4E)
- Ban (temporary or permanently) system
- Whitelist system
- Whitelist system (Discord member, Discord Role, Approved License, Admin-only)
- Take notes about players
- Keep track of player's play and session time
- Import bans from EasyAdmin, BanSQL, vMenu, vRP, el_bwh
- Self-contained player database with backup tool (no MySQL required!)
- Clean/Optimize the database by removing old players, or bans/warns/whitelists
- Real-time playerlist
- Scheduled restarts with warning announcements and custom events ([more info](docs/events.md))
- Translation Support ([more info](docs/translation.md))
- FiveM's Server CFG editor & validator
- Responsive web interface with Dark Mode 😎
- Responsive(ish) web interface with Dark Mode 😎

Also, check our [Feature Graveyard](docs/feature_graveyard.md) for the features that are no longer among us (RIP).

Expand Down
4 changes: 2 additions & 2 deletions core/components/DiscordBot/slash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ApplicationCommandDataResolvable, ApplicationCommandOptionType, Applica
const statusCommand: ApplicationCommandDataResolvable = {
type: ApplicationCommandType.ChatInput,
name: 'status',
description: 'Status embed commands;',
description: 'Adds or removes the configurable, persistent, auto-updated embed.',
options: [
{
type: ApplicationCommandOptionType.Subcommand,
Expand All @@ -22,7 +22,7 @@ const statusCommand: ApplicationCommandDataResolvable = {
const whitelistCommand: ApplicationCommandDataResolvable = {
type: ApplicationCommandType.ChatInput,
name: 'whitelist',
description: 'Status embed commands.',
description: 'Whitelist embed commands.',
options: [
{
type: ApplicationCommandOptionType.Subcommand,
Expand Down
14 changes: 5 additions & 9 deletions docs/dev_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# TODO:
- [ ] fix: menu > send announcement does not drigger discord msg nor custom event
- [x] fix diagnostics data error on pterodactyl
- [ ] fix: menu > send announcement does not trigger discord msg nor custom event
- [ ] check why the bot cannot use an announcement channel for announcements (isTextBased() issue?)

(function() {
Expand Down Expand Up @@ -33,14 +34,6 @@ end

criar variáveis globais setadas no shared, pra salvar o trabalho de dar GetConvar em todo arquivo

===================
### MUI update
5.10.17 ok
5.11.0 broken
To test it, remove the `^`
rm -rf node_modules/; npm i; npm list @mui/material; npm run dev:menu:game
https://github.com/mui/material-ui/blob/master/CHANGELOG.md
===================


### Server resource scanner
Expand Down Expand Up @@ -170,6 +163,7 @@ Whitelist Page/routes:
console.log('aaa', {àa:true});
const {Console} = require('node:console');
const ogConsole = new Console({
//we can pipe this through something that logs the output
stdout: process.stdout,
stderr: process.stderr,
colorMode: true,
Expand Down Expand Up @@ -357,6 +351,8 @@ https://youtu.be/3elGSZSWTbM
around 12:00
https://immerjs.github.io/immer/ maybe?

if tailwind, check https://daisyui.com/docs/themes/


### Update Event + Rollout strategy
This is not compatible with the update events.
Expand Down
4 changes: 3 additions & 1 deletion docs/feature_graveyard.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ And as part of the process, we "retired" many features and parts of our code bas
- **Experiments:** Well... not much to experience with right now;
- **Discord static commands:** I don't think anyone ever used it since they can do it with basically any other bot;
- **Set process priority:** Although it was quite requested in the beginning, people just don't seem to use it;
- **Menu Weed troll effect:** It was just too similar to the drunk effect one, not worth keeping.
- **Menu Weed troll effect:** It was just too similar to the drunk effect one, not worth keeping;
- **Discord /status command:** Removed to give place for the persistent & auto-updated embed message;
- **Import bans from EasyAdmin, BanSQL, vMenu, vRP, el_bwh:** It was there for over a year, who wanted to migrate could have migrated already. Furthermore it is kinda easy write code to import it directly into the database JSON file;

Don't cry because they are gone.
Smile because they existed :)
3 changes: 0 additions & 3 deletions web/main/settings.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,17 @@
<a class="nav-item nav-link <%= activeTab === 'playerManager' ? 'active' : '' %>" id="nav-playerManager-tab" data-toggle="tab" href="#nav-playerManager"
role="tab" aria-controls="nav-playerManager" aria-selected="true">
Player Manager
&nbsp; <span class="badge badge-danger">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-item nav-link <%= activeTab === 'discord' ? 'active' : '' %>" id="nav-discord-tab" data-toggle="tab" href="#nav-discord"
role="tab" aria-controls="nav-discord" aria-selected="true">
Discord
&nbsp; <span class="badge badge-danger">NEW</span>
</a>
</li>
<li class="nav-item">
<a class="nav-item nav-link <%= activeTab === 'menu' ? 'active' : '' %>" id="nav-menu-tab" data-toggle="tab" href="#nav-menu" role="tab" aria-controls="nav-menu" aria-selected="true">
Game
&nbsp; <span class="badge badge-danger">NEW</span>
</a>
</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion web/parts/header.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<a class="c-sidebar-nav-link" href="settings">
<svg class="c-sidebar-nav-icon">
<use href="img/coreui_icons.svg#cil-settings"></use>
</svg> Settings <span class="badge badge-danger">NEW</span>
</svg> Settings
</a>
</li>
<li class="c-sidebar-nav-item">
Expand Down

0 comments on commit 0ed944b

Please sign in to comment.