Skip to content

Commit 4e1d7ef

Browse files
timonmdytimonmdy
authored
Merge pull request #35 from timonmdy/v2.2/hotfix-2
V2.2/hotfix 2
2 parents 9c210a8 + d26797d commit 4e1d7ef

108 files changed

Lines changed: 1053 additions & 2038 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/format-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Code Formatting
22

3-
on: [push, pull_request]
3+
on: [pull_request]
44

55
jobs:
66
check:

‎.prettierrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"tabWidth": 2,
77
"endOfLine": "lf",
88
"objectWrap": "preserve",
9-
"bracketSameLine": false
9+
"bracketSameLine": false,
10+
"plugins": ["prettier-plugin-organize-imports"]
1011
}

‎languages/de.json‎

Lines changed: 0 additions & 335 deletions
This file was deleted.

‎package-lock.json‎

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"electron-builder": "^24.9.0",
3636
"postcss": "^8.4.0",
3737
"prettier": "^3.8.1",
38+
"prettier-plugin-organize-imports": "^4.3.0",
3839
"rimraf": "^5.0.0",
3940
"tailwindcss": "^3.4.0",
4041
"terser": "^5.28.0",

‎src/main/AssetManager.ts‎

Lines changed: 0 additions & 286 deletions
This file was deleted.

src/main/rest-api/Base.routes.ts renamed to src/main/api/Base.routes.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ok } from '../RestAPI';
2-
import { processManager } from '../ProcessManager';
3-
import { defineRoute, RouteMap } from '../shared/types/RestAPI.types';
4-
import { getAllProfiles, getSettings, saveSettings } from '../Store';
5-
import { AppSettings } from '../shared/types/App.types';
61
import { version } from '../../../package.json';
2+
import { ok } from '../core/RestAPI';
3+
import { getAllProfiles, getSettings, saveSettings } from '../core/Store';
4+
import { processManager } from '../core/process/ProcessManager';
5+
import { AppSettings } from '../shared/types/App.types';
6+
import { defineRoute, RouteMap } from '../shared/types/RestAPI.types';
77

88
export const BaseRoutes: RouteMap = {
99
status: defineRoute('status', ({ res }) =>

src/main/rest-api/Log.routes.ts renamed to src/main/api/Log.routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { err, ok } from '../RestAPI';
1+
import { deleteLogFile, getLogFiles, readLogFile } from '../core/process/FileLogger';
2+
import { err, ok } from '../core/RestAPI';
23
import { defineRoute, RouteMap } from '../shared/types/RestAPI.types';
3-
import { getLogFiles, readLogFile, deleteLogFile } from '../FileLogger';
44

55
export const LogRoutes: RouteMap = {
66
logs_list: defineRoute('logs_list', ({ res, params }) => {

src/main/rest-api/Process.routes.ts renamed to src/main/api/Process.routes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { err, ok } from '../RestAPI';
1+
import { processManager } from '../core/process/ProcessManager';
2+
import { err, ok } from '../core/RestAPI';
3+
import { getAllProfiles } from '../core/Store';
24
import { defineRoute, RouteMap } from '../shared/types/RestAPI.types';
3-
import { processManager } from '../ProcessManager';
4-
import { getAllProfiles } from '../Store';
55

66
export const ProcessRoutes: RouteMap = {
77
processes_list: defineRoute('processes_list', ({ res }) => ok(res, processManager.getStates())),

0 commit comments

Comments
 (0)