From cbc1d53cc257cbf60172dd4356831e43671ec626 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp.dormann1@gmail.com>
Date: Tue, 26 Jan 2021 18:25:30 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fixed=20merge=20conflict=20error?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ref #13 #12
---
 src/App.svelte                     | 10 ++++++++--
 src/components/OrgDetail.svelte    |  1 +
 src/components/Orgs.svelte         |  1 +
 src/components/RunnerDetail.svelte |  2 +-
 src/locales/en.json                |  1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 806ac3f2..01ad5336 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -49,6 +49,7 @@
   import { register as registerSW } from "./swmodule";
   import TeamDetail from "./components/TeamDetail.svelte";
   import UserPermissions from "./components/UserPermissions.svelte";
+  import RunnerDetail from "./components/RunnerDetail.svelte";
   store.init();
   registerSW();
 </script>
@@ -87,8 +88,13 @@
           </Route>
           <Route path="/:trackid" let:params />
         </Route>
-        <Route path="/runners">
-          <Runners />
+        <Route path="/runners/*">
+          <Route path="/">
+            <Runners />
+          </Route>
+          <Route path="/:runnerid" let:params>
+            <RunnerDetail {params} />
+          </Route>
         </Route>
         <Route path="/teams/*">
           <Route path="/">
diff --git a/src/components/OrgDetail.svelte b/src/components/OrgDetail.svelte
index 91db9aff..d9b4812d 100644
--- a/src/components/OrgDetail.svelte
+++ b/src/components/OrgDetail.svelte
@@ -72,6 +72,7 @@
   on:cancelDelete={(event) => {
     import_modal_open = false;
   }}
+  passed_team={{}}
   passed_orgs={[]}
   passed_org={orgdata}
   opened_from="OrgDetail"
diff --git a/src/components/Orgs.svelte b/src/components/Orgs.svelte
index a90e7fe0..09d8dfc4 100644
--- a/src/components/Orgs.svelte
+++ b/src/components/Orgs.svelte
@@ -43,6 +43,7 @@
     on:cancelDelete={(event) => {
       import_modal_open = false;
     }}
+    passed_team={{}}
     passed_org={{}}
     passed_orgs={current_organizations}
     opened_from="OrgOverview"
diff --git a/src/components/RunnerDetail.svelte b/src/components/RunnerDetail.svelte
index 7ff0ba37..0b9827fe 100644
--- a/src/components/RunnerDetail.svelte
+++ b/src/components/RunnerDetail.svelte
@@ -69,7 +69,7 @@
 </script>
 
 {#await runner_promise}
-  <!--  -->
+  {$_('loading-runners')}
 {:then}
   <section class="container p-5 select-none">
     <div class="flex flex-row mb-4">
diff --git a/src/locales/en.json b/src/locales/en.json
index c0c7a88a..e709c0ba 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -103,6 +103,7 @@
     "lfk-is-os": "The \"Lauf für Kaya!\" Frontend is (like all other projects for the \"LfK!\" Also) an open source project.",
     "license": "License",
     "licenses-are-being-loaded": "Licenses are being loaded...",
+    "loading-runners": "loading runners...",
     "log_in": "Log in",
     "log_in_to_your_account": "Log in to your account",
     "login_is_checked": "Login is being checked...",