Skip to content

Commit

Permalink
ispravljena registracija
Browse files Browse the repository at this point in the history
  • Loading branch information
draganaF committed Jun 16, 2021
1 parent 04fb33a commit 5ea96f5
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ public ResponseEntity<Collection<PharmacyDTO>> getAllSubscribedPharmacies(@PathV
}

@PostMapping(consumes = "application/json")
@PreAuthorize("hasAnyRole('DERMATOLOGIST', 'PHARMACIST', 'PATIENT')")
//@PreAuthorize("hasAnyRole('DERMATOLOGIST', 'PHARMACIST', 'PATIENT')")
public ResponseEntity<PatientDTO> savePatient(@RequestBody PatientDTO patientDTO) throws Exception{
try {
/*try {
AdminPharmacy savedAdmin = adminService.findOne(patientDTO.getEmail());
if(savedAdmin != null) {
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
Expand Down Expand Up @@ -197,7 +197,7 @@ public ResponseEntity<PatientDTO> savePatient(@RequestBody PatientDTO patientDTO
}
catch(NullPointerException e) {
}
}*/


Address address = new Address();
Expand Down Expand Up @@ -231,7 +231,7 @@ public ResponseEntity<PatientDTO> savePatient(@RequestBody PatientDTO patientDTO
System.out.println(e.getMessage());
}

return new ResponseEntity<>(new PatientDTO(patient), HttpStatus.CREATED);
return new ResponseEntity<>(HttpStatus.CREATED);
}

@GetMapping(value="/confirm-account")
Expand Down
2 changes: 1 addition & 1 deletion src/main/ui/vue/dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><title>vue</title><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script><script src="https://use.fontawesome.com/releases/v5.0.8/js/all.js"></script><link rel="stylesheet" href="https://m.w3newbie.com/you-tube.css"><link href="/css/app.4a8f70f9.css" rel="preload" as="style"><link href="/css/chunk-vendors.7a02bd6c.css" rel="preload" as="style"><link href="/js/app.86ac6897.js" rel="preload" as="script"><link href="/js/chunk-vendors.54fe7980.js" rel="preload" as="script"><link href="/css/chunk-vendors.7a02bd6c.css" rel="stylesheet"><link href="/css/app.4a8f70f9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.54fe7980.js"></script><script src="/js/app.86ac6897.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><meta name="viewport" content="width=device-width,initial-scale=1"><title>vue</title><link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"><script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script><script src="https://use.fontawesome.com/releases/v5.0.8/js/all.js"></script><link rel="stylesheet" href="https://m.w3newbie.com/you-tube.css"><link href="/css/app.4a8f70f9.css" rel="preload" as="style"><link href="/css/chunk-vendors.7a02bd6c.css" rel="preload" as="style"><link href="/js/app.254cf2b1.js" rel="preload" as="script"><link href="/js/chunk-vendors.54fe7980.js" rel="preload" as="script"><link href="/css/chunk-vendors.7a02bd6c.css" rel="stylesheet"><link href="/css/app.4a8f70f9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.54fe7980.js"></script><script src="/js/app.254cf2b1.js"></script></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

160 changes: 79 additions & 81 deletions src/main/ui/vue/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5ea96f5

Please sign in to comment.