From b515d09f894b9ffaeb86b6c85f4d9fcd392310d1 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 9 May 2021 13:01:02 +0200 Subject: [PATCH 01/17] Master: Text changes --- .../java/com/example/springboot/HelloController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 7cfc2a7..b335c5d 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -2,13 +2,18 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; - +import org.springframework.web.bind.annotation.GetMapping; @RestController public class HelloController { @RequestMapping("/") public String index() { - return "Hello World!"; + return "Hello World"; + } + + @GetMapping("/") + String hello() { + return "Deployed!"; } } \ No newline at end of file From 24ce939b70abff29395da90a5165eeb63132d77f Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 9 May 2021 13:05:53 +0200 Subject: [PATCH 02/17] Deployed --- SpringBootApp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpringBootApp b/SpringBootApp index fe35c8b..087bf6b 160000 --- a/SpringBootApp +++ b/SpringBootApp @@ -1 +1 @@ -Subproject commit fe35c8b362647699d22f50b10438e37a407c168b +Subproject commit 087bf6bdadcdf252ad295810c3cbf68bee2de307 From 2d522ac8357460b0beb73baa076aeeb8fb3ab126 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 9 May 2021 13:17:43 +0200 Subject: [PATCH 03/17] deployed --- src/main/java/com/example/springboot/HelloController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index b335c5d..e71afcc 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -13,7 +13,7 @@ public String index() { @GetMapping("/") String hello() { - return "Deployed!"; + return "Deployed"; } } \ No newline at end of file From 317427b93f9fdefae69e5a1378518cfd03cad63b Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 9 May 2021 13:21:27 +0200 Subject: [PATCH 04/17] Thema --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e87a63..40e76cb 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# SpringBootApp \ No newline at end of file +Food Map zur vietnamesischen Küche in Deutschland + +Diese Website ist ein Ort, wo köstliche vietnamesische Gerichten in Deutschland geteilt werden. Sie wird mit einer Karte (wahrscheinlich Google) verknüpft. Beste Standorte zu Gerichten nach Städten bzw Bezirken sortiert werden. Auch detaillierte wahre Erfahrungen von Besuchern zu jedem Standort sind zu finden. + +Außerdem gibt es die Möglichkeit, die Ursprung jedes Gerichts herauszufinden. An dieser Stelle werden auch beste Standorte für jeweiliges Gericht in Vietnam gezeigt. Es sollte leichter gehen, den vollen Geschmack dieses Gerichts zu genießen, wenn man nach Vietnam kommt. \ No newline at end of file From 0c1e0ee8f71917fbe8cf843f5787c9424ff6d128 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 9 May 2021 23:08:58 +0200 Subject: [PATCH 05/17] =?UTF-8?q?Datenbank=20verkn=C3=BCpft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 +++++ pom.xml | 8 ++++++++ .../java/com/example/springboot/Food.java | 19 +++++++++++++++++++ .../example/springboot/HelloController.java | 8 +++++--- src/main/resources/application.properties | 7 +++++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 pom.xml create mode 100644 src/main/java/com/example/springboot/Food.java diff --git a/build.gradle b/build.gradle index 4cd4393..887745f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id 'java' } + group = 'com.example' version = '0.0.1-SNAPSHOT' sourceCompatibility = '11' @@ -15,8 +16,12 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-jdbc' developmentOnly 'org.springframework.boot:spring-boot-devtools' testImplementation 'org.springframework.boot:spring-boot-starter-test' + runtimeOnly 'org.postgresql:postgresql' } test { diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..710d956 --- /dev/null +++ b/pom.xml @@ -0,0 +1,8 @@ + + + + + org.postgresql + postgresql + runtime + \ No newline at end of file diff --git a/src/main/java/com/example/springboot/Food.java b/src/main/java/com/example/springboot/Food.java new file mode 100644 index 0000000..c698e83 --- /dev/null +++ b/src/main/java/com/example/springboot/Food.java @@ -0,0 +1,19 @@ +package com.example.springboot; + +public class Food { + private final String name; + private final String id; + private final String location; + + public Food (String name, String id, String location) { + this.name = name; + this.id = id; + this.location = location; + } + + public String getId() {return id;} + + public String getName() {return name;} + + public String getLocation() {return location;} +} diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index e71afcc..9f815f4 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -1,5 +1,6 @@ package com.example.springboot; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -11,9 +12,10 @@ public String index() { return "Hello World"; } - @GetMapping("/") - String hello() { - return "Deployed"; + @GetMapping("/hello") + public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { + return String.format("Hello, %s", name); } + } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b13789..2590da6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,8 @@ +spring.datasource.url= jdbc:postgresql://localhost:5432/springbootwebtech +spring.datasource.jdbc-url=${spring.datasource.url} +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.platform=postgres +spring.datasource.username=postgres +spring.datasource.password=password +spring.datasource.initialization-mode=always From 2fb17ac1837c108f4176850bae160195b0d5a8b0 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Tue, 11 May 2021 16:46:45 +0200 Subject: [PATCH 06/17] Commit --- build.gradle | 3 ++- pom.xml | 8 -------- .../example/{springboot => accessingdatajpa}/Food.java | 4 ++-- src/main/resources/application.properties | 8 -------- 4 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 pom.xml rename src/main/java/com/example/{springboot => accessingdatajpa}/Food.java (91%) diff --git a/build.gradle b/build.gradle index 887745f..a91d6b8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,12 +16,13 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + //implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-jdbc' developmentOnly 'org.springframework.boot:spring-boot-devtools' testImplementation 'org.springframework.boot:spring-boot-starter-test' runtimeOnly 'org.postgresql:postgresql' + runtimeOnly 'com.h2database:h2' } test { diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 710d956..0000000 --- a/pom.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - org.postgresql - postgresql - runtime - \ No newline at end of file diff --git a/src/main/java/com/example/springboot/Food.java b/src/main/java/com/example/accessingdatajpa/Food.java similarity index 91% rename from src/main/java/com/example/springboot/Food.java rename to src/main/java/com/example/accessingdatajpa/Food.java index c698e83..dd3dc05 100644 --- a/src/main/java/com/example/springboot/Food.java +++ b/src/main/java/com/example/accessingdatajpa/Food.java @@ -1,4 +1,4 @@ -package com.example.springboot; +package com.example.accessingdatajpa; public class Food { private final String name; @@ -16,4 +16,4 @@ public Food (String name, String id, String location) { public String getName() {return name;} public String getLocation() {return location;} -} +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2590da6..e69de29 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +0,0 @@ -spring.datasource.url= jdbc:postgresql://localhost:5432/springbootwebtech -spring.datasource.jdbc-url=${spring.datasource.url} -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.platform=postgres -spring.datasource.username=postgres -spring.datasource.password=password -spring.datasource.initialization-mode=always - From 56ec7741d34b9ce2c51448e6a27847abd80120d0 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Tue, 11 May 2021 17:02:08 +0200 Subject: [PATCH 07/17] Heroku --- .../com/example/springboot/HelloController.java | 15 +++++++-------- system.properties | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 system.properties diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 9f815f4..158a0b5 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -1,21 +1,20 @@ package com.example.springboot; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.GetMapping; -@RestController + +@Controller public class HelloController { - @RequestMapping("/") + @GetMapping("/") public String index() { return "Hello World"; } - @GetMapping("/hello") - public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { - return String.format("Hello, %s", name); + //@GetMapping("/") + //public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { + //return String.format("Hello, %s", name); } - -} \ No newline at end of file diff --git a/system.properties b/system.properties new file mode 100644 index 0000000..54b2799 --- /dev/null +++ b/system.properties @@ -0,0 +1 @@ +java.runtime.version = 16 \ No newline at end of file From f0570e02c742b63f47ef8a0112bf0f5ab1998a0a Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Tue, 11 May 2021 17:21:11 +0200 Subject: [PATCH 08/17] Heroku --- .../java/com/example/springboot/HelloController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 158a0b5..c5a9ea4 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -4,17 +4,18 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController public class HelloController { - @GetMapping("/") + @RequestMapping("/") public String index() { return "Hello World"; } - //@GetMapping("/") - //public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { - //return String.format("Hello, %s", name); + //@GetMapping("/hello") + //public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { + // return String.format("Hello, %s", name); } From 4c68c4559b9802f77b1fc44858daeb72b91b5121 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Tue, 11 May 2021 17:35:45 +0200 Subject: [PATCH 09/17] Heroku --- .../example/springboot/HelloController.java | 7 +++--- src/main/resources/application.properties | 23 +++++++++++++++++++ system.properties | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index c5a9ea4..5509f4d 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -14,8 +14,9 @@ public String index() { return "Hello World"; } - //@GetMapping("/hello") - //public String welcome(@RequestParam(value = "name", defaultValue = "world")String name) { - // return String.format("Hello, %s", name); + @GetMapping("/hello") + public String welcome(@RequestParam(value = "name", defaultValue = "world") String name) { + return String.format("Hello, %s", name); } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e69de29..05dd5a3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -0,0 +1,23 @@ +spring: + + datasource: + username: ${DATASOURCE_USERNAME} + password: ${DATASOURCE_PASSWORD} + url: ${DATASOURCE_URL} + driver-class-name: org.postgresql.Driver + platform: postgres + initialization-mode: always + +jpa: + properties: + hibernate: + #The SQL dialect makes Hibernate generate better SQL for the chosen database + dialect: org.hibernate.dialect.PostgreSQLDialect + jdbc: + time_zone: UTC + +show-sql: false #Set true for debugging +database-platform: org.hibernate.dialect.PostgreSQLDialect + + ddl-auto: update # (creat, creat-drop, validate, update) +open-in-view: false diff --git a/system.properties b/system.properties index 54b2799..558a90a 100644 --- a/system.properties +++ b/system.properties @@ -1 +1 @@ -java.runtime.version = 16 \ No newline at end of file +java.runtime.version = 16 From 540e0c61bd60ca94df3e1967970c865d85ec24dc Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 23 May 2021 17:02:11 +0200 Subject: [PATCH 10/17] Thymeleaf --- SpringBootApp | 1 - 1 file changed, 1 deletion(-) delete mode 160000 SpringBootApp diff --git a/SpringBootApp b/SpringBootApp deleted file mode 160000 index 087bf6b..0000000 --- a/SpringBootApp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 087bf6bdadcdf252ad295810c3cbf68bee2de307 From 9ed1ee77ae5a63695922012c3df66665d123e289 Mon Sep 17 00:00:00 2001 From: Quoc Huy Pham Date: Sun, 23 May 2021 17:29:33 +0200 Subject: [PATCH 11/17] Thymeleaf --- SpringBootApp | 1 - .../com/example/accessingdatajpa/Food.java | 29 +++++++++++++----- .../accessingdatajpa/FoodRepository.java | 9 ++++++ .../example/springboot/HelloController.java | 3 +- .../springboot/ThymeleafController.java | 25 ++++++++++++++++ .../example/springboot/config/Endpoints.java | 9 ++++++ .../example/springboot/config/ViewNames.java | 7 +++++ .../springboot/config/WebMvcConfig.java | 16 ++++++++++ .../springboot/config/WebMvcConfigImpl.java | 7 +++++ src/main/resources/application.properties | 30 +++++++++---------- src/main/resources/templates/Food.html | 12 ++++++++ src/main/resources/templates/index.html | 13 ++++++++ src/main/resources/templates/login.html | 12 ++++++++ 13 files changed, 149 insertions(+), 24 deletions(-) delete mode 160000 SpringBootApp create mode 100644 src/main/java/com/example/accessingdatajpa/FoodRepository.java create mode 100644 src/main/java/com/example/springboot/ThymeleafController.java create mode 100644 src/main/java/com/example/springboot/config/Endpoints.java create mode 100644 src/main/java/com/example/springboot/config/ViewNames.java create mode 100644 src/main/java/com/example/springboot/config/WebMvcConfig.java create mode 100644 src/main/java/com/example/springboot/config/WebMvcConfigImpl.java create mode 100644 src/main/resources/templates/Food.html create mode 100644 src/main/resources/templates/index.html create mode 100644 src/main/resources/templates/login.html diff --git a/SpringBootApp b/SpringBootApp deleted file mode 160000 index 087bf6b..0000000 --- a/SpringBootApp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 087bf6bdadcdf252ad295810c3cbf68bee2de307 diff --git a/src/main/java/com/example/accessingdatajpa/Food.java b/src/main/java/com/example/accessingdatajpa/Food.java index dd3dc05..0d97643 100644 --- a/src/main/java/com/example/accessingdatajpa/Food.java +++ b/src/main/java/com/example/accessingdatajpa/Food.java @@ -1,19 +1,34 @@ package com.example.accessingdatajpa; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity public class Food { - private final String name; - private final String id; - private final String location; - public Food (String name, String id, String location) { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private String name ; + private Long id; + private String origin; + + + public Food () { this.name = name; this.id = id; - this.location = location; + this.origin = origin; } - public String getId() {return id;} + public Long getId() {return id;} public String getName() {return name;} - public String getLocation() {return location;} + public String getOrigin() {return origin;} + + } \ No newline at end of file diff --git a/src/main/java/com/example/accessingdatajpa/FoodRepository.java b/src/main/java/com/example/accessingdatajpa/FoodRepository.java new file mode 100644 index 0000000..377bc5a --- /dev/null +++ b/src/main/java/com/example/accessingdatajpa/FoodRepository.java @@ -0,0 +1,9 @@ +//package com.example.accessingdatajpa; + +//import org.springframework.data.repository.CrudRepository; +//import org.springframework.stereotype.Repository; + +//@Repository +//public interface FoodRepository extends CrudRepository { + +//} diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 5509f4d..f92e0a0 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -1,5 +1,6 @@ package com.example.springboot; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestMapping; @@ -9,6 +10,7 @@ @RestController public class HelloController { + @RequestMapping("/") public String index() { return "Hello World"; @@ -19,4 +21,3 @@ public String welcome(@RequestParam(value = "name", defaultValue = "world") Stri return String.format("Hello, %s", name); } } - diff --git a/src/main/java/com/example/springboot/ThymeleafController.java b/src/main/java/com/example/springboot/ThymeleafController.java new file mode 100644 index 0000000..6f954d9 --- /dev/null +++ b/src/main/java/com/example/springboot/ThymeleafController.java @@ -0,0 +1,25 @@ +package com.example.springboot; + +import com.example.springboot.config.Endpoints; +import com.example.springboot.config.ViewNames; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.servlet.ModelAndView; + +@Controller +public class ThymeleafController { + @GetMapping(path = Endpoints.INDEX) + public ModelAndView IndexPage() { + return new ModelAndView(ViewNames.INDEX); + } + + @GetMapping(path = Endpoints.FOOD) + public ModelAndView FoodShowing() { + return new ModelAndView(ViewNames.FOOD); + } + + @GetMapping(path = Endpoints.LOGIN) + public ModelAndView Login() { + return new ModelAndView(ViewNames.LOGIN); + } +} diff --git a/src/main/java/com/example/springboot/config/Endpoints.java b/src/main/java/com/example/springboot/config/Endpoints.java new file mode 100644 index 0000000..2bee739 --- /dev/null +++ b/src/main/java/com/example/springboot/config/Endpoints.java @@ -0,0 +1,9 @@ +package com.example.springboot.config; + +public class Endpoints { + + public static final String INDEX = "/i"; + public static final String FOOD = "/food"; + public static final String LOGIN = "/login"; + +} diff --git a/src/main/java/com/example/springboot/config/ViewNames.java b/src/main/java/com/example/springboot/config/ViewNames.java new file mode 100644 index 0000000..5d7f73c --- /dev/null +++ b/src/main/java/com/example/springboot/config/ViewNames.java @@ -0,0 +1,7 @@ +package com.example.springboot.config; + +public class ViewNames { + public static final String INDEX = "index"; + public static final String FOOD = "food"; + public static final String LOGIN = "login"; +} diff --git a/src/main/java/com/example/springboot/config/WebMvcConfig.java b/src/main/java/com/example/springboot/config/WebMvcConfig.java new file mode 100644 index 0000000..a04fa7b --- /dev/null +++ b/src/main/java/com/example/springboot/config/WebMvcConfig.java @@ -0,0 +1,16 @@ +package com.example.springboot.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer, WebMvcConfigImpl { + + @Override + public void ViewControllers(ViewControllerRegistry registry) { + registry.addViewController(Endpoints.INDEX).setViewName(ViewNames.INDEX); + registry.addViewController(Endpoints.FOOD).setViewName(ViewNames.FOOD); + registry.addViewController(Endpoints.LOGIN).setViewName(ViewNames.LOGIN); + } +} diff --git a/src/main/java/com/example/springboot/config/WebMvcConfigImpl.java b/src/main/java/com/example/springboot/config/WebMvcConfigImpl.java new file mode 100644 index 0000000..e2ff40d --- /dev/null +++ b/src/main/java/com/example/springboot/config/WebMvcConfigImpl.java @@ -0,0 +1,7 @@ +package com.example.springboot.config; + +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; + +public interface WebMvcConfigImpl { + void ViewControllers(ViewControllerRegistry registry); +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 05dd5a3..2936049 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,23 +1,23 @@ spring: - datasource: - username: ${DATASOURCE_USERNAME} - password: ${DATASOURCE_PASSWORD} - url: ${DATASOURCE_URL} - driver-class-name: org.postgresql.Driver - platform: postgres - initialization-mode: always + datasource: + username: ${DATASOURCE_USERNAME} + password: ${DATASOURCE_PASSWORD} + url: ${DATASOURCE_URL} + driver-class-name: org.postgresql.Driver + platform: postgres + initialization-mode: always jpa: - properties: - hibernate: - #The SQL dialect makes Hibernate generate better SQL for the chosen database - dialect: org.hibernate.dialect.PostgreSQLDialect - jdbc: - time_zone: UTC + properties: + hibernate: + #The SQL dialect makes Hibernate generate better SQL for the chosen database + dialect: org.hibernate.dialect.PostgreSQLDialect + jdbc: + time_zone: UTC show-sql: false #Set true for debugging database-platform: org.hibernate.dialect.PostgreSQLDialect - ddl-auto: update # (creat, creat-drop, validate, update) -open-in-view: false + ddl-auto: update # (creat, creat-drop, validate, update) +open-in-view: false \ No newline at end of file diff --git a/src/main/resources/templates/Food.html b/src/main/resources/templates/Food.html new file mode 100644 index 0000000..df70205 --- /dev/null +++ b/src/main/resources/templates/Food.html @@ -0,0 +1,12 @@ + + + + + Food + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..525e475 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,13 @@ + + + + + Title + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 0000000..033524c --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,12 @@ + + + + + Login + + + + + \ No newline at end of file From 3e0f74e4f74c4b1639822bb109d67d860479a2cd Mon Sep 17 00:00:00 2001 From: Pham Huy Date: Fri, 11 Jun 2021 00:26:03 +0200 Subject: [PATCH 12/17] Vue testen --- .../example/springboot/HelloController.java | 6 +- .../springboot/ThymeleafController.java | 5 ++ .../example/springboot/config/Endpoints.java | 1 + .../example/springboot/config/ViewNames.java | 1 + src/main/resources/css/css.css | 71 +++++++++++++++++++ .../resources/templates/Registration.html | 34 +++++++++ src/main/resources/templates/index.html | 37 +++++++++- src/main/resources/templates/layout.html | 12 ++++ src/main/resources/templates/login.html | 23 ++++++ 9 files changed, 187 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/css/css.css create mode 100644 src/main/resources/templates/Registration.html create mode 100644 src/main/resources/templates/layout.html diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index f92e0a0..4b8b5c8 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -1,11 +1,14 @@ package com.example.springboot; +import com.example.springboot.config.Endpoints; +import com.example.springboot.config.ViewNames; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; @RestController public class HelloController { @@ -13,11 +16,12 @@ public class HelloController { @RequestMapping("/") public String index() { - return "Hello World"; + return "Welcome to Food Map!"; } @GetMapping("/hello") public String welcome(@RequestParam(value = "name", defaultValue = "world") String name) { return String.format("Hello, %s", name); } + } diff --git a/src/main/java/com/example/springboot/ThymeleafController.java b/src/main/java/com/example/springboot/ThymeleafController.java index 6f954d9..6ed9af0 100644 --- a/src/main/java/com/example/springboot/ThymeleafController.java +++ b/src/main/java/com/example/springboot/ThymeleafController.java @@ -22,4 +22,9 @@ public ModelAndView FoodShowing() { public ModelAndView Login() { return new ModelAndView(ViewNames.LOGIN); } + + @GetMapping(path = Endpoints.REGISTRATION) + public ModelAndView Registration() { + return new ModelAndView(ViewNames.REGISTRATION); + } } diff --git a/src/main/java/com/example/springboot/config/Endpoints.java b/src/main/java/com/example/springboot/config/Endpoints.java index 2bee739..9020519 100644 --- a/src/main/java/com/example/springboot/config/Endpoints.java +++ b/src/main/java/com/example/springboot/config/Endpoints.java @@ -5,5 +5,6 @@ public class Endpoints { public static final String INDEX = "/i"; public static final String FOOD = "/food"; public static final String LOGIN = "/login"; + public static final String REGISTRATION ="/registration"; } diff --git a/src/main/java/com/example/springboot/config/ViewNames.java b/src/main/java/com/example/springboot/config/ViewNames.java index 5d7f73c..c6c6b6e 100644 --- a/src/main/java/com/example/springboot/config/ViewNames.java +++ b/src/main/java/com/example/springboot/config/ViewNames.java @@ -4,4 +4,5 @@ public class ViewNames { public static final String INDEX = "index"; public static final String FOOD = "food"; public static final String LOGIN = "login"; + public static final String REGISTRATION = "registration"; } diff --git a/src/main/resources/css/css.css b/src/main/resources/css/css.css new file mode 100644 index 0000000..d6a8120 --- /dev/null +++ b/src/main/resources/css/css.css @@ -0,0 +1,71 @@ +/* Bordered form */ +form { + border: 3px solid #f1f1f1; +} + +/* Full-width inputs */ +input[type=text], input[type=password] { + width: 100%; + padding: 12px 20px; + margin: 8px 0; + display: inline-block; + border: 1px solid #ccc; + box-sizing: border-box; +} + +/* Set a style for all buttons */ +button { + background-color: #04AA6D; + color: white; + padding: 14px 20px; + margin: 8px 0; + border: none; + cursor: pointer; + width: 100%; +} + +/* Add a hover effect for buttons */ +button:hover { + opacity: 0.8; +} + +/* Extra style for the cancel button (red) */ +.cancelbtn { + width: auto; + padding: 10px 18px; + background-color: #f44336; +} + +/* Center the avatar image inside this container */ +.imgcontainer { + text-align: center; + margin: 24px 0 12px 0; +} + +/* Avatar image */ +img.avatar { + width: 40%; + border-radius: 50%; +} + +/* Add padding to containers */ +.container { + padding: 16px; +} + +/* The "Forgot password" text */ +span.psw { + float: right; + padding-top: 16px; +} + +/* Change styles for span and cancel button on extra small screens */ +@media screen and (max-width: 300px) { + span.psw { + display: block; + float: none; + } + .cancelbtn { + width: 100%; + } +} \ No newline at end of file diff --git a/src/main/resources/templates/Registration.html b/src/main/resources/templates/Registration.html new file mode 100644 index 0000000..8b0e723 --- /dev/null +++ b/src/main/resources/templates/Registration.html @@ -0,0 +1,34 @@ + + + + + Registration + + +
+
+

Register

+

Please fill this form to create an account.

+
+ + + + + + + + + +
+ +

By creating an account you agree to our Terms & Privacy.

+ +
+ + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 525e475..55f6884 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -3,11 +3,44 @@ Title + - +
+

{{msg}}

+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html new file mode 100644 index 0000000..1d80453 --- /dev/null +++ b/src/main/resources/templates/layout.html @@ -0,0 +1,12 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 033524c..46cb1b7 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -5,6 +5,29 @@ Login +
+
+ +
+ +
+ + + + + + + + +
+ +
+ + Forgot password? +
+
From 836cc2d702cd5e92799210ebd905ca442e2782d1 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:47:57 +0200 Subject: [PATCH 13/17] Update HelloController.java --- src/main/java/com/example/springboot/HelloController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 4b8b5c8..8980b94 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -14,9 +14,9 @@ public class HelloController { - @RequestMapping("/") - public String index() { - return "Welcome to Food Map!"; + @RequestMapping("/") + public String home() { + return "index"; } @GetMapping("/hello") From 7963e02b4b2c73f9333270b7bd808e7956f37925 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:56:43 +0200 Subject: [PATCH 14/17] Add files via upload --- .../com/example/springboot/HomeController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/com/example/springboot/HomeController.java diff --git a/src/main/java/com/example/springboot/HomeController.java b/src/main/java/com/example/springboot/HomeController.java new file mode 100644 index 0000000..d41397c --- /dev/null +++ b/src/main/java/com/example/springboot/HomeController.java @@ -0,0 +1,15 @@ +package com.example.springboot.config; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HomeController { + + @RequestMapping("/") + public String welcome() { + return "index"; + } + } + From bdd85d68740a2523500f89e485a108bdbca4da93 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 <72949558+phamquochuy2905@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:19:54 +0200 Subject: [PATCH 15/17] Update index.html --- src/main/resources/templates/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 55f6884..9abcbd9 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -17,11 +17,12 @@

{{msg}}

new Vue({ el: "#map", data: { - msg: 'Welome to Food Map' -} + msg: 'Welcome to Food Map!'} }); + + - \ No newline at end of file + From 5b363cbbb33d0e61d361b497a0fa3f75f483a8b5 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 Date: Tue, 29 Jun 2021 16:18:16 +0200 Subject: [PATCH 16/17] Fix --- .../com/example/accessingdatajpa/Food.java | 3 ++ .../accessingdatajpa/FoodRepository.java | 12 +++---- .../example/springboot/HelloController.java | 6 ++-- .../springboot/config/HomeController.java | 33 +++++++++++++++++++ src/main/resources/static/js/dymanic.js | 0 src/main/resources/static/js/main.js | 16 +++++++++ 6 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/example/springboot/config/HomeController.java create mode 100644 src/main/resources/static/js/dymanic.js create mode 100644 src/main/resources/static/js/main.js diff --git a/src/main/java/com/example/accessingdatajpa/Food.java b/src/main/java/com/example/accessingdatajpa/Food.java index 0d97643..586c91b 100644 --- a/src/main/java/com/example/accessingdatajpa/Food.java +++ b/src/main/java/com/example/accessingdatajpa/Food.java @@ -16,12 +16,14 @@ public class Food { private String name ; private Long id; private String origin; + private String location; public Food () { this.name = name; this.id = id; this.origin = origin; + this.location = location; } public Long getId() {return id;} @@ -30,5 +32,6 @@ public Food () { public String getOrigin() {return origin;} + public String getLocation() { return location;} } \ No newline at end of file diff --git a/src/main/java/com/example/accessingdatajpa/FoodRepository.java b/src/main/java/com/example/accessingdatajpa/FoodRepository.java index 377bc5a..0aa547d 100644 --- a/src/main/java/com/example/accessingdatajpa/FoodRepository.java +++ b/src/main/java/com/example/accessingdatajpa/FoodRepository.java @@ -1,9 +1,9 @@ -//package com.example.accessingdatajpa; +package com.example.accessingdatajpa; -//import org.springframework.data.repository.CrudRepository; -//import org.springframework.stereotype.Repository; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; -//@Repository -//public interface FoodRepository extends CrudRepository { + @Repository + public interface FoodRepository extends CrudRepository { -//} +} diff --git a/src/main/java/com/example/springboot/HelloController.java b/src/main/java/com/example/springboot/HelloController.java index 8980b94..4b8b5c8 100644 --- a/src/main/java/com/example/springboot/HelloController.java +++ b/src/main/java/com/example/springboot/HelloController.java @@ -14,9 +14,9 @@ public class HelloController { - @RequestMapping("/") - public String home() { - return "index"; + @RequestMapping("/") + public String index() { + return "Welcome to Food Map!"; } @GetMapping("/hello") diff --git a/src/main/java/com/example/springboot/config/HomeController.java b/src/main/java/com/example/springboot/config/HomeController.java new file mode 100644 index 0000000..34dbcb3 --- /dev/null +++ b/src/main/java/com/example/springboot/config/HomeController.java @@ -0,0 +1,33 @@ +package com.example.springboot.config; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@Controller +public class HomeController { + + @RequestMapping("/") + public String welcome() { + return "index"; + } + + @RequestMapping("/home") + public String home() { + return "index"; + } + + + @RequestMapping("/login") + public String login() { + return "login"; + } + + @RequestMapping("/registration") + public String registration() { + return "Registration"; + } + + } + diff --git a/src/main/resources/static/js/dymanic.js b/src/main/resources/static/js/dymanic.js new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/js/main.js b/src/main/resources/static/js/main.js new file mode 100644 index 0000000..6c1c709 --- /dev/null +++ b/src/main/resources/static/js/main.js @@ -0,0 +1,16 @@ +const app = Vue.createApp({}); + +app.component('app', { + data() { + return { + count : 0 + } + }, + template: `` + +}) + +app.mount('#components-demo') + From 1fd7530ef1d9832bd9200833eeedf56cb11ae441 Mon Sep 17 00:00:00 2001 From: phamquochuy2905 Date: Tue, 29 Jun 2021 16:31:06 +0200 Subject: [PATCH 17/17] Fix --- .../com/example/springboot/HomeController.java | 15 --------------- .../example/springboot/config/HomeController.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 src/main/java/com/example/springboot/HomeController.java diff --git a/src/main/java/com/example/springboot/HomeController.java b/src/main/java/com/example/springboot/HomeController.java deleted file mode 100644 index d41397c..0000000 --- a/src/main/java/com/example/springboot/HomeController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.springboot.config; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HomeController { - - @RequestMapping("/") - public String welcome() { - return "index"; - } - } - diff --git a/src/main/java/com/example/springboot/config/HomeController.java b/src/main/java/com/example/springboot/config/HomeController.java index 34dbcb3..614468c 100644 --- a/src/main/java/com/example/springboot/config/HomeController.java +++ b/src/main/java/com/example/springboot/config/HomeController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -@Controller +@RestController public class HomeController { @RequestMapping("/")