Merge branch 'main' of https://github.com/Ravende/ECHub

Ravende · Feb 22, 2024 · 4341b9d · 4341b9d
2 parents 92d1bff + a4fc319
commit 4341b9d
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 3 deletions.
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -17,8 +17,8 @@ bin/
 !**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
-backend/src/main/resources/application.properties
-backend/src/main/resources/ssl/keystore.p12
+src/main/resources/application.properties
+src/main/resources/ssl/keystore.p12
 .idea
 *.iws
 *.iml

diff --git a/backend/build/libs/backend-0.0.1-SNAPSHOT.jar b/backend/build/libs/backend-0.0.1-SNAPSHOT.jar
diff --git a/backend/build/tmp/bootJar/MANIFEST.MF b/backend/build/tmp/bootJar/MANIFEST.MF
@@ -1,2 +1,12 @@
 Manifest-Version: 1.0
+Main-Class: org.springframework.boot.loader.JarLauncher
+Start-Class: com.example.backend.BackendApplication
+Spring-Boot-Version: 3.1.0
+Spring-Boot-Classes: BOOT-INF/classes/
+Spring-Boot-Lib: BOOT-INF/lib/
+Spring-Boot-Classpath-Index: BOOT-INF/classpath.idx
+Spring-Boot-Layers-Index: BOOT-INF/layers.idx
+Build-Jdk-Spec: 17
+Implementation-Title: backend
+Implementation-Version: 0.0.1-SNAPSHOT
 
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeBasicInfoDto.class.uniqueId5 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeBasicInfoDto.class.uniqueId5
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeController.class.uniqueId6 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeController.class.uniqueId6
diff --git a/...end/build/tmp/compileJava/compileTransaction/stash-dir/CafeDetailInfoDto.class.uniqueId12 b/...end/build/tmp/compileJava/compileTransaction/stash-dir/CafeDetailInfoDto.class.uniqueId12
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeEntity.class.uniqueId0 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeEntity.class.uniqueId0
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeRepository.class.uniqueId8 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeRepository.class.uniqueId8
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeService.class.uniqueId3 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/CafeService.class.uniqueId3
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/HashtagEntity.class.uniqueId10 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/HashtagEntity.class.uniqueId10
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/OpenNowEntity.class.uniqueId7 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/OpenNowEntity.class.uniqueId7
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewEntity.class.uniqueId2 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewEntity.class.uniqueId2
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewRepository.class.uniqueId9 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewRepository.class.uniqueId9
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewService.class.uniqueId4 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/ReviewService.class.uniqueId4
diff --git a/...build/tmp/compileJava/compileTransaction/stash-dir/SecurityConfiguration.class.uniqueId11 b/...build/tmp/compileJava/compileTransaction/stash-dir/SecurityConfiguration.class.uniqueId11
diff --git a/backend/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId1 b/backend/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId1
diff --git a/backend/build/tmp/compileJava/previous-compilation-data.bin b/backend/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/backend/src/main/java/com/example/backend/configuration/GlobalCorsConfiguration.java b/backend/src/main/java/com/example/backend/configuration/GlobalCorsConfiguration.java
@@ -10,7 +10,7 @@ public class GlobalCorsConfiguration implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:3000")
+                .allowedOrigins("http://localhost:3000", "https://ewhacafeuhub.netlify.app")
                 .allowedMethods("GET", "POST")
                 .allowCredentials(true);
     }