We use cookies to ensure you get the best experience on our website
Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
0ct0pu5
/
kafka-ui
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

Fix external resources loading for backend part (#1639)

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>
Roman Zabaluev 3 gadi atpakaļ
vecāks
48d3c3828e
revīzija
8b07a332e6
4 mainītis faili ar 78 papildinājumiem un 35 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 2 1
      kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java
  2. 33 34
      kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java
  3. 5 0
      kafka-ui-api/src/main/resources/static/static/css/bootstrap.min.css
  4. 38 0
      kafka-ui-api/src/main/resources/static/static/css/signin.css

+ 2 - 1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java
Parādīt failu 

@@ -16,7 +16,8 @@ abstract class AbstractAuthSecurityConfig {
 
       "/auth",
 
       "/auth",
 
       "/login",
 
       "/login",
 
       "/logout",
 
       "/logout",
 
-      "/oauth2/**"
 
+      "/oauth2/**",
 
+      "/static/**"
 
   };
 
   };
 
 
 
 }
 
 }

+ 33 - 34
kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java
Parādīt failu 

@@ -30,25 +30,24 @@ public class AuthController {
 
     String contextPath = exchange.getRequest().getPath().contextPath().value();
 
     String contextPath = exchange.getRequest().getPath().contextPath().value();
 
     String page =
 
     String page =
 
         "<!DOCTYPE html>\n" + "<html lang=\"en\">\n" + "  <head>\n"
 
         "<!DOCTYPE html>\n" + "<html lang=\"en\">\n" + "  <head>\n"
 
-            + "    <meta charset=\"utf-8\">\n"
 
-            + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, "
 
-            + "shrink-to-fit=no\">\n"
 
-            + "    <meta name=\"description\" content=\"\">\n"
 
-            + "    <meta name=\"author\" content=\"\">\n"
 
-            + "    <title>Please sign in</title>\n"
 
-            + "    <link href=\"https://maxcdn.bootstrapcdn.com/bootstrap/"
 
-            + "4.0.0-beta/css/bootstrap.min.css\" rel=\"stylesheet\" "
 
-            + "integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
-            + "crossorigin=\"anonymous\">\n"
 
-            + "    <link href=\"https://getbootstrap.com/docs/4.0/examples/signin/signin.css\" "
 
-            + "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
-            + "  </head>\n"
 
-            + "  <body>\n"
 
-            + "     <div class=\"container\">\n"
 
-            + formLogin(queryParams, contextPath, csrfTokenHtmlInput)
 
-            + "    </div>\n"
 
-            + "  </body>\n"
 
-            + "</html>";
 
+        + "    <meta charset=\"utf-8\">\n"
 
+        + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, "
 
+        + "shrink-to-fit=no\">\n"
 
+        + "    <meta name=\"description\" content=\"\">\n"
 
+        + "    <meta name=\"author\" content=\"\">\n"
 
+        + "    <title>Please sign in</title>\n"
 
+        + "    <link href=\"/static/css/bootstrap.min.css\" rel=\"stylesheet\" "
 
+        + "integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
 
+        + "crossorigin=\"anonymous\">\n"
 
+        + "    <link href=\"/static/css/signin.css\" "
 
+        + "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
 
+        + "  </head>\n"
 
+        + "  <body>\n"
 
+        + "     <div class=\"container\">\n"
 
+        + formLogin(queryParams, contextPath, csrfTokenHtmlInput)
 
+        + "    </div>\n"
 
+        + "  </body>\n"
 
+        + "</html>";
 
 
 
     return page.getBytes(Charset.defaultCharset());
 
     return page.getBytes(Charset.defaultCharset());
 
   }
 
   }
 
@@ -61,21 +60,21 @@ public class AuthController {
 
     boolean isLogoutSuccess = queryParams.containsKey("logout");
 
     boolean isLogoutSuccess = queryParams.containsKey("logout");
 
     return
 
     return
 
         "      <form class=\"form-signin\" method=\"post\" action=\"" + contextPath + "/auth\">\n"
 
         "      <form class=\"form-signin\" method=\"post\" action=\"" + contextPath + "/auth\">\n"
 
-            + "        <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
 
-            + createError(isError)
 
-            + createLogoutSuccess(isLogoutSuccess)
 
-            + "        <p>\n"
 
-            + "          <label for=\"username\" class=\"sr-only\">Username</label>\n"
 
-            + "          <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" "
 
-            + "placeholder=\"Username\" required autofocus>\n"
 
-            + "        </p>\n" + "        <p>\n"
 
-            + "          <label for=\"password\" class=\"sr-only\">Password</label>\n"
 
-            + "          <input type=\"password\" id=\"password\" name=\"password\" "
 
-            + "class=\"form-control\" placeholder=\"Password\" required>\n"
 
-            + "        </p>\n" + csrfTokenHtmlInput
 
-            + "        <button class=\"btn btn-lg btn-primary btn-block\" "
 
-            + "type=\"submit\">Sign in</button>\n"
 
-            + "      </form>\n";
 
+        + "        <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
 
+        + createError(isError)
 
+        + createLogoutSuccess(isLogoutSuccess)
 
+        + "        <p>\n"
 
+        + "          <label for=\"username\" class=\"sr-only\">Username</label>\n"
 
+        + "          <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" "
 
+        + "placeholder=\"Username\" required autofocus>\n"
 
+        + "        </p>\n" + "        <p>\n"
 
+        + "          <label for=\"password\" class=\"sr-only\">Password</label>\n"
 
+        + "          <input type=\"password\" id=\"password\" name=\"password\" "
 
+        + "class=\"form-control\" placeholder=\"Password\" required>\n"
 
+        + "        </p>\n" + csrfTokenHtmlInput
 
+        + "        <button class=\"btn btn-lg btn-primary btn-block\" "
 
+        + "type=\"submit\">Sign in</button>\n"
 
+        + "      </form>\n";
 
   }
 
   }
 
 
 
   private static String csrfToken(CsrfToken token) {
 
   private static String csrfToken(CsrfToken token) {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 5 - 0
kafka-ui-api/src/main/resources/static/static/css/bootstrap.min.css


+ 38 - 0
kafka-ui-api/src/main/resources/static/static/css/signin.css
Parādīt failu 

@@ -0,0 +1,38 @@
 
+body {
 
+  padding-top: 40px;
 
+  padding-bottom: 40px;
 
+  background-color: #eee;
 
+}
 
+
 
+.form-signin {
 
+  max-width: 330px;
 
+  padding: 15px;
 
+  margin: 0 auto;
 
+}
 
+.form-signin .form-signin-heading,
 
+.form-signin .checkbox {
 
+  margin-bottom: 10px;
 
+}
 
+.form-signin .checkbox {
 
+  font-weight: 400;
 
+}
 
+.form-signin .form-control {
 
+  position: relative;
 
+  box-sizing: border-box;
 
+  height: auto;
 
+  padding: 10px;
 
+  font-size: 16px;
 
+}
 
+.form-signin .form-control:focus {
 
+  z-index: 2;
 
+}
 
+.form-signin input[type="email"] {
 
+  margin-bottom: -1px;
 
+  border-bottom-right-radius: 0;
 
+  border-bottom-left-radius: 0;
 
+}
 
+.form-signin input[type="password"] {
 
+  margin-bottom: 10px;
 
+  border-top-left-radius: 0;
 
+  border-top-right-radius: 0;
 
+}

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5