chore(github): use ui/dist for all assets

solareon · Jun 30, 2024 · 29f4159 · 29f4159
1 parent 791305e
commit 29f4159
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/debugbuild.yml b/.github/workflows/debugbuild.yml
@@ -51,7 +51,7 @@ jobs:
                 mkdir -p ./temp/${{ github.event.repository.name }}/ui
                 cp ./{README.md,LICENSE,fxmanifest.lua} ./temp/${{ github.event.repository.name }}
                 cp -r ./{client,bridge,server} ./temp/${{ github.event.repository.name }}
-                cp -r ./ui/{public,dist} ./temp/${{ github.event.repository.name }}/ui/
+                cp -r ./ui/dist ./temp/${{ github.event.repository.name }}/ui/
                 cd ./temp && zip -r ../${{ github.event.repository.name }}.zip ./${{ github.event.repository.name }}
                 
             - name: Upload Build Artifact

diff --git a/client/main.lua b/client/main.lua
@@ -30,7 +30,7 @@ CreateThread(function()
             defaultApp = true,
             ui = GetCurrentResourceName() .. "/ui/dist/index.html",
             -- ui = "http://localhost:3000", -- for local ui build testing
-            icon = "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/public/icon.svg",
+            icon = "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/dist/icon.svg",
             fixBlur = true,
             onUse = function()
                 lib.callback('slrn_groups:server:getSetupAppData', false, function(setupAppData)
@@ -41,8 +41,8 @@ CreateThread(function()
                 end)
             end,
             images = { -- OPTIONAL array of screenshots of the app, used for showcasing the app
-            "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/public/screenshot-light.png",
-            "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/public/screenshot-dark.png"
+            "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/dist/screenshot-light.png",
+            "https://cfx-nui-" .. GetCurrentResourceName() .. "/ui/dist/screenshot-dark.png"
         },
         })
         if not added then

diff --git a/ui/package.json b/ui/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "lb-phone-app-template-react",
+    "name": "slrn_groups",
     "version": "2.0.0",
     "private": true,
     "homepage": "./",