User's gallery images correction

CodeURJC-DAW-2019-20 · Apr 5, 2020 · 6e92a75 · 6e92a75
1 parent 2f4c96b
commit 6e92a75
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/AngularAnimalShelter/proxy.conf.json b/AngularAnimalShelter/proxy.conf.json
@@ -10,6 +10,12 @@
       "secure": false,
       "logLevel": "debug",
       "changeOrigin": true
+    },
+    "//*": {
+      "target": "https://localhost:8443/",
+      "secure": false,
+      "logLevel": "debug",
+      "changeOrigin": true
     }
 
 

diff --git a/AngularAnimalShelter/src/app/profile/profile.component.html b/AngularAnimalShelter/src/app/profile/profile.component.html
@@ -69,7 +69,7 @@ <h2>Gallery</h2>
 	<div class="container">
 		<div class="row">
 			<div id="imagebox" *ngFor="let ani of animal">
-				<img class="allimages" src="https://localhost:8443{{ani}}" alt="" height="100px" wight="100px">
+				<img class="allimages" src="{{src2}}{{ani}}" alt="" height="100px" wight="100px">
 
 			</div>
 		</div>

diff --git a/AngularAnimalShelter/src/app/profile/profile.component.ts b/AngularAnimalShelter/src/app/profile/profile.component.ts
@@ -19,6 +19,8 @@ export class ProfileComponent {
   file: any[];
   userGallery: string;
   src=environment.apiBase2 + '/user';
+  src2=environment.apiBase3;
+
 
   constructor(private service: ServiceService, private router: Router) {
     this.user = JSON.parse(localStorage.getItem('currentUser'));

diff --git a/AngularAnimalShelter/src/environments/environment.prod.ts b/AngularAnimalShelter/src/environments/environment.prod.ts
@@ -2,4 +2,6 @@ export const environment = {
   production: true,
   apiBase: "/api",
   apiBase2:"/images",
+  apiBase3:"/",
+
 };
diff --git a/AngularAnimalShelter/src/environments/environment.ts b/AngularAnimalShelter/src/environments/environment.ts
@@ -6,6 +6,7 @@ export const environment = {
   production: false,
   apiBase: "/api",
   apiBase2:"/images",
+  apiBase3:"/"
 };
 
 /*

diff --git a/backend/animalshelter/src/main/java/es/sidelab/animalshelter/api/APIWebUserController.java b/backend/animalshelter/src/main/java/es/sidelab/animalshelter/api/APIWebUserController.java
@@ -145,14 +145,14 @@ public ResponseEntity<Object> getUserImage(@PathVariable long id) throws Malform
 		}
 	}
 
-	@PostMapping("/galleries")//to post UserPhoto by postman
+        @PostMapping("/galleries")//to post UserPhoto by postman
 	@ResponseStatus(HttpStatus.CREATED)
 	public List<String> setUserGallery(@RequestParam(value="userGallery", required=false) MultipartFile userGallery)  throws IOException {
 		System.out.print("holai");
 		WebUser webuser= (WebUser) loggeduser.getLoggedUser();
 		service.save(webuser);
 		imageService.saveUserGalleryImage("users", userGallery);
-		String photo = "/images/users/" + userGallery.getOriginalFilename();
+		String photo = "images/users/" + userGallery.getOriginalFilename();
 		UserGalleryPhoto gp = new UserGalleryPhoto(photo);
 		servicegallery.save(gp);
 		gp.setGalleryOwner(webuser);
@@ -165,6 +165,7 @@ public List<String> setUserGallery(@RequestParam(value="userGallery", required=f
 		return gallery;
 	}
 
+
 	@GetMapping("/galleries")
 	public ResponseEntity<List<String>> getuserGallery() {