From c0534a3b06a6f818c94adb70bca2a898ec70c2ab Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 16:51:15 +0100 Subject: [PATCH 01/11] Initial component sort/cleanup ref #68 --- src/App.svelte | 46 +++++++++---------- .../{ => auth}/ForgotPassword.svelte | 0 src/components/{ => auth}/Login.svelte | 4 +- .../{ => auth}/ResetPassword.svelte | 0 src/components/{ => base}/FormLayout.svelte | 0 .../{ => base}/NoComponentLoaded.svelte | 0 src/components/{ => base}/PromiseError.svelte | 0 src/components/{ => base}/Transition.svelte | 0 src/components/{ => base}/datatable_i18n.js | 0 src/components/{ => base}/outsideclick.js | 0 .../{ => contacts}/AddContactModal.svelte | 2 +- .../{ => contacts}/ContactDetail.svelte | 4 +- src/components/{ => contacts}/Contacts.svelte | 2 +- .../{ => contacts}/ContactsEmptyState.svelte | 2 +- .../{ => contacts}/ContactsOverview.svelte | 0 .../{ => dashboard}/Dashboard.svelte | 4 +- .../{ => dashboard}/MainDashContent.svelte | 2 +- .../{ => dashboard}/StatCards.svelte | 0 src/components/{ => general}/About.svelte | 2 +- src/components/{ => general}/Footer.svelte | 0 src/components/{ => general}/Imprint.svelte | 1 - src/components/{ => general}/NotFound.svelte | 0 src/components/{ => general}/Privacy.svelte | 1 - src/components/{ => general}/Settings.svelte | 2 +- src/components/{ => general}/Sidebar.svelte | 0 src/components/{ => orgs}/AddOrgModal.svelte | 2 +- .../{ => orgs}/ConfirmOrgDeletion.svelte | 2 +- src/components/{ => orgs}/OrgDetail.svelte | 6 +-- src/components/{ => orgs}/OrgOverview.svelte | 2 +- src/components/{ => orgs}/Orgs.svelte | 4 +- .../{ => orgs}/OrgsEmptyState.svelte | 0 src/components/{ => orgs}/org_empty.svg | 0 src/components/{ => random}/Avatars.svelte | 0 src/components/{ => random}/Badges.svelte | 0 .../{ => random}/BreadcrumbNav.svelte | 0 .../{ => random}/ComponentDump.svelte | 0 .../{ => random}/ConversionsChart.svelte | 0 src/components/{ => random}/DataTable.svelte | 0 src/components/{ => random}/FileUpload.svelte | 0 src/components/{ => random}/Pagination.svelte | 0 src/components/{ => random}/Profile.svelte | 0 src/components/{ => random}/Table.svelte | 0 src/components/{ => random}/Tabs.svelte | 0 src/components/{ => random}/Tags.svelte | 0 src/components/{ => random}/Test.svelte | 0 src/components/{ => random}/simple.css | 0 .../{ => runners}/AddRunnerModal.svelte | 2 +- .../{ => runners}/ImportRunnerModal.svelte | 2 +- .../{ => runners}/RunnerDetail.svelte | 4 +- src/components/{ => runners}/Runners.svelte | 2 +- .../{ => runners}/RunnersEmptyState.svelte | 0 .../{ => runners}/RunnersOverview.svelte | 2 +- .../{ => runners}/runners_empty.svg | 0 .../{ => teams}/AddTeamModal.svelte | 2 +- .../{ => teams}/ConfirmTeamDeletion.svelte | 2 +- src/components/{ => teams}/TeamDetail.svelte | 6 +-- src/components/{ => teams}/Teams.svelte | 2 +- .../{ => teams}/TeamsEmptyState.svelte | 0 .../{ => teams}/TeamsOverview.svelte | 3 +- src/components/{ => teams}/team_empty.svg | 0 .../{ => tracks}/AddTrackModal.svelte | 4 +- src/components/{ => tracks}/Tracks.svelte | 4 +- .../{ => tracks}/TracksEmptyState.svelte | 0 .../{ => tracks}/TracksOverview.svelte | 0 .../{ => users}/AddUserModal.svelte | 2 +- src/components/{ => users}/UserDetail.svelte | 4 +- .../{ => users}/UserPermissions.svelte | 2 +- src/components/{ => users}/Users.svelte | 2 +- .../{ => users}/UsersEmptyState.svelte | 0 .../{ => users}/UsersOverview.svelte | 3 +- src/components/{ => users}/users_empty.svg | 0 71 files changed, 66 insertions(+), 70 deletions(-) rename src/components/{ => auth}/ForgotPassword.svelte (100%) rename src/components/{ => auth}/Login.svelte (98%) rename src/components/{ => auth}/ResetPassword.svelte (100%) rename src/components/{ => base}/FormLayout.svelte (100%) rename src/components/{ => base}/NoComponentLoaded.svelte (100%) rename src/components/{ => base}/PromiseError.svelte (100%) rename src/components/{ => base}/Transition.svelte (100%) rename src/components/{ => base}/datatable_i18n.js (100%) rename src/components/{ => base}/outsideclick.js (100%) rename src/components/{ => contacts}/AddContactModal.svelte (99%) rename src/components/{ => contacts}/ContactDetail.svelte (99%) rename src/components/{ => contacts}/Contacts.svelte (96%) rename src/components/{ => contacts}/ContactsEmptyState.svelte (90%) rename src/components/{ => contacts}/ContactsOverview.svelte (100%) rename src/components/{ => dashboard}/Dashboard.svelte (99%) rename src/components/{ => dashboard}/MainDashContent.svelte (94%) rename src/components/{ => dashboard}/StatCards.svelte (100%) rename src/components/{ => general}/About.svelte (99%) rename src/components/{ => general}/Footer.svelte (100%) rename src/components/{ => general}/Imprint.svelte (97%) rename src/components/{ => general}/NotFound.svelte (100%) rename src/components/{ => general}/Privacy.svelte (97%) rename src/components/{ => general}/Settings.svelte (95%) rename src/components/{ => general}/Sidebar.svelte (100%) rename src/components/{ => orgs}/AddOrgModal.svelte (99%) rename src/components/{ => orgs}/ConfirmOrgDeletion.svelte (98%) rename src/components/{ => orgs}/OrgDetail.svelte (98%) rename src/components/{ => orgs}/OrgOverview.svelte (99%) rename src/components/{ => orgs}/Orgs.svelte (94%) rename src/components/{ => orgs}/OrgsEmptyState.svelte (100%) rename src/components/{ => orgs}/org_empty.svg (100%) rename src/components/{ => random}/Avatars.svelte (100%) rename src/components/{ => random}/Badges.svelte (100%) rename src/components/{ => random}/BreadcrumbNav.svelte (100%) rename src/components/{ => random}/ComponentDump.svelte (100%) rename src/components/{ => random}/ConversionsChart.svelte (100%) rename src/components/{ => random}/DataTable.svelte (100%) rename src/components/{ => random}/FileUpload.svelte (100%) rename src/components/{ => random}/Pagination.svelte (100%) rename src/components/{ => random}/Profile.svelte (100%) rename src/components/{ => random}/Table.svelte (100%) rename src/components/{ => random}/Tabs.svelte (100%) rename src/components/{ => random}/Tags.svelte (100%) rename src/components/{ => random}/Test.svelte (100%) rename src/components/{ => random}/simple.css (100%) rename src/components/{ => runners}/AddRunnerModal.svelte (99%) rename src/components/{ => runners}/ImportRunnerModal.svelte (99%) rename src/components/{ => runners}/RunnerDetail.svelte (99%) rename src/components/{ => runners}/Runners.svelte (98%) rename src/components/{ => runners}/RunnersEmptyState.svelte (100%) rename src/components/{ => runners}/RunnersOverview.svelte (99%) rename src/components/{ => runners}/runners_empty.svg (100%) rename src/components/{ => teams}/AddTeamModal.svelte (99%) rename src/components/{ => teams}/ConfirmTeamDeletion.svelte (98%) rename src/components/{ => teams}/TeamDetail.svelte (98%) rename src/components/{ => teams}/Teams.svelte (97%) rename src/components/{ => teams}/TeamsEmptyState.svelte (100%) rename src/components/{ => teams}/TeamsOverview.svelte (98%) rename src/components/{ => teams}/team_empty.svg (100%) rename src/components/{ => tracks}/AddTrackModal.svelte (98%) rename src/components/{ => tracks}/Tracks.svelte (98%) rename src/components/{ => tracks}/TracksEmptyState.svelte (100%) rename src/components/{ => tracks}/TracksOverview.svelte (100%) rename src/components/{ => users}/AddUserModal.svelte (99%) rename src/components/{ => users}/UserDetail.svelte (99%) rename src/components/{ => users}/UserPermissions.svelte (99%) rename src/components/{ => users}/Users.svelte (97%) rename src/components/{ => users}/UsersEmptyState.svelte (100%) rename src/components/{ => users}/UsersOverview.svelte (98%) rename src/components/{ => users}/users_empty.svg (100%) diff --git a/src/App.svelte b/src/App.svelte index aef1c587..cec35a20 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -28,33 +28,33 @@ description: "LfK! admin dashbaord", }); // - import Login from "./components/Login.svelte"; - import Dashboard from "./components/Dashboard.svelte"; + import Login from "./components/auth/Login.svelte"; + import Dashboard from "./components/dashboard/Dashboard.svelte"; import store from "./store.js"; - import ForgotPassword from "./components/ForgotPassword.svelte"; - import MainDashContent from "./components/MainDashContent.svelte"; - import Users from "./components/Users.svelte"; - import About from "./components/About.svelte"; - import Settings from "./components/Settings.svelte"; - import Transition from "./components/Transition.svelte"; - import Orgs from "./components/Orgs.svelte"; - import Runners from "./components/Runners.svelte"; - import Footer from "./components/Footer.svelte"; - import TracksOverview from "./components/TracksOverview.svelte"; - import OrgDetail from "./components/OrgDetail.svelte"; - import Teams from "./components/Teams.svelte"; + import ForgotPassword from "./components/auth/ForgotPassword.svelte"; + import MainDashContent from "./components/dashboard/MainDashContent.svelte"; + import Users from "./components/users/Users.svelte"; + import About from "./components/general/About.svelte"; + import Settings from "./components/general/Settings.svelte"; + import Transition from "./components/base/Transition.svelte"; + import Orgs from "./components/orgs/Orgs.svelte"; + import Runners from "./components/runners/Runners.svelte"; + import Footer from "./components/general/Footer.svelte"; + import TracksOverview from "./components/tracks/TracksOverview.svelte"; + import OrgDetail from "./components/orgs/OrgDetail.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 UserPermissions from "./components/UserPermissions.svelte"; - import RunnerDetail from "./components/RunnerDetail.svelte"; - import Imprint from "./components/Imprint.svelte"; - import Privacy from "./components/Privacy.svelte"; -import ResetPassword from "./components/ResetPassword.svelte"; -import Contacts from "./components/Contacts.svelte"; -import ContactDetail from "./components/ContactDetail.svelte"; + import TeamDetail from "./components/teams/TeamDetail.svelte"; + import UserPermissions from "./components/users/UserPermissions.svelte"; + import RunnerDetail from "./components/runners/RunnerDetail.svelte"; + import Imprint from "./components/general/Imprint.svelte"; + import Privacy from "./components/general/Privacy.svelte"; +import ResetPassword from "./components/auth/ResetPassword.svelte"; +import Contacts from "./components/contacts/Contacts.svelte"; +import ContactDetail from "./components/contacts/ContactDetail.svelte"; store.init(); registerSW(); diff --git a/src/components/ForgotPassword.svelte b/src/components/auth/ForgotPassword.svelte similarity index 100% rename from src/components/ForgotPassword.svelte rename to src/components/auth/ForgotPassword.svelte diff --git a/src/components/Login.svelte b/src/components/auth/Login.svelte similarity index 98% rename from src/components/Login.svelte rename to src/components/auth/Login.svelte index fac549c2..b6d21c73 100644 --- a/src/components/Login.svelte +++ b/src/components/auth/Login.svelte @@ -1,10 +1,10 @@ diff --git a/src/components/ContactsOverview.svelte b/src/components/contacts/ContactsOverview.svelte similarity index 100% rename from src/components/ContactsOverview.svelte rename to src/components/contacts/ContactsOverview.svelte diff --git a/src/components/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte similarity index 99% rename from src/components/Dashboard.svelte rename to src/components/dashboard/Dashboard.svelte index 72ffc38d..40401798 100644 --- a/src/components/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -1,9 +1,9 @@ diff --git a/src/components/StatCards.svelte b/src/components/dashboard/StatCards.svelte similarity index 100% rename from src/components/StatCards.svelte rename to src/components/dashboard/StatCards.svelte diff --git a/src/components/About.svelte b/src/components/general/About.svelte similarity index 99% rename from src/components/About.svelte rename to src/components/general/About.svelte index 5c375323..c080b251 100644 --- a/src/components/About.svelte +++ b/src/components/general/About.svelte @@ -1,6 +1,6 @@
diff --git a/src/components/Sidebar.svelte b/src/components/general/Sidebar.svelte similarity index 100% rename from src/components/Sidebar.svelte rename to src/components/general/Sidebar.svelte diff --git a/src/components/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte similarity index 99% rename from src/components/AddOrgModal.svelte rename to src/components/orgs/AddOrgModal.svelte index f41c5888..54ba1051 100644 --- a/src/components/AddOrgModal.svelte +++ b/src/components/orgs/AddOrgModal.svelte @@ -1,6 +1,6 @@ diff --git a/src/components/OrgsEmptyState.svelte b/src/components/orgs/OrgsEmptyState.svelte similarity index 100% rename from src/components/OrgsEmptyState.svelte rename to src/components/orgs/OrgsEmptyState.svelte diff --git a/src/components/org_empty.svg b/src/components/orgs/org_empty.svg similarity index 100% rename from src/components/org_empty.svg rename to src/components/orgs/org_empty.svg diff --git a/src/components/Avatars.svelte b/src/components/random/Avatars.svelte similarity index 100% rename from src/components/Avatars.svelte rename to src/components/random/Avatars.svelte diff --git a/src/components/Badges.svelte b/src/components/random/Badges.svelte similarity index 100% rename from src/components/Badges.svelte rename to src/components/random/Badges.svelte diff --git a/src/components/BreadcrumbNav.svelte b/src/components/random/BreadcrumbNav.svelte similarity index 100% rename from src/components/BreadcrumbNav.svelte rename to src/components/random/BreadcrumbNav.svelte diff --git a/src/components/ComponentDump.svelte b/src/components/random/ComponentDump.svelte similarity index 100% rename from src/components/ComponentDump.svelte rename to src/components/random/ComponentDump.svelte diff --git a/src/components/ConversionsChart.svelte b/src/components/random/ConversionsChart.svelte similarity index 100% rename from src/components/ConversionsChart.svelte rename to src/components/random/ConversionsChart.svelte diff --git a/src/components/DataTable.svelte b/src/components/random/DataTable.svelte similarity index 100% rename from src/components/DataTable.svelte rename to src/components/random/DataTable.svelte diff --git a/src/components/FileUpload.svelte b/src/components/random/FileUpload.svelte similarity index 100% rename from src/components/FileUpload.svelte rename to src/components/random/FileUpload.svelte diff --git a/src/components/Pagination.svelte b/src/components/random/Pagination.svelte similarity index 100% rename from src/components/Pagination.svelte rename to src/components/random/Pagination.svelte diff --git a/src/components/Profile.svelte b/src/components/random/Profile.svelte similarity index 100% rename from src/components/Profile.svelte rename to src/components/random/Profile.svelte diff --git a/src/components/Table.svelte b/src/components/random/Table.svelte similarity index 100% rename from src/components/Table.svelte rename to src/components/random/Table.svelte diff --git a/src/components/Tabs.svelte b/src/components/random/Tabs.svelte similarity index 100% rename from src/components/Tabs.svelte rename to src/components/random/Tabs.svelte diff --git a/src/components/Tags.svelte b/src/components/random/Tags.svelte similarity index 100% rename from src/components/Tags.svelte rename to src/components/random/Tags.svelte diff --git a/src/components/Test.svelte b/src/components/random/Test.svelte similarity index 100% rename from src/components/Test.svelte rename to src/components/random/Test.svelte diff --git a/src/components/simple.css b/src/components/random/simple.css similarity index 100% rename from src/components/simple.css rename to src/components/random/simple.css diff --git a/src/components/AddRunnerModal.svelte b/src/components/runners/AddRunnerModal.svelte similarity index 99% rename from src/components/AddRunnerModal.svelte rename to src/components/runners/AddRunnerModal.svelte index fe4cc642..d2017d27 100644 --- a/src/components/AddRunnerModal.svelte +++ b/src/components/runners/AddRunnerModal.svelte @@ -1,6 +1,6 @@ diff --git a/src/components/tracks/Tracks.svelte b/src/components/tracks/Tracks.svelte index ef321af5..94f9d89e 100644 --- a/src/components/tracks/Tracks.svelte +++ b/src/components/tracks/Tracks.svelte @@ -62,7 +62,6 @@ elem.childNodes[2].innerHTML = `${elem.childNodes[2].childNodes[0].value}`; }) .catch((err) => { - console.error(err); }); } }; @@ -93,7 +92,6 @@ renderdatatable(); }) .catch((err) => { - console.log(err); }); }; window.track__edit_handler = () => { diff --git a/src/components/users/Users.svelte b/src/components/users/Users.svelte index 1ffd9dc4..e4edd40d 100644 --- a/src/components/users/Users.svelte +++ b/src/components/users/Users.svelte @@ -4,7 +4,6 @@ import AddUserModal from "./AddUserModal.svelte"; export let modal_open = false; import UsersOverview from "./UsersOverview.svelte"; - console.log(store.state.jwtinfo.userdetails.permissions); let current_users=[]; diff --git a/src/store.js b/src/store.js index 5657dac3..8fefe738 100644 --- a/src/store.js +++ b/src/store.js @@ -23,9 +23,7 @@ const store = () => { }); }, refreshAuth() { - console.log('refreshing auth'); AuthService.authControllerRefresh({ token: state.auth.refresh_token }).then((auth) => { - console.log('got new auth'); OpenAPI.TOKEN = auth.access_token; const jwtinfo = JSON.parse(atob(auth.access_token.split('.')[1])); state.jwtinfo = jwtinfo; From e2fb9a66adbc2ecb12b3705a24fd6469d0f3af38 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:04:39 +0100 Subject: [PATCH 06/11] Reimported simple.css ref #68 --- src/components/{random => base}/simple.css | 0 src/components/general/Imprint.svelte | 1 + src/components/general/Privacy.svelte | 1 + 3 files changed, 2 insertions(+) rename src/components/{random => base}/simple.css (100%) diff --git a/src/components/random/simple.css b/src/components/base/simple.css similarity index 100% rename from src/components/random/simple.css rename to src/components/base/simple.css diff --git a/src/components/general/Imprint.svelte b/src/components/general/Imprint.svelte index d9a9b3ff..d050c3fe 100644 --- a/src/components/general/Imprint.svelte +++ b/src/components/general/Imprint.svelte @@ -2,6 +2,7 @@ import { _, getLocaleFromNavigator } from "svelte-i18n"; import marked from "marked"; import Footer from "./Footer.svelte"; + import * as css from "../base/simple.css"; let html = ""; async function load() { let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md"); diff --git a/src/components/general/Privacy.svelte b/src/components/general/Privacy.svelte index 845d296d..19b0c024 100644 --- a/src/components/general/Privacy.svelte +++ b/src/components/general/Privacy.svelte @@ -2,6 +2,7 @@ import { _, getLocaleFromNavigator } from "svelte-i18n"; import marked from "marked"; import Footer from "./Footer.svelte"; + import * as css from "../base/simple.css"; let html = ""; async function load() { let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md"); From e1427f3ecbf1e6d6dbb0b3e8c7c9514cb68c2c08 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:06:25 +0100 Subject: [PATCH 07/11] renamed folder and removed useless files ref #68 --- .../{random => presets}/Avatars.svelte | 0 .../{random => presets}/Badges.svelte | 0 .../{random => presets}/BreadcrumbNav.svelte | 0 .../{random => presets}/ComponentDump.svelte | 0 .../ConversionsChart.svelte | 0 .../{random => presets}/DataTable.svelte | 0 .../{random => presets}/Pagination.svelte | 0 .../{random => presets}/Profile.svelte | 0 .../{random => presets}/Table.svelte | 0 .../{random => presets}/Tabs.svelte | 0 .../{random => presets}/Tags.svelte | 0 src/components/random/FileUpload.svelte | 74 ------------------- src/components/random/Test.svelte | 5 -- 13 files changed, 79 deletions(-) rename src/components/{random => presets}/Avatars.svelte (100%) rename src/components/{random => presets}/Badges.svelte (100%) rename src/components/{random => presets}/BreadcrumbNav.svelte (100%) rename src/components/{random => presets}/ComponentDump.svelte (100%) rename src/components/{random => presets}/ConversionsChart.svelte (100%) rename src/components/{random => presets}/DataTable.svelte (100%) rename src/components/{random => presets}/Pagination.svelte (100%) rename src/components/{random => presets}/Profile.svelte (100%) rename src/components/{random => presets}/Table.svelte (100%) rename src/components/{random => presets}/Tabs.svelte (100%) rename src/components/{random => presets}/Tags.svelte (100%) delete mode 100644 src/components/random/FileUpload.svelte delete mode 100644 src/components/random/Test.svelte diff --git a/src/components/random/Avatars.svelte b/src/components/presets/Avatars.svelte similarity index 100% rename from src/components/random/Avatars.svelte rename to src/components/presets/Avatars.svelte diff --git a/src/components/random/Badges.svelte b/src/components/presets/Badges.svelte similarity index 100% rename from src/components/random/Badges.svelte rename to src/components/presets/Badges.svelte diff --git a/src/components/random/BreadcrumbNav.svelte b/src/components/presets/BreadcrumbNav.svelte similarity index 100% rename from src/components/random/BreadcrumbNav.svelte rename to src/components/presets/BreadcrumbNav.svelte diff --git a/src/components/random/ComponentDump.svelte b/src/components/presets/ComponentDump.svelte similarity index 100% rename from src/components/random/ComponentDump.svelte rename to src/components/presets/ComponentDump.svelte diff --git a/src/components/random/ConversionsChart.svelte b/src/components/presets/ConversionsChart.svelte similarity index 100% rename from src/components/random/ConversionsChart.svelte rename to src/components/presets/ConversionsChart.svelte diff --git a/src/components/random/DataTable.svelte b/src/components/presets/DataTable.svelte similarity index 100% rename from src/components/random/DataTable.svelte rename to src/components/presets/DataTable.svelte diff --git a/src/components/random/Pagination.svelte b/src/components/presets/Pagination.svelte similarity index 100% rename from src/components/random/Pagination.svelte rename to src/components/presets/Pagination.svelte diff --git a/src/components/random/Profile.svelte b/src/components/presets/Profile.svelte similarity index 100% rename from src/components/random/Profile.svelte rename to src/components/presets/Profile.svelte diff --git a/src/components/random/Table.svelte b/src/components/presets/Table.svelte similarity index 100% rename from src/components/random/Table.svelte rename to src/components/presets/Table.svelte diff --git a/src/components/random/Tabs.svelte b/src/components/presets/Tabs.svelte similarity index 100% rename from src/components/random/Tabs.svelte rename to src/components/presets/Tabs.svelte diff --git a/src/components/random/Tags.svelte b/src/components/presets/Tags.svelte similarity index 100% rename from src/components/random/Tags.svelte rename to src/components/presets/Tags.svelte diff --git a/src/components/random/FileUpload.svelte b/src/components/random/FileUpload.svelte deleted file mode 100644 index c595b185..00000000 --- a/src/components/random/FileUpload.svelte +++ /dev/null @@ -1,74 +0,0 @@ - - -
- -
diff --git a/src/components/random/Test.svelte b/src/components/random/Test.svelte deleted file mode 100644 index 132d1562..00000000 --- a/src/components/random/Test.svelte +++ /dev/null @@ -1,5 +0,0 @@ - - -
$locale $_('hallo')
From ca41f4d4f26871b2768a1cc1d438cd99f21956b9 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:06:54 +0100 Subject: [PATCH 08/11] Removed filepond ref #68 --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 6208d3c5..82117e50 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,10 @@ "dependencies": { "@odit/lfk-client-js": "0.4.5", "csvtojson": "^2.0.10", - "filepond": "4.25.1", "gridjs": "3.3.0", "localforage": "1.9.0", "lodash.isequal": "^4.5.0", "marked": "^2.0.0", - "svelte-filepond": "0.0.1", "svelte-focus-trap": "1.0.1", "svelte-i18n": "3.3.2", "svelte-select": "^3.16.1", From dc0c7384710985524e8caceebde06918b878ec6c Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:08:19 +0100 Subject: [PATCH 09/11] Added license to package ref #68 --- LICENSE | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 2 files changed, 363 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..5797ceb3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,362 @@ +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Creative +Commons Corporation ("Creative Commons") is not a law firm and does not provide +legal services or legal advice. Distribution of Creative Commons public licenses +does not create a lawyer-client or other relationship. Creative Commons makes +its licenses and related information available on an "as-is" basis. Creative +Commons gives no warranties regarding its licenses, any material licensed +under their terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the fullest +extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions +that creators and other rights holders may use to share original works of +authorship and other material subject to copyright and certain other rights +specified in the public license below. The following considerations are for +informational purposes only, are not exhaustive, and do not form part of our +licenses. + +Considerations for licensors: Our public licenses are intended for use by +those authorized to give the public permission to use material in ways otherwise +restricted by copyright and certain other rights. Our licenses are irrevocable. +Licensors should read and understand the terms and conditions of the license +they choose before applying it. Licensors should also secure all rights necessary +before applying our licenses so that the public can reuse the material as +expected. Licensors should clearly mark any material not subject to the license. +This includes other CC-licensed material, or material used under an exception +or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors + +Considerations for the public: By using one of our public licenses, a licensor +grants the public permission to use the licensed material under specified +terms and conditions. If the licensor's permission is not necessary for any +reason–for example, because of any applicable exception or limitation to copyright–then +that use is not regulated by the license. Our licenses grant only permissions +under copyright and certain other rights that a licensor has authority to +grant. Use of the licensed material may still be restricted for other reasons, +including because others have copyright or other rights in the material. A +licensor may make special requests, such as asking that all changes be marked +or described. Although not required by our licenses, you are encouraged to +respect those requests where reasonable. More considerations for the public +: wiki.creativecommons.org/Considerations_for_licensees + +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree to +be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike +4.0 International Public License ("Public License"). To the extent this Public +License may be interpreted as a contract, You are granted the Licensed Rights +in consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the Licensor +receives from making the Licensed Material available under these terms and +conditions. + +Section 1 – Definitions. + +a. Adapted Material means material subject to Copyright and Similar Rights +that is derived from or based upon the Licensed Material and in which the +Licensed Material is translated, altered, arranged, transformed, or otherwise +modified in a manner requiring permission under the Copyright and Similar +Rights held by the Licensor. For purposes of this Public License, where the +Licensed Material is a musical work, performance, or sound recording, Adapted +Material is always produced where the Licensed Material is synched in timed +relation with a moving image. + +b. Adapter's License means the license You apply to Your Copyright and Similar +Rights in Your contributions to Adapted Material in accordance with the terms +and conditions of this Public License. + +c. BY-NC-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, +approved by Creative Commons as essentially the equivalent of this Public +License. + +d. Copyright and Similar Rights means copyright and/or similar rights closely +related to copyright including, without limitation, performance, broadcast, +sound recording, and Sui Generis Database Rights, without regard to how the +rights are labeled or categorized. For purposes of this Public License, the +rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + +e. Effective Technological Measures means those measures that, in the absence +of proper authority, may not be circumvented under laws fulfilling obligations +under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, +and/or similar international agreements. + +f. Exceptions and Limitations means fair use, fair dealing, and/or any other +exception or limitation to Copyright and Similar Rights that applies to Your +use of the Licensed Material. + +g. License Elements means the license attributes listed in the name of a Creative +Commons Public License. The License Elements of this Public License are Attribution, +NonCommercial, and ShareAlike. + +h. Licensed Material means the artistic or literary work, database, or other +material to which the Licensor applied this Public License. + +i. Licensed Rights means the rights granted to You subject to the terms and +conditions of this Public License, which are limited to all Copyright and +Similar Rights that apply to Your use of the Licensed Material and that the +Licensor has authority to license. + +j. Licensor means the individual(s) or entity(ies) granting rights under this +Public License. + +k. NonCommercial means not primarily intended for or directed towards commercial +advantage or monetary compensation. For purposes of this Public License, the +exchange of the Licensed Material for other material subject to Copyright +and Similar Rights by digital file-sharing or similar means is NonCommercial +provided there is no payment of monetary compensation in connection with the +exchange. + +l. Share means to provide material to the public by any means or process that +requires permission under the Licensed Rights, such as reproduction, public +display, public performance, distribution, dissemination, communication, or +importation, and to make material available to the public including in ways +that members of the public may access the material from a place and at a time +individually chosen by them. + +m. Sui Generis Database Rights means rights other than copyright resulting +from Directive 96/9/EC of the European Parliament and of the Council of 11 +March 1996 on the legal protection of databases, as amended and/or succeeded, +as well as other essentially equivalent rights anywhere in the world. + +n. You means the individual or entity exercising the Licensed Rights under +this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + +1. Subject to the terms and conditions of this Public License, the Licensor +hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, +irrevocable license to exercise the Licensed Rights in the Licensed Material +to: + +A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial +purposes only; and + +B. produce, reproduce, and Share Adapted Material for NonCommercial purposes +only. + +2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions +and Limitations apply to Your use, this Public License does not apply, and +You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + +4. Media and formats; technical modifications allowed. The Licensor authorizes +You to exercise the Licensed Rights in all media and formats whether now known +or hereafter created, and to make technical modifications necessary to do +so. The Licensor waives and/or agrees not to assert any right or authority +to forbid You from making technical modifications necessary to exercise the +Licensed Rights, including technical modifications necessary to circumvent +Effective Technological Measures. For purposes of this Public License, simply +making modifications authorized by this Section 2(a)(4) never produces Adapted +Material. + + 5. Downstream recipients. + +A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed +Material automatically receives an offer from the Licensor to exercise the +Licensed Rights under the terms and conditions of this Public License. + +B. Additional offer from the Licensor – Adapted Material. Every recipient +of Adapted Material from You automatically receives an offer from the Licensor +to exercise the Licensed Rights in the Adapted Material under the conditions +of the Adapter's License You apply. + +C. No downstream restrictions. You may not offer or impose any additional +or different terms or conditions on, or apply any Effective Technological +Measures to, the Licensed Material if doing so restricts exercise of the Licensed +Rights by any recipient of the Licensed Material. + +6. No endorsement. Nothing in this Public License constitutes or may be construed +as permission to assert or imply that You are, or that Your use of the Licensed +Material is, connected with, or sponsored, endorsed, or granted official status +by, the Licensor or others designated to receive attribution as provided in +Section 3(a)(1)(A)(i). + + b. Other rights. + +1. Moral rights, such as the right of integrity, are not licensed under this +Public License, nor are publicity, privacy, and/or other similar personality +rights; however, to the extent possible, the Licensor waives and/or agrees +not to assert any such rights held by the Licensor to the limited extent necessary +to allow You to exercise the Licensed Rights, but not otherwise. + +2. Patent and trademark rights are not licensed under this Public License. + +3. To the extent possible, the Licensor waives any right to collect royalties +from You for the exercise of the Licensed Rights, whether directly or through +a collecting society under any voluntary or waivable statutory or compulsory +licensing scheme. In all other cases the Licensor expressly reserves any right +to collect such royalties, including when the Licensed Material is used other +than for NonCommercial purposes. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following +conditions. + + a. Attribution. + +1. If You Share the Licensed Material (including in modified form), You must: + +A. retain the following if it is supplied by the Licensor with the Licensed +Material: + +i. identification of the creator(s) of the Licensed Material and any others +designated to receive attribution, in any reasonable manner requested by the +Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + + +v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + +B. indicate if You modified the Licensed Material and retain an indication +of any previous modifications; and + +C. indicate the Licensed Material is licensed under this Public License, and +include the text of, or the URI or hyperlink to, this Public License. + +2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner +based on the medium, means, and context in which You Share the Licensed Material. +For example, it may be reasonable to satisfy the conditions by providing a +URI or hyperlink to a resource that includes the required information. + +3. If requested by the Licensor, You must remove any of the information required +by Section 3(a)(1)(A) to the extent reasonably practicable. + +b. ShareAlike.In addition to the conditions in Section 3(a), if You Share +Adapted Material You produce, the following conditions also apply. + +1. The Adapter's License You apply must be a Creative Commons license with +the same License Elements, this version or later, or a BY-NC-SA Compatible +License. + +2. You must include the text of, or the URI or hyperlink to, the Adapter's +License You apply. You may satisfy this condition in any reasonable manner +based on the medium, means, and context in which You Share Adapted Material. + +3. You may not offer or impose any additional or different terms or conditions +on, or apply any Effective Technological Measures to, Adapted Material that +restrict exercise of the rights granted under the Adapter's License You apply. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to +Your use of the Licensed Material: + +a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, +reuse, reproduce, and Share all or a substantial portion of the contents of +the database for NonCommercial purposes only; + +b. if You include all or a substantial portion of the database contents in +a database in which You have Sui Generis Database Rights, then the database +in which You have Sui Generis Database Rights (but not its individual contents) +is Adapted Material, including for purposes of Section 3(b); and + +c. You must comply with the conditions in Section 3(a) if You Share all or +a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not replace +Your obligations under this Public License where the Licensed Rights include +other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + +a. Unless otherwise separately undertaken by the Licensor, to the extent possible, +the Licensor offers the Licensed Material as-is and as-available, and makes +no representations or warranties of any kind concerning the Licensed Material, +whether express, implied, statutory, or other. This includes, without limitation, +warranties of title, merchantability, fitness for a particular purpose, non-infringement, +absence of latent or other defects, accuracy, or the presence or absence of +errors, whether or not known or discoverable. Where disclaimers of warranties +are not allowed in full or in part, this disclaimer may not apply to You. + +b. To the extent possible, in no event will the Licensor be liable to You +on any legal theory (including, without limitation, negligence) or otherwise +for any direct, special, indirect, incidental, consequential, punitive, exemplary, +or other losses, costs, expenses, or damages arising out of this Public License +or use of the Licensed Material, even if the Licensor has been advised of +the possibility of such losses, costs, expenses, or damages. Where a limitation +of liability is not allowed in full or in part, this limitation may not apply +to You. + +c. The disclaimer of warranties and limitation of liability provided above +shall be interpreted in a manner that, to the extent possible, most closely +approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + +a. This Public License applies for the term of the Copyright and Similar Rights +licensed here. However, if You fail to comply with this Public License, then +Your rights under this Public License terminate automatically. + +b. Where Your right to use the Licensed Material has terminated under Section +6(a), it reinstates: + +1. automatically as of the date the violation is cured, provided it is cured +within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + +For the avoidance of doubt, this Section 6(b) does not affect any right the +Licensor may have to seek remedies for Your violations of this Public License. + +c. For the avoidance of doubt, the Licensor may also offer the Licensed Material +under separate terms or conditions or stop distributing the Licensed Material +at any time; however, doing so will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + +a. The Licensor shall not be bound by any additional or different terms or +conditions communicated by You unless expressly agreed. + +b. Any arrangements, understandings, or agreements regarding the Licensed +Material not stated herein are separate from and independent of the terms +and conditions of this Public License. + +Section 8 – Interpretation. + +a. For the avoidance of doubt, this Public License does not, and shall not +be interpreted to, reduce, limit, restrict, or impose conditions on any use +of the Licensed Material that could lawfully be made without permission under +this Public License. + +b. To the extent possible, if any provision of this Public License is deemed +unenforceable, it shall be automatically reformed to the minimum extent necessary +to make it enforceable. If the provision cannot be reformed, it shall be severed +from this Public License without affecting the enforceability of the remaining +terms and conditions. + +c. No term or condition of this Public License will be waived and no failure +to comply consented to unless expressly agreed to by the Licensor. + +d. Nothing in this Public License constitutes or may be interpreted as a limitation +upon, or waiver of, any privileges and immunities that apply to the Licensor +or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative +Commons may elect to apply one of its public licenses to material it publishes +and in those instances will be considered the "Licensor." The text of the +Creative Commons public licenses is dedicated to the public domain under the +CC0 Public Domain Dedication. Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as otherwise +permitted by the Creative Commons policies published at creativecommons.org/policies, +Creative Commons does not authorize the use of the trademark "Creative Commons" +or any other trademark or logo of Creative Commons without its prior written +consent including, without limitation, in connection with any unauthorized +modifications to any of its public licenses or any other arrangements, understandings, +or agreements concerning use of licensed material. For the avoidance of doubt, +this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/package.json b/package.json index 82117e50..82408fa1 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "release": "release-it", "licenses:export": "license-exporter --json -o public" }, + "license": "CC-BY-NC-SA-4.0", "dependencies": { "@odit/lfk-client-js": "0.4.5", "csvtojson": "^2.0.10", From 2b57d49e4e703ca15dc151ab69614dd893e8a0a5 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:13:19 +0100 Subject: [PATCH 10/11] =?UTF-8?q?Dependency=20bump=20=F0=9F=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #68 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82408fa1..431d16df 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "xlsx": "^0.16.9" }, "devDependencies": { - "@odit/license-exporter": "0.0.9", + "@odit/license-exporter": "^0.0.10", "@snowpack/plugin-svelte": "3.5.2", "auto-changelog": "^2.2.1", "autoprefixer": "10.2.4", From 27609dc5e0bf9a78ef37f0b3b74cc2ca25bfddbf Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Thu, 18 Feb 2021 17:13:58 +0100 Subject: [PATCH 11/11] Removed debug output ref #68 --- src/components/contacts/AddContactModal.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/contacts/AddContactModal.svelte b/src/components/contacts/AddContactModal.svelte index 837408d1..4f0203d5 100644 --- a/src/components/contacts/AddContactModal.svelte +++ b/src/components/contacts/AddContactModal.svelte @@ -183,7 +183,6 @@

{$_('create-a-new-contact')}

-

{selected_team}

Please provide the required information to add a new contact.