PGL/Clyde
PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Compare commits

base: PGL:25c5c1b018cdde9861e74068d6cb5e00b48f2c67
Branches Tags
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
PGL:JalonB
PGL:jalonA
..
compare: PGL:77ac771b8f99522ff792ce1ab82919bc1ca1f82b
Branches Tags
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
PGL:JalonB
PGL:jalonA

3 Commits
25c5c1b018 ... 77ac771b8f

Author SHA1 Message Date
Wawilski
77ac771b8f Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers
Some checks failed
Build and test backend / Build-backend (pull_request) Failing after 1m31s
Details
Build and test backend / Test-backend (pull_request) Failing after 1m31s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
Details
2024-03-18 17:36:07 +01:00
Wawilski
3762750968 Tempo 2024-03-18 17:34:35 +01:00
Bartha Maxime
a276c24f8f added delete self
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m2s
Details
Build and test backend / Test-backend (pull_request) Successful in 2m0s
Details
Build and test FrontEnd / Build-frontend (pull_request) Successful in 25s
Details
2024-03-18 17:30:04 +01:00
3 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
View File

@ -125,7 +125,7 @@ public class UserController {
@DeleteMapping("/user/{id}") @DeleteMapping("/user/{id}")
public ResponseEntity<String> deleteStudent(@RequestHeader("Authorization") String token, @PathVariable Long id){ public ResponseEntity<String> deleteStudent(@RequestHeader("Authorization") String token, @PathVariable Long id){
if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token)) if (authServ.isNotIn(new Role[]{Role.Admin,Role.Secretary},token) || id.equals(authServ.getUserFromToken(token).getRegNo()))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
User toDelete = userService.getUserById(id); User toDelete = userService.getUserById(id);

5
frontend/src/App.vue
View File

@ -15,11 +15,10 @@ window.onhashchange = function() {
const Logged = ref(isLogged()); const Logged = ref(isLogged());
window.addEventListener('hashchange', () => { window.addEventListener('hashchange', () => {
if((location.hash === "#/home" && prevURL === "#/login") || location.hash === "#/home" && prevURL === "#/profil" && !Logged)){ if((location.hash === "#/home" && prevURL === "#/login") || (location.hash === "#/home" && prevURL === "#/profil")){
window.location.reload(); window.location.reload();
} }
}) });
const home=ref(i18n("app.home")) const home=ref(i18n("app.home"))
const notifications=ref(i18n("app.notifications")) const notifications=ref(i18n("app.notifications"))
const settings=ref(i18n("app.settings")) const settings=ref(i18n("app.settings"))

6
frontend/src/Apps/Profil.vue
View File

@ -56,8 +56,10 @@
} }
async function unRegister(){ async function unRegister(){
await deleteUser(user.regNo); disconnect();
setTimeout(() => {
window.location.href="#/home";
}, "500");
} }