Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tabarra authored Feb 21, 2024
2 parents 0e3d678 + c1523e0 commit 1f52e2a
Show file tree
Hide file tree
Showing 358 changed files with 27,007 additions and 18,728 deletions.
12 changes: 10 additions & 2 deletions .deploy.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
export default {
fxserverPath: 'E:\\FiveM\\6520\\fxserver.exe',
debouncerInterval: 250,
preReleaseExpirationDays: 21,

//NOTE: to test the panel from LAN, change localhost to your LAN IP
//but the NUI will not work due to HTTPS->HTTP restrictions
panelViteUrl: 'http://localhost:40122',
// panelViteUrl: 'http://192.168.0.39:40122',

txAdminArgs: [
'+set', 'txAdminDevMode', 'true',
'+set', 'txAdminVerbose', 'true',
// '+set', 'txAdminPort', '40121',
// '+set', 'txAdminPort', '40125',
// '--trace-warnings',
// '--inspect',
// '--trace-gc',
// '--max-old-space-size=4096', //doesn't work

//FIXME: broken
// '+set', 'txDebugPlayerlistGenerator', 'true',
Expand Down
11 changes: 11 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
env: {
node: true,
commonjs: true,
es2017: true,
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2021,
},
};
2 changes: 1 addition & 1 deletion .github/workflows/build-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
# We fetch to 0 so we can collect the commits
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
# We fetch to 0 so we can collect the commits
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/locale-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Check Locale PR

on:
pull_request:
paths:
- 'locale/**'

jobs:
check-locale-pr:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/[email protected]
with:
node-version: '20'

- name: Install dependencies
run: npm ci

- name: Label PR and enforce base branch
uses: actions/[email protected]
with:
script: |
console.log(JSON.stringify(context.payload.pull_request));
const { repo, owner } = context.repo;
// Get the pull request
const pull_number = context.payload.pull_request.number;
const pull_request = await github.rest.pulls.get({
owner,
repo,
pull_number
});
// Add the 'translation' label
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['translation']
})
// Check if the base branch is 'main' or 'master'
if (pull_request.data.base.ref === 'main' || pull_request.data.base.ref === 'master') {
// Change the base branch to 'develop'
await github.rest.pulls.update({
owner,
repo,
pull_number,
base: 'develop'
});
}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Run locale:check
id: locale-check
run: npm run locale:check
16 changes: 0 additions & 16 deletions .npm-upgrade.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
{
"ignore": {
"open": {
"versions": "> 7.1.0",
"reason": "Doesn't work when powershell is not in PATH or something like that."
},
"fs-extra": {
"versions": ">9",
"reason": "recipe errors on some OSs"
},
"execa": {
"versions": ">5",
"reason": "dependency of the hardcoded windows-release"
},
"windows-release": {
"versions": ">4",
"reason": "inlined to transform it into async"
},
"@types/node": {
"versions": ">16.9.1",
"reason": "fixed to fxserver's node version"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2023 André Tabarra <maintainer@txadm.in>
Copyright (c) 2019-2024 André Tabarra <maintainer@txadmin.gg>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- Monitoring:
- Auto Restart FXServer on crash or hang
- Server’s CPU/RAM consumption
- Live Console (with log file and command history)
- Live Console (with log file, command history and search)
- Server tick time performance chart with player count ([example](https://i.imgur.com/VG8hpzr.gif))
- Server Activity Log (connections/disconnections, kills, chat, explosions and [custom commands](docs/custom_serverlog.md))
- Player Manager:
Expand All @@ -63,7 +63,7 @@
- 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(ish) web interface with Dark Mode 😎
- Responsive 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 Expand Up @@ -92,15 +92,15 @@ ConVar usage **example** for different port and profile:
```

### Contributing & Development
- All PRs should be based on the develop branch, specially translation PRs.
- All PRs should be based on the develop branch, including translation PRs.
- Before putting effort for any significant PR, make sure to join our discord and talk to us, since the change you want to do might not have been done for a reason or there might be some required context.
- If you want to run it from build & source, please do read [this](docs/development.md).


## License, Credits and Thanks
- This project is licensed under the [MIT License](https://github.com/tabarra/txAdmin/blob/master/LICENSE);
- [Favicons](https://www.flaticon.com/free-icon/support_1545728?term=gear%20wrench&page=2&position=11) made by Freepik from [www.flaticon.com](https://www.flaticon.com) are licensed under [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/);
- Warning Sounds ([1](https://freesound.org/people/Ultranova105/sounds/136756/)/[2](https://freesound.org/people/Ultranova105/sounds/136754/)) made by Ultranova105 are licensed under [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/);
- [Announcement Sound](https://freesound.org/people/IENBA/sounds/545495/) made by IENBA is licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/);
- [Message Sound](https://freesound.org/people/Divinux/sounds/198414/) made by Divinux is licensed under [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/);
- Special thanks to everyone that contributed to this project, specially the very fine Discord folks that provide support for others;
- ["Kick" button icons](https://www.flaticon.com/free-icon/users-avatar_8188385) made by __SeyfDesigner__ from [www.flaticon.com](https://www.flaticon.com);
- Warning Sounds ([1](https://freesound.org/people/Ultranova105/sounds/136756/)/[2](https://freesound.org/people/Ultranova105/sounds/136754/)) made by __Ultranova105__ are licensed under [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/);
- [Announcement Sound](https://freesound.org/people/IENBA/sounds/545495/) made by __IENBA__ is licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/);
- [Message Sound](https://freesound.org/people/Divinux/sounds/198414/) made by __Divinux__ is licensed under [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/);
- Especial thanks to everyone that contributed to this project, especially the very fine Discord folks that provide support for others;
3 changes: 0 additions & 3 deletions .eslintrc.js → core/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ module.exports = {
VerifyPasswordHash: 'readonly',
},
extends: [],
parserOptions: {
ecmaVersion: 2021,
},
ignorePatterns: [
'*.ignore.*',
],
Expand Down
36 changes: 36 additions & 0 deletions core/.npm-upgrade.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"ignore": {
"open": {
"versions": "> 7.1.0",
"reason": "Doesn't work when powershell is not in PATH or something like that."
},
"fs-extra": {
"versions": ">9",
"reason": "recipe errors on some OSs"
},
"execa": {
"versions": "^5",
"reason": "following @sindresorhus/windows-release"
},
"windows-release": {
"versions": "^5.1.1",
"reason": "inlined to transform it into async"
},
"nanoid": {
"versions": ">4",
"reason": "dropped support for node 16"
},
"got": {
"versions": ">13",
"reason": "dropped support for node 16"
},
"jose": {
"versions": ">4",
"reason": "dropped support for node 16"
},
"lowdb": {
"versions": ">6",
"reason": "dropped support for node 16"
}
}
}
Loading

0 comments on commit 1f52e2a

Please sign in to comment.