lfk/frontend
2
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'dev' into feature/12-user-management

Browse Source 
# Conflicts:
#	src/components/UserDetail.svelte
This commit is contained in:
Nicolai Ort
2021-01-24 21:50:38 +01:00
parent 44f07ca231 e91e197873
commit 473cf978b4
44 changed files with 767 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.svelte
View File

@@ -31,7 +31,6 @@
import Login from "./components/Login.svelte";
import Dashboard from "./components/Dashboard.svelte";
import store from "./store.js";
import NotFound from "./components/NotFound.svelte";
import ForgotPassword from "./components/ForgotPassword.svelte";
import MainDashContent from "./components/MainDashContent.svelte";
import Users from "./components/Users.svelte";
@@ -41,18 +40,17 @@
import Orgs from "./components/Orgs.svelte";
import Runners from "./components/Runners.svelte";
import Footer from "./components/Footer.svelte";
import Tracks from "./components/Tracks.svelte";
import TracksOverview from "./components/TracksOverview.svelte";
import OrgDetail from "./components/OrgDetail.svelte";
import Teams from "./components/Teams.svelte";
import { OpenAPI, AuthService } from "@odit/lfk-client-js";
import { OpenAPI } from "@odit/lfk-client-js";
import UserDetail from "./components/UserDetail.svelte";
OpenAPI.BASE = config.baseurl;
import { register as registerSW } from "./swmodule";
import TeamDetail from "./components/TeamDetail.svelte";
import UserPermissions from "./components/UserPermissions.svelte";
store.init();
// registerSW();
registerSW();
</script>
<Route>