Merge remote-tracking branch 'upstream/master'

[nominatim-ui.git] / src / App.svelte

diff --git a/src/App.svelte b/src/App.svelte
index a9779ad440b6ab6b2b9c4bc8c93bcdf5b04a268e..98ba0292bd87f4458f636b0031a44a8713dbdfab 100644 (file)
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,34 +1,39 @@
 <script>
-  import * as jquery from 'jquery';
   import 'bootstrap/dist/css/bootstrap.css';
   import 'bootstrap/dist/js/bootstrap.bundle.js';
 
   import { page, refresh_page } from './lib/stores.js';
 
-  import Header from './components/Header.svelte';
   import Footer from './components/Footer.svelte';
-  import ReportIssueModal from './components/ReportIssueModal.svelte';
   import SearchPage from './pages/SearchPage.svelte';
+  import ReversePage from './pages/ReversePage.svelte';
   import DetailsPage from './pages/DetailsPage.svelte';
   import PolygonsPage from './pages/PolygonsPage.svelte';
   import DeletablePage from './pages/DeletablePage.svelte';
+  import StatusPage from './pages/StatusPage.svelte';
+  import AboutPage from './pages/AboutPage.svelte';
 
   $: view = $page.tab;
 
   refresh_page();
 </script>
 
-<Header/>
+<!-- deal with back-button and other user action -->
+<svelte:window on:popstate={() => refresh_page()} />
+
 {#if view === 'search'}
-<SearchPage reverse_search={false} />
+<SearchPage />
 {:else if view === 'reverse'}
-<SearchPage reverse_search={true}/>
+<ReversePage />
 {:else if view === 'details'}
 <DetailsPage />
 {:else if view === 'deletable'}
 <DeletablePage />
 {:else if view === 'polygons'}
 <PolygonsPage />
+{:else if view === 'status'}
+<StatusPage />
+{:else if view === 'about'}
+<AboutPage />
 {/if}
 <Footer/>
-<ReportIssueModal/>