Merge remote-tracking branch 'remotes/origin/master' into masterthesis/patternauthoringAPI

Author: Manuela Weigold

.docker/docker-compose.yml

@@ -62,6 +62,7 @@ public FilterRegistrationBean customCorsFilter() {
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
         config.addAllowedOrigin("http://localhost:4200");
+        config.addAllowedOrigin("http://localhost:4201");
         config.addAllowedHeader("*");
         config.addAllowedMethod("*");
         source.registerCorsConfiguration("/**", config);
@@ -71,4 +72,4 @@ public FilterRegistrationBean customCorsFilter() {
         bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return bean;
     }
-}
+}

src/main/java/com/patternpedia/api/config/ResourceServerConfig.java

@@ -1,8 +1,8 @@
 server.port=8080
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/patternpedia
-spring.datasource.username=patternpedia
-spring.datasource.password=patternpedia
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.username=postgres
+spring.datasource.password=postgres
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 spring.jpa.hibernate.ddl-auto=update