tune design a little bit

asolntsev · Jul 30, 2024 · d8b1907 · d8b1907
1 parent 59dada6
commit d8b1907
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/app/controllers/Login.java b/app/controllers/Login.java
@@ -39,14 +39,17 @@ public Result firstStep(@Required @Email String username, @Required String passw
 
     String otpLabel = otpCodeService.generateOtpLabel();
     String otpCode = otpCodeService.generateOtpCode();
-    otpCodeService.sendOtpCode(username, otpCode);
+    String sentTo = otpCodeService.sendOtpCode(username, otpCode);
 
     session.put("login.username", username);
     session.put("login.otpLabel", otpLabel);
     session.put("login.otpCode", otpCode);
 
     log.info("Generated OTP code {} for {}, label: {}", otpCode, username, otpLabel);
-    return new View("login/otpCodeForm.html").with("otpLabel", otpLabel);
+    return new View("login/otpCodeForm.html")
+      .with("username", username)
+      .with("otpLabel", otpLabel)
+      .with("sentTo", sentTo);
   }
 
   public Result secondStep(String otpCode) {

diff --git a/app/services/OtpCodeService.java b/app/services/OtpCodeService.java
@@ -20,15 +20,14 @@ private int randomDigit() {
     return (int) (Math.random() * 10);
   }
 
-  public void sendOtpCode(String username, String otpCode) throws Exception {
+  public String sendOtpCode(String username, String otpCode) throws Exception {
     Email mail = new SimpleEmail();
     mail.setCharset("UTF-8");
-    //mail.setHostName(config.domain());
-    //String domain = config.domain();
     mail.setFrom("[email protected]");
     mail.setMsg("Хочешь залогиниться? Введи этот код: " + otpCode);
     mail.setSubject("Логин в суперсервис");
     mail.addTo(username); // usernames are emails
     Mail.send(mail);
+    return username;
   }
 }
diff --git a/app/views/login/otpCodeForm.html b/app/views/login/otpCodeForm.html
@@ -1,6 +1,11 @@
 #{extends 'main.html'/}
 
-Hello ${username}, please enter OTP Code
+<h1>Confirm your identity</h1>
+
+<div style="margin: 1vh 0">
+Hello ${username},<br>
+please enter OTP Code that we sent to ${sentTo}.
+</div>
 
 #{form '/login/second-step'}
     <label> ${otpLabel}-

diff --git a/app/views/main.html b/app/views/main.html
@@ -5,6 +5,18 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+  <style>
+    body, html {
+      height: 100%;
+      min-height: 100%;
+      background: #eee url(/public/images/bg.png);
+    }
+    .container {
+      background-color: white;
+      margin: 20vh auto;
+      padding: 2vh 2vw;
+    }
+  </style>
 </head>
 <body>
 

diff --git a/public/images/bg.png b/public/images/bg.png