Refactor settings, DRY up everything

This commit is contained in:
2026-04-21 15:59:55 +04:00
parent a384e83dd0
commit c5316bf336
5 changed files with 122 additions and 107 deletions

View File

@@ -1,25 +1,41 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { action } from '@ember/object';
import { service } from '@ember/service';
import Icon from '#components/icon';
import AppMenuSettingsMapUi from './settings/map-ui';
import AppMenuSettingsApis from './settings/apis';
import AppMenuSettingsNostr from './settings/nostr';
<template>
<div class="sidebar-header">
<button type="button" class="back-btn" {{on "click" @onBack}}>
<Icon @name="arrow-left" @size={{20}} @color="#333" />
</button>
<h2>Settings</h2>
<button type="button" class="close-btn" {{on "click" @onClose}}>
<Icon @name="x" @size={{20}} @color="#333" />
</button>
</div>
export default class AppMenuSettings extends Component {
@service settings;
<div class="sidebar-content">
<section class="settings-section">
<AppMenuSettingsMapUi />
<AppMenuSettingsApis />
<AppMenuSettingsNostr />
</section>
</div>
</template>
@action
updateSetting(key, event) {
let value = event.target.value;
if (value === 'true') value = true;
if (value === 'false') value = false;
this.settings.update(key, value);
}
<template>
<div class="sidebar-header">
<button type="button" class="back-btn" {{on "click" @onBack}}>
<Icon @name="arrow-left" @size={{20}} @color="#333" />
</button>
<h2>Settings</h2>
<button type="button" class="close-btn" {{on "click" @onClose}}>
<Icon @name="x" @size={{20}} @color="#333" />
</button>
</div>
<div class="sidebar-content">
<section class="settings-section">
<AppMenuSettingsMapUi @onChange={{this.updateSetting}} />
<AppMenuSettingsApis @onChange={{this.updateSetting}} />
<AppMenuSettingsNostr @onChange={{this.updateSetting}} />
</section>
</div>
</template>
}

View File

@@ -1,23 +1,13 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { service } from '@ember/service';
import { action } from '@ember/object';
import { fn } from '@ember/helper';
import Icon from '#components/icon';
import eq from 'ember-truth-helpers/helpers/eq';
export default class AppMenuSettingsApis extends Component {
@service settings;
@action
updateApi(event) {
this.settings.updateOverpassApi(event.target.value);
}
@action
updatePhotonApi(event) {
this.settings.updatePhotonApi(event.target.value);
}
<template>
{{! template-lint-disable no-nested-interactive }}
<details>
@@ -31,7 +21,7 @@ export default class AppMenuSettingsApis extends Component {
<select
id="overpass-api"
class="form-control"
{{on "change" this.updateApi}}
{{on "change" (fn @onChange "overpassApi")}}
>
{{#each this.settings.overpassApis as |api|}}
<option
@@ -51,7 +41,7 @@ export default class AppMenuSettingsApis extends Component {
<select
id="photon-api"
class="form-control"
{{on "change" this.updatePhotonApi}}
{{on "change" (fn @onChange "photonApi")}}
>
{{#each this.settings.photonApis as |api|}}
<option

View File

@@ -1,22 +1,12 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { service } from '@ember/service';
import { action } from '@ember/object';
import { fn } from '@ember/helper';
import Icon from '#components/icon';
export default class AppMenuSettingsMapUi extends Component {
@service settings;
@action
toggleKinetic(event) {
this.settings.updateMapKinetic(event.target.value === 'true');
}
@action
toggleQuickSearchButtons(event) {
this.settings.updateShowQuickSearchButtons(event.target.value === 'true');
}
<template>
{{! template-lint-disable no-nested-interactive }}
<details>
@@ -30,7 +20,7 @@ export default class AppMenuSettingsMapUi extends Component {
<select
id="show-quick-search"
class="form-control"
{{on "change" this.toggleQuickSearchButtons}}
{{on "change" (fn @onChange "showQuickSearchButtons")}}
>
<option
value="true"
@@ -54,7 +44,7 @@ export default class AppMenuSettingsMapUi extends Component {
<select
id="map-kinetic"
class="form-control"
{{on "change" this.toggleKinetic}}
{{on "change" (fn @onChange "mapKinetic")}}
>
<option
value="true"

View File

@@ -1,19 +1,12 @@
import Component from '@glimmer/component';
import { on } from '@ember/modifier';
import { service } from '@ember/service';
import { action } from '@ember/object';
import { fn } from '@ember/helper';
import Icon from '#components/icon';
export default class AppMenuSettingsNostr extends Component {
@service settings;
@action
togglePhotoFallbackUploads(event) {
this.settings.updateNostrPhotoFallbackUploads(
event.target.value === 'true'
);
}
<template>
{{! template-lint-disable no-nested-interactive }}
<details>
@@ -28,7 +21,7 @@ export default class AppMenuSettingsNostr extends Component {
<select
id="nostr-photo-fallback-uploads"
class="form-control"
{{on "change" this.togglePhotoFallbackUploads}}
{{on "change" (fn @onChange "nostrPhotoFallbackUploads")}}
>
<option
value="true"