forth commit

39cdfc87 · SPTimmer · ac2380b3 · 39cdfc87 · 39cdfc87 · 39cdfc87
Commit 39cdfc87 authored 2 years ago by SPTimmer
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.utwente.di</groupId>
-	<artifactId>bookQuote</artifactId>
+	<artifactId>mod4</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<properties>

--- a/src/main/java/nl/utwente/di/temperature/Converter.java
+++ b/src/main/java/nl/utwente/di/temperature/Converter.java
+package nl.utwente.di.temperature;
+
+public class Converter {
+    public static double convert(String string) {
+        try {
+            return Double.parseDouble(string);
+        } catch (NumberFormatException | NullPointerException exception) {
+            return 0;
+        }
+    }
+}
--- a/src/main/java/nl/utwente/di/temperature/Temperature.java
+++ b/src/main/java/nl/utwente/di/temperature/Temperature.java
+package nl.utwente.di.temperature;
+
+import nl.utwente.di.bookQuote.Quoter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class Temperature  extends HttpServlet {
+    private static final long serialVersionUID = 1L;
+
+    public void init() throws ServletException {
+
+    }
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        response.setContentType("text/html");
+        PrintWriter out = response.getWriter();
+        String docType =
+                "<!DOCTYPE HTML>\n";
+        String title = "Temperature";
+        out.println(docType +
+                "<HTML>\n" +
+                "<HEAD><TITLE>" + title + "</TITLE>" +
+                "<LINK REL=STYLESHEET HREF=\"styles.css\">" +
+                "</HEAD>\n" +
+                "<BODY BGCOLOR=\"#FDF5E6\">\n" +
+                "<H1>" + title + "</H1>\n" +
+                "  <P>ISBN number: " +
+                request.getParameter("temp") + "\n" +
+                "  <P>Price: " +
+                Double.toString(Converter.convert(request.getParameter("temp"))) +
+                "</BODY></HTML>");
+    }
+}
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
 		 http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
         version="3.1">

-  <display-name>di.bookQuote</display-name>
+  <display-name>di.lab1</display-name>
  
  <welcome-file-list>
    <welcome-file>index.html</welcome-file>
@@ -21,8 +21,18 @@
    <servlet-name>BookQuote</servlet-name>
    <servlet-class>nl.utwente.di.bookQuote.BookQuote</servlet-class>
  </servlet>
+  <servlet>
+    <description>Temperature Servlet</description>
+    <display-name>Temperature</display-name>
+    <servlet-name>Temperature</servlet-name>
+    <servlet-class>nl.utwente.di.temperature.Temperature</servlet-class>
+  </servlet>
  <servlet-mapping>
    <servlet-name>BookQuote</servlet-name>
    <url-pattern>/bookQuote</url-pattern>
  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>Temperature</servlet-name>
+    <url-pattern>/temperature</url-pattern>
+  </servlet-mapping>
 </web-app>
\ No newline at end of file
--- a/target/bookQuote/index.html
+++ b/target/bookQuote/index.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Web Book Quote Application</title>
-<link rel="stylesheet" href="styles.css">
+<link rel="stylesheet" href="../styles.css">
 <meta charset="UTF-8">
 </head>


--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
-<!DOCTYPE HTML>
-<!-- Front end for the webBookQuote Servlet. -->
-
+<!DOCTYPE html>
 <html lang="en">
 <head>
-<title>Web Book Quote Application</title>
-<link rel="stylesheet" href="styles.css">
-<meta charset="UTF-8">
+    <meta charset="UTF-8">
+    <title>HOME</title>
 </head>
-
 <body>
-<h1>Web Book Quote Application</h1>
-
-<form ACTION="./bookQuote">
-  <p>Enter ISBN number:  <input TYPE="TEXT" NAME="isbn"></p>
-  <input TYPE="SUBMIT">
-</form>
+<header>
+  <nav>
+    <a href="/bookquote">book quote</a>
+    <a href="/temperature">temperature</a>
+  </nav>
+</header>
+<main>
+  <section>
+    <h1>Welcome!</h1>
+    <p>
+      <strong>
+        Hello everyone, welcome to this website.
+      </strong>
+    </p>
+  </section>
+</main>
+<footer>

+</footer>
 </body>
-</html>
+</html>
\ No newline at end of file
--- a/src/main/webapp/temperature/index.html
+++ b/src/main/webapp/temperature/index.html
+<!DOCTYPE HTML>
+<!-- Front end for the webBookQuote Servlet. -->
+
+<html lang="en">
+<head>
+<title>&deg;F to &deg;C</title>
+<link rel="stylesheet" href="../styles.css">
+<meta charset="UTF-8">
+</head>
+
+<body>
+<h1>&deg;Fahrenheit to &deg;Celsius calculator</h1>
+
+<form ACTION="./bookQuote">
+  <p>Enter &deg;F:  <input TYPE="NUMBER" NAME="temp"></p>
+  <input TYPE="SUBMIT">
+</form>
+
+</body>
+</html>
--- a/target/classes/nl/utwente/di/bookQuote/BookQuote.class
+++ b/target/classes/nl/utwente/di/bookQuote/BookQuote.class
--- a/target/classes/nl/utwente/di/temperature/Converter.class
+++ b/target/classes/nl/utwente/di/temperature/Converter.class
--- a/target/classes/nl/utwente/di/temperature/Temperature.class
+++ b/target/classes/nl/utwente/di/temperature/Temperature.class
--- a/target/bookQuote.war
+++ b/target/bookQuote.war
--- a/target/mod4/META-INF/MANIFEST.MF
+++ b/target/mod4/META-INF/MANIFEST.MF
+Manifest-Version: 1.0
+Created-By: IntelliJ IDEA
+Built-By: sande
+Build-Jdk: Eclipse Temurin version 11.0.13
+
--- a/target/bookQuote/WEB-INF/classes/nl/utwente/di/bookQuote/BookQuote.class
+++ b/target/bookQuote/WEB-INF/classes/nl/utwente/di/bookQuote/BookQuote.class
--- a/target/bookQuote/WEB-INF/classes/nl/utwente/di/bookQuote/Quoter.class
+++ b/target/bookQuote/WEB-INF/classes/nl/utwente/di/bookQuote/Quoter.class
--- a/target/mod4/WEB-INF/classes/nl/utwente/di/temperature/Converter.class
+++ b/target/mod4/WEB-INF/classes/nl/utwente/di/temperature/Converter.class
--- a/target/mod4/WEB-INF/classes/nl/utwente/di/temperature/Temperature.class
+++ b/target/mod4/WEB-INF/classes/nl/utwente/di/temperature/Temperature.class
--- a/target/bookQuote/WEB-INF/lib/apiguardian-api-1.1.2.jar
+++ b/target/bookQuote/WEB-INF/lib/apiguardian-api-1.1.2.jar
--- a/target/bookQuote/WEB-INF/lib/junit-jupiter-api-5.8.2.jar
+++ b/target/bookQuote/WEB-INF/lib/junit-jupiter-api-5.8.2.jar
--- a/target/bookQuote/WEB-INF/lib/junit-jupiter-engine-5.8.2.jar
+++ b/target/bookQuote/WEB-INF/lib/junit-jupiter-engine-5.8.2.jar
--- a/target/bookQuote/WEB-INF/lib/junit-platform-commons-1.8.2.jar
+++ b/target/bookQuote/WEB-INF/lib/junit-platform-commons-1.8.2.jar