Skip to content

Commit

Permalink
Run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
pierr3 committed Jun 4, 2024
1 parent 5460bfc commit 3e94d2d
Show file tree
Hide file tree
Showing 41 changed files with 2,542 additions and 2,789 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install Python 3.x
uses: actions/setup-python@v5
with:
python-version: "3.11.x"
python-version: '3.11.x'

- name: Update cmake
if: matrix.os != 'macos-latest'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install Python 3.x
uses: actions/setup-python@v5
with:
python-version: "3.11.x"
python-version: '3.11.x'

- name: Update cmake
if: matrix.os != 'macos-latest'
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
dmg_file=$(find . -name "*.dmg" -type f)
new_dmg_file=$(echo $dmg_file | sed 's/arm64/apple-silicon/')
mv $dmg_file $new_dmg_file
- id: relinfo
uses: pozetroninc/github-action-get-latest-release@master
with:
Expand All @@ -176,7 +176,7 @@ jobs:
if: matrix.os == 'macos-latest'
with:
tag_name: ${{ steps.relinfo.outputs.release }}
files: "dist/*.dmg"
files: 'dist/*.dmg'

- name: Upload artifacts
uses: softprops/action-gh-release@v2
Expand Down
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ pnpm-lock.yaml
LICENSE.md
tsconfig.json
tsconfig.*.json
backend
node_modules
resources
scripts
2,060 changes: 980 additions & 1,080 deletions LICENSES_COMPILED.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ Read this document entirely first. If you can't find the answer to your problem,

TrackAudio is available in the [AUR](https://aur.archlinux.org/packages/trackaudio-bin) and can be installed using your favourite AUR helper, for example:

* `yay -S trackaudio-bin`
* `paru -S trackaudio-bin`
- `yay -S trackaudio-bin`
- `paru -S trackaudio-bin`

#### Debian

Expand Down
12 changes: 6 additions & 6 deletions backend/src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "afv-native/atcClientWrapper.h"
#include "afv-native/event.h"
#include "afv-native/hardwareType.h"
#include "spdlog/spdlog.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/spdlog.h"
#include <absl/strings/ascii.h>
#include <absl/strings/match.h>
#include <atomic>
Expand Down Expand Up @@ -640,13 +640,13 @@ void CreateLoggers()
{
auto max_size = 1048576 * 5;
auto max_files = 3;
std::string fileName = std::string(FileSystem::GetStateFolderPath().string() + "trackaudio.log");
auto trackaudio_logger = spdlog::rotating_logger_mt("trackaudio_logger",
fileName, max_size, max_files);
std::string fileName
= std::string(FileSystem::GetStateFolderPath().string() + "trackaudio.log");
auto trackaudio_logger
= spdlog::rotating_logger_mt("trackaudio_logger", fileName, max_size, max_files);

spdlog::set_default_logger(trackaudio_logger);
auto afv_logger = spdlog::rotating_logger_mt(
"afv_logger", fileName, max_size, max_files);
auto afv_logger = spdlog::rotating_logger_mt("afv_logger", fileName, max_size, max_files);

// NOLINTNEXTLINE this cannot be solved here but in afv
afv_native::api::setLogger(
Expand Down
2 changes: 1 addition & 1 deletion electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default defineConfig({
'@renderer': resolve('src/renderer/src'),
'~bootstrap': resolve(__dirname, 'node_modules/bootstrap'),
'~bootstrap-icons': resolve(__dirname, 'node_modules/bootstrap-icons'),
'~bootstrap-typeahead': resolve(__dirname, 'node_modules/react-bootstrap-typeahead'),
'~bootstrap-typeahead': resolve(__dirname, 'node_modules/react-bootstrap-typeahead')
}
},
plugins: [react()]
Expand Down
34 changes: 24 additions & 10 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
import pluginReactConfig from "eslint-plugin-react/configs/recommended.js";

import globals from 'globals'
import pluginJs from '@eslint/js'
import tseslint from 'typescript-eslint'
import pluginReactConfig from 'eslint-plugin-react/configs/recommended.js'

export default [
{
files: ["src/**/*.{tsx,ts,js,jsx}"],
languageOptions: { globals: { ...globals.browser, ...globals.node } },
files: ['src/**/*.{tsx,ts,js,jsx}'],
languageOptions: { globals: { ...globals.browser, ...globals.node } }
},
{
ignores: ["node_modules/**/*", "resources/**/*", "dist/**/*", "build/**/*", "backend/**/*", "old/**/*", "out/**/*", "scripts/**/*", "public/**/*", "coverage/**/*", "test/**/*", "tests/**/*", "mocks/**/*", "docs/**/*"],
ignores: [
'node_modules/**/*',
'resources/**/*',
'dist/**/*',
'build/**/*',
'backend/**/*',
'old/**/*',
'out/**/*',
'scripts/**/*',
'public/**/*',
'coverage/**/*',
'test/**/*',
'tests/**/*',
'mocks/**/*',
'docs/**/*'
]
},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
pluginReactConfig,
{ settings: { react: { version: "detect" } } }
];
{ settings: { react: { version: 'detect' } } }
]
26 changes: 13 additions & 13 deletions license_report_config.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"output": "markdown",
"fields": [
"name",
"relatedTo",
"licenseType",
"installedVersion",
"definedVersion",
"remoteVersion",
"latestRemoteVersion",
"latestRemoteModified",
"author"
]
}
"output": "markdown",
"fields": [
"name",
"relatedTo",
"licenseType",
"installedVersion",
"definedVersion",
"remoteVersion",
"latestRemoteVersion",
"latestRemoteModified",
"author"
]
}
22 changes: 11 additions & 11 deletions src/main/config.d.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
export interface Configuration {
audioApi: number;
audioInputDeviceId: string;
headsetOutputDeviceId: string;
speakerOutputDeviceId: string;
audioApi: number
audioInputDeviceId: string
headsetOutputDeviceId: string
speakerOutputDeviceId: string

cid: string;
password: string;
callsign: string;
cid: string
password: string
callsign: string

hardwareType: number;
radioGain: number;
hardwareType: number
radioGain: number

alwaysOnTop: boolean;
consentedToTelemetry: boolean | undefined;
alwaysOnTop: boolean
consentedToTelemetry: boolean | undefined
}
Loading

0 comments on commit 3e94d2d

Please sign in to comment.