Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: reworked UI and backend #5

Merged
merged 35 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5cfa717
feat(ui): initial UI redesign
solareon Jun 22, 2024
2cf0e37
refactor(types): remove unused variables
solareon Jun 25, 2024
11f696d
chore(gitignore): modify gitignore
solareon Jun 25, 2024
ac010a0
refactor(ui): styling
solareon Jun 26, 2024
80fdd18
refactor(ui): themeing
solareon Jun 26, 2024
aa799d5
refactor(ui): cleanup datastores
solareon Jun 26, 2024
9231e1c
fix(ui): use stores correctly
solareon Jun 26, 2024
5573704
feat(groups): basic conversion
FjamZoo Jun 25, 2024
eb79f4e
chore(groups): add missing parameters
FjamZoo Jun 25, 2024
79cd7f9
chore(groups): add blip data
FjamZoo Jun 25, 2024
172c53d
chore(groups): Introduce API module
FjamZoo Jun 25, 2024
473391b
fix(groups): linting errors
FjamZoo Jun 25, 2024
ae24947
feat(groups): Intial work on internal resource
FjamZoo Jun 25, 2024
36234e8
feat(groups): Convert more events to new backend
FjamZoo Jun 25, 2024
ddd1697
chore(groups): port remaining functions
FjamZoo Jun 26, 2024
544eb46
refactor(groups): Update groups.lua
FjamZoo Jun 26, 2024
740b994
feat(groups): Reorganize files
FjamZoo Jun 26, 2024
4bc6160
rewrite(ui): adapt to new ui
solareon Jun 26, 2024
9224b17
feat(groups): move group functions to seperate client file (#3)
FjamZoo Jun 27, 2024
3f74cfa
fix(ui): move UI directory and correct type issues
solareon Jun 27, 2024
3042af7
feat(bridge): bridge for multiple core support
solareon Jun 28, 2024
cc6a1a8
refactor: use playerId and remove citizenid
solareon Jun 28, 2024
94a9d2c
feat(groups): triggerGroupEvent (#4)
FjamZoo Jun 28, 2024
40e7ea9
feat(bridge): bridge support
solareon Jun 28, 2024
45caf31
fix(ui): task list not showing data
solareon Jun 29, 2024
5f0147a
refactor(github): github actions and icon
solareon Jun 29, 2024
f1510b2
chore(readme): update readme
solareon Jun 29, 2024
099b9e4
chore(github): optimize CI check
solareon Jun 29, 2024
813855e
refactor(groups): use unique ids for groups
solareon Jun 30, 2024
a282b24
chore(github): tweak debug build
solareon Jun 30, 2024
6eac24b
chore(github): use ui/dist for all assets
solareon Jun 30, 2024
b45e7f0
fix(server/main): add version check back
solareon Jun 30, 2024
bb84c23
chore(github): add debugbuild.yml
solareon Jun 30, 2024
69fd87b
chore(github): modify CI check action
solareon Jul 2, 2024
1a4d3e6
Merge branch 'main' into rework-ui
solareon Jul 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@ insert_final_newline = false
indent_style = space
charset = utf-8
trim_trailing_whitespace = true
indent_size = 2
indent_style = space

[*.lua]
indent_size = 4
indent_style = space
61 changes: 61 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Main CI
on: [push, pull_request]
jobs:
build:
name: Build Test
runs-on: ubuntu-latest
defaults:
run:
working-directory: ui

steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Get Commit Range
id: get_commit_range
run: |
if [ "${{ github.event_name }}" == "push" ]; then
echo "commit_range=${{ github.event.before }}...${{ github.sha }}" >> $GITHUB_ENV
else
echo "commit_range=${{ github.event.pull_request.base.sha }}...${{ github.sha }}" >> $GITHUB_ENV
fi

- name: Check for changes in UI directory
id: check_changes
run: |
if git diff --quiet ${{ env.commit_range }} -- ui; then
echo "No changes in UI directory. Skipping step."
echo "skip_step=true" >> $GITHUB_ENV
else
echo "Changes detected in UI directory. Proceeding with step."
echo "skip_step=false" >> $GITHUB_ENV
fi

- name: Install pnpm
if: env.skip_step == 'false'
uses: pnpm/action-setup@v4
with:
version: 9

- name: Setup node environment
if: env.skip_step == 'false'
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "pnpm"
cache-dependency-path: "ui/pnpm-lock.yaml"

- name: Install deps
if: env.skip_step == 'false'
run: pnpm install --frozen-lockfile
working-directory: ui

- name: Try build
if: env.skip_step == 'false'
run: pnpm build
working-directory: ui
env:
CI: true
13 changes: 4 additions & 9 deletions .github/workflows/debugbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ name: "Debug Build Action"

on:
workflow_dispatch:
inputs:
branch:
description: 'Branch to run the workflow on'
required: true
default: 'main'

jobs:
debug-build:
Expand Down Expand Up @@ -51,11 +46,11 @@ 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 ./temp/${{ github.event.repository.name }}/ui/public
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
uses: actions/upload-artifact@v4
with:
name: debug-build
path: ${{ github.event.repository.name }}.zip
name: ${{ github.event.repository.name }}
path: ./temp/
14 changes: 13 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
ref: ${{ github.event.pull_request.head.sha }}
- name: Check for lua changes
id: check_changes
run: |
if git diff --quiet HEAD^ HEAD -- '*.lua'; then
echo "No changes to lua files. Skipping step."
echo "skip_step=true" >> $GITHUB_ENV
else
echo "Changes detected to lua files. Proceeding with step."
echo "skip_step=false" >> $GITHUB_ENV
fi
- name: Lint
if: env.skip_step == 'false'
uses: iLLeniumStudios/fivem-lua-lint-action@v2
with:
capture: "junit.xml"
args: "-t --formatter JUnit"
extra_libs: ox_lib+mysql+qblocales+qbox+qbox_playerdata+qbox_lib
- name: Generate Lint Report
if: always()
if: env.skip_step == 'false'
uses: mikepenz/action-junit-report@v4
with:
report_paths: "**/junit.xml"
Expand Down
32 changes: 28 additions & 4 deletions .github/workflows/release-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,37 @@ jobs:
- name: Install ZIP
run: sudo apt install zip

- name: Install pnpm
uses: pnpm/action-setup@v4.0.0
with:
version: 9

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "pnpm"
cache-dependency-path: "ui/pnpm-lock.yaml"

- name: Install dependencies
run: pnpm i --frozen-lockfile
working-directory: ui

- name: Run build
run: pnpm build
working-directory: ui
env:
CI: false

- name: Bundle files
run: |
rm -rf ./.github ./.vscode ./.git
shopt -s extglob
mkdir ./${{ github.event.repository.name }}
cp -r !(${{ github.event.repository.name }}) ${{ github.event.repository.name }}
zip -r ./${{ github.event.repository.name }}.zip ./${{ github.event.repository.name }}
mkdir -p ./temp/${{ github.event.repository.name }}
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 ./temp/${{ github.event.repository.name }}/ui/public
cd ./temp && zip -r ../${{ github.event.repository.name }}.zip ./${{ github.event.repository.name }}

- name: Get App Token
uses: actions/create-github-app-token@v1
Expand Down
Loading