Merge pull request #13 from kadampabookings/prod

January work

Author: salmonb

.github/workflows/publish-javadoc.yml

@@ -12,7 +12,7 @@ jobs:
       # WebFX requires at least JDK 13 due to javac bugs in prior versions (otherwise JDK 11+ should be enough in theory)
       jdk-version: '19'
       repo-dir: .
-      target-javadoc-dir: ./target/site/apidocs
+      target-javadoc-dir: ./target/reports/apidocs
       web-push-repository-name:  'webfx-netlify'
       web-push-repository-owner: 'webfx-project'
       web-push-branch: 'javadoc-stack'
@@ -36,7 +36,7 @@ jobs:
 
       # Build JavaDoc
       - name: Build JavaDoc
-        run: mvn -B javadoc:aggregate
+        run: mvn -B javadoc:aggregate -Ddoclint=none
 
       - name: Publish JavaDoc to ${{ env.web-push-branch }} branch
         uses: cpina/github-action-push-to-another-repository@master

webfx-stack-authn-login-ui-gateway-magiclink-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/magiclink/MagicLinkUi.java

@@ -44,6 +44,7 @@ public MagicLinkUi(StringProperty tokenProperty, Consumer<String> requestedPathC
         uiLoginView.hideGraphicFromActionButton();
         Button actionButton = uiLoginView.getActionButton();
         actionButton.setDisable(false);
+        actionButton.setDefaultButton(true);
 
         FXProperties.runNowAndOnPropertyChange(token -> {
             if (token == null) {

webfx-stack-authn-login-ui-gateway-password-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/password/PasswordI18nKeys.java

@@ -20,7 +20,6 @@ public interface PasswordI18nKeys {
     String Back = "Back";
     String Recovery = "Recovery";
     String LinkSent = "LinkSent";
-    String AppTitle = "AppTitle";
     String CaseSensitive = "CaseSensitive";
     String GoToLogin = "GoToLogin";
     String PasswordUpdated = "PasswordUpdated";

webfx-stack-authn-login-ui-gateway-password-plugin/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/gateway/password/UILoginView.java

@@ -29,6 +29,8 @@
 
 public class UILoginView implements MaterialFactoryMixin {
 
+    private static final String CHECKMARK_PATH = "M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm0 18a8 8 0 1 1 8-8 8 8 0 0 1-8 8z M14.7 8.39l-3.78 5-1.63-2.11a1 1 0 0 0-1.58 1.23l2.43 3.11a1 1 0 0 0 .79.38 1 1 0 0 0 .79-.39l4.57-6a1 1 0 1 0-1.6-1.22z";
+
     private Label loginTitleLabel;
     private Label mainMessageLabel;
     private TextField emailTextField;
@@ -41,13 +43,9 @@ public class UILoginView implements MaterialFactoryMixin {
     private VBox passwordFieldAndMessageVbox;
     private VBox emailAndPasswordContainer;
     private final ValidationSupport validationSupport = new ValidationSupport();
-
     private BorderPane container;
     private final Consumer<String> createAccountEmailConsumer;
 
-
-    private static final String CHECKMARK_PATH = "M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm0 18a8 8 0 1 1 8-8 8 8 0 0 1-8 8z M14.7 8.39l-3.78 5-1.63-2.11a1 1 0 0 0-1.58 1.23l2.43 3.11a1 1 0 0 0 .79.38 1 1 0 0 0 .79-.39l4.57-6a1 1 0 1 0-1.6-1.22z";
-
     public UILoginView(Consumer<String> emailConsumer) {
         createAccountEmailConsumer = emailConsumer;
     }
@@ -63,7 +61,6 @@ public void initializeComponents() {
         container.setCenter(loginVBox);
     }
 
-
     private void initialiseMainVBox(VBox container) {
         mainVBox = new VBox();
         mainVBox.setMinWidth(container.getMinWidth());
@@ -88,18 +85,13 @@ private void initialiseMainVBox(VBox container) {
         emailAndPasswordContainer.setMaxHeight(vBoxHeight);
         emailTextField = newMaterialTextField(PasswordI18nKeys.Email);
         VBox.setMargin(emailTextField, new Insets(40, 0, 0, 0));
-        emailTextField.setMaxWidth(370);
-        emailTextField.setMinWidth(370);
+        emailTextField.setPrefWidth(370);
 
 
         passwordFieldAndMessageVbox = new VBox(10);
         passwordField = newMaterialPasswordField(PasswordI18nKeys.Password);
-        passwordField.setMaxWidth(300);
-        passwordField.setMaxWidth(370);
+        passwordField.setPrefWidth(370);
         VBox.setMargin(passwordField, new Insets(15, 0, 0, 0));
-        passwordFieldAndMessageVbox.setMaxWidth(370);
-        passwordFieldAndMessageVbox.setMinWidth(370);
-
 
         infoMessageForPasswordFieldLabel = Bootstrap.small(I18nControls.newLabel(PasswordI18nKeys.CaseSensitive));
         infoMessageForPasswordFieldLabel.setVisible(true);
@@ -110,18 +102,10 @@ private void initialiseMainVBox(VBox container) {
 
         VBox.setMargin(forgetRememberPasswordHyperlink, new Insets(40, 0, 0, 0));
 
-        createAccountHyperlink = new Hyperlink();
-        //Here we display in a transition pane the content
-        createAccountHyperlink.setOnAction(e -> {
-        });
-        I18nControls.bindI18nProperties(createAccountHyperlink, PasswordI18nKeys.CreateAccount);
-        createAccountHyperlink.getStyleClass().setAll(Bootstrap.TEXT_SECONDARY);
-        createAccountHyperlink.setVisible(true);
+        createAccountHyperlink = I18nControls.newHyperlink(PasswordI18nKeys.CreateAccount);
         if (createAccountEmailConsumer == null) {
-            createAccountHyperlink.setVisible(false);
-            createAccountHyperlink.setManaged(false);
+            hideCreateAccountHyperlink();
         }
-        createAccountHyperlink.setOnAction(null);
         VBox.setMargin(createAccountHyperlink, new Insets(20, 0, 0, 0));
 
         actionButton = Bootstrap.largePrimaryButton(I18nControls.newButton(PasswordI18nKeys.Continue));

webfx-stack-authn-login-ui-gateway-password-plugin/src/main/webfx/i18n/[email protected]

@@ -26,11 +26,6 @@ LinkSent:
   graphic:
     fill: "#41BA4D"
     svgPath: "M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm0 18a8 8 0 1 1 8-8 8 8 0 0 1-8 8z M14.7 8.39l-3.78 5-1.63-2.11a1 1 0 0 0-1.58 1.23l2.43 3.11a1 1 0 0 0 .79.38 1 1 0 0 0 .79-.39l4.57-6a1 1 0 1 0-1.6-1.22z"
-AppTitle:
-  text: "Kadampa <br/><strong>Booking System</strong>"
-  graphic:
-    fill: "#0096D6"
-    svgPath: "M54.6002 10.561C30.3226 10.561 10.5752 30.3084 10.5752 54.6C10.5752 78.8915 30.3226 98.6249 54.6002 98.6249C78.8777 98.6249 98.6392 78.8775 98.6392 54.6C98.6392 30.3224 78.8777 10.561 54.6002 10.561Z M80.5186 49.621C80.5046 48.7936 80.3924 48.2045 80.3924 48.2045C74.3336 54.5859 69.2845 51.8791 67.8539 50.8833C67.4893 49.607 66.9563 48.4008 66.2691 47.3069C66.6758 45.7781 68.6674 40.6029 77.1947 40.5748C77.1947 40.5748 76.7739 39.9577 76.0867 39.2705C77.0404 32.4683 81.9913 30.8413 83.5481 30.5047C88.2185 36.1148 91.304 43.0853 92.0894 50.743C91.0515 51.4724 86.2549 54.2914 80.5046 49.6351L80.5186 49.621Z          M81.5144 54.628C80.6028 54.9927 80.1119 55.5817 79.8595 56.2269C79.5088 55.5537 78.9899 54.9786 78.1765 54.6841C78.9759 54.3335 79.5088 53.7304 79.8595 53.0432C80.1119 53.6883 80.6028 54.2774 81.5004 54.642L81.5144 54.628Z              M73.9689 73.562C73.0573 73.1833 72.2999 73.2394 71.6688 73.5199C71.9072 72.7906 71.9353 72.0192 71.5846 71.2338C72.3981 71.5564 73.1975 71.5003 73.9409 71.2619C73.6603 71.907 73.6042 72.6644 73.9689 73.548V73.562Z              M78.7094 83.5619C73.0993 88.2323 66.1288 91.3178 58.4711 92.1032C57.7418 91.0654 54.9227 86.2688 59.5791 80.5185C60.4066 80.5044 60.9956 80.3922 60.9956 80.3922C54.6142 74.3334 57.321 69.2843 58.3168 67.8537C59.5931 67.4891 60.7993 66.9561 61.8932 66.2689C63.422 66.6756 68.5973 68.6672 68.6253 77.1945C68.6253 77.1945 69.2424 76.7737 69.9297 76.0865C76.7319 77.0402 78.3588 81.9911 78.6954 83.5479L78.7094 83.5619Z              M35.4979 71.4442C36.2272 71.6826 36.9986 71.7107 37.784 71.36C37.4754 72.1735 37.5175 72.9729 37.756 73.7163C37.1108 73.4358 36.3534 73.3797 35.4698 73.7443C35.8626 72.8327 35.7924 72.0753 35.5119 71.4582L35.4979 71.4442Z              M39.7054 76.5914C40.2945 77.1664 40.7854 77.503 40.7854 77.503C40.547 68.1903 46.69 66.886 48.0083 66.7037C49.0181 67.2507 50.0981 67.6854 51.2341 67.9659C52.0897 69.5087 54.0111 74.4596 48.1907 80.3081C48.1907 80.3081 48.92 80.4483 49.9017 80.4624C54.2495 86.2127 51.4305 91.0513 50.7152 92.1032C43.1977 91.3318 36.3254 88.3445 30.7714 83.8003C31.094 82.2576 32.6929 77.3207 39.7054 76.5914Z              M35.2174 35.638C36.129 36.0166 36.8864 35.9605 37.5175 35.68C37.2791 36.4093 37.251 37.1807 37.6017 37.9661C36.7882 37.6435 35.9888 37.6996 35.2454 37.9381C35.5259 37.2929 35.582 36.5356 35.2174 35.652V35.638Z              M30.4909 25.638C36.101 20.9676 43.0715 17.8821 50.7292 17.0967C51.4585 18.1346 54.2776 22.9312 49.6212 28.6815C48.7937 28.6955 48.2047 28.8077 48.2047 28.8077C54.5861 34.8666 51.8793 39.9156 50.8835 41.3462C49.6072 41.7108 48.401 42.2438 47.3071 42.931C45.7783 42.5243 40.6031 40.5327 40.575 32.0054C40.575 32.0054 39.9579 32.4262 39.2707 33.1134C32.4685 32.1597 30.8415 27.2088 30.5049 25.652L30.4909 25.638Z              M73.5201 37.5173C72.7908 37.2789 72.0194 37.2508 71.234 37.6015C71.5426 36.788 71.5005 35.9886 71.262 35.2452C71.9072 35.5258 72.6646 35.5819 73.5481 35.2172C73.1554 36.1288 73.2256 36.8862 73.5061 37.5033L73.5201 37.5173Z              M69.3125 32.3841C68.7235 31.8091 68.2326 31.4725 68.2326 31.4725C68.4851 41.5706 61.2481 42.2578 60.7712 42.2859C59.8736 41.8371 58.9339 41.4864 57.9522 41.234C57.0966 39.6912 55.1752 34.7403 60.9956 28.8919C60.9956 28.8919 60.2663 28.7516 59.2846 28.7376C54.9368 22.9873 57.7558 18.1486 58.4711 17.0967C65.9044 17.8541 72.7066 20.7993 78.2325 25.2593C77.8679 26.8863 76.2129 31.6688 69.3266 32.3841H69.3125Z              M54.516 78.1903C54.8666 78.9897 55.4697 79.5227 56.157 79.8733C55.5118 80.1258 54.9227 80.6166 54.5581 81.5142C54.1934 80.6026 53.6044 80.1117 52.9592 79.8733C53.6324 79.5227 54.2075 79.0037 54.502 78.1903H54.516Z              M54.6002 62.0473C50.4908 62.0473 47.1528 58.7093 47.1528 54.6C47.1528 50.4906 50.4908 47.1526 54.6002 47.1526C58.7095 47.1526 62.0475 50.4906 62.0475 54.6C62.0475 58.7093 58.7095 62.0473 54.6002 62.0473Z              M54.6843 31.0097C54.3337 30.2102 53.7306 29.6773 53.0434 29.3266C53.6885 29.0742 54.2776 28.5833 54.6422 27.6857C55.0069 28.5973 55.5959 29.0882 56.2411 29.3266C55.5679 29.6773 54.9929 30.1962 54.6983 31.0097H54.6843Z              M25.2455 30.9676C26.8724 31.3322 31.655 32.9872 32.3703 39.8736C31.7953 40.4626 31.4587 40.9535 31.4587 40.9535C41.5568 40.701 42.244 47.938 42.272 48.4149C41.8092 49.3265 41.4586 50.2802 41.2061 51.29C39.9719 52.0334 34.8107 54.5158 28.6396 48.3728C28.6396 48.3728 28.4993 49.1021 28.4853 50.0839C23.0436 54.1932 18.4293 51.8931 17.0548 51.0236C17.7701 43.464 20.7154 36.5636 25.2315 30.9536L25.2455 30.9676Z              M30.7714 54.6981C29.972 55.0488 29.439 55.6519 29.0884 56.3391C28.8359 55.6939 28.3451 55.1049 27.4475 54.7402C28.3591 54.3756 28.85 53.7865 29.1024 53.1413C29.4531 53.8146 29.972 54.3896 30.7854 54.6841L30.7714 54.6981Z              M17.0969 58.4849C18.4994 57.6014 23.0576 55.3713 28.4432 59.7472C28.4573 60.5747 28.5695 61.1637 28.5695 61.1637C35.4278 53.9408 40.9817 58.3447 41.4726 58.7654C41.7952 59.7753 42.23 60.729 42.7629 61.6266C42.3843 63.0992 40.4207 68.3727 31.8373 68.4007C31.8373 68.4007 32.2581 69.0178 32.9453 69.7051C31.9916 76.5353 26.9987 78.1342 25.4699 78.4708C20.9117 72.9028 17.8963 66.0305 17.1249 58.4849H17.0969Z              M83.9408 78.2324C82.3139 77.8677 77.5313 76.2127 76.816 69.3264C77.391 68.7373 77.7276 68.2464 77.7276 68.2464C67.6436 68.4989 66.9423 61.2619 66.9142 60.7851C67.3631 59.8875 67.7137 58.9478 67.9661 57.966C69.5089 57.1105 74.4598 55.189 80.3083 61.0095C80.3083 61.0095 80.4485 60.2802 80.4625 59.2984C86.2129 54.9506 91.0515 57.7697 92.1034 58.4849C91.3461 65.9183 88.4008 72.7205 83.9408 78.2464V78.2324Z              M54.6284 8.92C55.3156 7.12478 56.6901 5.49786 59.2427 4.46C56.7602 3.43616 55.3857 1.80925 54.6705 0C53.6747 1.93547 52.188 3.60447 49.958 4.60025C52.2161 5.44176 53.6887 7.04063 54.6424 8.93402L54.6284 8.92Z              M86.9139 22.3281C88.667 21.5426 90.7988 21.3603 93.3374 22.4403C92.2995 19.9718 92.4959 17.84 93.2672 16.0448C91.2056 16.718 88.9615 16.8442 86.6895 15.9606C87.6852 18.1486 87.6011 20.3225 86.9419 22.3421L86.9139 22.3281Z              M104.6 49.9576V49.9436C103.758 52.2016 102.16 53.6743 100.266 54.628C102.061 55.3152 103.688 56.6897 104.726 59.2423C105.75 56.7598 107.377 55.3853 109.186 54.67C107.251 53.6743 105.582 52.1876 104.586 49.9576H104.6Z              M86.8715 86.9139C87.6569 88.667 87.8392 90.7989 86.7593 93.3374C89.2277 92.2995 91.3595 92.4959 93.1547 93.2673C92.4815 91.2056 92.3553 88.9616 93.2389 86.6895C91.051 87.6853 88.8771 87.6011 86.8575 86.9419L86.8715 86.9139Z              M54.5576 100.28C53.8704 102.075 52.4959 103.702 49.9434 104.74C52.4258 105.764 53.8003 107.391 54.5156 109.2C55.5113 107.264 56.998 105.595 59.228 104.6C56.97 103.758 55.4973 102.159 54.5436 100.266L54.5576 100.28Z              M22.2717 86.8718C20.5185 87.6572 18.3867 87.8395 15.8481 86.7596C16.886 89.228 16.6897 91.3598 15.9183 93.1551C17.98 92.4818 20.224 92.3556 22.4961 93.2392C21.5003 91.0513 21.5844 88.8774 22.2436 86.8578L22.2717 86.8718Z              M4.46 49.9436C3.43616 52.426 1.80925 53.8005 0 54.5158C1.93547 55.5116 3.60447 56.9982 4.60025 59.2282V59.2423C5.44176 56.9842 7.04063 55.5116 8.93402 54.5579C7.1388 53.8706 5.51189 52.4962 4.47403 49.9436H4.46Z              M22.3279 22.2719C21.5425 20.5188 21.3601 18.387 22.4401 15.8484C19.9716 16.8863 17.8398 16.6899 16.0446 15.9185C16.7178 17.9802 16.844 20.2243 15.9604 22.4963C18.1484 21.5006 20.3223 21.5847 22.3419 22.2439L22.3279 22.2719Z"
 CaseSensitive: "Case sensitive"
 GoToLogin: "Go to login"
 PasswordUpdated:

webfx-stack-authn-login-ui-portal/src/main/java/dev/webfx/stack/authn/login/ui/spi/impl/portal/LoginPortalUi.java

@@ -1,8 +1,6 @@
 package dev.webfx.stack.authn.login.ui.spi.impl.portal;
 
-import dev.webfx.extras.panes.FlipPane;
-import dev.webfx.extras.panes.GoldenRatioPane;
-import dev.webfx.extras.panes.ScalePane;
+import dev.webfx.extras.panes.*;
 import dev.webfx.extras.util.animation.Animations;
 import dev.webfx.kit.util.properties.FXProperties;
 import dev.webfx.platform.console.Console;
@@ -42,13 +40,12 @@ final class LoginPortalUi implements UiLoginPortalCallback {
     private final List<Node> otherLoginButtons = new ArrayList<>();
 
     private final GoldenRatioPane loginPaneContainer = new GoldenRatioPane();
-    private final Pane loginPane = new Pane(backgroundRegion, leftLine, orText, rightLine) {
+    private final Pane loginPane = new HPane(backgroundRegion, leftLine, orText, rightLine) {
 
         @Override
-        protected void layoutChildren() {
-            double width = getWidth(), height = getHeight();
+        protected void layoutChildren(double width, double height) {
             double margin = 40, x = margin, y = margin, w = width - 2 * margin, h, wor = orText.prefWidth(w), wl = w * 0.5 - wor;
-            layoutInArea(backgroundRegion, 0, 0, width, height, 0, null, HPos.LEFT, VPos.TOP);
+            layoutInArea(backgroundRegion, 0, 0, width, height);
             layoutInArea(userUI, x, y, w, h = Math.min(userUI.prefHeight(w), height - 2 * margin), 0, Insets.EMPTY, false, false, HPos.CENTER, VPos.TOP);
             int n = otherLoginButtons.size();
             boolean hasOtherLoginButtons = n > 0;
@@ -57,8 +54,8 @@ protected void layoutChildren() {
             rightLine.setVisible(hasOtherLoginButtons);
             if (hasOtherLoginButtons) {
                 layoutInArea(orText, x, y += h + margin, w, 0, 0, null, false, false, HPos.CENTER, VPos.CENTER);
-                layoutInArea(leftLine, x, y, wl, 1, 0, HPos.LEFT, VPos.CENTER);
-                layoutInArea(rightLine, x + w -wl, y, wl, 1, 0, HPos.RIGHT, VPos.CENTER);
+                layoutInArea(leftLine, x, y, wl, 1, Pos.CENTER_LEFT);
+                layoutInArea(rightLine, x + w -wl, y, wl, 1, Pos.CENTER_RIGHT);
                 double[] prefWidths = new double[n];
                 double prefWidthTotal = 24 * (n - 1);
                 for (int i = 0; i < n; i++) {

webfx-stack-authn-login-ui-portal/src/main/webfx/css/[email protected]

@@ -1,5 +1,6 @@
 * {
     -webfx-login-portal-background-image: none; /* Specify the path to your image */
+    -webfx-login-portal-title-color: #0096D6;
 }
 
 .login {
@@ -18,7 +19,9 @@
     -fx-effect: dropshadow(gaussian, lightgray, 10, 0, 0, 0);
 }
 
-.login .h2 {
+.login .h2 { /* Login word on top */
     -fx-font-family: 'Poppins', sans-serif;
+    -fx-font-weight: bold;
     -fx-line-spacing: 0;
+    -fx-text-fill: -webfx-login-portal-title-color;
 }

webfx-stack-authn-login-ui-portal/src/main/webfx/css/[email protected]

@@ -1,5 +1,6 @@
 :root {
     --webfx-login-portal-background-image: none;
+    --webfx-login-portal-title-color: #0096D6;
 }
 
 /* Montserrat password dots are tiny! So we use another font for passwords, but we don't want that font for the placeholder!
@@ -27,7 +28,7 @@ input[type="password"]:not([value=""]) {
 
 .login input {
      font-size: 13px;
-       }
+}
 
 .login-child {
     background-color: rgba(255, 255, 255, 0.8);
@@ -38,9 +39,11 @@ input[type="password"]:not([value=""]) {
     height: 506px; /* Sets the fixed height */
 }
 
-.login .h2 {
+.login .h2 { /* Login word on top */
     font-family: 'Poppins', sans-serif; /* Sets the font to Poppins, with a fallback to sans-serif */
+    font-weight: bold;
     line-height: 0.5;
+    color: var(--webfx-login-portal-title-color);
 }
 
 .login .or {
@@ -51,11 +54,11 @@ input[type="password"]:not([value=""]) {
     background-color: lightgray;
 }
 
-.transparent-input > fx-background{
+.transparent-input > fx-background {
     background-color: transparent;
 }
 
-.transparent-input > fx-border{
+.transparent-input > fx-border {
     border-style: none;
 }
 

webfx-stack-com-bus-json-client/pom.xml

@@ -39,12 +39,6 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>dev.webfx</groupId>
-            <artifactId>webfx-platform-console</artifactId>
-            <version>0.1.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-javatime-emul-j2cl</artifactId>