Compare commits
	
		
			21 Commits
		
	
	
		
			0.5.1
			...
			3b4c11e4c0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3b4c11e4c0 | |||
| 89820d4450 | |||
| 121022c843 | |||
| d713fbef94 | |||
| 815a36f202 | |||
| baa6da3dd0 | |||
| f141130db5 | |||
| 5a123b0cf8 | |||
| f5ae2145df | |||
| 96c0e56986 | |||
| bc1de2acdc | |||
| 5c558aa9ee | |||
| 145b49906b | |||
| 0a62e8f5d1 | |||
| 53eeb6be3d | |||
| a554a90e74 | |||
| c3b2b93d90 | |||
| 7064a5bd82 | |||
| f0a7f35dec | |||
| b938cfc49e | |||
| f6334397dc | 
							
								
								
									
										20
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -2,9 +2,29 @@
 | 
			
		||||
 | 
			
		||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 | 
			
		||||
 | 
			
		||||
#### [0.6.1](https://git.odit.services/lfk/selfservice/compare/0.6.0...0.6.1)
 | 
			
		||||
 | 
			
		||||
- Fixed imprint/privacy default links [`96c0e56`](https://git.odit.services/lfk/selfservice/commit/96c0e5698697361e65c5aa80c9a0aada5c3d5f30)
 | 
			
		||||
 | 
			
		||||
#### [0.6.0](https://git.odit.services/lfk/selfservice/compare/0.5.1...0.6.0)
 | 
			
		||||
 | 
			
		||||
> 3 April 2021
 | 
			
		||||
 | 
			
		||||
- 🚀Bumped version to v0.6.0 [`bc1de2a`](https://git.odit.services/lfk/selfservice/commit/bc1de2acdcbf8f3319026887cb6b3d594fcd63dc)
 | 
			
		||||
- first part of certificate generation with manual data [`f633439`](https://git.odit.services/lfk/selfservice/commit/f6334397dc99cd38d31ef524bc26ba7d386b33dd)
 | 
			
		||||
- Renoved fixed data [`f0a7f35`](https://git.odit.services/lfk/selfservice/commit/f0a7f35dec07508a07d4c11abda297ad0bf91187)
 | 
			
		||||
- Revert "🚀Bumped version to v0.6.0" [`145b499`](https://git.odit.services/lfk/selfservice/commit/145b49906bdf2d75abf93e1779f188a691a3a909)
 | 
			
		||||
- 🚀Bumped version to v0.6.0 [`0a62e8f`](https://git.odit.services/lfk/selfservice/commit/0a62e8f5d1929bfe9a53a9709a3031f06a2487c3)
 | 
			
		||||
- Merge pull request 'Certificate download feature/19-runner_certficates' (#38) from feature/19-runner_certficates into dev [`53eeb6b`](https://git.odit.services/lfk/selfservice/commit/53eeb6be3ddf4735a11b6c4636c28b4d16aa58ee)
 | 
			
		||||
- Fixed blob handling [`b938cfc`](https://git.odit.services/lfk/selfservice/commit/b938cfc49e269e76761a752f8257ebbab88f6959)
 | 
			
		||||
- Reverted relative linking fix [`c3b2b93`](https://git.odit.services/lfk/selfservice/commit/c3b2b93d90102b4e31cfce15220acfc8fe48a7c5)
 | 
			
		||||
 | 
			
		||||
#### [0.5.1](https://git.odit.services/lfk/selfservice/compare/0.5.0...0.5.1)
 | 
			
		||||
 | 
			
		||||
> 3 April 2021
 | 
			
		||||
 | 
			
		||||
- Merge pull request 'feature/30-profile-forgot-link' (#35) from feature/30-profile-forgot-link into dev [`#30`](https://git.odit.services/lfk/selfservice/issues/30)
 | 
			
		||||
- 🚀Bumped version to v0.5.1 [`1a3c9ed`](https://git.odit.services/lfk/selfservice/commit/1a3c9edeb3987907ffe2223da8f3be079a1c80d2)
 | 
			
		||||
- Merge pull request 'Env linking bugfix bugfix/31-env_linking' (#37) from bugfix/31-env_linking into dev [`fd6bd88`](https://git.odit.services/lfk/selfservice/commit/fd6bd88d4238cca2a2755ab1bc51ff7870bef947)
 | 
			
		||||
- basic ProfileNone layout [`863568d`](https://git.odit.services/lfk/selfservice/commit/863568d7d0e132dd1b7d13a2cb1afe8db02c472c)
 | 
			
		||||
- add forgot view + action [`30f3a51`](https://git.odit.services/lfk/selfservice/commit/30f3a51ef82ad966225abc6fd95508af56106924)
 | 
			
		||||
 
 | 
			
		||||
@@ -10,8 +10,8 @@
 | 
			
		||||
 | 
			
		||||
<body class="dark:bg-gray-900 text-black dark:text-white p-0">
 | 
			
		||||
  <div id="app"></div>
 | 
			
		||||
  <script src="./env.js"></script>
 | 
			
		||||
  <script defer type="module" src="./src/main.js"></script>
 | 
			
		||||
  <script src="/env.js"></script>
 | 
			
		||||
  <script defer type="module" src="/src/main.js"></script>
 | 
			
		||||
</body>
 | 
			
		||||
 | 
			
		||||
</html>
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
	"name": "@odit/lfk-selfservice",
 | 
			
		||||
	"version": "0.5.1",
 | 
			
		||||
	"version": "0.6.1",
 | 
			
		||||
	"scripts": {
 | 
			
		||||
		"dev": "vite",
 | 
			
		||||
		"build": "vite build",
 | 
			
		||||
 
 | 
			
		||||
@@ -5,8 +5,8 @@ const config = {
 | 
			
		||||
	baseurl: '',
 | 
			
		||||
	// optional, will fallback to /selfservice/
 | 
			
		||||
	baseurl_selfservice: '/selfservice/',
 | 
			
		||||
	// optional, will fallback to /imprint
 | 
			
		||||
	// optional, will fallback to baseurl_selfservice/imprint
 | 
			
		||||
	url_imprint: '',
 | 
			
		||||
	// optional, will fallback to /privacy
 | 
			
		||||
	// optional, will fallback to baseurl_selfservice/privacy
 | 
			
		||||
	url_privacy: ''
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -31,8 +31,8 @@
 | 
			
		||||
export default {
 | 
			
		||||
  data() {
 | 
			
		||||
    return {
 | 
			
		||||
      imprint_url: config.url_imprint || "/imprint/"
 | 
			
		||||
      , privacy_url: config.url_privacy || "/privacy/"
 | 
			
		||||
      imprint_url: config.url_imprint || config.baseurl_selfservice + "imprint"
 | 
			
		||||
      , privacy_url: config.url_privacy || config.baseurl_selfservice + "privacy"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,14 @@
 | 
			
		||||
{
 | 
			
		||||
  "access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
 | 
			
		||||
  "already_have_an_account": "Sie haben bereits einen Account?",
 | 
			
		||||
  "amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
 | 
			
		||||
  "apartment_suite_etc": "Addresszeile 2",
 | 
			
		||||
  "cancel_keep_my_data": "Abbrechen, meine Daten behalten",
 | 
			
		||||
  "configuration_error": "Konfigurationsfehler",
 | 
			
		||||
  "confirm_delete_all_of_my_data": "Bestätigung, meine gesamten Daten löschen",
 | 
			
		||||
  "confirm_personal_data": "Hiermit bestätige ich die Vollständigkeit und Richtigkeit der oben genannten Angaben",
 | 
			
		||||
    "delete-all-of-my-data": "Meine gesamten Daten löschen",
 | 
			
		||||
  "current_total_amount_in_eur": "Aktueller Gesamtbetrag (in €)",
 | 
			
		||||
  "delete_all_of_my_data": "Meine gesamten Daten löschen",
 | 
			
		||||
  "delete_my_data": "Meine Daten löschen",
 | 
			
		||||
  "deletion_in_progress": "Daten werden gelöscht...",
 | 
			
		||||
  "distance": "Distanz",
 | 
			
		||||
@@ -24,6 +26,7 @@
 | 
			
		||||
  "mittelname": "Mittelname",
 | 
			
		||||
  "nachname": "Nachname",
 | 
			
		||||
  "no_laps_scans_were_recorded_yet": "Es wurden noch keine Runden / Scans aufgezeichnet ...",
 | 
			
		||||
  "no_sponsorings_for_you_were_recorded_yet": "Es gibt noch keine Sponsorings für dich",
 | 
			
		||||
  "not_registered_yet": "Noch nicht registriert?",
 | 
			
		||||
  "organization": "Organisation",
 | 
			
		||||
  "ort": "Ort",
 | 
			
		||||
@@ -50,5 +53,6 @@
 | 
			
		||||
  "view_my_data": "Meine Läuferdaten einsehen",
 | 
			
		||||
  "vorname": "Vorname",
 | 
			
		||||
  "you_have_been_registered": "Sie wurden registriert!",
 | 
			
		||||
    "you_have_not_provided_a_valid_access_key": "Sie haben keinen gültigen Zugangsschlüssel angegeben..."
 | 
			
		||||
  "you_have_not_provided_a_valid_access_key": "Sie haben keinen gültigen Zugangsschlüssel angegeben...",
 | 
			
		||||
  "total": "Gesamt"
 | 
			
		||||
}
 | 
			
		||||
@@ -2,11 +2,13 @@
 | 
			
		||||
  "access_is_only_provided_via_your_email_link": "Access is only provided via the link you received upon registration.",
 | 
			
		||||
  "all_data_deleted": "All Data deleted!",
 | 
			
		||||
  "already_have_an_account": "Already have an account?",
 | 
			
		||||
  "amount_per_kilometer_in_eur": "Amount per kilometer (in €)",
 | 
			
		||||
  "apartment_suite_etc": "Apartment, suite, etc.",
 | 
			
		||||
  "cancel_keep_my_data": "Cancel, keep my data",
 | 
			
		||||
  "configuration_error": "Configuration error",
 | 
			
		||||
  "confirm_delete_all_of_my_data": "Confirm, delete all of my data",
 | 
			
		||||
  "confirm_personal_data": "I hereby confirm that the above information is complete and correct",
 | 
			
		||||
  "current_total_amount_in_eur": "Current total amount (in €)",
 | 
			
		||||
  "delete_my_data": "Delete my data",
 | 
			
		||||
  "deletion_in_progress": "Deletion in progress...",
 | 
			
		||||
  "distance": "Distance",
 | 
			
		||||
@@ -24,6 +26,7 @@
 | 
			
		||||
  "mittelname": "Middlename",
 | 
			
		||||
  "nachname": "Lastname",
 | 
			
		||||
  "no_laps_scans_were_recorded_yet": "No laps/ scans were recorded yet...",
 | 
			
		||||
  "no_sponsorings_for_you_were_recorded_yet": "No sponsorings for you were recorded yet...",
 | 
			
		||||
  "not_registered_yet": "Not registered yet?",
 | 
			
		||||
  "organization": "Organization",
 | 
			
		||||
  "ort": "City",
 | 
			
		||||
@@ -50,5 +53,6 @@
 | 
			
		||||
  "view_my_data": "View my data",
 | 
			
		||||
  "vorname": "Firstname",
 | 
			
		||||
  "you_have_been_registered": "You have been registered!",
 | 
			
		||||
    "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key..."
 | 
			
		||||
  "you_have_not_provided_a_valid_access_key": "You have not provided a valid access key...",
 | 
			
		||||
  "total": "Total"
 | 
			
		||||
}
 | 
			
		||||
@@ -16,6 +16,7 @@
 | 
			
		||||
            <button
 | 
			
		||||
              type="button"
 | 
			
		||||
              class="focus:border-black focus:ring-2 focus:ring-black text-white text-sm py-2.5 px-5 rounded-md bg-blue-500 hover:bg-blue-600 hover:shadow-lg"
 | 
			
		||||
              @click="get_certificate"
 | 
			
		||||
            >
 | 
			
		||||
              <svg
 | 
			
		||||
                xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
@@ -215,7 +216,7 @@
 | 
			
		||||
                      <tbody class="text-gray-900 dark:text-gray-50">
 | 
			
		||||
                        <tr v-for="s in state.scans" :key="s.id">
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span v-text="s.distance"></span>m
 | 
			
		||||
                            <span v-text="s.distance"></span>
 | 
			
		||||
                          </td>
 | 
			
		||||
                          <td class="px-4 py-3" v-text="s.lapTime"></td>
 | 
			
		||||
                        </tr>
 | 
			
		||||
@@ -235,7 +236,88 @@
 | 
			
		||||
            </div>
 | 
			
		||||
          </div>
 | 
			
		||||
          <div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
 | 
			
		||||
            <div class="py-4 w-full">coming soon...</div>
 | 
			
		||||
            <div class="py-4 w-full">
 | 
			
		||||
              <section class="text-gray-400 dark:bg-gray-900 body-font">
 | 
			
		||||
                <div class="container mx-auto">
 | 
			
		||||
                  <div class="lg:w-2/3 w-full mx-auto overflow-auto">
 | 
			
		||||
                    <table
 | 
			
		||||
                      v-if="state.sponsorings.length > 0"
 | 
			
		||||
                      class="table-auto w-full text-left whitespace-no-wrap"
 | 
			
		||||
                    >
 | 
			
		||||
                      <thead
 | 
			
		||||
                        class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
 | 
			
		||||
                      >
 | 
			
		||||
                        <tr>
 | 
			
		||||
                          <th class="px-4 py-3 title-font tracking-wider font-medium">Name</th>
 | 
			
		||||
                          <th
 | 
			
		||||
                            class="px-4 py-3 title-font tracking-wider font-medium"
 | 
			
		||||
                          >{{ $t('amount_per_kilometer_in_eur') }}</th>
 | 
			
		||||
                          <th
 | 
			
		||||
                            class="px-4 py-3 title-font tracking-wider font-medium"
 | 
			
		||||
                          >{{ $t('current_total_amount_in_eur') }}</th>
 | 
			
		||||
                        </tr>
 | 
			
		||||
                      </thead>
 | 
			
		||||
                      <tbody class="text-gray-900 dark:text-gray-50">
 | 
			
		||||
                        <tr v-for="s in state.sponsorings" :key="s.id">
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span v-text="s.donor.firstname"></span>
 | 
			
		||||
                            <span v-if="s.donor.middlename">
 | 
			
		||||
                              <span v-text="s.donor.middlename"></span>
 | 
			
		||||
                            </span>
 | 
			
		||||
                            <span v-text="s.donor.lastname"></span>
 | 
			
		||||
                          </td>
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span
 | 
			
		||||
                              v-text="(s.amountPerDistance / 100)
 | 
			
		||||
                              .toFixed(2)
 | 
			
		||||
                              .toLocaleString('de-DE', { valute: 'EUR' })"
 | 
			
		||||
                            ></span>€
 | 
			
		||||
                          </td>
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span
 | 
			
		||||
                              v-text="(s.amount / 100)
 | 
			
		||||
                              .toFixed(2)
 | 
			
		||||
                              .toLocaleString('de-DE', { valute: 'EUR' })"
 | 
			
		||||
                            ></span>€
 | 
			
		||||
                          </td>
 | 
			
		||||
                        </tr>
 | 
			
		||||
                      </tbody>
 | 
			
		||||
                      <tfoot class="text-gray-900 dark:text-gray-50">
 | 
			
		||||
                        <tr>
 | 
			
		||||
                          <td class="px-4 py-3">{{ $t('total') }}</td>
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span
 | 
			
		||||
                              v-text="(state.sponsorings.reduce(function(sum, current) {
 | 
			
		||||
                              return sum + current.amountPerDistance;
 | 
			
		||||
                            }, 0) / 100)
 | 
			
		||||
                              .toFixed(2)
 | 
			
		||||
                              .toLocaleString('de-DE', { valute: 'EUR' })"
 | 
			
		||||
                            ></span>€
 | 
			
		||||
                          </td>
 | 
			
		||||
                          <td class="px-4 py-3">
 | 
			
		||||
                            <span
 | 
			
		||||
                              v-text="(state.sponsorings.reduce(function(sum, current) {
 | 
			
		||||
                              return sum + current.amount;
 | 
			
		||||
                            }, 0) / 100)
 | 
			
		||||
                              .toFixed(2)
 | 
			
		||||
                              .toLocaleString('de-DE', { valute: 'EUR' })"
 | 
			
		||||
                            ></span>€
 | 
			
		||||
                          </td>
 | 
			
		||||
                        </tr>
 | 
			
		||||
                      </tfoot>
 | 
			
		||||
                    </table>
 | 
			
		||||
                    <div v-else class="text-center font-bold text-black dark:text-white text-2xl">
 | 
			
		||||
                      <img
 | 
			
		||||
                        src="../assets/empty_laps.svg"
 | 
			
		||||
                        style="height:25rem; margin:0 auto;"
 | 
			
		||||
                        :alt="[[$t('no_sponsorings_for_you_were_recorded_yet')]]"
 | 
			
		||||
                      />
 | 
			
		||||
                      {{ $t('no_sponsorings_for_you_were_recorded_yet') }}
 | 
			
		||||
                    </div>
 | 
			
		||||
                  </div>
 | 
			
		||||
                </div>
 | 
			
		||||
              </section>
 | 
			
		||||
            </div>
 | 
			
		||||
          </div>
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
@@ -255,9 +337,11 @@ const state = reactive({
 | 
			
		||||
  middlename: "",
 | 
			
		||||
  lastname: "",
 | 
			
		||||
  scans: [],
 | 
			
		||||
  sponsorings: [],
 | 
			
		||||
  group: "",
 | 
			
		||||
  activetab: "profile",
 | 
			
		||||
  delete_active: false,
 | 
			
		||||
  fullobject: {}
 | 
			
		||||
})
 | 
			
		||||
const toast = useToast();
 | 
			
		||||
const props = defineProps({
 | 
			
		||||
@@ -272,6 +356,8 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
 | 
			
		||||
    state.middlename = data.middlename;
 | 
			
		||||
    state.lastname = data.lastname;
 | 
			
		||||
    state.group = data.group;
 | 
			
		||||
    state.sponsorings = data.distanceDonations;
 | 
			
		||||
    state.fullobject = data;
 | 
			
		||||
  }).catch((error) => {
 | 
			
		||||
    toast.error("An error occured while loading your profile data");
 | 
			
		||||
  })
 | 
			
		||||
@@ -279,6 +365,7 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
 | 
			
		||||
  .then(({ data }) => {
 | 
			
		||||
    data.map(function(s) {
 | 
			
		||||
      s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
 | 
			
		||||
      s.distance = Math.floor(s.distance / 1000) + 'km ' + (Math.floor(s.distance % 1000) + "").padStart(3, "0") + "m"
 | 
			
		||||
      return s;
 | 
			
		||||
    })
 | 
			
		||||
    data.filter(s => s.valid === true);
 | 
			
		||||
@@ -298,4 +385,38 @@ function delete_me() {
 | 
			
		||||
      toast.error("An error occured while deleting your profile data");
 | 
			
		||||
    });
 | 
			
		||||
}
 | 
			
		||||
function get_certificate() {
 | 
			
		||||
  toast("Generation in progress...");
 | 
			
		||||
  const browserlocale = ((navigator.languages && navigator.languages[0]) || '').substr(0, 2);
 | 
			
		||||
  let url = `${config.baseurl}documents/certificates?locale=${browserlocale}&download=true&key=${config.documentserver_key}`;
 | 
			
		||||
  let postdata = Object.assign({}, state.fullobject);
 | 
			
		||||
  postdata.group = {
 | 
			
		||||
    name: postdata.group
 | 
			
		||||
  }
 | 
			
		||||
  postdata = [postdata]
 | 
			
		||||
  axios.post(url, postdata, {
 | 
			
		||||
    responseType: "blob"
 | 
			
		||||
  })
 | 
			
		||||
    .then((response) => {
 | 
			
		||||
      console.log(response)
 | 
			
		||||
      if (response.status != "200") {
 | 
			
		||||
        toast.error("An error occured while generateing your certificate!");
 | 
			
		||||
      } else {
 | 
			
		||||
        var fileURL = window.URL.createObjectURL(new Blob([response.data], { type: 'application/pdf' }));
 | 
			
		||||
        var fileLink = document.createElement('a');
 | 
			
		||||
 | 
			
		||||
        fileLink.href = fileURL;
 | 
			
		||||
        fileLink.setAttribute('download', 'Certificate.pdf');
 | 
			
		||||
        document.body.appendChild(fileLink);
 | 
			
		||||
 | 
			
		||||
        fileLink.click();
 | 
			
		||||
        fileLink.remove();
 | 
			
		||||
        toast("Document generated!");
 | 
			
		||||
      }
 | 
			
		||||
    })
 | 
			
		||||
    .catch((err) => {
 | 
			
		||||
      console.error(err);
 | 
			
		||||
      toast.error("An error occured while deleting your profile data");
 | 
			
		||||
    });
 | 
			
		||||
}
 | 
			
		||||
</script>
 | 
			
		||||
		Reference in New Issue
	
	Block a user