Merge branch 'dev' into feature/108_vite_migration
# Conflicts: # index.html # package.json # public/licenses.json # src/App.svelte # src/components/orgs/OrgOverview.svelte # src/components/teams/TeamsOverview.svelte
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
<script>
|
||||
import "toastify-js/src/toastify.css";
|
||||
import "gridjs/dist/theme/mermaid.css";
|
||||
import { Route, router } from "tinro";
|
||||
router.subscribe((routeInfo) => {
|
||||
window.scrollTo(0, 0);
|
||||
@@ -65,11 +67,11 @@
|
||||
import Donations from "./components/donations/Donations.svelte";
|
||||
import DonationDetail from "./components/donations/DonationDetail.svelte";
|
||||
import GroupDetail from "./components/groups/GroupDetail.svelte";
|
||||
import ScanStationsOverview from "./components/scanstations/ScanStationsOverview.svelte";
|
||||
import ScanStations from "./components/scanstations/ScanStations.svelte";
|
||||
import ScanStationDetail from "./components/scanstations/ScanStationDetail.svelte";
|
||||
import Scans from "./components/scans/Scans.svelte";
|
||||
import ScanDetail from "./components/scans/ScanDetail.svelte";
|
||||
import ScanDetail from "./components/scans/ScanDetail.svelte";
|
||||
import Cards from "./components/cards/Cards.svelte";
|
||||
store.init();
|
||||
</script>
|
||||
|
||||
@@ -180,6 +182,14 @@ import ScanDetail from "./components/scans/ScanDetail.svelte";
|
||||
<DonationDetail {params} />
|
||||
</Route>
|
||||
</Route>
|
||||
<Route path="/cards/*">
|
||||
<Route path="/">
|
||||
<Cards />
|
||||
</Route>
|
||||
<!-- <Route path="/:scanid" let:params>
|
||||
<ScanDetail {params} />
|
||||
</Route> -->
|
||||
</Route>
|
||||
<Route path="/scans/*">
|
||||
<Route path="/">
|
||||
<Scans />
|
||||
|
||||
Reference in New Issue
Block a user