Initial component sort/cleanup

ref #68

src/App.svelte

@@ -28,33 +28,33 @@
     description: "LfK! admin dashbaord",
   });
   //
-  import Login from "./components/Login.svelte";
+  import Login from "./components/auth/Login.svelte";
-  import Dashboard from "./components/Dashboard.svelte";
+  import Dashboard from "./components/dashboard/Dashboard.svelte";
   import store from "./store.js";
-  import ForgotPassword from "./components/ForgotPassword.svelte";
+  import ForgotPassword from "./components/auth/ForgotPassword.svelte";
-  import MainDashContent from "./components/MainDashContent.svelte";
+  import MainDashContent from "./components/dashboard/MainDashContent.svelte";
-  import Users from "./components/Users.svelte";
+  import Users from "./components/users/Users.svelte";
-  import About from "./components/About.svelte";
+  import About from "./components/general/About.svelte";
-  import Settings from "./components/Settings.svelte";
+  import Settings from "./components/general/Settings.svelte";
-  import Transition from "./components/Transition.svelte";
+  import Transition from "./components/base/Transition.svelte";
-  import Orgs from "./components/Orgs.svelte";
+  import Orgs from "./components/orgs/Orgs.svelte";
-  import Runners from "./components/Runners.svelte";
+  import Runners from "./components/runners/Runners.svelte";
-  import Footer from "./components/Footer.svelte";
+  import Footer from "./components/general/Footer.svelte";
-  import TracksOverview from "./components/TracksOverview.svelte";
+  import TracksOverview from "./components/tracks/TracksOverview.svelte";
-  import OrgDetail from "./components/OrgDetail.svelte";
+  import OrgDetail from "./components/orgs/OrgDetail.svelte";
-  import Teams from "./components/Teams.svelte";
+  import Teams from "./components/teams/Teams.svelte";
   import { OpenAPI } from "@odit/lfk-client-js";
-  import UserDetail from "./components/UserDetail.svelte";
+  import UserDetail from "./components/users/UserDetail.svelte";
   OpenAPI.BASE = config.baseurl;
   import { register as registerSW } from "./swmodule";
-  import TeamDetail from "./components/TeamDetail.svelte";
+  import TeamDetail from "./components/teams/TeamDetail.svelte";
-  import UserPermissions from "./components/UserPermissions.svelte";
+  import UserPermissions from "./components/users/UserPermissions.svelte";
-  import RunnerDetail from "./components/RunnerDetail.svelte";
+  import RunnerDetail from "./components/runners/RunnerDetail.svelte";
-  import Imprint from "./components/Imprint.svelte";
+  import Imprint from "./components/general/Imprint.svelte";
-  import Privacy from "./components/Privacy.svelte";
+  import Privacy from "./components/general/Privacy.svelte";
-import ResetPassword from "./components/ResetPassword.svelte";
+import ResetPassword from "./components/auth/ResetPassword.svelte";
-import Contacts from "./components/Contacts.svelte";
+import Contacts from "./components/contacts/Contacts.svelte";
-import ContactDetail from "./components/ContactDetail.svelte";
+import ContactDetail from "./components/contacts/ContactDetail.svelte";
   store.init();
   registerSW();
 </script>

src/components/auth/Login.svelte

@@ -1,10 +1,10 @@
 <script>
-  import store from "../store.js";
+  import store from "../../store.js";
   import localForage from "localforage";
   import { _ } from "svelte-i18n";
   store.init();
   import { OpenAPI, AuthService } from "@odit/lfk-client-js";
-  import Footer from "./Footer.svelte";
+  import Footer from "../general/Footer.svelte";
   import Toastify from "toastify-js";
   // ------
   let username = "demo";

src/components/contacts/AddContactModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import {
     GroupContactService,

src/components/contacts/ContactDetail.svelte

@@ -1,13 +1,13 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import {
     GroupContactService,
     RunnerTeamService,
     RunnerOrganizationService,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
   let data_loaded = false;
   let orgs = [];

src/components/contacts/Contacts.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddContactModal from "./AddContactModal.svelte";
   import ContactsOverview from "./ContactsOverview.svelte";
   export let modal_open = false;

src/components/contacts/ContactsEmptyState.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import AddContactModal from "./AddContactModal.svelte";
-  import team_empty from "./team_empty.svg";
+  import team_empty from "../teams/team_empty.svg";
   let modal_open = false;
   let current_contacts = [];
 </script>

src/components/dashboard/Dashboard.svelte

@@ -1,9 +1,9 @@
 <script>
   import { _ } from "svelte-i18n";
   import localForage from "localforage";
-  import store from "../store";
+  import store from "../../store";
   import { router } from "tinro";
-  import NoComponentLoaded from "./NoComponentLoaded.svelte";
+  import NoComponentLoaded from "../base/NoComponentLoaded.svelte";
   import { AuthService } from "@odit/lfk-client-js";
   let dropdown1 = false;
   $: navOpen = false;

src/components/dashboard/MainDashContent.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import StatCards from "./StatCards.svelte";
-  import store from "../store";
+  import store from "../../store";
   let navOpen = false;
 </script>
 

src/components/general/About.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   export let modal_open;
   (function () {

src/components/general/Imprint.svelte

@@ -1,6 +1,5 @@
 <script>
   import { _, getLocaleFromNavigator } from "svelte-i18n";
-  import * as css from "./simple.css";
   import marked from "marked";
   import Footer from "./Footer.svelte";
   let html = "";

src/components/general/Privacy.svelte

@@ -1,6 +1,5 @@
 <script>
   import { _, getLocaleFromNavigator } from "svelte-i18n";
-  import * as css from "./simple.css";
   import marked from "marked";
   import Footer from "./Footer.svelte";
   let html = "";

src/components/general/Settings.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-import FormLayout from "./FormLayout.svelte";
+import FormLayout from "../base/FormLayout.svelte";
 </script>
 
 <div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">

src/components/orgs/AddOrgModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";

src/components/orgs/ConfirmOrgDeletion.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";

src/components/orgs/OrgDetail.svelte

@@ -5,10 +5,10 @@
   } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
-  import store from "../store";
+  import store from "../../store";
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   $: delete_triggered = false;
   $: save_enabled = !data_changed;
   export let params;

src/components/orgs/OrgOverview.svelte

@@ -3,7 +3,7 @@
   let modal_open = false;
   let delete_org = {};
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
-  import store from "../store";
+  import store from "../../store";
   import OrgsEmptyState from "./OrgsEmptyState.svelte";
   import Toastify from "toastify-js";
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";

src/components/orgs/Orgs.svelte

@@ -1,10 +1,10 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddOrgModal from "./AddOrgModal.svelte";
   export let modal_open = false;
   import OrgOverview from "./OrgOverview.svelte";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
   let current_organizations = [];
   export let import_modal_open = false;
 </script>

src/components/runners/AddRunnerModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import {
     RunnerService,

src/components/runners/ImportRunnerModal.svelte

@@ -2,7 +2,7 @@
   import csv from "csvtojson";
   import { read as readXlsx, utils as xlsx_utils } from "xlsx";
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import Toastify from "toastify-js";
   import {

src/components/runners/RunnerDetail.svelte

@@ -1,14 +1,14 @@
 <script>
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
-  import store from "../store";
+  import store from "../../store";
   import {
     RunnerService,
     RunnerTeamService,
     RunnerOrganizationService,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
   let data_loaded = false;
   export let params;

src/components/runners/Runners.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddRunnerModal from "./AddRunnerModal.svelte";
   import ImportRunnerModal from "./ImportRunnerModal.svelte";
   import RunnersOverview from "./RunnersOverview.svelte";

src/components/runners/RunnersOverview.svelte

@@ -2,7 +2,7 @@
   import { _ } from "svelte-i18n";
   import { RunnerService,RunnerTeamService,
     RunnerOrganizationService, } from "@odit/lfk-client-js";
-  import store from "../store";
+  import store from "../../store";
   import RunnersEmptyState from "./RunnersEmptyState.svelte";
   import Select from 'svelte-select';
   $: searchvalue = "";

src/components/teams/AddTeamModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import {
     RunnerOrganizationService,

src/components/teams/ConfirmTeamDeletion.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import { RunnerTeamService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";

src/components/teams/TeamDetail.svelte

@@ -6,9 +6,9 @@
   } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
-  import store from "../store";
+  import store from "../../store";
-  import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
   let [teamdata, original, delete_team, orgs, contacts, modal_open] = [
     {},

src/components/teams/Teams.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddTeamModal from "./AddTeamModal.svelte";
   export let modal_open = false;
   import TeamsOverview from "./TeamsOverview.svelte";

src/components/teams/TeamsOverview.svelte

@@ -3,8 +3,7 @@
   import Toastify from "toastify-js";
   import { RunnerTeamService } from "@odit/lfk-client-js";
   const teams_promise = RunnerTeamService.runnerTeamControllerGetAll();
-  import { users as usersstore } from "../store.js";
+  import { users as usersstore, store } from "../../store.js";
-  import store from "../store";
   import TeamsEmptyState from "./TeamsEmptyState.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
   $: searchvalue = "";

src/components/tracks/AddTrackModal.svelte

@@ -1,8 +1,8 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
-  import { tracks as tracksstore } from "../store.js";
+  import { tracks as tracksstore } from "../../store.js";
   import { TrackService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import "toastify-js/src/toastify.css";

src/components/tracks/Tracks.svelte

@@ -4,9 +4,9 @@
   import TracksEmptyState from "./TracksEmptyState.svelte";
   import { TrackService } from "@odit/lfk-client-js";
   const tracks_promise = TrackService.trackControllerGetAll();
-  import { getlang } from "./datatable_i18n";
+  import { getlang } from "../base/datatable_i18n";
   import { Grid, html } from "gridjs";
-  import { tracks as tracksstore } from "../store.js";
+  import { tracks as tracksstore } from "../../store.js";
   $: trackscache = [];
   $: blocked = [];
   let table;

src/components/users/AddUserModal.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import { clickOutside } from "./outsideclick";
+  import { clickOutside } from "../base/outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import { UserService } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";

src/components/users/UserDetail.svelte

@@ -1,11 +1,11 @@
 <script>
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
-  import store from "../store";
+  import store from "../../store";
   import isEmail from "validator/es/lib/isEmail";
   import { UserService, UserGroupService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   export let params;
   const user_promise = UserService.userControllerGetOne(params.userid);
   let data_loaded = false;

src/components/users/UserPermissions.svelte

@@ -6,7 +6,7 @@
     CreatePermission,
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
-  import PromiseError from "./PromiseError.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
   export let params;
   let [
     grantedPermissions_initial,

src/components/users/Users.svelte

@@ -1,6 +1,6 @@
 <script>
   import { _ } from "svelte-i18n";
-  import store from "../store";
+  import store from "../../store";
   import AddUserModal from "./AddUserModal.svelte";
   export let modal_open = false;
   import UsersOverview from "./UsersOverview.svelte";

src/components/users/UsersOverview.svelte

@@ -2,8 +2,7 @@
   import { _ } from "svelte-i18n";
   import { UserService } from "@odit/lfk-client-js";
   const users_promise = UserService.userControllerGetAll();
-  import { users as usersstore } from "../store.js";
+  import { users as usersstore, store } from "../../store.js";
-  import store from "../store";
   import UsersEmptyState from "./UsersEmptyState.svelte";
   $: searchvalue = "";
   $: active_deletes = [];