Merge branch 'dev' of https://git.odit.services/lfk/frontend into dev
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
commit
7a63d4eed1
41
CHANGELOG.md
41
CHANGELOG.md
|
|
@ -2,12 +2,53 @@
|
|||
|
||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||
|
||||
#### [0.15.1](https://git.odit.services/lfk/frontend/compare/0.15.0...0.15.1)
|
||||
|
||||
- Merge pull request '🐞🐳 fix Dockerfile' (#138) from bugfix/136-opacity_reactivity into dev [`2bd3779`](https://git.odit.services/lfk/frontend/commit/2bd3779839de16a89b91a3da93033e2a2b742ab7)
|
||||
- 🚚 move to tailwind [`07ac041`](https://git.odit.services/lfk/frontend/commit/07ac041d69b3b1810e5db538b53fe62084490f7a)
|
||||
- 🐞🐳 fix Dockerfile [`303e33c`](https://git.odit.services/lfk/frontend/commit/303e33cafb4a1be01e4c4b43f46ff0c651cb4620)
|
||||
- Dockerfile now uses selfhosted registry [`b4e689d`](https://git.odit.services/lfk/frontend/commit/b4e689dddf0b93a2794aa30ea83e8c6505d6bbfd)
|
||||
- new license file version [CI SKIP] [`98a0b03`](https://git.odit.services/lfk/frontend/commit/98a0b036c5490b4bc4992e83f3bca02be39927fa)
|
||||
- Merge pull request 'Opacity import fix bugfix/136-opacity_reactivity' (#137) from bugfix/136-opacity_reactivity into dev [`fb3f30f`](https://git.odit.services/lfk/frontend/commit/fb3f30fb1024de61ce1c541dae90374454f6ef96)
|
||||
- Added bs import fix [`6213952`](https://git.odit.services/lfk/frontend/commit/621395200751c2d42b9ad44c77e84bda03b62e83)
|
||||
|
||||
#### [0.15.0](https://git.odit.services/lfk/frontend/compare/0.14.0...0.15.0)
|
||||
|
||||
> 15 April 2021
|
||||
|
||||
- 🚀RELEASE v0.15.0 [`5c02028`](https://git.odit.services/lfk/frontend/commit/5c02028841c68d9a284bf6971eec2b6bc2fdf1f3)
|
||||
- Merge pull request 'Mark donations as payed feature/133-donation_payments' (#135) from feature/133-donation_payments into dev [`c561b53`](https://git.odit.services/lfk/frontend/commit/c561b536705a68215d9c0a6b320587d1647bf57f)
|
||||
- Sorted translations [`c7a858e`](https://git.odit.services/lfk/frontend/commit/c7a858eed7962294bc9df3c92ce2e46b0a354796)
|
||||
- Added total donation amount to donor overview [`e42ea94`](https://git.odit.services/lfk/frontend/commit/e42ea943b7821d433fe21599edbd9f76c3128ef2)
|
||||
- Added Add Payment button to donor overview [`6e6e8b2`](https://git.odit.services/lfk/frontend/commit/6e6e8b26171f16542c101520800b4b6ea7c023d3)
|
||||
- You can now open a modal to add a payment to a donation from the donation overview [`a943aaf`](https://git.odit.services/lfk/frontend/commit/a943aaf5fce8f113dd967d3842e2b0d7d50604e9)
|
||||
- You can now add payments from the donation overview [`1dbab03`](https://git.odit.services/lfk/frontend/commit/1dbab03fe73b5e0fc011f9b0af7199bd71bc79c5)
|
||||
- Added payment updating via detail [`bdcf5d3`](https://git.odit.services/lfk/frontend/commit/bdcf5d3fc08d250377226a253642d79b2e82d624)
|
||||
- Added **all** missing toast translations [`de5aa92`](https://git.odit.services/lfk/frontend/commit/de5aa9237d261b5d47a8def35afa7f8e0089aea6)
|
||||
- You can now mark fixed donations as already paid on creation [`3d3a10a`](https://git.odit.services/lfk/frontend/commit/3d3a10aafb16d371be9471eb5172f9251fb2583f)
|
||||
- Added translations 🌎 [`d015f97`](https://git.odit.services/lfk/frontend/commit/d015f9739570c44a7a2fe6ba248c9a45c3047c62)
|
||||
- Changed top info style for donation overview [`4c2c24a`](https://git.odit.services/lfk/frontend/commit/4c2c24af2ca5c2874a583b0fd93bee147a17f449)
|
||||
- Added paid donation amount and status to donation detail [`5645eea`](https://git.odit.services/lfk/frontend/commit/5645eeaafaa4254edf1a81bc597ce0c7a9b03ff0)
|
||||
- Added total donation amount to donation overview [`961477d`](https://git.odit.services/lfk/frontend/commit/961477d5224bc44b552d2fc2851d8514116f4e20)
|
||||
- Fixed chante recognition bug for fixed donation [`0f0aae7`](https://git.odit.services/lfk/frontend/commit/0f0aae7ba4cf5dfab15d56ce48edbdbc7cb7e403)
|
||||
- Added total donation amount to donor detail [`a5f7101`](https://git.odit.services/lfk/frontend/commit/a5f71015a6557d664e9d3f505613352792fc38cb)
|
||||
- Added msiisng runner id conversion [`5761815`](https://git.odit.services/lfk/frontend/commit/57618156b49b2b0f0274f2126fef36a017d90022)
|
||||
- AddDonationModal - vertical alignment for paid status [`18acac8`](https://git.odit.services/lfk/frontend/commit/18acac83bc6532e14d36b3399d867e026d0c88ac)
|
||||
- Added missing updated comparison [`04a3038`](https://git.odit.services/lfk/frontend/commit/04a3038369f2717c43459318b7b5754ebbaa9e45)
|
||||
- DonationsOverview contrast on action [`d7d4447`](https://git.odit.services/lfk/frontend/commit/d7d44470bb08ac06594bc400608c17eeacb0434b)
|
||||
- Fixed typo [`4c0886a`](https://git.odit.services/lfk/frontend/commit/4c0886a5d9b91439967bc8f66b09a57177f967d0)
|
||||
- Fixed styling [`865254d`](https://git.odit.services/lfk/frontend/commit/865254d646b5f7de15720551c67ae649601cbcd2)
|
||||
- Changed top info style for donation detail [`000fc97`](https://git.odit.services/lfk/frontend/commit/000fc97beb14427f69d421ff2c96975dbbdc7a3a)
|
||||
|
||||
#### [0.14.0](https://git.odit.services/lfk/frontend/compare/0.13.1...0.14.0)
|
||||
|
||||
> 14 April 2021
|
||||
|
||||
- Merge pull request 'added donor receipt list download to DonorsOverview' (#134) from feature/132-export-donors-receipt-list into dev [`#132`](https://git.odit.services/lfk/frontend/issues/132)
|
||||
- Sorted translations 🌎 [`c6c9751`](https://git.odit.services/lfk/frontend/commit/c6c97516b3981ef580d620c0c8a6fcc42f26facd)
|
||||
- Fixed typos in translations [`03676b2`](https://git.odit.services/lfk/frontend/commit/03676b2894892c3559118b93e969c063b53b081e)
|
||||
- added donor receipt list download to DonorsOverview [`d241ca5`](https://git.odit.services/lfk/frontend/commit/d241ca569838abbe9581fbd319f7f3b563cb7dcc)
|
||||
- 🚀RELEASE v0.14.0 [`9c5fc6b`](https://git.odit.services/lfk/frontend/commit/9c5fc6b61c0bb2a6d831d4a23ef8679c6e68c6a1)
|
||||
- ⏫ general version bump [`18f151c`](https://git.odit.services/lfk/frontend/commit/18f151c1fb878a74c3d1a2c2a2debf7913739417)
|
||||
- new license file version [CI SKIP] [`302caf0`](https://git.odit.services/lfk/frontend/commit/302caf015f88f77e2b2ae2b67680e79f987ad81e)
|
||||
- Switched to selfhosted images [`112eb29`](https://git.odit.services/lfk/frontend/commit/112eb29f932cd936f1d6c2308dcaeaf8cb642490)
|
||||
|
|
|
|||
10
Dockerfile
10
Dockerfile
|
|
@ -1,14 +1,12 @@
|
|||
FROM node:15.5.1-alpine3.12
|
||||
FROM registry.odit.services/hub/library/node:15.14.0-alpine3.13
|
||||
WORKDIR /app
|
||||
COPY package.json ./
|
||||
RUN yarn
|
||||
COPY package.json *.config.js index.html ./
|
||||
COPY package.json *.config.js postcss.config.cjs index.html ./
|
||||
COPY src ./src
|
||||
COPY public ./public
|
||||
RUN yarn build
|
||||
# final image
|
||||
FROM alpine
|
||||
COPY --from=0 /app/dist /app
|
||||
FROM fholzer/nginx-brotli:v1.19.1
|
||||
COPY --from=1 /app /usr/share/nginx/html
|
||||
FROM registry.odit.services/hub/fholzer/nginx-brotli:v1.19.1
|
||||
COPY --from=0 /app/dist /usr/share/nginx/html
|
||||
COPY ./nginx.conf /etc/nginx/nginx.conf
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.14.0-RELEASE_INFO</span>
|
||||
<span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.15.1-RELEASE_INFO</span>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<script src="/env.js"></script>
|
||||
<script type="module" src="/src/main.js"></script>
|
||||
|
|
|
|||
12
package.json
12
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@odit/lfk-frontend",
|
||||
"version": "0.14.0",
|
||||
"version": "0.15.1",
|
||||
"scripts": {
|
||||
"i18n-order": "node order.js",
|
||||
"dev": "vite",
|
||||
|
|
@ -10,30 +10,30 @@
|
|||
},
|
||||
"license": "CC-BY-NC-SA-4.0",
|
||||
"devDependencies": {
|
||||
"check-password-strength": "2.0.2",
|
||||
"@odit/lfk-client-js": "0.11.0",
|
||||
"@odit/license-exporter": "0.0.11",
|
||||
"@sveltejs/vite-plugin-svelte": "1.0.0-next.6",
|
||||
"@types/html-minifier": "4.0.0",
|
||||
"auto-changelog": "2.2.1",
|
||||
"autoprefixer": "10.2.5",
|
||||
"autoprefixer": "^10.2.5",
|
||||
"check-password-strength": "2.0.2",
|
||||
"csvtojson": "2.0.10",
|
||||
"gridjs": "3.4.0",
|
||||
"html-minifier": "4.0.0",
|
||||
"localforage": "1.9.0",
|
||||
"marked": "2.0.3",
|
||||
"postcss": "^8.2.10",
|
||||
"release-it": "14.6.1",
|
||||
"svelte": "3.37.0",
|
||||
"svelte-focus-trap": "1.2.0",
|
||||
"svelte-i18n": "3.3.9",
|
||||
"svelte-preprocess": "4.7.0",
|
||||
"svelte-preprocess": "^4.7.0",
|
||||
"svelte-select": "3.17.0",
|
||||
"tailwindcss": "2.1.1",
|
||||
"tailwindcss": "^2.1.1",
|
||||
"tinro": "0.6.1",
|
||||
"toastify-js": "1.10.0",
|
||||
"validator": "13.5.2",
|
||||
"vite": "2.1.5",
|
||||
"vite-plugin-windicss": "0.14.0",
|
||||
"xlsx": "0.16.9"
|
||||
},
|
||||
"release-it": {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
module.exports = {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
autoprefixer: {}
|
||||
}
|
||||
};
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -76,7 +76,7 @@
|
|||
// last login was not processed yet
|
||||
} else {
|
||||
Toastify({
|
||||
text: "chill...",
|
||||
text: $_('please-wait-a-moment-your-login-is-still-being-processed'),
|
||||
duration: 1500,
|
||||
backgroundColor:
|
||||
"linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
<!--
|
||||
Temporary tailwind import fixes for classes that wouldn't be directly used otherwise.
|
||||
Or as others may call it: Real big bullshit time.
|
||||
Issue: https://git.odit.services/lfk/frontend/issues/136
|
||||
-->
|
||||
<div class="opacity-50"></div>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
if (processed_last_submit === true) {
|
||||
processed_last_submit = false;
|
||||
const toast = Toastify({
|
||||
text: "Contact is being added...",
|
||||
text: $_('contact-is-being-added'),
|
||||
duration: -1,
|
||||
}).showToast();
|
||||
let address = {};
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: "Contact added",
|
||||
text: $_('contact-added'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
} from "@odit/lfk-client-js";
|
||||
import Select from "svelte-select";
|
||||
import Toastify from "toastify-js";
|
||||
import { is_promise } from "svelte/internal";
|
||||
export let modal_open;
|
||||
export let current_donations;
|
||||
const getDonorLabel = (option) =>
|
||||
|
|
@ -24,6 +25,7 @@
|
|||
$: donors = [];
|
||||
$: runners = [];
|
||||
$: is_fixed = false;
|
||||
$: is_paid = false;
|
||||
DonorService.donorControllerGetAll().then((val) => {
|
||||
donors = val.map((r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
|
|
@ -57,14 +59,18 @@
|
|||
let amount_cent = Math.floor(amount_input * 100);
|
||||
processed_last_submit = false;
|
||||
const toast = Toastify({
|
||||
text: "adding donation",
|
||||
text: $_('adding-donation'),
|
||||
duration: -1,
|
||||
}).showToast();
|
||||
if (is_fixed) {
|
||||
let postdata = {
|
||||
donor,
|
||||
amount: amount_cent,
|
||||
paidAmount: 0
|
||||
};
|
||||
if(is_paid){
|
||||
postdata.paidAmount = amount_cent;
|
||||
}
|
||||
DonationService.donationControllerPostFixed(postdata)
|
||||
.then((result) => {
|
||||
donor = donors[0].id || 0;
|
||||
|
|
@ -73,7 +79,7 @@
|
|||
modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: "donation_added",
|
||||
text: $_('donation_added'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -102,7 +108,7 @@
|
|||
modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: "donation_added",
|
||||
text: $_('donation_added'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -123,7 +129,7 @@
|
|||
</script>
|
||||
|
||||
<style>
|
||||
input:before {
|
||||
.toggle:before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 1.25rem;
|
||||
|
|
@ -137,12 +143,12 @@
|
|||
transition: 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
input:checked {
|
||||
.toggle:checked {
|
||||
/* @apply: bg-indigo-400; */
|
||||
background-color: #7f9cf5;
|
||||
}
|
||||
|
||||
input:checked:before {
|
||||
.toggle:checked:before {
|
||||
left: 1.25rem;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -195,7 +201,7 @@
|
|||
class="ml-2 text-base"
|
||||
class:text-gray-300={is_fixed}>{$_('distance-donation')}</span>
|
||||
<input
|
||||
class="relative w-10 h-5 transition-all duration-200 ease-in-out bg-gray-400 rounded-full shadow-inner outline-none appearance-none align-middle"
|
||||
class="toggle relative w-10 h-5 transition-all duration-200 ease-in-out bg-gray-400 rounded-full shadow-inner outline-none appearance-none align-middle"
|
||||
type="checkbox"
|
||||
bind:checked={is_fixed} />
|
||||
<span
|
||||
|
|
@ -267,6 +273,29 @@
|
|||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
{#if is_fixed}
|
||||
<div class="col-span-6">
|
||||
<label
|
||||
for="paid"
|
||||
class="block text-sm font-medium text-gray-700">{$_('already-paid')}</label>
|
||||
<p class="text-gray-500">
|
||||
<input
|
||||
id="paid"
|
||||
bind:checked={is_paid}
|
||||
name="paid"
|
||||
type="checkbox"
|
||||
class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" >
|
||||
<span class="align-text-bottom">
|
||||
|
||||
{#if is_paid}
|
||||
{$_('paid')}
|
||||
{:else}
|
||||
{$_('open')}
|
||||
{/if}
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,202 @@
|
|||
<script>
|
||||
import { _ } from "svelte-i18n";
|
||||
import { clickOutside } from "../base/outsideclick";
|
||||
import { focusTrap } from "svelte-focus-trap";
|
||||
import { DonationService } from "@odit/lfk-client-js";
|
||||
import Toastify from "toastify-js";
|
||||
export let payment_modal_open = false;
|
||||
export let current_donations = [];
|
||||
export let editable = {};
|
||||
export let original_data = {};
|
||||
export let paid_amount_input = 0;
|
||||
$:processed_last_submit=true;
|
||||
function focus(el) {
|
||||
el.focus();
|
||||
}
|
||||
$: createbtnenabled = is_paid_amount_valid && !(paid_amount_input*100 == original_data.paidAmount)
|
||||
$: is_paid_amount_valid = paid_amount_input > 0;
|
||||
(() => {
|
||||
document.onkeydown = (e) => {
|
||||
e = e || window.event;
|
||||
if (e.key === "Escape") {
|
||||
payment_modal_open = false;
|
||||
}
|
||||
if (e.keyCode === 13) {
|
||||
if (createbtnenabled === true) {
|
||||
createbtnenabled = false;
|
||||
submit();
|
||||
}
|
||||
}
|
||||
};
|
||||
})();
|
||||
function submit() {
|
||||
if (processed_last_submit === true) {
|
||||
processed_last_submit = false;
|
||||
const toast = Toastify({
|
||||
text: $_('updating-donation'),
|
||||
duration: -1,
|
||||
}).showToast();
|
||||
editable.donor = editable.donor.id;
|
||||
editable.paidAmount = paid_amount_input*100;
|
||||
if(editable.responseType == "DISTANCEDONATION" || editable.runner){
|
||||
editable.runner = editable.runner.id;
|
||||
DonationService.donationControllerPutDistance(original_data.id, editable)
|
||||
.then((result) => {
|
||||
let id = original_data.id;
|
||||
editable = {};
|
||||
original_data = {};
|
||||
payment_modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: $_('donation-updated'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
current_donations[current_donations.findIndex((c) => c.id === id)] = result;
|
||||
current_donations = current_donations;
|
||||
})
|
||||
.catch((err) => {
|
||||
//
|
||||
})
|
||||
.finally(() => {
|
||||
processed_last_submit = true;
|
||||
//
|
||||
toast.hideToast();
|
||||
});
|
||||
}
|
||||
else{
|
||||
DonationService.donationControllerPutFixed(original_data.id, editable)
|
||||
.then((result) => {
|
||||
let id = original_data.id;
|
||||
editable = {};
|
||||
original_data = {};
|
||||
payment_modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: $_('donation-updated'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
current_donations[current_donations.findIndex((c) => c.id === id)] = result;
|
||||
current_donations = current_donations;
|
||||
})
|
||||
.catch((err) => {
|
||||
//
|
||||
})
|
||||
.finally(() => {
|
||||
processed_last_submit = true;
|
||||
//
|
||||
toast.hideToast();
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
{#if payment_modal_open}
|
||||
<div
|
||||
class="fixed z-10 inset-0 overflow-y-auto"
|
||||
use:focusTrap
|
||||
use:clickOutside
|
||||
on:click_outside={() => {
|
||||
payment_modal_open = false;
|
||||
}}>
|
||||
<div
|
||||
class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
|
||||
<div class="fixed inset-0 transition-opacity" aria-hidden="true">
|
||||
<div
|
||||
class="absolute inset-0 bg-gray-500 opacity-75"
|
||||
data-id="modal_backdrop" />
|
||||
</div>
|
||||
<span
|
||||
class="hidden sm:inline-block sm:align-middle sm:h-screen"
|
||||
aria-hidden="true">​</span>
|
||||
<div
|
||||
class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-labelledby="modal-headline">
|
||||
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
|
||||
<div class="sm:flex sm:items-start">
|
||||
<div
|
||||
class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
|
||||
<svg
|
||||
class="h-6 w-6 text-blue-600"
|
||||
fill="currentColor"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
width="24"
|
||||
height="24"><path fill="none" d="M0 0h24v24H0z" />
|
||||
<path
|
||||
fill="currentColor"
|
||||
d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z" /></svg>
|
||||
</div>
|
||||
<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
|
||||
<h3 class="text-lg leading-6 font-medium text-gray-900">
|
||||
{$_('enter-payment')}
|
||||
</h3>
|
||||
<div class="mt-2 mb-6">
|
||||
<p class="text-sm text-gray-500">
|
||||
{$_('you-can-enter-the-donations-paid-amount-manually-or-use-the-max-button-to-use-the-donations-exact-amount')}
|
||||
</p>
|
||||
</div>
|
||||
<div class="grid grid-cols gap-6">
|
||||
<div class="w-full">
|
||||
<label
|
||||
for="token"
|
||||
class="block text-sm font-medium text-gray-700">{$_('paid-amount')}</label>
|
||||
<div class="inline-flex border-gray-300 border rounded-l-md rounded-r-md bg-gray-50 text-gray-500 w-full">
|
||||
<input
|
||||
autocomplete="off"
|
||||
class:border-red-500={!is_paid_amount_valid}
|
||||
class:focus:border-red-500={!is_paid_amount_valid}
|
||||
class:focus:ring-red-500={!is_paid_amount_valid}
|
||||
bind:value={paid_amount_input}
|
||||
type="number"
|
||||
step="0.01"
|
||||
name="donation_amount_eur"
|
||||
class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm p-2"
|
||||
placeholder="2.00" />
|
||||
<button
|
||||
on:click={
|
||||
()=>{
|
||||
paid_amount_input=paid_amount_input = (original_data.amount/100).toFixed(2);
|
||||
}
|
||||
}
|
||||
class="inline-flex items-center p-r-2 text-indigo-300 hover:text-indigo-700 text-sm">MAX</button>
|
||||
<span
|
||||
class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm">€</span>
|
||||
</div>
|
||||
{#if !is_paid_amount_valid}
|
||||
<span
|
||||
class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
|
||||
{$_('payment-amount-must-be-greater-than-0-00eur')}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
|
||||
<button
|
||||
disabled={!createbtnenabled}
|
||||
class:opacity-50={!createbtnenabled}
|
||||
on:click={submit}
|
||||
type="button"
|
||||
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
|
||||
{$_('save-changes')}
|
||||
</button>
|
||||
<button
|
||||
on:click={() => {
|
||||
payment_modal_open = false;
|
||||
}}
|
||||
type="button"
|
||||
class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
|
||||
{$_('cancel')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
|
@ -20,6 +20,8 @@
|
|||
$: current_runners = [];
|
||||
$: amount_input = 0;
|
||||
$: is_amount_valid = amount_input > 0;
|
||||
$: paid_amount_input = 0;
|
||||
$: is_paid_amount_valid = paid_amount_input > 0;
|
||||
$: is_everything_set =
|
||||
editable.donor != null &&
|
||||
((original_data.responseType == "DISTANCEDONATION" &&
|
||||
|
|
@ -30,15 +32,17 @@
|
|||
(original_data.responseType == "DISTANCEDONATION" &&
|
||||
!(Math.floor(amount_input * 100) === original_data.amountPerDistance)) ||
|
||||
(original_data.responseType !== "DISTANCEDONATION" &&
|
||||
!(Math.floor(amount_input * 100) === original_data.amount));
|
||||
!(Math.floor(amount_input * 100) === original_data.amount)) ||
|
||||
!(Math.floor(paid_amount_input * 100) === original_data.paidAmount);
|
||||
$: save_enabled = changes_performed && is_amount_valid && is_everything_set;
|
||||
|
||||
const promise = DonationService.donationControllerGetOne(
|
||||
params.donationid
|
||||
).then((data) => {
|
||||
data_loaded = true;
|
||||
original_data = Object.assign(original_data, data);
|
||||
editable = Object.assign(editable, original_data);
|
||||
original_data = Object.assign({}, data);
|
||||
editable = Object.assign({}, original_data);
|
||||
paid_amount_input = data.paidAmount / 100;
|
||||
if (data.responseType == "DISTANCEDONATION") {
|
||||
amount_input = data.amountPerDistance / 100;
|
||||
RunnerService.runnerControllerGetAll().then((val) => {
|
||||
|
|
@ -66,10 +70,11 @@
|
|||
function submit() {
|
||||
if (data_loaded === true && save_enabled) {
|
||||
Toastify({
|
||||
text: "Donation is being updated",
|
||||
text: $_('updating-donation'),
|
||||
duration: 2500,
|
||||
}).showToast();
|
||||
let postdata = {};
|
||||
editable.paidAmount = paid_amount_input*100;
|
||||
if (original_data.responseType === "DISTANCEDONATION") {
|
||||
editable.amountPerDistance = Math.floor(amount_input * 100);
|
||||
postdata = Object.assign(postdata, editable);
|
||||
|
|
@ -83,7 +88,7 @@
|
|||
Object.assign(original_data, editable);
|
||||
original_data = original_data;
|
||||
Toastify({
|
||||
text: "updated donation",
|
||||
text: $_('donation-updated'),
|
||||
duration: 2500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -98,7 +103,7 @@
|
|||
Object.assign(original_data, editable);
|
||||
original_data = original_data;
|
||||
Toastify({
|
||||
text: "updated donation",
|
||||
text: $_('donation-updated'),
|
||||
duration: 2500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -112,7 +117,7 @@
|
|||
DonationService.donationControllerRemove(original_data.id, false)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Donation delete",
|
||||
text: $_('donation-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -219,7 +224,24 @@
|
|||
<span>{(editable.amount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€</span>
|
||||
|
|
||||
<span
|
||||
class="font-medium text-gray-700">{$_('paid-amount')}:</span>
|
||||
<span>{(editable.paidAmount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€</span>
|
||||
|
|
||||
<span
|
||||
class="font-medium text-gray-700">{$_('status')}:</span>
|
||||
{#if editable.status =="PAID"}
|
||||
<span
|
||||
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">{$_('paid')}</span>
|
||||
{:else}
|
||||
<span
|
||||
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">{$_('open')}</span>
|
||||
{/if}
|
||||
</div>
|
||||
<br>
|
||||
<div class=" w-full">
|
||||
<label
|
||||
for="donor"
|
||||
|
|
@ -232,7 +254,7 @@
|
|||
placeholder={$_('search-for-donor-name-or-id')}
|
||||
noOptionsMessage={$_('no-donors-found')}
|
||||
bind:selectedValue={donor}
|
||||
on:select={(selectedValue) => (editable.donor = selectedValue.detail.value)}
|
||||
on:select={(selectedValue) => {editable.donor = selectedValue.detail.value; editable.donor.donationAmount=original_data.donor.donationAmount; editable.donor.paidDonationAmount =original_data.donor.paidDonationAmount}}
|
||||
on:clear={() => (editable.donor = null)} />
|
||||
</div>
|
||||
{#if original_data.responseType == 'DISTANCEDONATION'}
|
||||
|
|
@ -280,6 +302,39 @@
|
|||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<label
|
||||
for="token"
|
||||
class="block text-sm font-medium text-gray-700">{$_('paid-amount')}</label>
|
||||
<div class="inline-flex border-gray-300 border rounded-l-md rounded-r-md bg-gray-50 text-gray-500 w-full">
|
||||
<input
|
||||
autocomplete="off"
|
||||
class:border-red-500={!is_amount_valid}
|
||||
class:focus:border-red-500={!is_amount_valid}
|
||||
class:focus:ring-red-500={!is_amount_valid}
|
||||
bind:value={paid_amount_input}
|
||||
type="number"
|
||||
step="0.01"
|
||||
name="donation_amount_eur"
|
||||
class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm p-2"
|
||||
placeholder="2.00" />
|
||||
<button
|
||||
on:click={
|
||||
()=>{
|
||||
paid_amount_input=paid_amount_input = (original_data.amount/100).toFixed(2);
|
||||
}
|
||||
}
|
||||
class="inline-flex items-center p-r-2 text-indigo-300 hover:text-indigo-700 text-sm">MAX</button>
|
||||
<span
|
||||
class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm">€</span>
|
||||
</div>
|
||||
{#if !is_paid_amount_valid}
|
||||
<span
|
||||
class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
|
||||
{$_('payment-amount-must-be-greater-than-0-00eur')}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
</section>
|
||||
{:catch error}
|
||||
<PromiseError {error} />
|
||||
|
|
|
|||
|
|
@ -4,9 +4,14 @@
|
|||
import store from "../../store";
|
||||
import Toastify from "toastify-js";
|
||||
import DonationsEmptyState from "./DonationsEmptyState.svelte";
|
||||
import AddDonationPaymentModal from "./AddDonationPaymentModal.svelte";
|
||||
$: searchvalue = "";
|
||||
$: active_deletes = [];
|
||||
export let current_donations = [];
|
||||
export let payment_modal_open = false;
|
||||
export let editable = {};
|
||||
export let original_data = {};
|
||||
export let paid_amount_input = 0;
|
||||
const donations_promise = DonationService.donationControllerGetAll().then(
|
||||
(val) => {
|
||||
current_donations = val;
|
||||
|
|
@ -18,8 +23,15 @@
|
|||
}
|
||||
return id.toString() === searchvalue;
|
||||
}
|
||||
function open_payment_modal(donation) {
|
||||
editable = Object.assign({}, donation);
|
||||
original_data = Object.assign({}, donation);
|
||||
paid_amount_input = (donation.paidAmount/100).toFixed(2);
|
||||
payment_modal_open = true;
|
||||
}
|
||||
</script>
|
||||
|
||||
<AddDonationPaymentModal bind:current_donations bind:original_data bind:editable bind:paid_amount_input bind:payment_modal_open />
|
||||
{#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:GET')}
|
||||
{#await donations_promise}
|
||||
<div
|
||||
|
|
@ -63,6 +75,16 @@
|
|||
class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||
{$_('donation-amount')}
|
||||
</th>
|
||||
<th
|
||||
scope="col"
|
||||
class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||
{$_('paid-amount')}
|
||||
</th>
|
||||
<th
|
||||
scope="col"
|
||||
class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||
{$_('status')}
|
||||
</th>
|
||||
<th scope="col" class="relative px-6 py-3">
|
||||
<span class="sr-only">{$_('action')}</span>
|
||||
</th>
|
||||
|
|
@ -132,6 +154,22 @@
|
|||
.toLocaleString('de-DE', { valute: 'EUR' })}€
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap">
|
||||
<div class="text-sm font-medium text-gray-900">
|
||||
{(donation.paidAmount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap">
|
||||
{#if donation.status =="PAID"}
|
||||
<span
|
||||
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">{$_('paid')}</span>
|
||||
{:else}
|
||||
<span
|
||||
class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">{$_('open')}</span>
|
||||
{/if}
|
||||
</td>
|
||||
{#if active_deletes[donation.id] === true}
|
||||
<td
|
||||
class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
||||
|
|
@ -149,7 +187,7 @@
|
|||
(obj) => obj.id !== donation.id
|
||||
);
|
||||
Toastify({
|
||||
text: 'Donation deleted',
|
||||
text: $_('donation-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor:
|
||||
'linear-gradient(to right, #00b09b, #96c93d)',
|
||||
|
|
@ -163,6 +201,9 @@
|
|||
{:else}
|
||||
<td
|
||||
class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
||||
<button
|
||||
on:click={() => {open_payment_modal(donation);}}
|
||||
class="text-[#025a21] hover:text-green-900 mr-4">{$_('enter-payment')}</button>
|
||||
<a
|
||||
href="./{donation.id}"
|
||||
class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Donor deleted",
|
||||
text: $_('donor-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -193,6 +193,12 @@
|
|||
<span>{(editable.donationAmount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€</span>
|
||||
|
|
||||
<span
|
||||
class="font-medium text-gray-700">{$_('total-paid-amount')}:</span>
|
||||
<span>{(editable.paidDonationAmount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€</span>
|
||||
<br />
|
||||
<span class="font-medium text-gray-700">{$_('donations')}:</span>
|
||||
{#if current_donations.filter((d) => d.donor.id == editable.id).length > 0}
|
||||
|
|
|
|||
|
|
@ -77,6 +77,11 @@
|
|||
class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||
{$_('total-donation-amount')}
|
||||
</th>
|
||||
<th
|
||||
scope="col"
|
||||
class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
|
||||
{$_('total-paid-amount')}
|
||||
</th>
|
||||
<th scope="col" class="relative px-6 py-3">
|
||||
<span class="sr-only">{$_('action')}</span>
|
||||
</th>
|
||||
|
|
@ -145,6 +150,11 @@
|
|||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€
|
||||
</td>
|
||||
<td class="px-6 py-4 whitespace-nowrap">
|
||||
{(donor.paidDonationAmount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })}€
|
||||
</td>
|
||||
{#if active_deletes[donor.id] === true}
|
||||
<td
|
||||
class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Organization deleted",
|
||||
text: $_('organization-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@
|
|||
toast.hideToast();
|
||||
recent_processed = true;
|
||||
Toastify({
|
||||
text: "Import finished",
|
||||
text: $_('import-finished'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
MeService.meControllerRemove(true)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Profile deleted!",
|
||||
text: $_('profile-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
if (processed_last_submit === true) {
|
||||
processed_last_submit = false;
|
||||
const toast = Toastify({
|
||||
text: "Team is being added...",
|
||||
text: $_('team-is-being-added'),
|
||||
duration: -1,
|
||||
}).showToast();
|
||||
RunnerTeamService.runnerTeamControllerPost({
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
modal_open = false;
|
||||
//
|
||||
Toastify({
|
||||
text: "Team added",
|
||||
text: $_('team-added'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
RunnerTeamService.runnerTeamControllerRemove(delete_team.id, true)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Team deleted",
|
||||
text: $_('team-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@
|
|||
export let params;
|
||||
export let import_modal_open = false;
|
||||
$: delete_triggered = false;
|
||||
$: save_enabled = !data_changed && teamdata.parentGroup != null;
|
||||
$: save_enabled = data_changed && teamdata.parentGroup != null;
|
||||
$: data_loaded = false;
|
||||
$: data_changed = JSON.stringify(teamdata) === JSON.stringify(original);
|
||||
$: data_changed = !(JSON.stringify(teamdata) === JSON.stringify(original));
|
||||
$: sponsoring_contracts_show = true;
|
||||
$: cards_show = true;
|
||||
$: certificates_show = true;
|
||||
|
|
@ -47,6 +47,8 @@
|
|||
RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
|
||||
(val) => {
|
||||
orgs = val.map((r) => {
|
||||
delete r.contact;
|
||||
r.teams = [];
|
||||
return { label: r.name, value: r };
|
||||
});
|
||||
group = orgs.find((g) => g.value.id == teamdata.parentGroup.id);
|
||||
|
|
@ -67,7 +69,7 @@
|
|||
RunnerTeamService.runnerTeamControllerRemove(original.id, false)
|
||||
.then((resp) => {
|
||||
Toastify({
|
||||
text: "Organization deleted",
|
||||
text: $_('team-deleted'),
|
||||
duration: 500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
@ -81,7 +83,7 @@
|
|||
function submit() {
|
||||
if (data_loaded === true && save_enabled) {
|
||||
Toastify({
|
||||
text: "updating team",
|
||||
text: $_('updating-team'),
|
||||
duration: 2500,
|
||||
}).showToast();
|
||||
let postdata = teamdata;
|
||||
|
|
@ -92,7 +94,7 @@
|
|||
Object.assign(original, teamdata);
|
||||
original = original;
|
||||
Toastify({
|
||||
text: "updated team",
|
||||
text: $_('updated-team'),
|
||||
duration: 2500,
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
`[data-id="triggered_table_actions_${trackid}"]`
|
||||
).parentNode.parentNode.parentNode;
|
||||
Toastify({
|
||||
text: "Track is being updated...",
|
||||
text: $_('track-is-being-updated'),
|
||||
duration: 500,
|
||||
}).showToast();
|
||||
TrackService.trackControllerPut(trackid, {
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
})
|
||||
.then((r) => {
|
||||
Toastify({
|
||||
text: "Track was updated!",
|
||||
text: $_('track-was-updated'),
|
||||
backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
|
||||
duration: 1000,
|
||||
}).showToast();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
});
|
||||
function submit() {
|
||||
Toastify({
|
||||
text: "updating permissions...",
|
||||
text: $_('updating-permissions'),
|
||||
duration: 2500,
|
||||
}).showToast();
|
||||
to_delete.forEach((d) => {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
"add-your-fist-donation": "Erstelle dein erstes Sponsoring",
|
||||
"add-your-fist-scan": "Füge deinen ersten Scan hinzu",
|
||||
"adding-card": "Karte wird erstellt",
|
||||
"adding-donation": "Sponsoring wird erstellt...",
|
||||
"adding-scan": "Scan wird hinzugefügt",
|
||||
"address": "Adresse",
|
||||
"address-is-required": "Du musst eine Adresse angeben",
|
||||
|
|
@ -30,6 +31,7 @@
|
|||
"all-associated-donations-will-get-deleted-as-well": "Alle Sponsorings dieser Sponsor:in werden ebenfalls gelöscht",
|
||||
"all-associated-runners-will-be-deleted-too": "Alle zugehörigen Läufer:innen werden auch gelöscht!",
|
||||
"all-associated-teams-and-runners-will-be-deleted-too": "Alle assoziierten Teams und Läufer:innen werden auch gelöscht!",
|
||||
"already-paid": "Bereits bezahlt",
|
||||
"amount": "Anzahl",
|
||||
"amount-per-kilometer": "Betrag pro Kilometer",
|
||||
"apartment-suite-etc": "Apartment, Wohnung, etc.",
|
||||
|
|
@ -68,8 +70,10 @@
|
|||
"confirm-deletion": "Löschung Bestätigen",
|
||||
"confirm-the-new-password": "Neues Passwort bestätigen",
|
||||
"contact": "Kontakt",
|
||||
"contact-added": "Kontakt wurde hinzugefügt",
|
||||
"contact-deleted": "Kontakt gelöscht",
|
||||
"contact-information": "Kontaktinformation",
|
||||
"contact-is-being-added": "Kontakt wird erstellt...",
|
||||
"contact-is-being-updated": "Kontakt wird aktualisiert ...",
|
||||
"contact-is-not-a-member-in-any-group": "Kontakt gehört zu keiner Gruppe",
|
||||
"contacts": "Kontakte",
|
||||
|
|
@ -129,7 +133,7 @@
|
|||
},
|
||||
"delete": "Löschen",
|
||||
"delete-contact": "Kontakt löschen",
|
||||
"delete-donation": "Sponsporing löschen",
|
||||
"delete-donation": "Sponsoring löschen",
|
||||
"delete-donor": "Sponsor:in löschen",
|
||||
"delete-group": "Gruppe löschen",
|
||||
"delete-organization": "Organisation löschen",
|
||||
|
|
@ -157,6 +161,9 @@
|
|||
"documentation": "Dokumentation",
|
||||
"donation-amount": "Sponsoringbetrag",
|
||||
"donation-amount-must-be-greater-that-0-00eur": "Der Sponsoringbetrag muss größer als 0.00€ sein.",
|
||||
"donation-deleted": "Sponsoring gelöscht",
|
||||
"donation-updated": "Sponsoring wurde aktualisiert",
|
||||
"donation_added": "Sponsoring hinzugefügt",
|
||||
"donations": "Sponsorings",
|
||||
"donor": "Sponsor:in",
|
||||
"donor-added": "Sponsor:in hinzugefügt",
|
||||
|
|
@ -176,6 +183,7 @@
|
|||
"enabled": "aktiviert",
|
||||
"enabled_large": "Aktiviert",
|
||||
"english": "Englisch",
|
||||
"enter-payment": "Zahlung eingeben",
|
||||
"error-during-import": "Fehler beim Importieren",
|
||||
"error-whyile-copying-to-clipboard": "Fehler beim Kopieren in die Zwischenablage",
|
||||
"error_on_login": "😢Fehler beim Login",
|
||||
|
|
@ -269,6 +277,7 @@
|
|||
"no-runners-found": "Keine Läufer:innen gefunden",
|
||||
"no-tracks-added-yet": "Es wurden noch keine Tracks erstellt.",
|
||||
"non-blanko": "Keine/Blankokarte",
|
||||
"open": "OFFEN",
|
||||
"organization": "Organisation",
|
||||
"organization-added": "Organisation hinzugefügt",
|
||||
"organization-deleted": "Organisation gelöscht",
|
||||
|
|
@ -279,6 +288,8 @@
|
|||
"organizations-are-being-loaded": "Organisationen werden geladen ...",
|
||||
"orgs": "Organisationen",
|
||||
"oss_credit_description": "Wir verwenden eine Menge Open Source-Software bei diesen Projekten und möchten uns bei den folgenden Projekten und Mitwirkenden bedanken, die dazu beitragen, Open Source großartig zu machen!",
|
||||
"paid": "BEZAHLT",
|
||||
"paid-amount": "Gezahlter Betrag",
|
||||
"password": "Passwort",
|
||||
"password-changed": "Passwort wurde aktualisiert!",
|
||||
"password-is-required": "Passwort muss angegeben werden",
|
||||
|
|
@ -287,6 +298,7 @@
|
|||
"password-reset-mail-sent": "Passwort-Reset Mail wurde an \"{usersEmail}\" geschickt.",
|
||||
"password-reset-successful": "Passwort erfolgreich zurückgesetzt!",
|
||||
"passwords-dont-match": "Die Passwörter stimmen nicht überein!",
|
||||
"payment-amount-must-be-greater-than-0-00eur": "Der Zahlungsbetrag muss größer als 0.00€ sein!",
|
||||
"pdf-generation-failed": "PDF Generierung fehlgeschlagen!",
|
||||
"pdf-successfully-generated": "PDF wurde erfolgreich generiert!",
|
||||
"pdfs-successfully-generated": "Alle PDFs wurden generiert!",
|
||||
|
|
@ -309,9 +321,11 @@
|
|||
"please-provide-the-required-information-to-add-a-new-user": "Bitte gebe alle nötigen Informationen an, im die neue Benutzer:in zu erstellen.",
|
||||
"please-provide-the-required-information-to-create-a-new-scanstation": "Bitte gebe alle für eine Scannerstation notwendigen Informationen an",
|
||||
"please-request-a-new-reset-mail": "Bitte eine neue Passwortreset-Mail anfordern...",
|
||||
"please-wait-a-moment-your-login-is-still-being-processed": "Bitte warte einen Moment, deine Anmeldung wird verarbeitet",
|
||||
"privacy": "Datenschutz",
|
||||
"privacy-loading": "Datenschutzerklärung lädt...",
|
||||
"profile": "Profil",
|
||||
"profile-deleted": "Profil gelöscht!",
|
||||
"profile-picture": "Profilbild",
|
||||
"profile-updated": "Profil wurde aktualisiert!",
|
||||
"read-license": "Lizenz-Text lesen",
|
||||
|
|
@ -362,7 +376,10 @@
|
|||
"stuff-that-could-harm-your-profile": "Einstellungen, die deinem Profil nachhaltig schaden können",
|
||||
"successful-password-reset": "Passwort erfolgreich zurückgesetzt!",
|
||||
"team": "Team",
|
||||
"team-added": "Team wurde hinzugefügt",
|
||||
"team-deleted": "Team gelöscht",
|
||||
"team-detail-is-being-loaded": "Team wird geladen...",
|
||||
"team-is-being-added": "Team wird erstellt...",
|
||||
"team-name": "Teamname",
|
||||
"team-name-is-required": "Teamname ist erforderlich",
|
||||
"teams": "Teams",
|
||||
|
|
@ -387,28 +404,35 @@
|
|||
"total-distance": "gelaufene Strecke",
|
||||
"total-donation-amount": "Gesamtbetrag",
|
||||
"total-donations": "Spendensumme",
|
||||
"total-paid-amount": "Gezahlter Gesamtbetrag",
|
||||
"total-scans": "gesamte Scans",
|
||||
"total_donation_amount_in_eur": "Gesamtbetrag in €",
|
||||
"track": "Track",
|
||||
"track-added": "Track hinzugefügt",
|
||||
"track-data-is-being-loaded": "Trackdaten werden geladen",
|
||||
"track-is-being-added": "Track wird hinzugefügt...",
|
||||
"track-is-being-updated": "Track wird aktualisiert...",
|
||||
"track-length-in-m": "Tracklänge (in Metern)",
|
||||
"track-length-must-be-greater-than-0": "Die Länge muss größer als 0 (Meter) sein",
|
||||
"track-name": "Trackname",
|
||||
"track-name-must-not-be-empty": "Der Name muss angegeben werden",
|
||||
"track-was-updated": "Track wurde aktualisiert",
|
||||
"tracks": "Tracks",
|
||||
"unpaid": "Offen",
|
||||
"update-card": "Karte aktualisieren",
|
||||
"update-password": "Passwort ändern",
|
||||
"updated-contact": "Kontakt aktualisiert!",
|
||||
"updated-donor": "Sponsor:in wurde aktualisiert",
|
||||
"updated-organization": "Organisation wurde aktualisiert",
|
||||
"updated-scan": "Scan wurde aktualisiert",
|
||||
"updated-team": "Team wurde aktualisiert",
|
||||
"updateing-group": "Gruppe wird aktualisiert...",
|
||||
"updating-card": "Karte wird aktualisiert",
|
||||
"updating-donation": "Sponsoring wird aktualisiert",
|
||||
"updating-organization": "Organisation wird aktualisiert",
|
||||
"updating-permissions": "Berechtigungen werden aktualisiert...",
|
||||
"updating-runner": "Läufer:in wird aktualisiert.",
|
||||
"updating-team": "Team wird aktualisiert",
|
||||
"updating-user": "Benutzer:in wird aktualisiert...",
|
||||
"updating-your-profile": "Profil wird aktualisiert...",
|
||||
"user-added": "Benutzer hinzugefügt",
|
||||
|
|
@ -426,6 +450,7 @@
|
|||
"welcome_wavinghand": "Willkommen 👋",
|
||||
"yes-i-copied-the-token": "Ja, ich habe den Token kopiert",
|
||||
"you-are-going-to-loose-all-permissions-and-access-to-the-runner-system": "Du wirst all deine Berechtigungen und den Zugriff aufs Läufersystem verlieren!",
|
||||
"you-can-enter-the-donations-paid-amount-manually-or-use-the-max-button-to-use-the-donations-exact-amount": "Du kannst den Betrag der Zahlung entweder manuell eingeben oder über den MAX Button auf den Spendenbetrag setzen",
|
||||
"you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉",
|
||||
"you-can-provide-a-runner-but-you-dont-have-to": "Du kannst eine Läufer:in angeben, musst aber nicht.",
|
||||
"you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen",
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"add-card": "Add Card",
|
||||
"add-donation": "Add donation",
|
||||
"add-donor": "Add donor",
|
||||
"add-or-update-a-payment": "Add or update a payment",
|
||||
"add-scan": "Add scan",
|
||||
"add-the-first-scanstation": "Add your first scanstation.",
|
||||
"add-user-group": "Add User Group",
|
||||
|
|
@ -22,6 +23,7 @@
|
|||
"add-your-fist-donation": "Add your fist donation",
|
||||
"add-your-fist-scan": "Add your fist scan",
|
||||
"adding-card": "Adding Card",
|
||||
"adding-donation": "Adding donation...",
|
||||
"adding-scan": "Adding Scan",
|
||||
"address": "Address",
|
||||
"address-is-required": "Address is required",
|
||||
|
|
@ -30,6 +32,7 @@
|
|||
"all-associated-donations-will-get-deleted-as-well": "All associated donations will get deleted as well",
|
||||
"all-associated-runners-will-be-deleted-too": "All associated runners will be deleted too!",
|
||||
"all-associated-teams-and-runners-will-be-deleted-too": "All associated teams and runners will be deleted too!",
|
||||
"already-paid": "Already paid",
|
||||
"amount": "Amount",
|
||||
"amount-per-kilometer": "Amount per kilometer",
|
||||
"apartment-suite-etc": "Apartment, suite, etc.",
|
||||
|
|
@ -68,8 +71,10 @@
|
|||
"confirm-deletion": "Confirm Deletion",
|
||||
"confirm-the-new-password": "Confirm the new password",
|
||||
"contact": "Contact",
|
||||
"contact-added": "Contact added",
|
||||
"contact-deleted": "Contact deleted",
|
||||
"contact-information": "Contact Information",
|
||||
"contact-is-being-added": "Contact is being added...",
|
||||
"contact-is-being-updated": "Contact is being updated...",
|
||||
"contact-is-not-a-member-in-any-group": "Contact is not a member in any group",
|
||||
"contacts": "Contacts",
|
||||
|
|
@ -157,6 +162,9 @@
|
|||
"documentation": "Documentation",
|
||||
"donation-amount": "Donation amount",
|
||||
"donation-amount-must-be-greater-that-0-00eur": "Donation amount must be greater that 0.00€",
|
||||
"donation-deleted": "Donation deleted",
|
||||
"donation-updated": "Donation updated",
|
||||
"donation_added": "Donation_added",
|
||||
"donations": "Donations",
|
||||
"donor": "Donor",
|
||||
"donor-added": "Donor added",
|
||||
|
|
@ -176,6 +184,7 @@
|
|||
"enabled": "enabled",
|
||||
"enabled_large": "Enabled",
|
||||
"english": "English",
|
||||
"enter-payment": "Enter payment",
|
||||
"error-during-import": "Error during import",
|
||||
"error-whyile-copying-to-clipboard": "Error while copying to clipboard",
|
||||
"error_on_login": "Error on login",
|
||||
|
|
@ -269,6 +278,7 @@
|
|||
"no-runners-found": "No runners found",
|
||||
"no-tracks-added-yet": "there are no tracks added yet.",
|
||||
"non-blanko": "Non/Blanko",
|
||||
"open": "OPEN",
|
||||
"organization": "Organization",
|
||||
"organization-added": "Organization added",
|
||||
"organization-deleted": "Organization deleted",
|
||||
|
|
@ -279,6 +289,8 @@
|
|||
"organizations-are-being-loaded": "organizations are being loaded...",
|
||||
"orgs": "Organizations",
|
||||
"oss_credit_description": "We use a lot of open source software on these projects, and would like to thank the following projects and contributors who help make open source great!",
|
||||
"paid": "PAID",
|
||||
"paid-amount": "Paid amount",
|
||||
"password": "Password",
|
||||
"password-changed": "Password changed!",
|
||||
"password-is-required": "Password is required",
|
||||
|
|
@ -287,6 +299,7 @@
|
|||
"password-reset-mail-sent": "Password reset mail was sent to \"{usersEmail}\".",
|
||||
"password-reset-successful": "Password Reset successful!",
|
||||
"passwords-dont-match": "Passwords don't match!",
|
||||
"payment-amount-must-be-greater-than-0-00eur": "Payment amount must be greater than 0.00€!",
|
||||
"pdf-generation-failed": "PDF generation failed!",
|
||||
"pdf-successfully-generated": "PDF successfully generated!",
|
||||
"pdfs-successfully-generated": "PDFs successfully generated!",
|
||||
|
|
@ -309,9 +322,11 @@
|
|||
"please-provide-the-required-information-to-add-a-new-user": "Please provide the required information to add a new user.",
|
||||
"please-provide-the-required-information-to-create-a-new-scanstation": "Please provide the required information to create a new scanstation",
|
||||
"please-request-a-new-reset-mail": "Please request a new reset mail...",
|
||||
"please-wait-a-moment-your-login-is-still-being-processed": "Please wait a moment, your login is still being processed",
|
||||
"privacy": "Privacy",
|
||||
"privacy-loading": "Privacy loading...",
|
||||
"profile": "Profile",
|
||||
"profile-deleted": "Profile deleted!",
|
||||
"profile-picture": "Profile Picture",
|
||||
"profile-updated": "Profile updated!",
|
||||
"read-license": "Read License",
|
||||
|
|
@ -362,7 +377,10 @@
|
|||
"stuff-that-could-harm-your-profile": "Stuff that could harm your profile",
|
||||
"successful-password-reset": "Successful password reset!",
|
||||
"team": "Team",
|
||||
"team-added": "Team added",
|
||||
"team-deleted": "Team deleted",
|
||||
"team-detail-is-being-loaded": "team detail is being loaded...",
|
||||
"team-is-being-added": "Team is being added...",
|
||||
"team-name": "Team name",
|
||||
"team-name-is-required": "team name is required",
|
||||
"teams": "Teams",
|
||||
|
|
@ -387,28 +405,35 @@
|
|||
"total-distance": "total distance",
|
||||
"total-donation-amount": "total donation amount",
|
||||
"total-donations": "total donations",
|
||||
"total-paid-amount": "Total paid amount",
|
||||
"total-scans": "total scans",
|
||||
"total_donation_amount_in_eur": "Total donation amount in €",
|
||||
"track": "Track",
|
||||
"track-added": "Track added",
|
||||
"track-data-is-being-loaded": "Track data is being loaded",
|
||||
"track-is-being-added": "Track is being added...",
|
||||
"track-is-being-updated": "Track is being updated...",
|
||||
"track-length-in-m": "Track Length in m",
|
||||
"track-length-must-be-greater-than-0": "Track length must be greater than 0",
|
||||
"track-name": "Track name",
|
||||
"track-name-must-not-be-empty": "Track name must not be empty",
|
||||
"track-was-updated": "Track was updated!",
|
||||
"tracks": "Tracks",
|
||||
"unpaid": "Unpaid",
|
||||
"update-card": "Update Card",
|
||||
"update-password": "Update password",
|
||||
"updated-contact": "Updated contact!",
|
||||
"updated-donor": "updated donor",
|
||||
"updated-organization": "updated organization",
|
||||
"updated-scan": "updated scan",
|
||||
"updated-team": "Updated team",
|
||||
"updateing-group": "updateing group...",
|
||||
"updating-card": "Updating card",
|
||||
"updating-donation": "Updating donation",
|
||||
"updating-organization": "updating organization",
|
||||
"updating-permissions": "updating permissions...",
|
||||
"updating-runner": "Updating runner...",
|
||||
"updating-team": "Updating team",
|
||||
"updating-user": "updating user...",
|
||||
"updating-your-profile": "Updating your profile...",
|
||||
"user-added": "User added",
|
||||
|
|
@ -426,6 +451,7 @@
|
|||
"welcome_wavinghand": "Welcome 👋",
|
||||
"yes-i-copied-the-token": "Yes, I copied the token",
|
||||
"you-are-going-to-loose-all-permissions-and-access-to-the-runner-system": "You are going to loose all permissions and access to the runner system!",
|
||||
"you-can-enter-the-donations-paid-amount-manually-or-use-the-max-button-to-use-the-donations-exact-amount": "You can enter the donation's paid amount manually or use the MAX button to use the donation's exact amount.",
|
||||
"you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉",
|
||||
"you-can-provide-a-runner-but-you-dont-have-to": "You can provide a runner, but you don't have to.",
|
||||
"you-dont-have-any-scanstations-yet": "You don't have any scanstations yet",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import 'windi.css';
|
||||
import './style.css';
|
||||
import "toastify-js/src/toastify.css";
|
||||
import "gridjs/dist/theme/mermaid.css";
|
||||
import App from './App.svelte';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
module.exports = {
|
||||
mode: 'jit',
|
||||
purge: [ './src/**/*.svelte' ],
|
||||
theme: {
|
||||
extend: {
|
||||
colors: {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import svelte from '@sveltejs/vite-plugin-svelte';
|
||||
import windiCSS from 'vite-plugin-windicss';
|
||||
import { minify } from 'html-minifier';
|
||||
import { defineConfig } from 'vite';
|
||||
//
|
||||
|
|
@ -24,17 +23,6 @@ export default defineConfig(({ command, mode }) => {
|
|||
minify: isProduction
|
||||
},
|
||||
plugins: [
|
||||
windiCSS({
|
||||
//@ts-ignore
|
||||
verbose: true,
|
||||
silent: false,
|
||||
debug: true,
|
||||
config: 'tailwind.config.js', // tailwind config file path (optional)
|
||||
compile: false, // false: interpretation mode; true: compilation mode
|
||||
prefix: 'windi-', // set compilation mode style prefix
|
||||
globalPreflight: true, // set preflight style is global or scoped
|
||||
globalUtility: true // set utility style is global or scoped
|
||||
}),
|
||||
svelte({
|
||||
//@ts-ignore
|
||||
hot: !isProduction,
|
||||
|
|
|
|||
Loading…
Reference in New Issue