m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java13
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/client/Query.java30
-rw-r--r--src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html35
3 files changed, 77 insertions, 1 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
index ce3ee81..56237f0 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java
@@ -23,4 +23,17 @@ public class ClientController {
model.addAttribute("homeMessage", "Welcome to CloudaAtlas client interface");
return "home";
}
+
+ @GetMapping("/query")
+ public String queryPage(Model model) {
+ model.addAttribute("queryObject", new Query());
+ return "queryForm";
+ }
+
+ @PostMapping("/submitQuery")
+ public String submitQuery(@ModelAttribute Query queryObject, Model model) {
+ System.out.println(queryObject.toString());
+ model.addAttribute("homeMessage", "Query submitted successfully");
+ return "home";
+ }
}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/client/Query.java b/src/main/java/pl/edu/mimuw/cloudatlas/client/Query.java
index 468c869..de6a18e 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/client/Query.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/client/Query.java
@@ -1,4 +1,32 @@
package pl.edu.mimuw.cloudatlas.client;
-public class Query {
+class Query {
+ private String name;
+ private String value;
+
+// Query() {
+// this.name = "";
+// this.value = "";
+// }
+//
+// Query(String name, String value){
+// this.name = name;
+// this.value = value;
+// }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
}
diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html
new file mode 100644
index 0000000..eb9a971
--- /dev/null
+++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/queryForm.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+ <meta charset="UTF-8">
+ <title>Query form</title>
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+</head>
+
+<body>
+
+<div th:replace="fragments/navbar :: navbar"></div>
+<div id="queryForm">
+ <form action="#" th:action="@{/submitQuery}" th:object="${queryObject}" method="post">
+ <div class="form-group">
+ <label for="QueryName1">Enter query name</label>
+ <input type="text" class="form-control" id="QueryName1" rows="3" th:field="*{name}"/>
+ </div>
+ <div class="form-group">
+ <label for="Textarea1">Enter query</label>
+ <textarea class="form-control" id="Textarea1" rows="3" th:field="*{value}"></textarea>
+ </div>
+ <button type="submit" class="btn btn-primary">Submit</button>
+ </form>
+
+ <div id="response"><p th:text="${responseText}"/></div>
+</div>
+
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
+</body>
+
+</html>