From 592331236e213eadc3fda27653c5dcf0c66e6cd5 Mon Sep 17 00:00:00 2001 From: MAILLAL Anas Date: Thu, 1 May 2025 17:45:49 +0200 Subject: [PATCH 1/2] added endpoints to see all user without any auth for testing --- .../myinpulse/controller/UnauthApi.java | 21 ++++++++++++++++++- .../myinpulse/service/AdminApiService.java | 4 ++++ .../service/EntrepreneurApiService.java | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/UnauthApi.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/UnauthApi.java index 52ddd41..8484afc 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/UnauthApi.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/controller/UnauthApi.java @@ -1,6 +1,8 @@ package enseirb.myinpulse.controller; +import enseirb.myinpulse.model.Administrator; import enseirb.myinpulse.model.Entrepreneur; +import enseirb.myinpulse.service.AdminApiService; import enseirb.myinpulse.service.EntrepreneurApiService; import org.springframework.beans.factory.annotation.Autowired; @@ -14,10 +16,12 @@ import org.springframework.web.bind.annotation.*; public class UnauthApi { private final EntrepreneurApiService entrepreneurApiService; + private final AdminApiService adminApiService; @Autowired - UnauthApi(EntrepreneurApiService entrepreneurApiService) { + UnauthApi(EntrepreneurApiService entrepreneurApiService, AdminApiService administratorService) { this.entrepreneurApiService = entrepreneurApiService; + this.adminApiService = administratorService; } @GetMapping("/unauth/finalize") @@ -48,4 +52,19 @@ public class UnauthApi { true); entrepreneurApiService.createAccount(e); } + + /* + * These bottom endpoints are meant for testing only + * and should not py merged to main + * + */ + @GetMapping("/unauth/getAllAdmins") + public Iterable getEveryAdmin() { + return this.adminApiService.getAllAdmins(); + } + + @GetMapping("/unauth/getAllEntrepreneurs") + public Iterable getEveryEntrepreneur() { + return this.entrepreneurApiService.getAllEntrepreneurs(); + } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java index 4aade61..d73efaf 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/AdminApiService.java @@ -206,4 +206,8 @@ public class AdminApiService { public Iterable getPendingUsers() { return this.userService.getPendingAccounts(); } + + public Iterable getAllAdmins() { + return this.administratorService.allAdministrators(); + } } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java index c89a35f..7709caa 100644 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/EntrepreneurApiService.java @@ -219,4 +219,8 @@ public class EntrepreneurApiService { } throw new ResponseStatusException(HttpStatus.CONFLICT, "User already exists in the system"); } + + public Iterable getAllEntrepreneurs() { + return entrepreneurService.getAllEntrepreneurs(); + } } From 4356a01e4a699b309ab30f1793ffd9108d90ce76 Mon Sep 17 00:00:00 2001 From: ALAMI Adnane Date: Thu, 1 May 2025 19:23:21 +0200 Subject: [PATCH 2/2] feat: adding delete button with the corresponding endpoint --- .../src/components/AllEntrep.vue | 77 +++++++++++++++++++ .../src/components/canvas/CanvasItem.vue | 61 ++++++++++++++- .../src/components/canvas/HeaderCanvas.vue | 2 +- .../src/services/Apis/Unauth.ts | 23 ++++++ front/MyINPulse-front/src/views/AdminMain.vue | 4 +- .../MyINPulse-front/src/views/CanvasView.vue | 2 +- 6 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 front/MyINPulse-front/src/components/AllEntrep.vue diff --git a/front/MyINPulse-front/src/components/AllEntrep.vue b/front/MyINPulse-front/src/components/AllEntrep.vue new file mode 100644 index 0000000..b8e2df8 --- /dev/null +++ b/front/MyINPulse-front/src/components/AllEntrep.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue index 5c04b62..8caa3ce 100755 --- a/front/MyINPulse-front/src/components/canvas/CanvasItem.vue +++ b/front/MyINPulse-front/src/components/canvas/CanvasItem.vue @@ -30,6 +30,18 @@