final refactoring

src/lib/timeline/detail/NewEntryForm.svelte

@@ -1,11 +1,12 @@
 <script>
-  import { journals, addJournal } from '../../stores/journalStore.js';
+  import { journals, addEntry } from '../../stores/entriesStore.svelte.js';
   import { get } from 'svelte/store';
   import { flashCountry } from '../../layout/selection.svelte.js';
   import { countryNames } from '../../shared/countries.js';
-  import { countryCities } from '../../shared/countryCities.js';
+  import { ALL_CITIES } from '../../shared/cities.js';
   import SearchInput from '../../shared/SearchInput.svelte';
   import PhotoEditor from './PhotoEditor.svelte';
+  import StepNav from './StepNavbar.svelte';
   import airplaneImg from '../../../assets/airplane.png';
   import trainImg    from '../../../assets/train.png';
   import busImg      from '../../../assets/bus.png';
@@ -25,8 +26,12 @@
   // ── Fields ─────────────────────────────────────────────────────────
   let cities    = $state([]);
   let cityInput = $state('');
-  let country   = $state(initialCountry);
+  let country   = $state('');
   let date      = $state(new Date().toISOString().slice(0, 10));
+
+  $effect(() => {
+    country = initialCountry;
+  });
   let days      = $state('');
   let tripType  = $state('');
   let transport = $state('');
@@ -65,7 +70,7 @@
   let cityOptions = $derived(
     country.trim()
       ? [...new Set([
-          ...(countryCities[country.trim()] ?? []),
+          ...(ALL_CITIES[country.trim()] ?? []),
           ...journalEntries.filter(j => (j.location?.country || '').toLowerCase() === country.trim().toLowerCase()).flatMap(e => e.location?.cities ?? []),
         ])]
       : []
@@ -128,7 +133,7 @@
       .filter(Boolean)
       .join('\n\n');
     try {
-      await addJournal({
+      await addEntry({
         title: `${cities.join(', ')}, ${country}`,
         date,
         days: Number(days),
@@ -145,34 +150,12 @@
       saveError = e?.message ?? 'Failed to save. Please try again.';
     }
   }
+
+  let next = $derived(step < 3 ? nextStep : save);
 </script>
 
 <div class="layout">
-  <header class="topbar">
-    <div class="topbar-left">
-      <button class="ghost-btn" onclick={prevStep}>
-        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><path d="M19 12H5M12 5l-7 7 7 7"/></svg>
-        {step === 1 ? 'Back' : 'Previous'}
-      </button>
-    </div>
-
-    <div class="steps">
-      {#each [1,2,3] as s}
-        <div class="step-dot" class:active={step === s} class:done={step > s}></div>
-      {/each}
-    </div>
-
-    <div class="topbar-right">
-      {#if step < 3}
-        <button class="save-btn" onclick={nextStep}>Next</button>
-      {:else}
-        <button class="save-btn" onclick={save} disabled={saving}>
-          {saving ? 'Saving…' : 'Save trip'}
-        </button>
-        {#if saveError}<span class="save-err">{saveError}</span>{/if}
-      {/if}
-    </div>
-  </header>
+  <StepNav {step} onback={prevStep} onnext={next} {saving} saveLabel="Save trip" {saveError} />
 
   <div class="scroll">
     <div class="form">
@@ -283,78 +266,6 @@
     font-family: var(--sans);
   }
 
-  /* topbar */
-  .topbar {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 20px;
-    height: 52px;
-    flex-shrink: 0;
-    border-bottom: 1px solid var(--border);
-    background: var(--bg);
-  }
-  .topbar-left, .topbar-right {
-    display: flex;
-    align-items: center;
-    min-width: 110px;
-  }
-  .topbar-right { justify-content: flex-end; }
-
-  .steps {
-    display: flex;
-    gap: 8px;
-    align-items: center;
-  }
-  .step-dot {
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-    background: var(--border);
-    transition: background 0.2s, transform 0.2s;
-  }
-  .step-dot.active {
-    background: var(--accent);
-    transform: scale(1.25);
-  }
-  .step-dot.done {
-    background: var(--accent);
-    opacity: 0.35;
-  }
-
-  .ghost-btn {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    font-family: var(--sans);
-    font-size: 15px;
-    font-weight: 400;
-    color: var(--text);
-    background: none;
-    border: 1px solid transparent;
-    border-radius: 10px;
-    padding: 8px 14px;
-    cursor: pointer;
-    transition: background 0.15s, color 0.15s, border-color 0.15s;
-  }
-  .ghost-btn:hover { background: var(--bg-subtle); border-color: var(--border); color: var(--text-h); }
-
-  .save-btn {
-    font-family: var(--sans);
-    font-size: 15px;
-    font-weight: 400;
-    color: #fff;
-    background: var(--accent);
-    border: 1px solid var(--accent);
-    border-radius: 10px;
-    padding: 8px 18px;
-    cursor: pointer;
-    transition: background 0.15s;
-    white-space: nowrap;
-  }
-  .save-btn:hover { background: var(--accent-dark); border-color: var(--accent-dark); }
-  .save-btn:disabled { opacity: 0.6; cursor: not-allowed; }
-
   /* scroll + form */
   .scroll { flex: 1; overflow-y: auto; }