dependency upgrades

Author: gladius

demo/package.json

@@ -8,9 +8,9 @@
     "start": "next start"
   },
   "dependencies": {
-    "axios": "^0.21.0",
-    "next": "10.0.3",
-    "react": "17.0.1",
-    "react-dom": "17.0.1"
+    "axios": "^0.21.1",
+    "next": "^11.0.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
   }
 }

demo/pages/index.js

@@ -2,22 +2,21 @@ import Head from "next/head";
 import { useEffect, useState } from "react";
 import axios from "axios";
 
-//const CDN_URL = "REPLACE_WITH_YOUR_CDN_URL";
-
-const CDN_URL = "https://zeaque-dev.ams3.digitaloceanspaces.com/files/";
 const Gallery = () => {
   const [loading, setLoading] = useState(true);
   const [images, setImages] = useState([]);
   const [progress, setProgress] = useState(0);
 
+  const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL;
+
   useEffect(() => {
     loadImages();
   }, []);
 
   const loadImages = () => {
     setLoading(true);
     axios
-      .get("http://localhost:8080/get/images")
+      .get(`${SERVER_URL}/get/images`)
       .then((response) => {
         setImages(response.data);
         setLoading(false);
@@ -30,7 +29,7 @@ const Gallery = () => {
   const deleteImage = (id) => {
     setLoading(true);
     axios
-      .delete("http://localhost:8080/delete/image/" + id)
+      .delete(`${SERVER_URL}/delete/image/${id}`)
       .then((response) => {
         loadImages();
       })
@@ -44,17 +43,13 @@ const Gallery = () => {
     formData.append("image", image);
     let config = {
       onUploadProgress: (progressEvent) => {
-        console.log(
-          "progress event:: ",
-          Math.round((progressEvent.loaded * 100) / progressEvent.total)
-        );
         setProgress(
           Math.round((progressEvent.loaded * 100) / progressEvent.total)
         );
       },
     };
     axios
-      .put("http://localhost:8080/save/image", formData, config)
+      .put(`${SERVER_URL}/save/image`, formData, config)
       .then((response) => {
         loadImages();
         setProgress(0);
@@ -141,7 +136,7 @@ const Gallery = () => {
                         />
                       </button>
                       <img
-                        src={`${CDN_URL}${image.name}.${image.ext}`}
+                        src={`${process.env.NEXT_PUBLIC_DO_SPACES_URL}/files/${image.name}.${image.ext}`}
                         alt={image.name}
                         className="image"
                       />

src/main/java/io/thepro/dospaces/configs/DoConfig.java

@@ -26,7 +26,7 @@ public class DoConfig {
 	private String doSpaceRegion;
 
 	@Bean
-	public AmazonS3 getCredentials() {
+	public AmazonS3 getS3() {
 		BasicAWSCredentials creds = new BasicAWSCredentials(doSpaceKey, doSpaceSecret);
 		return AmazonS3ClientBuilder.standard()
 				.withEndpointConfiguration(new EndpointConfiguration(doSpaceEndpoint, doSpaceRegion))

src/main/java/io/thepro/dospaces/repositories/ImageRepository.java

@@ -1,11 +1,11 @@
 package io.thepro.dospaces.repositories;
 
-import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 import io.thepro.dospaces.entities.Image;
 
 @Repository
-public interface ImageRepository extends CrudRepository<Image, Long>{
+public interface ImageRepository extends PagingAndSortingRepository<Image, Long>{
 
 }

src/main/java/io/thepro/dospaces/services/ImageStorageServiceImpl.java

@@ -24,17 +24,18 @@
 @Service
 public class ImageStorageServiceImpl implements ImageStorageService {
 
+	@Autowired
+	ImageRepository imageRepo;
+	
+	@Autowired
+	AmazonS3 s3Client;
+	
+	
 	@Value("${do.space.bucket}")
 	private String doSpaceBucket;
 
 	String FOLDER = "files/";
 
-	@Autowired
-	AmazonS3 s3Client;
-
-	@Autowired
-	ImageRepository imageRepo;
-
 	@Override
 	public void saveFile(MultipartFile multipartFile) throws IOException {
 		String extension = FilenameUtils.getExtension(multipartFile.getOriginalFilename());

src/main/resources/application.yaml

@@ -1,14 +1,14 @@
+## DO properties
 do:
   spaces:
-    access:
-      key: ${DO_SPACE_KEY}
-      secret: ${DO_SPACE_SECRET}
-      endpoint: ${DO_SPACE_ENDPOINT}
-      region: ${DO_SPACE_REGION}
-      bucket: ${DO_SPACE_BUCKET}
+    key: ${DO_SPACE_KEY}
+    secret: ${DO_SPACE_SECRET}
+    endpoint: ${DO_SPACE_ENDPOINT}
+    region: ${DO_SPACE_REGION}
+    bucket: ${DO_SPACE_BUCKET}
 
-      
-     
+
+## Database Properties
 spring:
   datasource:
     url: jdbc:h2:file:${PATH_TO_DB_FILE};DB_CLOSE_ON_EXIT=FALSE