new license file version [CI SKIP]

Reviewed-on: #142

.drone.yml

@@ -43,18 +43,23 @@ steps:
       ssh_key:
         from_secret: git_ssh
   - name: build dev
-    image: plugins/docker
+    depends_on: ["clone"]
-    depends_on: [clone]
+    image: registry.odit.services/library/drone-kaniko
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/frontend
+      build_args:
+        - NPM_REGISTRY_DOMAIN:
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
+      repo: lfk/frontend
       tags:
         - dev
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   branch:
     - dev
@@ -67,18 +72,23 @@ type: kubernetes
 name: build:tags
 steps:
   - name: build $DRONE_TAG
-    image: plugins/docker
+    depends_on: ["clone"]
-    depends_on: [clone]
+    image: registry.odit.services/library/drone-kaniko
     settings:
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
-      repo: registry.odit.services/lfk/frontend
+      build_args:
+        - NPM_REGISTRY_DOMAIN:
+          from_secret: npmjs_domain
+        - NPM_REGISTRY_TOKEN:
+          from_secret: npmjs_token
+      repo: lfk/frontend
       tags:
-        - '${DRONE_TAG}'
+        - "${DRONE_TAG}"
+      cache: true
       registry: registry.odit.services
-      mtu: 1000
 trigger:
   event:
   - tag

.gitignore

@@ -8,3 +8,4 @@ public/index.html
 .yarn
 .pnp.js
 .yarnrc.yml
+pnpm-lock.yaml

CHANGELOG.md

@@ -2,8 +2,40 @@
 
 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)

Dockerfile

@@ -1,12 +1,12 @@
-FROM registry.odit.services/hub/library/node:15.14.0-alpine3.13
+FROM registry.odit.services/hub/library/node:19.5.0-alpine3.16 as build
 WORKDIR /app
 COPY package.json ./
-RUN yarn
+RUN npx pnpm i
 COPY package.json *.config.js postcss.config.cjs index.html ./
 COPY src ./src
 COPY public ./public
 RUN yarn build
 # final image
-FROM registry.odit.services/hub/fholzer/nginx-brotli:v1.19.1
+FROM registry.odit.services/library/nginx-brotli:3.15 as final
-COPY --from=0 /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /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.2-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>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.15.2",
+	"version": "0.15.6",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
@@ -15,21 +15,21 @@
 		"@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",
+		"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",

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