🐞 fixed merge conflict errors

ref #13 #12

package.json

@@ -22,7 +22,7 @@
 		"svelte-focus-trap": "1.0.1",
 		"svelte-i18n": "3.3.0",
 		"tailwindcss": "2.0.2",
-		"tinro": "0.5.8",
+		"tinro": "0.5.9",
 		"toastify-js": "1.9.3",
 		"validator": "13.5.2",
 		"xlsx": "^0.16.9"
@@ -37,7 +37,7 @@
 		"postcss-load-config": "3.0.0",
 		"release-it": "^14.2.2",
 		"snowpack": "3.0.11",
-		"svelte": "3.31.2",
+		"svelte": "3.32.0",
 		"svelte-preprocess": "4.6.3",
 		"workbox-cli": "6.0.2"
 	},

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">
+        <Route path="/runners/*">
-          <Runners />
+          <Route path="/">
+            <Runners />
+          </Route>
+          <Route path="/:runnerid" let:params>
+            <RunnerDetail {params} />
+          </Route>
         </Route>
         <Route path="/teams/*">
           <Route path="/">

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"

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"

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">

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...",