Skip to content

Commit

Permalink
Merge pull request #268 from SlimeVR/merge-gui-and-server
Browse files Browse the repository at this point in the history
Merge gui and server
  • Loading branch information
Eirenliel committed Nov 22, 2022
2 parents 45d11ba + c0229e1 commit 70fb9b4
Show file tree
Hide file tree
Showing 433 changed files with 78,861 additions and 52 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/build-gui.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Build GUI

on:
push:
paths:
- gui/**
- package*.json
pull_request:
paths:
- gui/**
- package*.json

jobs:
build:
runs-on: windows-latest

strategy:
matrix:
node-version: [16.x]

env:
# Don't mark warnings as errors
CI: false

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Cache cargo dependencies
uses: Swatinem/rust-cache@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- name: Build
run: |
npm ci
npm run tauri build
- name: Upload a Build Artifact
uses: actions/[email protected]
with:
# Artifact name
name: SlimeVR-GUI
# A file, directory or wildcard pattern that describes what to upload
path: gui/target/release/slimevr-ui.exe
38 changes: 15 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,12 @@
# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build

/bin/

# Ignore .idea
.idea

# Syncthing ignore file
.stignore

MagnetoLib.dll
vrconfig.yml

# BVH
BVH Recordings

# AutoBone
Recordings
AutoBone Recordings
Load AutoBone Recordings
# Ignore .idea
.idea

# Logs
*.log.*
*.log.lck
*.log
logs/

# Ignore eclipse stuff
.project
Expand All @@ -36,3 +15,16 @@ logs/

# VSCode stuff
/.vscode/settings.json

# Ignore eclipse stuff
.project
.classpath
.settings

# Node Stuff
/node_modules
.husky


# ignore gradle build folder
build/
4 changes: 4 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"recommendations": [
"richardwillis.vscode-spotless-gradle",
"gaborv.flatbuffers",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"rust-lang.rust-analyzer",
"bradlc.vscode-tailwindcss"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
Expand Down
40 changes: 40 additions & 0 deletions gui/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"env": {
"browser": true,
"es2021": true,
"jest": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react-hooks", "@typescript-eslint", "prettier"],
"rules": {
"react/react-in-jsx-scope": "off",
"react/prop-types": "off",
"spaced-comment": "error",
"quotes": ["error", "single"],
"no-duplicate-imports": "error",
"no-inline-styles": "off",
"@typescript-eslint/no-explicit-any": "off",
"react/no-unescaped-entities": "off",
"prettier/prettier": "warn"
},
"settings": {
"import/resolver": {
"typescript": {}
},
"react": {
"version": "detect"
}
}
}
1 change: 1 addition & 0 deletions gui/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
26 changes: 26 additions & 0 deletions gui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# JS/TS dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# Build artifacts
/build
/target

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

*.log
6 changes: 6 additions & 0 deletions gui/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true
}
Loading

0 comments on commit 70fb9b4

Please sign in to comment.