From 1aeb4959a2a0aeaf2542a4f78d1d13d07d9d063b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Zatorski?= Date: Wed, 6 Nov 2024 16:46:16 +0100 Subject: [PATCH] sd --- .../config/liquibase/fake-data/blob/hipster.txt | 2 +- .../config/liquibase/fake-data/charge.csv | 11 +---------- .../resources/config/liquibase/fake-data/event.csv | 12 ++---------- .../config/liquibase/fake-data/registration.csv | 10 ---------- src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue | 2 +- .../registration/registration-details.component.ts | 14 +++++++++++++- .../entities/registration/registration-details.vue | 2 +- src/main/webapp/app/router/index.ts | 2 +- 8 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/main/resources/config/liquibase/fake-data/blob/hipster.txt b/src/main/resources/config/liquibase/fake-data/blob/hipster.txt index 3bf9d1e..eb1ae45 100644 --- a/src/main/resources/config/liquibase/fake-data/blob/hipster.txt +++ b/src/main/resources/config/liquibase/fake-data/blob/hipster.txt @@ -1 +1 @@ -JHipster is a development platform to generate, develop and deploy Spring Boot + Angular / React / Vue Web applications and Spring microservices. \ No newline at end of file +... diff --git a/src/main/resources/config/liquibase/fake-data/charge.csv b/src/main/resources/config/liquibase/fake-data/charge.csv index d0e7b4b..f89fe57 100644 --- a/src/main/resources/config/liquibase/fake-data/charge.csv +++ b/src/main/resources/config/liquibase/fake-data/charge.csv @@ -1,11 +1,2 @@ id;charge_date;type;amount -1;2024-11-05;CHARGE;9041.03 -2;2024-11-04;CHARGE;21481.71 -3;2024-11-05;PAYMENT;20706.62 -4;2024-11-05;PAYMENT;3052.82 -5;2024-11-04;CHARGE;19800.11 -6;2024-11-04;PAYMENT;21867.73 -7;2024-11-05;PAYMENT;27189.8 -8;2024-11-04;CHARGE;24639.37 -9;2024-11-04;CHARGE;11995.91 -10;2024-11-04;PAYMENT;14703.4 + diff --git a/src/main/resources/config/liquibase/fake-data/event.csv b/src/main/resources/config/liquibase/fake-data/event.csv index 8eb58de..295d6b4 100644 --- a/src/main/resources/config/liquibase/fake-data/event.csv +++ b/src/main/resources/config/liquibase/fake-data/event.csv @@ -1,11 +1,3 @@ id;name;date;players_limit;cost;comment -1;beyond;2024-11-04;10433;29183.35;../fake-data/blob/hipster.txt -2;consequently um;2024-11-04;19962;5298.5;../fake-data/blob/hipster.txt -3;phooey incidentally excepting;2024-11-05;18229;24949;../fake-data/blob/hipster.txt -4;hmph;2024-11-05;12797;23126.51;../fake-data/blob/hipster.txt -5;whether;2024-11-04;29300;6622.71;../fake-data/blob/hipster.txt -6;wound;2024-11-05;5236;6534.13;../fake-data/blob/hipster.txt -7;insignificant downshift gallery;2024-11-05;6735;17678.34;../fake-data/blob/hipster.txt -8;hence astride;2024-11-04;354;399.79;../fake-data/blob/hipster.txt -9;selfishly;2024-11-05;14372;29015.86;../fake-data/blob/hipster.txt -10;whoever phooey until;2024-11-05;27795;1239.07;../fake-data/blob/hipster.txt +1;Piłka 160;2024-11-11;18;380;Piłka wcześniej niż zwykle!!!! + diff --git a/src/main/resources/config/liquibase/fake-data/registration.csv b/src/main/resources/config/liquibase/fake-data/registration.csv index 81f36e9..365e7b0 100644 --- a/src/main/resources/config/liquibase/fake-data/registration.csv +++ b/src/main/resources/config/liquibase/fake-data/registration.csv @@ -1,11 +1 @@ id;date_time;active;player_name;comment -1;2024-11-04T21:39:10;true;towards;../fake-data/blob/hipster.txt -2;2024-11-04T16:49:21;true;because last;../fake-data/blob/hipster.txt -3;2024-11-04T20:56:23;false;even;../fake-data/blob/hipster.txt -4;2024-11-05T04:46:06;true;untrue;../fake-data/blob/hipster.txt -5;2024-11-04T12:41:16;true;devise thorn;../fake-data/blob/hipster.txt -6;2024-11-05T00:16:30;false;rotten aw bah;../fake-data/blob/hipster.txt -7;2024-11-05T02:43:46;true;amidst;../fake-data/blob/hipster.txt -8;2024-11-04T09:14:58;false;vice;../fake-data/blob/hipster.txt -9;2024-11-04T14:16:43;false;truly thoughtfully;../fake-data/blob/hipster.txt -10;2024-11-05T07:55:10;false;courtroom annex;../fake-data/blob/hipster.txt diff --git a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue index 30cd715..c941f0c 100644 --- a/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue +++ b/src/main/webapp/app/core/jhi-navbar/jhi-navbar.vue @@ -26,7 +26,7 @@ - + All Events diff --git a/src/main/webapp/app/entities/registration/registration-details.component.ts b/src/main/webapp/app/entities/registration/registration-details.component.ts index c836fb3..365a00c 100644 --- a/src/main/webapp/app/entities/registration/registration-details.component.ts +++ b/src/main/webapp/app/entities/registration/registration-details.component.ts @@ -6,6 +6,8 @@ import useDataUtils from '@/shared/data/data-utils.service'; import { useDateFormat } from '@/shared/composables'; import { type IRegistration } from '@/shared/model/registration.model'; import { useAlertService } from '@/shared/alert/alert.service'; +import { type IUser, User } from '@/shared/model/user.model'; +import UserService from '@/entities/user/user.service'; export default defineComponent({ compatConfig: { MODE: 3 }, @@ -14,7 +16,9 @@ export default defineComponent({ const dateFormat = useDateFormat(); const registrationService = inject('registrationService', () => new RegistrationService()); const alertService = inject('alertService', () => useAlertService(), true); - + const userService = inject('userService', () => new UserService()); + // const loggedUser: Ref = ref(new User()); + const currentUserId = ref(''); const dataUtils = useDataUtils(); const route = useRoute(); @@ -23,6 +27,13 @@ export default defineComponent({ const previousState = () => router.go(-1); const registration: Ref = ref({}); + // Fetch user details from the /api/account endpoint + userService() + .fetchAccountDetails() + .then(account => { + currentUserId.value = `${account.id}`; + }); + const retrieveRegistration = async registrationId => { try { const res = await registrationService().find(registrationId); @@ -37,6 +48,7 @@ export default defineComponent({ } return { + currentUserId, ...dateFormat, alertService, registration, diff --git a/src/main/webapp/app/entities/registration/registration-details.vue b/src/main/webapp/app/entities/registration/registration-details.vue index 8684a84..d79ba4f 100644 --- a/src/main/webapp/app/entities/registration/registration-details.vue +++ b/src/main/webapp/app/entities/registration/registration-details.vue @@ -53,7 +53,7 @@  Back routes: [ { path: '/', - redirect: '/event/3/view', + redirect: '/event/1/view', }, { path: '/forbidden',