🚀RELEASE v0.15.6

Reviewed-on: #142

CHANGELOG.md

@@ -2,8 +2,62 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.15.6](https://git.odit.services/lfk/frontend/compare/0.15.5...0.15.6)
+
+- Fixed donations getting reduced to the first one on certificates [`2391668`](https://git.odit.services/lfk/frontend/commit/2391668a25a1e11a1409df572d77ad1635070fbc)
+- new license file version [CI SKIP] [`97054a7`](https://git.odit.services/lfk/frontend/commit/97054a71c1ab8a045762a55148124965c6994373)
+
+#### [0.15.5](https://git.odit.services/lfk/frontend/compare/0.15.4...0.15.5)
+
+> 5 July 2021
+
+- 🚀RELEASE v0.15.5 [`717d335`](https://git.odit.services/lfk/frontend/commit/717d33547c3378424dd720005da9952f8a753f1a)
+- Merge pull request 'Fixed kilometer conversion' (#142) from bugfix/141-runner_kilometers into dev [`997be32`](https://git.odit.services/lfk/frontend/commit/997be32679dc38c9fb0e92b6ce011057b854d99d)
+- Fixed kilometer conversion [`134f00c`](https://git.odit.services/lfk/frontend/commit/134f00c40e0c8252e7604a73151e8d6685b2c61d)
+- new license file version [CI SKIP] [`e752ee1`](https://git.odit.services/lfk/frontend/commit/e752ee12d17a4423f4364f7766eafbe7d4cef2d1)
+
+#### [0.15.4](https://git.odit.services/lfk/frontend/compare/0.15.3...0.15.4)
+
+> 5 July 2021
+
+- Merge pull request 'fix total donation sum in dashboard' (#140) from bugfix/139-total-donation-sum-is-wrong into dev [`#139`](https://git.odit.services/lfk/frontend/issues/139)
+- 🚀RELEASE v0.15.4 [`cc4515f`](https://git.odit.services/lfk/frontend/commit/cc4515ff66b1c1de3747d0ee6cc465574accedb7)
+- divide by 100 + toFixes(2) [`b246f2b`](https://git.odit.services/lfk/frontend/commit/b246f2b349b06d1adea318dfad58f97fb1a249bb)
+
+#### [0.15.3](https://git.odit.services/lfk/frontend/compare/0.15.2...0.15.3)
+
+> 16 April 2021
+
+- 🚀RELEASE v0.15.3 [`76b69d8`](https://git.odit.services/lfk/frontend/commit/76b69d851aa590ecf8caac135b72962a72e83635)
+- Small bugfix (null got displayed) 🛠 [`224f586`](https://git.odit.services/lfk/frontend/commit/224f5863683ae2543a4a435510ed2c558dc5d307)
+
+#### [0.15.2](https://git.odit.services/lfk/frontend/compare/0.15.1...0.15.2)
+
+> 16 April 2021
+
+- 🚀RELEASE v0.15.2 [`9add6c8`](https://git.odit.services/lfk/frontend/commit/9add6c8ff1fbeed91fe97a7cf262921b716f4e3c)
+- Footer - noopener link [`cee04c1`](https://git.odit.services/lfk/frontend/commit/cee04c1d6fb6005cefe77fb95855ab6fe2cc448f)
+- Hotfix: Team change recognition 🐞 [`cbec785`](https://git.odit.services/lfk/frontend/commit/cbec78589d2fa21f12ce87e71bff2b49c3a7d345)
+- NGINX cache assets [`e54a480`](https://git.odit.services/lfk/frontend/commit/e54a4807f70bc333396885f81d3dcc7ae6c115d9)
+
+#### [0.15.1](https://git.odit.services/lfk/frontend/compare/0.15.0...0.15.1)
+
+> 16 April 2021
+
+- 🚀RELEASE v0.15.1 [`a85db7c`](https://git.odit.services/lfk/frontend/commit/a85db7cb3f89881794e37a66ecd822f8ad5873f1)
+- 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)

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
+FROM registry.odit.services/hub/fholzer/nginx-brotli:v1.19.1
-COPY --from=0 /app/dist /app
+COPY --from=0 /app/dist /usr/share/nginx/html
-FROM fholzer/nginx-brotli:v1.19.1
-COPY --from=1 /app /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

index.html

@@ -13,7 +13,7 @@
 </head>
 
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.15.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.15.6-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>

nginx.conf

@@ -6,6 +6,11 @@ http {
     server {
         error_page 404 /index.html;
         root /usr/share/nginx/html;
+        location /assets {
+            expires 1y;
+            log_not_found off;
+            access_log off;
+        }
         location = /index.html {
             add_header Cache-Control 'no-store';
         }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.15.0",
+	"version": "0.15.6",
 	"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": {

postcss.config.cjs

@@ -0,0 +1,6 @@
+module.exports = {
+	plugins: {
+		tailwindcss: {},
+		autoprefixer: {}
+	}
+};

src/components/base/importfixes.svelte

@@ -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>

src/components/dashboard/StatCards.svelte

@@ -70,7 +70,7 @@
             <div class="text-xs uppercase font-light text-grey-500">
               {$_('total-donations')}
             </div>
-            <div class="text-xl font-bold">{stats.total_donation} €</div>
+            <div class="text-xl font-bold">{(stats.total_donation/100).toFixed(2)} €</div>
           </div><svg
             xmlns="http://www.w3.org/2000/svg"
             height="24"

src/components/donors/DonorsOverview.svelte

@@ -132,7 +132,7 @@
                           <a
                             href="../donations/{d.id}"
                             class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1">{d.runner.firstname}
-                            {d.runner.middlename}
+                            {d.runner.middlename || ''}
                             {d.runner.lastname}</a>
                         {:else}
                           <a

src/components/general/Footer.svelte

@@ -32,8 +32,12 @@
       target="_blank"
       rel="noopener, noreferrer"
       href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a>
-      -
+    -
-    <a class="underline" href="https://docs.lauf-fuer-kaya.de" target="_blank">{$_('documentation')}</a>
+    <a
+      rel="noopener, noreferrer"
+      class="underline"
+      href="https://docs.lauf-fuer-kaya.de"
+      target="_blank">{$_('documentation')}</a>
     -
     <a class="underline" href="/privacy">{$_('privacy')}</a>
     -

src/components/pdf_generation/GenerateRunnerCertificates.svelte

@@ -40,7 +40,8 @@
         const current_donations = (await DonationService.donationControllerGetAll()) || [];
         let certificateRunners = [];
         for (let runner of generate_runners) {
-            runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
+            runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || [];
+            console.log(runner.distanceDonations)
             certificateRunners.push(runner);
         }
         fetch(
@@ -103,7 +104,7 @@
                 );
             let certificateRunners = [];
             for (let runner of runners) {
-                runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
+                runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || [];
                 certificateRunners.push(runner);
             }
             fetch(
@@ -166,7 +167,7 @@
             let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true)
             let certificateRunners = [];
             for (let runner of runners) {
-                runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
+                runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || [];
                 certificateRunners.push(runner);
             }
             await fetch(
@@ -219,7 +220,7 @@
                 );
                 let certificateRunners = [];
             for (let runner of runners) {
-                runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
+                runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || [];
                 certificateRunners.push(runner);
             }
             await fetch(

src/components/runners/RunnerDetail.svelte

@@ -294,7 +294,7 @@
     <div class="text-sm w-full">
       <span class="font-medium text-gray-700">{$_('distance')}</span>
       <br />
-      <span class="text-gray-700">{original_data.distance} km</span>
+      <span class="text-gray-700">{original_data.distance /1000 } km</span>
     </div>
   </section>
 {:catch error}

src/components/runners/RunnersOverview.svelte

@@ -206,7 +206,7 @@
                       {/if}
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap">
-                      {runner.distance}
+                      {runner.distance /1000 } km
                     </td>
                     {#if active_deletes[runner.id] === true}
                       <td

src/components/teams/TeamDetail.svelte

@@ -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);

src/main.js

@@ -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';

src/style.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

tailwind.config.js

@@ -1,4 +1,6 @@
 module.exports = {
+	mode: 'jit',
+	purge: [ './src/**/*.svelte' ],
 	theme: {
 		extend: {
 			colors: {

vite.config.js

@@ -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,