Merge pull request #39 from Runi-VN/issue#2

issue #2
Runi-VN · Sep 13, 2019 · 34c9af1 · 34c9af1
2 parents b544c1d + 8819c96
commit 34c9af1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -9,7 +9,7 @@
     <properties>
       <!-- DO NOT remove the line below. It's not set by the  entityUtils.EMF_Creator -->
       <property name="javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver"/>
-      <property name="eclipselink.deploy-on-startup" value="true"/>
+      <!-- <property name="eclipselink.deploy-on-startup" value="true"/> -->
       <!-- The missing values are added by entityUtils.EMF_Creator -->
     </properties>
   </persistence-unit>

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -1,10 +1,29 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Start Page</title>
+        <title>CA1 - Hold Krykke</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+        <link href="css/globalCSS.css" rel="stylesheet">
     </head>
     <body>
-        <h1>Change or remove this page</h1>
+        <div class="container mt-5">
+            <div>
+                <table class="table">
+                </table>
+            </div>
+        </div>
+        <div>
+            <a href="groupContract.html" id="contracthtml">Group Contract</a> 
+        </div>
+        <div>
+            <a href="jokes.html" id="jokeshtml">Jokes!</a>
+        </div>
+        <div>
+            <a href="cars.html" id="carshtml">Our cars for sale</a>
+        </div>
+        <script src="https://code.jquery.com/jquery-3.4.0.min.js" crossorigin="anonymous"></script>
+        <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+        <script src="javascript/index.js"></script>
     </body>
 </html>
diff --git a/src/main/webapp/javascript/index.js b/src/main/webapp/javascript/index.js
@@ -0,0 +1,2 @@
+
+