Compare commits
8 Commits
0.4.0
...
e91e197873
| Author | SHA1 | Date | |
|---|---|---|---|
| e91e197873 | |||
| b30b6734a1 | |||
| dadb80608a | |||
| fc21427685 | |||
| fbc67eeb98 | |||
| 09fd73b130 | |||
| 259a76f46b | |||
| c6504c2eaf |
6
.vscode/extensions.json
vendored
6
.vscode/extensions.json
vendored
@@ -4,8 +4,10 @@
|
|||||||
"christian-kohler.npm-intellisense",
|
"christian-kohler.npm-intellisense",
|
||||||
"remimarsal.prettier-now",
|
"remimarsal.prettier-now",
|
||||||
"svelte.svelte-vscode",
|
"svelte.svelte-vscode",
|
||||||
"antfu.i18n-ally",
|
"lokalise.i18n-ally",
|
||||||
"fivethree.vscode-svelte-snippets"
|
"fivethree.vscode-svelte-snippets"
|
||||||
],
|
],
|
||||||
"unwantedRecommendations": []
|
"unwantedRecommendations": [
|
||||||
|
"antfu.i18n-ally"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.3.1-RELEASE_INFO</span>
|
<span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.4.0-RELEASE_INFO</span>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
<script src="/env.js"></script>
|
<script src="/env.js"></script>
|
||||||
<script defer type="module" src="/_dist_/index.js"></script>
|
<script defer type="module" src="/_dist_/index.js"></script>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"licenses:export": "license-exporter --json -o public"
|
"licenses:export": "license-exporter --json -o public"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@odit/lfk-client-js": "0.1.1",
|
"@odit/lfk-client-js": "0.3.0",
|
||||||
"filepond": "4.25.1",
|
"filepond": "4.25.1",
|
||||||
"gridjs": "3.2.2",
|
"gridjs": "3.2.2",
|
||||||
"localforage": "1.9.0",
|
"localforage": "1.9.0",
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
"svelte-focus-trap": "1.0.1",
|
"svelte-focus-trap": "1.0.1",
|
||||||
"svelte-i18n": "3.3.0",
|
"svelte-i18n": "3.3.0",
|
||||||
"tailwindcss": "2.0.2",
|
"tailwindcss": "2.0.2",
|
||||||
"tinro": "0.5.7",
|
"tinro": "0.5.8",
|
||||||
"toastify-js": "1.9.3",
|
"toastify-js": "1.9.3",
|
||||||
"validator": "13.5.2"
|
"validator": "13.5.2"
|
||||||
},
|
},
|
||||||
@@ -29,14 +29,14 @@
|
|||||||
"@odit/license-exporter": "0.0.9",
|
"@odit/license-exporter": "0.0.9",
|
||||||
"@snowpack/plugin-svelte": "3.5.2",
|
"@snowpack/plugin-svelte": "3.5.2",
|
||||||
"auto-changelog": "^2.2.1",
|
"auto-changelog": "^2.2.1",
|
||||||
"autoprefixer": "10.2.1",
|
"autoprefixer": "10.2.3",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"postcss": "8.2.4",
|
"postcss": "8.2.4",
|
||||||
"postcss-load-config": "3.0.0",
|
"postcss-load-config": "3.0.0",
|
||||||
"release-it": "^14.2.2",
|
"release-it": "^14.2.2",
|
||||||
"snowpack": "3.0.11",
|
"snowpack": "3.0.11",
|
||||||
"svelte": "3.31.2",
|
"svelte": "3.31.2",
|
||||||
"svelte-preprocess": "4.6.1",
|
"svelte-preprocess": "4.6.3",
|
||||||
"workbox-cli": "6.0.2"
|
"workbox-cli": "6.0.2"
|
||||||
},
|
},
|
||||||
"release-it": {
|
"release-it": {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -2,7 +2,7 @@
|
|||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
import { clickOutside } from "./outsideclick";
|
import { clickOutside } from "./outsideclick";
|
||||||
import { focusTrap } from "svelte-focus-trap";
|
import { focusTrap } from "svelte-focus-trap";
|
||||||
import { RunnerOrganisationService } from "@odit/lfk-client-js";
|
import { RunnerOrganizationService } from "@odit/lfk-client-js";
|
||||||
import Toastify from "toastify-js";
|
import Toastify from "toastify-js";
|
||||||
export let modal_open;
|
export let modal_open;
|
||||||
export let current_organizations;
|
export let current_organizations;
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
text: "Organization is being added...",
|
text: "Organization is being added...",
|
||||||
duration: -1,
|
duration: -1,
|
||||||
}).showToast();
|
}).showToast();
|
||||||
RunnerOrganisationService.runnerOrganisationControllerPost({
|
RunnerOrganizationService.runnerOrganizationControllerPost({
|
||||||
name,
|
name,
|
||||||
address: undefined,
|
address: undefined,
|
||||||
contact: undefined,
|
contact: undefined,
|
||||||
|
|||||||
@@ -28,7 +28,13 @@
|
|||||||
$: firstname_input_value = "";
|
$: firstname_input_value = "";
|
||||||
$: processed_last_submit = true;
|
$: processed_last_submit = true;
|
||||||
$: isPhoneValidOrEmpty =
|
$: isPhoneValidOrEmpty =
|
||||||
isMobilePhone(phone_input_value) || phone_input_value === "";
|
isMobilePhone(
|
||||||
|
phone_input_value
|
||||||
|
.replaceAll("(", "")
|
||||||
|
.replaceAll(")", "")
|
||||||
|
.replaceAll("-", "")
|
||||||
|
.replaceAll(" ", "")
|
||||||
|
) || phone_input_value === "";
|
||||||
$: isEmailValidOrEmpty =
|
$: isEmailValidOrEmpty =
|
||||||
isEmail(email_input_value) || email_input_value === "";
|
isEmail(email_input_value) || email_input_value === "";
|
||||||
$: isLastnameValid = lastname_input_value.trim().length !== 0;
|
$: isLastnameValid = lastname_input_value.trim().length !== 0;
|
||||||
@@ -213,7 +219,7 @@
|
|||||||
<select
|
<select
|
||||||
name="team"
|
name="team"
|
||||||
bind:value={selected_team}
|
bind:value={selected_team}
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2">
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
|
||||||
{#each groups as g}
|
{#each groups as g}
|
||||||
<option value={g.id}>{g.name}</option>
|
<option value={g.id}>{g.name}</option>
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { clickOutside } from "./outsideclick";
|
import { clickOutside } from "./outsideclick";
|
||||||
import { focusTrap } from "svelte-focus-trap";
|
import { focusTrap } from "svelte-focus-trap";
|
||||||
import {
|
import {
|
||||||
RunnerOrganisationService,
|
RunnerOrganizationService,
|
||||||
RunnerTeamService,
|
RunnerTeamService,
|
||||||
} from "@odit/lfk-client-js";
|
} from "@odit/lfk-client-js";
|
||||||
import Toastify from "toastify-js";
|
import Toastify from "toastify-js";
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
})();
|
})();
|
||||||
$: parentGroup = undefined;
|
$: parentGroup = undefined;
|
||||||
$: orgs = [];
|
$: orgs = [];
|
||||||
RunnerOrganisationService.runnerOrganisationControllerGetAll().then((val) => {
|
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
|
||||||
orgs = val;
|
orgs = val;
|
||||||
});
|
});
|
||||||
function submit() {
|
function submit() {
|
||||||
@@ -147,7 +147,7 @@
|
|||||||
class="block text-sm font-medium text-gray-700">{$_('organization')}</label>
|
class="block text-sm font-medium text-gray-700">{$_('organization')}</label>
|
||||||
<select
|
<select
|
||||||
bind:value={parentGroup}
|
bind:value={parentGroup}
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2">
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
|
||||||
{#each orgs as t}
|
{#each orgs as t}
|
||||||
<option value={t.id}>{t.name}</option>
|
<option value={t.id}>{t.name}</option>
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
<Table />
|
<Table />
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 mb-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="widget w-full p-4 mb-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Regular</div>
|
<div class="text-sm font-light text-grey-500">Regular</div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
import { clickOutside } from "./outsideclick";
|
import { clickOutside } from "./outsideclick";
|
||||||
import { focusTrap } from "svelte-focus-trap";
|
import { focusTrap } from "svelte-focus-trap";
|
||||||
import { RunnerOrganisationService } from "@odit/lfk-client-js";
|
import { RunnerOrganizationService } from "@odit/lfk-client-js";
|
||||||
import Toastify from "toastify-js";
|
import Toastify from "toastify-js";
|
||||||
import { createEventDispatcher } from "svelte";
|
import { createEventDispatcher } from "svelte";
|
||||||
export let modal_open;
|
export let modal_open;
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
dispatch("cancelDelete", { id: delete_org.id });
|
dispatch("cancelDelete", { id: delete_org.id });
|
||||||
}
|
}
|
||||||
function deleteOrg() {
|
function deleteOrg() {
|
||||||
RunnerOrganisationService.runnerOrganisationControllerRemove(
|
RunnerOrganizationService.runnerOrganizationControllerRemove(
|
||||||
delete_org.id,
|
delete_org.id,
|
||||||
true
|
true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Conversions</div>
|
<div class="text-sm font-light text-grey-500">Conversions</div>
|
||||||
@@ -18,16 +18,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -323,7 +323,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="main w-full bg-grey-50 text-grey-900 dark:bg-grey-900 dark:text-white">
|
<div class="main w-full bg-grey-50 text-grey-900">
|
||||||
<div class="navbar navbar-1 border-b">
|
<div class="navbar navbar-1 border-b">
|
||||||
<div class="navbar-inner w-full flex items-center justify-start"><button class="mx-4"><svg stroke="currentColor"
|
<div class="navbar-inner w-full flex items-center justify-start"><button class="mx-4"><svg stroke="currentColor"
|
||||||
fill="none" stroke-width="2" viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" size="20"
|
fill="none" stroke-width="2" viewBox="0 0 24 24" stroke-linecap="round" stroke-linejoin="round" size="20"
|
||||||
@@ -733,7 +733,7 @@
|
|||||||
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">Users</div>
|
<div class="text-xs uppercase font-light text-grey-500">Users</div>
|
||||||
@@ -751,7 +751,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">Sessions</div>
|
<div class="text-xs uppercase font-light text-grey-500">Sessions</div>
|
||||||
@@ -766,7 +766,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">Bounce rate</div>
|
<div class="text-xs uppercase font-light text-grey-500">Bounce rate</div>
|
||||||
@@ -783,7 +783,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">Session duration</div>
|
<div class="text-xs uppercase font-light text-grey-500">Session duration</div>
|
||||||
@@ -803,7 +803,7 @@
|
|||||||
<ConversionsChart />
|
<ConversionsChart />
|
||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/3">
|
<div class="w-full lg:w-1/3">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Sessions</div>
|
<div class="text-sm font-light text-grey-500">Sessions</div>
|
||||||
@@ -823,16 +823,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -923,7 +923,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
<div class="w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Users</div>
|
<div class="text-sm font-light text-grey-500">Users</div>
|
||||||
@@ -1211,15 +1211,15 @@
|
|||||||
</table>
|
</table>
|
||||||
<div class="flex flex-row w-full items-center justify-around lg:justify-between my-4">
|
<div class="flex flex-row w-full items-center justify-around lg:justify-between my-4">
|
||||||
<div class="flex flex-wrap items-center justify-start space-x-2 pagination"><button
|
<div class="flex flex-wrap items-center justify-start space-x-2 pagination"><button
|
||||||
class="btn btn-default bg-transparent hover:bg-grey-200 text-grey-900 dark:text-white">Next</button><button
|
class="btn btn-default bg-transparent hover:bg-grey-200 text-grey-900">Next</button><button
|
||||||
class="btn btn-default bg-transparent hover:bg-grey-200 text-grey-900 dark:text-white">Last</button>
|
class="btn btn-default bg-transparent hover:bg-grey-200 text-grey-900">Last</button>
|
||||||
</div><span class="hidden lg:block">Page
|
</div><span class="hidden lg:block">Page
|
||||||
<!-- --> <b>1
|
<!-- --> <b>1
|
||||||
<!-- --> of
|
<!-- --> of
|
||||||
<!-- -->11
|
<!-- -->11
|
||||||
</b>
|
</b>
|
||||||
</span><select
|
</span><select
|
||||||
class="hidden lg:block form-select text-sm bg-white dark:bg-grey-800 dark:border-grey-800 outline-none shadow-none focus:shadow-none">
|
class="hidden lg:block form-select text-sm bg-white outline-none shadow-none focus:shadow-none">
|
||||||
<option selected="" value="10">Show 10</option>
|
<option selected="" value="10">Show 10</option>
|
||||||
<option value="25">Show 25</option>
|
<option value="25">Show 25</option>
|
||||||
<option value="50">Show 50</option>
|
<option value="50">Show 50</option>
|
||||||
@@ -1232,7 +1232,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
||||||
<div class="w-full lg:w-1/2">
|
<div class="w-full lg:w-1/2">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Project status</div>
|
<div class="text-sm font-light text-grey-500">Project status</div>
|
||||||
@@ -1252,16 +1252,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -1336,7 +1336,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/2">
|
<div class="w-full lg:w-1/2">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Sales</div>
|
<div class="text-sm font-light text-grey-500">Sales</div>
|
||||||
@@ -1356,16 +1356,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -1578,7 +1578,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
<div class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
||||||
<div class="w-full lg:w-1/3">
|
<div class="w-full lg:w-1/3">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">Activities</div>
|
<div class="text-sm font-light text-grey-500">Activities</div>
|
||||||
@@ -1598,16 +1598,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -1619,7 +1619,7 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<div class="flex relative justify-start items-start">
|
<div class="flex relative justify-start items-start">
|
||||||
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
||||||
<div class="h-full w-1 bg-grey-200 dark:bg-grey-800 pointer-events-none"></div>
|
<div class="h-full w-1 bg-grey-200 pointer-events-none"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
||||||
@@ -1636,7 +1636,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex relative justify-start items-start">
|
<div class="flex relative justify-start items-start">
|
||||||
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
||||||
<div class="h-full w-1 bg-grey-200 dark:bg-grey-800 pointer-events-none"></div>
|
<div class="h-full w-1 bg-grey-200 pointer-events-none"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
||||||
@@ -1653,7 +1653,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex relative justify-start items-start">
|
<div class="flex relative justify-start items-start">
|
||||||
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
||||||
<div class="h-full w-1 bg-grey-200 dark:bg-grey-800 pointer-events-none"></div>
|
<div class="h-full w-1 bg-grey-200 pointer-events-none"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
||||||
@@ -1670,7 +1670,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex relative justify-start items-start">
|
<div class="flex relative justify-start items-start">
|
||||||
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
<div class="h-full w-6 absolute inset-0 flex items-center justify-center">
|
||||||
<div class="h-full w-1 bg-grey-200 dark:bg-grey-800 pointer-events-none"></div>
|
<div class="h-full w-1 bg-grey-200 pointer-events-none"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
class="flex-shrink-0 w-6 h-6 rounded-full inline-flex items-center justify-center bg-blue-500 text-white relative z-10 font-medium text-sm">
|
||||||
@@ -1690,7 +1690,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-2/3">
|
<div class="w-full lg:w-2/3">
|
||||||
<div class="w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
<div class="w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between mb-6">
|
<div class="flex flex-row items-center justify-between mb-6">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-sm font-light text-grey-500">To do</div>
|
<div class="text-sm font-light text-grey-500">To do</div>
|
||||||
@@ -1710,16 +1710,16 @@
|
|||||||
<div class="flex flex-col w-full">
|
<div class="flex flex-col w-full">
|
||||||
<ul class="list-none">
|
<ul class="list-none">
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">Today</a></li>
|
href="/">Today</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This week</a></li>
|
href="/">This week</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This month</a></li>
|
href="/">This month</a></li>
|
||||||
<li><a
|
<li><a
|
||||||
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100 dark:bg-grey-895 dark:hover:bg-grey-890"
|
class="flex flex-row items-center justify-start h-10 w-full px-2 bg-white hover:bg-grey-100"
|
||||||
href="/">This year</a></li>
|
href="/">This year</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@@ -1831,7 +1831,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<form>
|
<form>
|
||||||
<div class="form-element"><input type="text" value="" name="todo"
|
<div class="form-element"><input type="text" value="" name="todo"
|
||||||
class="form-input text-sm bg-white dark:bg-grey-800 dark:border-grey-800"
|
class="form-input text-sm bg-white"
|
||||||
placeholder="Add new..."></div>
|
placeholder="Add new..."></div>
|
||||||
</form>
|
</form>
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script>
|
<script>
|
||||||
import { RunnerOrganisationService } from "@odit/lfk-client-js";
|
import { RunnerOrganizationService } from "@odit/lfk-client-js";
|
||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
import Toastify from "toastify-js";
|
import Toastify from "toastify-js";
|
||||||
import store from "../store";
|
import store from "../store";
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
let original = {};
|
let original = {};
|
||||||
$: data_loaded = false;
|
$: data_loaded = false;
|
||||||
$: data_changed = JSON.stringify(orgdata) === JSON.stringify(original);
|
$: data_changed = JSON.stringify(orgdata) === JSON.stringify(original);
|
||||||
const promise = RunnerOrganisationService.runnerOrganisationControllerGetOne(
|
const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne(
|
||||||
params.orgid
|
params.orgid
|
||||||
).then((value) => {
|
).then((value) => {
|
||||||
data_loaded = true;
|
data_loaded = true;
|
||||||
@@ -21,8 +21,8 @@
|
|||||||
});
|
});
|
||||||
let modal_open = false;
|
let modal_open = false;
|
||||||
let delete_org = {};
|
let delete_org = {};
|
||||||
function deleteOrganisation() {
|
function deleteOrganization() {
|
||||||
// RunnerOrganisationService.runnerOrganisationControllerRemove(
|
// RunnerOrganizationService.runnerOrganizationControllerRemove(
|
||||||
// original.id,
|
// original.id,
|
||||||
// false
|
// false
|
||||||
// )
|
// )
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
text: "updating organization",
|
text: "updating organization",
|
||||||
duration: 2500,
|
duration: 2500,
|
||||||
}).showToast();
|
}).showToast();
|
||||||
RunnerOrganisationService.runnerOrganisationControllerPut(
|
RunnerOrganizationService.runnerOrganizationControllerPut(
|
||||||
original.id,
|
original.id,
|
||||||
orgdata
|
orgdata
|
||||||
)
|
)
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
|
||||||
{#if delete_triggered}
|
{#if delete_triggered}
|
||||||
<button
|
<button
|
||||||
on:click={deleteOrganisation}
|
on:click={deleteOrganization}
|
||||||
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-delete')}</button>
|
class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-delete')}</button>
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
@@ -181,7 +181,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={orgdata.name}
|
bind:value={orgdata.name}
|
||||||
name="name"
|
name="name"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -193,7 +193,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={orgdata.contact}
|
bind:value={orgdata.contact}
|
||||||
name="contact"
|
name="contact"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -205,7 +205,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={orgdata.address}
|
bind:value={orgdata.address}
|
||||||
name="address"
|
name="address"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
{:else}
|
{:else}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
let modal_open = false;
|
let modal_open = false;
|
||||||
let delete_org = {};
|
let delete_org = {};
|
||||||
import { RunnerOrganisationService } from "@odit/lfk-client-js";
|
import { RunnerOrganizationService } from "@odit/lfk-client-js";
|
||||||
import store from "../store";
|
import store from "../store";
|
||||||
import OrgsEmptyState from "./OrgsEmptyState.svelte";
|
import OrgsEmptyState from "./OrgsEmptyState.svelte";
|
||||||
import Toastify from "toastify-js";
|
import Toastify from "toastify-js";
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
$: active_deletes = [];
|
$: active_deletes = [];
|
||||||
export let current_organizations = [];
|
export let current_organizations = [];
|
||||||
|
|
||||||
const promise = RunnerOrganisationService.runnerOrganisationControllerGetAll().then(
|
const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
|
||||||
(val) => {
|
(val) => {
|
||||||
current_organizations = val;
|
current_organizations = val;
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
}}
|
}}
|
||||||
bind:modal_open
|
bind:modal_open
|
||||||
bind:delete_org />
|
bind:delete_org />
|
||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:GET')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:GET')}
|
||||||
{#await promise}
|
{#await promise}
|
||||||
<div
|
<div
|
||||||
class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
|
class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{o.name}
|
{o.name}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{#if o.address}
|
{#if o.address}
|
||||||
{JSON.stringify(o.address)}
|
{JSON.stringify(o.address)}
|
||||||
{:else}no address specified{/if}
|
{:else}no address specified{/if}
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{#if o.contact}
|
{#if o.contact}
|
||||||
{JSON.stringify(o.contact)}
|
{JSON.stringify(o.contact)}
|
||||||
{:else}no contact specified{/if}
|
{:else}no contact specified{/if}
|
||||||
@@ -121,7 +121,7 @@
|
|||||||
Delete</button>
|
Delete</button>
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
RunnerOrganisationService.runnerOrganisationControllerRemove(o.id, false)
|
RunnerOrganizationService.runnerOrganizationControllerRemove(o.id, false)
|
||||||
.then((resp) => {
|
.then((resp) => {
|
||||||
current_organizations = current_organizations.filter((obj) => obj.id !== o.id);
|
current_organizations = current_organizations.filter((obj) => obj.id !== o.id);
|
||||||
Toastify({
|
Toastify({
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
<a
|
<a
|
||||||
href="./{o.id}"
|
href="./{o.id}"
|
||||||
class="text-indigo-600 hover:text-indigo-900">Edit</a>
|
class="text-indigo-600 hover:text-indigo-900">Edit</a>
|
||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:DELETE')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:DELETE')}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
active_deletes[o.id] = true;
|
active_deletes[o.id] = true;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<section class="container p-5">
|
<section class="container p-5">
|
||||||
<span class="mb-1 text-3xl font-extrabold leading-tight">
|
<span class="mb-1 text-3xl font-extrabold leading-tight">
|
||||||
{$_('organizations')}
|
{$_('organizations')}
|
||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:CREATE')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:CREATE')}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
modal_open = true;
|
modal_open = true;
|
||||||
@@ -26,6 +26,6 @@
|
|||||||
<OrgOverview bind:current_organizations />
|
<OrgOverview bind:current_organizations />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANISATION:CREATE')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:CREATE')}
|
||||||
<AddOrgModal bind:current_organizations bind:modal_open />
|
<AddOrgModal bind:current_organizations bind:modal_open />
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="w-full p-4 mb-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890">
|
class="w-full p-4 mb-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-start p-4">
|
<div class="flex flex-row items-center justify-start p-4">
|
||||||
<div class="flex-shrink-0 w-24">
|
<div class="flex-shrink-0 w-24">
|
||||||
<img
|
<img
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{runner.firstname}
|
{runner.firstname}
|
||||||
{runner.middlename || ''}
|
{runner.middlename || ''}
|
||||||
{runner.lastname}
|
{runner.lastname}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
|
||||||
<a href="/runners/" class="w-full lg:w-1/4">
|
<a href="/runners/" class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="w-full lg:w-1/4">
|
<div class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<a href="/teams/" class="w-full lg:w-1/4">
|
<a href="/teams/" class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<a href="/orgs/" class="w-full lg:w-1/4">
|
<a href="/orgs/" class="w-full lg:w-1/4">
|
||||||
<div
|
<div
|
||||||
class="widget w-full p-4 rounded-lg bg-white border border-grey-100 dark:bg-grey-895 dark:border-grey-890 dark:bg-gray-900 dark:text-white">
|
class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
|
||||||
<div class="flex flex-row items-center justify-between">
|
<div class="flex flex-row items-center justify-between">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<div class="text-xs uppercase font-light text-grey-500">
|
<div class="text-xs uppercase font-light text-grey-500">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
RunnerOrganisationService,
|
RunnerOrganizationService,
|
||||||
RunnerTeamService,
|
RunnerTeamService,
|
||||||
} from "@odit/lfk-client-js";
|
} from "@odit/lfk-client-js";
|
||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
teamdata = Object.assign(teamdata, value);
|
teamdata = Object.assign(teamdata, value);
|
||||||
original = Object.assign(original, value);
|
original = Object.assign(original, value);
|
||||||
});
|
});
|
||||||
RunnerOrganisationService.runnerOrganisationControllerGetAll().then((val) => {
|
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
|
||||||
orgs = val;
|
orgs = val;
|
||||||
});
|
});
|
||||||
function deleteTeam() {
|
function deleteTeam() {
|
||||||
@@ -188,7 +188,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={teamdata.name}
|
bind:value={teamdata.name}
|
||||||
name="name"
|
name="name"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -200,14 +200,14 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={teamdata.contact}
|
bind:value={teamdata.contact}
|
||||||
name="contact"
|
name="contact"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label for="org" class="font-medium text-gray-700">Parent Organization</label>
|
<label for="org" class="font-medium text-gray-700">Parent Organization</label>
|
||||||
<select
|
<select
|
||||||
name="org"
|
name="org"
|
||||||
bind:value={teamdata.parentGroup}
|
bind:value={teamdata.parentGroup}
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2">
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
|
||||||
{#each orgs as o}
|
{#each orgs as o}
|
||||||
<option value={o.id}>{o.name}</option>
|
<option value={o.id}>{o.name}</option>
|
||||||
{/each}
|
{/each}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{t.name}
|
{t.name}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{#if t.parentGroup}
|
{#if t.parentGroup}
|
||||||
{t.parentGroup.name}
|
{t.parentGroup.name}
|
||||||
{:else}no organization specified{/if}
|
{:else}no organization specified{/if}
|
||||||
@@ -103,7 +103,7 @@
|
|||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{#if t.contact}
|
{#if t.contact}
|
||||||
{JSON.stringify(t.contact)}
|
{JSON.stringify(t.contact)}
|
||||||
{:else}no contact specified{/if}
|
{:else}no contact specified{/if}
|
||||||
|
|||||||
@@ -206,7 +206,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={editable_userdata.firstname}
|
bind:value={editable_userdata.firstname}
|
||||||
name="firstname"
|
name="firstname"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -218,7 +218,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={editable_userdata.middlename}
|
bind:value={editable_userdata.middlename}
|
||||||
name="middlename"
|
name="middlename"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -230,7 +230,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={editable_userdata.lastname}
|
bind:value={editable_userdata.lastname}
|
||||||
name="lastname"
|
name="lastname"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -242,7 +242,7 @@
|
|||||||
type="email"
|
type="email"
|
||||||
bind:value={editable_userdata.email}
|
bind:value={editable_userdata.email}
|
||||||
name="email"
|
name="email"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<label
|
<label
|
||||||
@@ -254,14 +254,14 @@
|
|||||||
type="text"
|
type="text"
|
||||||
bind:value={editable_userdata.username}
|
bind:value={editable_userdata.username}
|
||||||
name="username"
|
name="username"
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
|
||||||
</div>
|
</div>
|
||||||
<div class="text-sm w-full">
|
<div class="text-sm w-full">
|
||||||
<span class="font-medium">{$_('groups')}</span>
|
<span class="font-medium">{$_('groups')}</span>
|
||||||
<!-- svelte-ignore a11y-no-onchange -->
|
<!-- svelte-ignore a11y-no-onchange -->
|
||||||
<select
|
<select
|
||||||
bind:value={usergroups_array}
|
bind:value={usergroups_array}
|
||||||
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2"
|
class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
|
||||||
multiple>
|
multiple>
|
||||||
{#each allgroups as g}
|
{#each allgroups as g}
|
||||||
{#if usergroups_array.includes(g.id)}
|
{#if usergroups_array.includes(g.id)}
|
||||||
@@ -291,7 +291,7 @@
|
|||||||
{#each allpermissions as p}
|
{#each allpermissions as p}
|
||||||
{#if !editable_userdata.permissions.includes(p)}
|
{#if !editable_userdata.permissions.includes(p)}
|
||||||
<p
|
<p
|
||||||
class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
|
class="block w-full mt-1 text-sm bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple form-input">
|
||||||
{p}
|
{p}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
@@ -311,7 +311,7 @@
|
|||||||
{#each allpermissions as p}
|
{#each allpermissions as p}
|
||||||
{#if editable_userdata.permissions.includes(p)}
|
{#if editable_userdata.permissions.includes(p)}
|
||||||
<p
|
<p
|
||||||
class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
|
class="block w-full mt-1 text-sm bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple form-input">
|
||||||
{p}
|
{p}
|
||||||
<button
|
<button
|
||||||
on:click={() => {
|
on:click={() => {
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
<div
|
<div
|
||||||
class="text-sm font-medium text-gray-900 dark:text-gray-100">
|
class="text-sm font-medium text-gray-900">
|
||||||
{u.firstname}
|
{u.firstname}
|
||||||
{u.middlename || ''}
|
{u.middlename || ''}
|
||||||
{u.lastname}
|
{u.lastname}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const package = JSON.parse(fs.readFileSync(`./package.json`, { encoding: 'utf-8' }));
|
const package = JSON.parse(fs.readFileSync(`./package.json`, { encoding: 'utf-8' }));
|
||||||
const original = fs.readFileSync(`./public/index.html`, { encoding: 'utf-8' });
|
const original = fs.readFileSync(`./index.template.html`, { encoding: 'utf-8' });
|
||||||
let out = original.replace(/RELEASE_INFO-(\S)+-RELEASE_INFO/gi, 'RELEASE_INFO-' + package.version + '-RELEASE_INFO');
|
let out = original.replace(/RELEASE_INFO-(\S)+-RELEASE_INFO/gi, 'RELEASE_INFO-' + package.version + '-RELEASE_INFO');
|
||||||
fs.writeFileSync(`./public/index.html`, out);
|
fs.writeFileSync(`./index.template.html`, out);
|
||||||
|
|||||||
Reference in New Issue
Block a user