diff --git a/MavenBack/src/main/java/ppp/staticServe/MainServe.java b/MavenBack/src/main/java/ppp/staticServe/MainServe.java index 31bbe5d..e4b2157 100644 --- a/MavenBack/src/main/java/ppp/staticServe/MainServe.java +++ b/MavenBack/src/main/java/ppp/staticServe/MainServe.java @@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; @WebServlet("") // Disable until future need public class MainServe extends HttpServlet { @@ -15,11 +16,22 @@ public class MainServe extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { try { - - RequestDispatcher view = request.getRequestDispatcher("/index.html"); // The static HTML file to serve. - response.setHeader("Cache-Control", "max-age=86400, public"); // 1 day - System.out.println(view.toString()); - view.forward(request, response); + if (request.getSession().getAttribute("new") == null && request.getSession().getAttribute("email") == null) { + // Freshly created. + RequestDispatcher view = request.getRequestDispatcher("/home.html"); // The static HTML file to serve. + response.setHeader("Cache-Control", "no-store, must-revalidate"); + response.setHeader("Pragma", "no-cache"); + response.setHeader("Expires", "0"); + System.out.println(view.toString()); + view.forward(request, response); + } else { + // Already created. + RequestDispatcher view = request.getRequestDispatcher("/index.html"); // The static HTML file to serve. + response.setHeader("Cache-Control", "max-age=86400, public"); // 1 day + System.out.println(view.toString()); + view.forward(request, response); + } + request.getSession().setAttribute("new", false); return; } catch (Exception e) { diff --git a/MavenBack/src/main/webapp/baseStyle.css b/MavenBack/src/main/webapp/baseStyle.css index 578d6d9..1adb841 100644 --- a/MavenBack/src/main/webapp/baseStyle.css +++ b/MavenBack/src/main/webapp/baseStyle.css @@ -48,7 +48,8 @@ p, h1, th, td {color: white;} .navBar{ overflow: hidden; - background-color: #5A5A5A; + /*background-color: #5A5A5A;*/ + background-color: #333335; width: 100%; } .navBar a{ @@ -61,7 +62,6 @@ p, h1, th, td {color: white;} } .navBar a.left{float:left;} .navBar a:hover{ - /*background-color: #7fa751;*/ background-color: #8c463d; } diff --git a/MavenBack/src/main/webapp/home.html b/MavenBack/src/main/webapp/home.html index a6a1619..221c6ef 100644 --- a/MavenBack/src/main/webapp/home.html +++ b/MavenBack/src/main/webapp/home.html @@ -24,18 +24,17 @@ --> - - + + PingPongPage - -
- The Ping Pong Page - ... +
@@ -43,8 +42,8 @@

Welcome to the Ping Pong Page.

Join the ranks. Beat your friends. Get good kid.

-

Learn More >

-

Play Pong >

+

What is this? >

 +

Play Pong >
diff --git a/MavenBack/src/main/webapp/homeStyle.css b/MavenBack/src/main/webapp/homeStyle.css index 2a5f542..7386111 100644 --- a/MavenBack/src/main/webapp/homeStyle.css +++ b/MavenBack/src/main/webapp/homeStyle.css @@ -1,4 +1,3 @@ - h1{ text-align: center; font-size: 6.5vw; @@ -8,9 +7,8 @@ h1{ p{ text-align: center; color: white; - - } + .links{ display: flex; color: #f95a42; @@ -18,15 +16,18 @@ p{ align-items:center; justify-content: space-around; } -.learn{ - + +.links div a p, .links a:visited p { + color: #f95a42; } + .welcomeContainer{ color: white; margin-top: 8%; margin-left: 25%; margin-right: 25%; } + body p{ color: inherit; } @@ -36,6 +37,5 @@ body p{ /*margin-left: 20%; margin-right: 20%;*/ flex-direction: column; - } } \ No newline at end of file diff --git a/MavenBack/src/main/webapp/index.html b/MavenBack/src/main/webapp/index.html index aa0fdef..b18de87 100644 --- a/MavenBack/src/main/webapp/index.html +++ b/MavenBack/src/main/webapp/index.html @@ -24,8 +24,8 @@ --> - - + + @@ -195,13 +195,8 @@ -<<<<<<< HEAD -
- The Ping Pong Page -======= diff --git a/MavenBack/src/main/webapp/qaa.html b/MavenBack/src/main/webapp/qaa.html index 91b9d94..3c8a22a 100644 --- a/MavenBack/src/main/webapp/qaa.html +++ b/MavenBack/src/main/webapp/qaa.html @@ -105,6 +105,12 @@ ... Manage Your Games
+ +

What is this?

+
+

Imagine like chess.com, but instead of playing online, you play ping pong in the UCC Bridge & you log your scores here. Then, we'll generate ratings based off those games :D +

+

What are the rules to play games?