Skip to content

Commit

Permalink
Merge pull request #196 from pierr3/new-design
Browse files Browse the repository at this point in the history
New Design
  • Loading branch information
pierr3 authored Nov 4, 2024
2 parents 5ba0441 + 220659c commit 401016b
Show file tree
Hide file tree
Showing 62 changed files with 3,876 additions and 596 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ lib-cov
coverage
*.lcov

.vs
# nyc test coverage
.nyc_output

Expand Down
6 changes: 6 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
"presentation": {
"hidden": true
}
},
{
"type": "lldb",
"request": "attach",
"name": "Debug Electron Renderer",
"pid": "${command:pickProcess}"
}
],
"compounds": [
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"files.associations": {
"xstring": "cpp"
}
}
1 change: 1 addition & 0 deletions backend/extern/libuiohook
Submodule libuiohook added at d8c369
2 changes: 1 addition & 1 deletion backend/vcpkg
Submodule vcpkg updated 3310 files
3 changes: 3 additions & 0 deletions dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
provider: generic
url: https://example.com/auto-updates
updaterCacheDirName: trackaudio-updater
5 changes: 5 additions & 0 deletions electron-builder-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ module.exports = {
directories: {
buildResources: 'build'
},
publish: {
provider: 's3',
bucket: 'trackaudio',
region: 'eu-west-2'
},
files: [
'!**/.vscode/*',
'!src/*',
Expand Down
138 changes: 124 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"build:win": "npm run build && electron-builder --win -c electron-builder-config.js",
"build:mac": "npm run build && electron-builder --mac -c electron-builder-config.js",
"build:linux": "npm run build && electron-builder --linux -c electron-builder-config.js",
"build:publish": "npm run build && electron-builder --win -c electron-builder-config.js --publish=always",
"build:backend": "cd backend && npm install && npm run build && cd .. && npm install ./backend/trackaudio-afv-1.0.0.tgz",
"build:backend-fast": "cd backend && npm install && npm run build-fast && cd .. && npm install ./backend/trackaudio-afv-1.0.0.tgz"
},
Expand All @@ -31,9 +32,11 @@
"bootstrap-typeahead": "^2.3.2",
"clsx": "^2.1.1",
"electron-store": "^8.2.0",
"electron-updater": "^6.3.9",
"react": "^18.3.1",
"react-bootstrap-icons": "^1.11.4",
"react-dom": "^18.3.1",
"react-responsive": "^10.0.0",
"scss": "^0.2.4",
"trackaudio-afv": "file:backend/trackaudio-afv-1.0.0.tgz",
"use-debounce": "^10.0.1",
Expand All @@ -50,7 +53,7 @@
"@types/react": "^18.3.3",
"@vitejs/plugin-react": "^4.0.0",
"electron": "^32.0.2",
"electron-builder": "24.13.3",
"electron-builder": "^24.13.3",
"electron-vite": "^2.0.0",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.2",
Expand Down
Loading

0 comments on commit 401016b

Please sign in to comment.