chore: nui perf increase + fix menu link

tabarra · Dec 30, 2023 · 2377dc1 · 2377dc1
1 parent 71aa41e
commit 2377dc1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/core/components/WebServer/getReactIndex.ts b/core/components/WebServer/getReactIndex.ts
@@ -178,5 +178,12 @@ export default async function getReactIndex(ctx: CtxWithVars | AuthedCtx) {
         htmlOut = htmlOut.replaceAll(replacerRegex, value);
     }
 
+    //If in prod mode and NUI, replace the entry point with the local one
+    //This is required because of how badly the WebPipe handles "large" files
+    if (!ctx.txVars.isWebInterface && !convars.isDevMode){
+        htmlOut = htmlOut.replace(/src="\.\/index.js"/, 'src="nui://monitor/panel/index.js"');
+        htmlOut = htmlOut.replace(/href="\.\/index.css"/, 'href="nui://monitor/panel/index.css"');
+    }
+
     return htmlOut;
 }
diff --git a/docs/dev_notes.md b/docs/dev_notes.md
@@ -222,6 +222,7 @@ Quickies
 - [x] commit the fixes for the player ids and god mode issues
 > BETA RELEASE
 
+- [ ] feat(menu): add keymapping for tp to waypoint (PR #886)
 - [ ] fix the tsc build
 - [ ] do i need to add a input type hidden with the username in the add master and account modal so vaults can save it both?
 - [ ] put in server name in the login page, to help lost admins notice they are in the wrong txAdmin

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '7.0.0-dev'
+version '7.0.0-beta1'
 ui_label 'txAdmin'
 
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'
@@ -65,6 +65,7 @@ files {
     'nui/**/*',
 
     -- WebPipe optimization:
+    'panel/**/*',
     'web/public/css/coreui.min.css',
     'web/public/css/jquery-confirm.min.css',
     'web/public/css/txAdmin.css',

diff --git a/panel/src/layout/DesktopNavbar.tsx b/panel/src/layout/DesktopNavbar.tsx
@@ -125,6 +125,13 @@ export default function DesktopHeader() {
                                 Diagnostics
                             </HeaderMenuLink>
                             <HeaderMenuLink
+                                className="w-36 justify-start"
+                                href="/system/system-logs"
+                                disabled={!hasPerm('txadmin.log.view')}
+                            >
+                                System Logs
+                            </HeaderMenuLink>
+                            {/* <HeaderMenuLink
                                 className="w-36 justify-start"
                                 href="/system/console-log"
                                 disabled={!hasPerm('txadmin.log.view')}
@@ -137,7 +144,7 @@ export default function DesktopHeader() {
                                 disabled={!hasPerm('txadmin.log.view')}
                             >
                                 Action Log
-                            </HeaderMenuLink>
+                            </HeaderMenuLink> */}
                         </NavigationMenuContent>
                     </NavigationMenuItem>
                 </NavigationMenuList>

diff --git a/panel/src/layout/MainRouter.tsx b/panel/src/layout/MainRouter.tsx
@@ -59,10 +59,20 @@ const allRoutes: RouteType[] = [
         children: <Iframe legacyUrl="systemLog#nav-console" />
     },
     {
-        path: '/system/action-log',
-        title: 'Action Log',
-        children: <Iframe legacyUrl="systemLog#nav-actions" />
+        path: '/system/system-logs',
+        title: 'System Logs',
+        children: <Iframe legacyUrl="systemLog" />
     },
+    // {
+    //     path: '/system/console-log',
+    //     title: 'Console Log',
+    //     children: <Iframe legacyUrl="systemLog#nav-console" />
+    // },
+    // {
+    //     path: '/system/action-log',
+    //     title: 'Action Log',
+    //     children: <Iframe legacyUrl="systemLog#nav-actions" />
+    // },
 
     //Server Routes
     {