new license file version [CI SKIP]

Merge pull request 'fix total donation sum in dashboard' (#140 ) from bugfix/139-total-donation-sum-is-wrong into dev
Reviewed-on: #140 close #139
2021-07-05 15:01:42 +00:00 · 2021-07-05 15:00:44 +00:00 · 2021-07-05 13:30:17 +02:00 · 2021-04-16 18:22:27 +02:00 · 2021-04-16 18:22:00 +02:00 · 2021-04-16 18:10:50 +02:00
16 changed files with 76 additions and 33 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,37 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.15.3](https://git.odit.services/lfk/frontend/compare/0.15.2...0.15.3)
 - 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)
--- a/10
+++ b/10
@@ -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
--- a/index.html
+++ b/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.3-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>
--- a/nginx.conf
+++ b/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';
        }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.15.0",
+	"version": "0.15.3",
 	"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": {
--- a/postcss.config.cjs
+++ b/postcss.config.cjs
@@ -0,0 +1,6 @@
 module.exports = {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {}
 	}
 };
--- a/public/licenses.json
+++ b/public/licenses.json
--- a/src/components/base/importfixes.svelte
+++ b/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>
--- a/src/components/dashboard/StatCards.svelte
+++ b/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"
--- a/src/components/donors/DonorsOverview.svelte
+++ b/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
--- a/src/components/general/Footer.svelte
+++ b/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>
    -
--- a/src/components/teams/TeamDetail.svelte
+++ b/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);
--- a/src/main.js
+++ b/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';
--- a/src/style.css
+++ b/src/style.css
@@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,4 +1,6 @@
 module.exports = {
 	mode: 'jit',
 	purge: [ './src/**/*.svelte' ],
 	theme: {
 		extend: {
 			colors: {
--- a/vite.config.js
+++ b/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,
Author	SHA1	Message	Date
Philipp Dormann	e752ee12d1	new license file version [CI SKIP]	2021-07-05 15:01:42 +00:00
Philipp Dormann	f190292171	Merge pull request 'fix total donation sum in dashboard' (#140 ) from bugfix/139-total-donation-sum-is-wrong into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #140 close #139	2021-07-05 15:00:44 +00:00
Philipp Dormann	b246f2b349	divide by 100 + toFixes(2) ref #139	2021-07-05 13:30:17 +02:00
Nicolai Ort	76b69d851a	🚀RELEASE v0.15.3 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-16 18:22:27 +02:00
Nicolai Ort	224f586368	Small bugfix (null got displayed) 🛠	2021-04-16 18:22:00 +02:00
Philipp Dormann	9add6c8ff1	🚀RELEASE v0.15.2 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-16 18:10:50 +02:00
Philipp Dormann	7a63d4eed1	Merge branch 'dev' of https://git.odit.services/lfk/frontend into dev All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-16 18:09:37 +02:00
Philipp Dormann	e54a4807f7	NGINX cache assets	2021-04-16 18:09:30 +02:00
Philipp Dormann	cee04c1d6f	Footer - noopener link	2021-04-16 18:09:22 +02:00
Nicolai Ort	cbec78589d	Hotfix: Team change recognition 🐞 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-16 18:06:53 +02:00
Nicolai Ort	a85db7cb3f	🚀RELEASE v0.15.1 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-16 17:53:38 +02:00
Nicolai Ort	2bd3779839	Merge pull request '🐞🐳 fix Dockerfile' (#138 ) from bugfix/136-opacity_reactivity into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #138	2021-04-16 15:51:37 +00:00
Philipp Dormann	303e33cafb	🐞🐳 fix Dockerfile ref #136	2021-04-16 17:46:15 +02:00
Nicolai Ort	b4e689dddf	Dockerfile now uses selfhosted registry All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-15 19:50:37 +02:00
Nicolai Ort	98a0b036c5	new license file version [CI SKIP]	2021-04-15 17:46:04 +00:00
Nicolai Ort	fb3f30fb10	Merge pull request 'Opacity import fix bugfix/136-opacity_reactivity' (#137 ) from bugfix/136-opacity_reactivity into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #137	2021-04-15 17:44:49 +00:00
Nicolai Ort	6213952007	Added bs import fix ref #136	2021-04-15 19:43:43 +02:00
Philipp Dormann	07ac041d69	🚚 move to tailwind ref #136	2021-04-15 19:22:57 +02:00