Skip to content

Commit e45d321

Browse files
chore: prettier auto format
1 parent 2abff9e commit e45d321

File tree

4 files changed

+29
-34
lines changed

4 files changed

+29
-34
lines changed

src/main/web/lib/tabs/SettingsTab/Selector.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
fileViewButton.addEventListener("click", () => {
115115
tabs.forEach((tab) => {
116116
tab.fileView();
117-
})
117+
});
118118
});
119119
120120
saveButton.addEventListener("click", () => {

src/main/web/lib/tabs/SettingsTab/SettingsTab.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
<div id="settings-tab" class="disabled">
2828
<div class="tab-container relative flex items-center justify-center">
29-
<span class="absolute left-[-80px] top-[25px] transform-[rotate(-30deg)] bg-[red] w-[400px] px-[80px] text-[12px] z-[2]">
30-
Note! "Easy mode" still in beta!<br>Please, be careful, make backups and report if something gone wrong!
29+
<span class="absolute top-[25px] left-[-80px] z-[2] w-[400px] transform-[rotate(-30deg)] bg-[red] px-[80px] text-[12px]">
30+
Note! "Easy mode" still in beta!<br />Please, be careful, make backups and report if something gone wrong!
3131
</span>
3232

3333
{#if configs}

src/main/web/lib/tabs/SettingsTab/Tab.svelte

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<script lang="ts">
22
import { onMount } from "svelte";
3-
import readConfig, {
4-
type AvailableConfigSetting,
5-
ConfigWriters,
6-
type Strategy
7-
} from "../../../scripts/configsManager";
3+
import readConfig, { type AvailableConfigSetting, ConfigWriters, type Strategy } from "../../../scripts/configsManager";
84
import Constants from "../../../scripts/constants";
95
import ToastSystem from "../../../scripts/toastSystem";
106
import slideOnOverflow from "../../../scripts/slideOnOverflow";
@@ -20,7 +16,7 @@
2016
let defaultStrategy: Strategy;
2117
let easyViewPlatesList: Strategy = {};
2218
23-
let platesList: HTMLDivElement[] = []
19+
let platesList: HTMLDivElement[] = [];
2420
2521
export async function update(force: boolean = false) {
2622
if (!tabContainer.classList.contains("disabled") || force) {
@@ -86,9 +82,9 @@
8682
}
8783
8884
function generateEasyConfig() {
89-
let configData: Record<string, any> = {}
85+
let configData: Record<string, any> = {};
9086
91-
platesList.forEach(plate => {
87+
platesList.forEach((plate) => {
9288
const name = plate.querySelector<HTMLSpanElement>(".name")!.innerHTML;
9389
const input = plate.querySelector<HTMLInputElement | HTMLSelectElement>(".input")!;
9490
const type = defaultStrategy[name].type;
@@ -102,12 +98,12 @@
10298
}
10399
});
104100
105-
const result = ConfigWriters.writeConfig(selfConfigSetting.config_type, configData)
101+
const result = ConfigWriters.writeConfig(selfConfigSetting.config_type, configData);
106102
if (result == null) {
107103
ToastSystem.addToQueue("Can't generate config: no such writer/unknown config type", ToastSystem.ToastType.ERROR);
108104
return;
109105
}
110-
textArea.value = result
106+
textArea.value = result;
111107
112108
fileView();
113109
}
@@ -119,7 +115,10 @@
119115

120116
<div class="tab disabled h-full" id={"settings_file|" + selfConfigSetting.selector_name} bind:this={tabContainer}>
121117
<div class="easy-view relative pt-[45px]" bind:this={easyViewDiv}>
122-
<button class="submit bg-[var(--easy-view-setting-background-color)] rounded-[5px] absolute left-[50%] top-0 transform-[translateX(-50%)] flex flex-col items-center justify-center w-[125px] h-[60px] active:w-[120px] active:h-[55px]" onclick={generateEasyConfig}>
118+
<button
119+
class="submit absolute top-0 left-[50%] flex h-[60px] w-[125px] transform-[translateX(-50%)] flex-col items-center justify-center rounded-[5px] bg-[var(--easy-view-setting-background-color)] active:h-[55px] active:w-[120px]"
120+
onclick={generateEasyConfig}
121+
>
123122
<span class="material-symbols-rounded">check_circle</span>
124123
<span>generate config</span>
125124
</button>

src/main/web/scripts/configsManager.ts

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,7 @@ export class ConfigWriters {
156156

157157
function deepMerge(target: any, source: any): any {
158158
for (const key in source) {
159-
if (
160-
key in target &&
161-
typeof target[key] === "object" &&
162-
typeof source[key] === "object" &&
163-
target[key] !== null &&
164-
source[key] !== null
165-
) {
159+
if (key in target && typeof target[key] === "object" && typeof source[key] === "object" && target[key] !== null && source[key] !== null) {
166160
deepMerge(target[key], source[key]);
167161
} else {
168162
target[key] = source[key];
@@ -172,15 +166,17 @@ export class ConfigWriters {
172166
}
173167

174168
function toHocon(obj: any, indent = ""): string {
175-
return Object.entries(obj).map(([key, val]) => {
176-
if (typeof val === "object" && val !== null) {
177-
return `${indent}${key} {\n${toHocon(val, indent + " ")}\n${indent}}\n`;
178-
} else if (typeof val === "string") {
179-
return `${indent}${key} = "${val}"`;
180-
} else {
181-
return `${indent}${key} = ${val}`;
182-
}
183-
}).join("\n");
169+
return Object.entries(obj)
170+
.map(([key, val]) => {
171+
if (typeof val === "object" && val !== null) {
172+
return `${indent}${key} {\n${toHocon(val, indent + " ")}\n${indent}}\n`;
173+
} else if (typeof val === "string") {
174+
return `${indent}${key} = "${val}"`;
175+
} else {
176+
return `${indent}${key} = ${val}`;
177+
}
178+
})
179+
.join("\n");
184180
}
185181

186182
let merged: any = {};
@@ -192,16 +188,16 @@ export class ConfigWriters {
192188
return toHocon(merged);
193189
});
194190

195-
this.register("minecraft", (input: Record<string, any>) => {
196-
let str = ""
191+
this.register("minecraft", (input: Record<string, any>) => {
192+
let str = "";
197193

198194
for (const [name, value] of Object.entries(input)) {
199195
str += `${name}=${value}\n`;
200196
}
201197

202-
return str
198+
return str;
203199
});
204200

205201
// TODO: add more config readers (json, yaml, etc.)
206202
}
207-
}
203+
}

0 commit comments

Comments
 (0)