Merge pull request 'Refactor app menu sidebar' (#28) from feature/app_menu into master

Reviewed-on: #28

app/components/app-menu/about.gjs

@@ -0,0 +1,63 @@
+import { on } from '@ember/modifier';
+import Icon from '#components/icon';
+
+<template>
+  <div class="sidebar-header">
+    <button type="button" class="back-btn" {{on "click" @onBack}}>
+      <Icon @name="arrow-left" @size={{20}} @color="#333" />
+    </button>
+    <h2>About</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">
+      <p>
+        <strong>Marco</strong>
+        (as in
+        <a
+          href="https://en.wikipedia.org/wiki/Marco_Polo"
+          target="_blank"
+          rel="noopener"
+        >Marco Polo</a>) is an unhosted maps application that respects your
+        privacy and choices.
+      </p>
+      <p>
+        Connect your own
+        <a
+          href="https://remotestorage.io/"
+          target="_blank"
+          rel="noopener"
+        >remote storage</a>
+        to sync place bookmarks across apps and devices.
+      </p>
+      <ul class="link-list">
+        <li>
+          <a
+            href="https://gitea.kosmos.org/raucao/marco"
+            target="_blank"
+            rel="noopener"
+          >
+            Source Code
+          </a>
+          (<a
+            href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License"
+            target="_blank"
+            rel="noopener"
+          >AGPL</a>)
+        </li>
+        <li>
+          <a
+            href="https://openstreetmap.org/copyright"
+            target="_blank"
+            rel="noopener"
+          >
+            Map Data © OpenStreetMap
+          </a>
+        </li>
+      </ul>
+    </section>
+  </div>
+</template>

app/components/app-menu/home.gjs

@@ -0,0 +1,32 @@
+import { on } from '@ember/modifier';
+import { fn } from '@ember/helper';
+import Icon from '#components/icon';
+
+<template>
+  <div class="sidebar-header">
+    <h2>
+      <img src="/icons/icon-rounded.svg" alt="" width="32" height="32" />
+      Marco
+    </h2>
+    <button type="button" class="close-btn" {{on "click" @onClose}}>
+      <Icon @name="x" @size={{20}} @color="#333" />
+    </button>
+  </div>
+
+  <div class="sidebar-content">
+    <ul class="app-menu">
+      <li>
+        <button type="button" {{on "click" (fn @onNavigate "settings")}}>
+          <Icon @name="settings" @size={{20}} />
+          <span>Settings</span>
+        </button>
+      </li>
+      <li>
+        <button type="button" {{on "click" (fn @onNavigate "about")}}>
+          <Icon @name="info" @size={{20}} />
+          <span>About</span>
+        </button>
+      </li>
+    </ul>
+  </div>
+</template>

app/components/app-menu/index.gjs

@@ -0,0 +1,38 @@
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
+import { fn } from '@ember/helper';
+import eq from 'ember-truth-helpers/helpers/eq';
+
+import AppMenuHome from './home';
+import AppMenuSettings from './settings';
+import AppMenuAbout from './about';
+
+export default class AppMenu extends Component {
+  @tracked currentView = 'menu'; // 'menu', 'settings', 'about'
+
+  @action
+  setView(view) {
+    this.currentView = view;
+  }
+
+  <template>
+    <div class="sidebar settings-pane">
+      {{#if (eq this.currentView "menu")}}
+        <AppMenuHome @onNavigate={{this.setView}} @onClose={{@onClose}} />
+
+      {{else if (eq this.currentView "settings")}}
+        <AppMenuSettings
+          @onBack={{fn this.setView "menu"}}
+          @onClose={{@onClose}}
+        />
+
+      {{else if (eq this.currentView "about")}}
+        <AppMenuAbout
+          @onBack={{fn this.setView "menu"}}
+          @onClose={{@onClose}}
+        />
+      {{/if}}
+    </div>
+  </template>
+}

app/components/app-menu/settings.gjs

@@ -0,0 +1,78 @@
+import Component from '@glimmer/component';
+import { on } from '@ember/modifier';
+import { service } from '@ember/service';
+import { action } from '@ember/object';
+import Icon from '#components/icon';
+import eq from 'ember-truth-helpers/helpers/eq';
+
+export default class AppMenuSettings extends Component {
+  @service settings;
+
+  @action
+  updateApi(event) {
+    this.settings.updateOverpassApi(event.target.value);
+  }
+
+  @action
+  toggleKinetic(event) {
+    this.settings.updateMapKinetic(event.target.value === 'true');
+  }
+
+  <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">
+        <div class="form-group">
+          <label for="map-kinetic">Map Inertia (Kinetic Panning)</label>
+          <select
+            id="map-kinetic"
+            class="form-control"
+            {{on "change" this.toggleKinetic}}
+          >
+            <option
+              value="true"
+              selected={{if this.settings.mapKinetic "selected"}}
+            >
+              On
+            </option>
+            <option
+              value="false"
+              selected={{unless this.settings.mapKinetic "selected"}}
+            >
+              Off
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <label for="overpass-api">Overpass API Provider</label>
+          <select
+            id="overpass-api"
+            class="form-control"
+            {{on "change" this.updateApi}}
+          >
+            {{#each this.settings.overpassApis as |api|}}
+              <option
+                value={{api.url}}
+                selected={{if
+                  (eq api.url this.settings.overpassApi)
+                  "selected"
+                }}
+              >
+                {{api.name}}
+              </option>
+            {{/each}}
+          </select>
+        </div>
+      </section>
+    </div>
+  </template>
+}

app/components/settings-pane.gjs

@@ -1,128 +0,0 @@
-import Component from '@glimmer/component';
-import { on } from '@ember/modifier';
-import { service } from '@ember/service';
-import { action } from '@ember/object';
-import Icon from '#components/icon';
-import eq from 'ember-truth-helpers/helpers/eq';
-
-export default class SettingsPane extends Component {
-  @service settings;
-
-  @action
-  updateApi(event) {
-    this.settings.updateOverpassApi(event.target.value);
-  }
-
-  @action
-  toggleKinetic(event) {
-    this.settings.updateMapKinetic(event.target.value === 'true');
-  }
-
-  <template>
-    <div class="sidebar settings-pane">
-      <div class="sidebar-header">
-        <h2>
-          <img src="/icons/icon-rounded.svg" alt="" width="32" height="32" />
-          Marco
-        </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">
-          <h3>Settings</h3>
-          <div class="form-group">
-            <label for="map-kinetic">Map Inertia (Kinetic Panning)</label>
-            <select
-              id="map-kinetic"
-              class="form-control"
-              {{on "change" this.toggleKinetic}}
-            >
-              <option
-                value="true"
-                selected={{if this.settings.mapKinetic "selected"}}
-              >
-                On
-              </option>
-              <option
-                value="false"
-                selected={{unless this.settings.mapKinetic "selected"}}
-              >
-                Off
-              </option>
-            </select>
-          </div>
-          <div class="form-group">
-            <label for="overpass-api">Overpass API Provider</label>
-            <select
-              id="overpass-api"
-              class="form-control"
-              {{on "change" this.updateApi}}
-            >
-              {{#each this.settings.overpassApis as |api|}}
-                <option
-                  value={{api.url}}
-                  selected={{if
-                    (eq api.url this.settings.overpassApi)
-                    "selected"
-                  }}
-                >
-                  {{api.name}}
-                </option>
-              {{/each}}
-            </select>
-          </div>
-        </section>
-        <section class="settings-section">
-          <h3>About</h3>
-          <p>
-            <strong>Marco</strong>
-            (as in
-            <a
-              href="https://en.wikipedia.org/wiki/Marco_Polo"
-              target="_blank"
-              rel="noopener"
-            >Marco Polo</a>) is an unhosted maps application that respects your
-            privacy and choices.
-          </p>
-          <p>
-            Connect your own
-            <a
-              href="https://remotestorage.io/"
-              target="_blank"
-              rel="noopener"
-            >remote storage</a>
-            to sync place bookmarks across apps and devices.
-          </p>
-          <ul class="link-list">
-            <li>
-              <a
-                href="https://gitea.kosmos.org/raucao/marco"
-                target="_blank"
-                rel="noopener"
-              >
-                Source Code
-              </a>
-              (<a
-                href="https://en.wikipedia.org/wiki/GNU_Affero_General_Public_License"
-                target="_blank"
-                rel="noopener"
-              >AGPL</a>)
-            </li>
-            <li>
-              <a
-                href="https://openstreetmap.org/copyright"
-                target="_blank"
-                rel="noopener"
-              >
-                Map Data © OpenStreetMap
-              </a>
-            </li>
-          </ul>
-        </section>
-      </div>
-    </div>
-  </template>
-}

app/styles/app.css

@@ -2,6 +2,7 @@
 
 :root {
   --default-list-color: #fc3;
+  --hover-bg: #f8f9fa;
 }
 
 html,
@@ -251,10 +252,43 @@ body {
   overscroll-behavior: contain;
 }
 
+.app-menu {
+  list-style: none;
+  padding: 0;
+  margin: 0 -1rem;
+}
+
+.app-menu button {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 0.8rem;
+  padding: 1rem;
+  padding-left: 1.4rem;
+  background: none;
+  border: none;
+  color: #333;
+  cursor: pointer;
+  text-align: left;
+  font-size: 0.95rem;
+  font-family: inherit;
+  transition: background-color 0.2s;
+}
+
+.app-menu button:hover {
+  background-color: var(--hover-bg);
+}
+
+.app-menu .icon {
+  color: #666;
+  width: 20px;
+  height: 20px;
+}
+
 .edit-form {
   margin: -1rem;
   margin-bottom: 1rem;
-  background: #f8f9fa;
+  background: var(--hover-bg);
   padding: 1rem;
   border-bottom: 1px solid #eee;
 }
@@ -276,7 +310,7 @@ body {
   border: 1px solid #ddd;
   border-radius: 4px;
   font-family: inherit;
-  font-size: 1rem;
+  font-size: 0.95rem;
   box-sizing: border-box; /* Ensure padding doesn't overflow width */
 }
 
@@ -294,15 +328,7 @@ body {
 
 .settings-section {
   margin-bottom: 2rem;
-}
+  font-size: 0.95rem;
-
-.settings-section h3 {
-  font-size: 1rem;
-  font-weight: bold;
-  color: #666;
-  margin: 0 0 0.5rem;
-  text-transform: uppercase;
-  letter-spacing: 0.5px;
 }
 
 .settings-section .form-group {
@@ -400,7 +426,7 @@ body {
 }
 
 .place-item:hover {
-  background: #eee;
+  background: var(--hover-bg);
 }
 
 .place-name {
@@ -946,7 +972,7 @@ button.create-place {
 
 .search-result-item:hover,
 .search-result-item:focus {
-  background: #f5f5f5;
+  background: var(--hover-bg);
   outline: none;
 }
 
@@ -1011,7 +1037,7 @@ button.create-place {
 }
 
 .place-lists-manager .list-item:hover {
-  background: #f8f9fa;
+  background: var(--hover-bg);
 }
 
 .place-lists-manager label {

app/templates/application.gjs

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { pageTitle } from 'ember-page-title';
 import Map from '#components/map';
 import AppHeader from '#components/app-header';
-import SettingsPane from '#components/settings-pane';
+import AppMenu from '#components/app-menu/index';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -14,7 +14,7 @@ export default class ApplicationComponent extends Component {
   @service mapUi;
   @service router;
 
-  @tracked isSettingsOpen = false;
+  @tracked isAppMenuOpen = false;
 
   get isSidebarOpen() {
     // We consider the sidebar "open" if we are in search or place routes.
@@ -34,19 +34,19 @@ export default class ApplicationComponent extends Component {
   }
 
   @action
-  toggleSettings() {
+  toggleAppMenu() {
-    this.isSettingsOpen = !this.isSettingsOpen;
+    this.isAppMenuOpen = !this.isAppMenuOpen;
   }
 
   @action
-  closeSettings() {
+  closeAppMenu() {
-    this.isSettingsOpen = false;
+    this.isAppMenuOpen = false;
   }
 
   @action
   handleOutsideClick() {
-    if (this.isSettingsOpen) {
+    if (this.isAppMenuOpen) {
-      this.closeSettings();
+      this.closeAppMenu();
     } else if (this.router.currentRouteName === 'search') {
       this.router.transitionTo('index');
     } else if (this.router.currentRouteName === 'place') {
@@ -65,7 +65,7 @@ export default class ApplicationComponent extends Component {
   <template>
     {{pageTitle "Marco"}}
 
-    <AppHeader @onToggleMenu={{this.toggleSettings}} />
+    <AppHeader @onToggleMenu={{this.toggleAppMenu}} />
 
     <div
       id="rs-widget-container"
@@ -81,12 +81,12 @@ export default class ApplicationComponent extends Component {
     {{/if}}
 
     <Map
-      @isSidebarOpen={{or this.isSidebarOpen this.isSettingsOpen}}
+      @isSidebarOpen={{or this.isSidebarOpen this.isAppMenuOpen}}
       @onOutsideClick={{this.handleOutsideClick}}
     />
 
-    {{#if this.isSettingsOpen}}
+    {{#if this.isAppMenuOpen}}
-      <SettingsPane @onClose={{this.closeSettings}} />
+      <AppMenu @onClose={{this.closeAppMenu}} />
     {{/if}}
 
     {{outlet}}

app/utils/icons.js

@@ -7,6 +7,7 @@ import edit from 'feather-icons/dist/icons/edit.svg?raw';
 import facebook from 'feather-icons/dist/icons/facebook.svg?raw';
 import globe from 'feather-icons/dist/icons/globe.svg?raw';
 import home from 'feather-icons/dist/icons/home.svg?raw';
+import info from 'feather-icons/dist/icons/info.svg?raw';
 import instagram from 'feather-icons/dist/icons/instagram.svg?raw';
 import logIn from 'feather-icons/dist/icons/log-in.svg?raw';
 import logOut from 'feather-icons/dist/icons/log-out.svg?raw';
@@ -36,6 +37,7 @@ const ICONS = {
   facebook,
   globe,
   home,
+  info,
   instagram,
   'log-in': logIn,
   'log-out': logOut,