Forms and Layouts (#998)

checkstyle.xml

@@ -146,7 +146,13 @@
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceAfter"/>
         <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
+        <module name="OperatorWrap">
+            <property name="tokens"
+                      value="ASSIGN,DIV_ASSIGN,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,MOD_ASSIGN,
+           SR_ASSIGN,BSR_ASSIGN,SL_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN,BAND_ASSIGN"/>
+            <property name="option" value="eol"/>
+        </module>
+
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
         <module name="WhitespaceAfter"/>

frontend/css/axe_form_styles.css

@@ -0,0 +1,24 @@
+.axe-form-title {
+    align-self: center;
+}
+
+.axe-form-subtitle {
+    padding-left: 1rem;
+}
+.space-after-submit-button {
+    width: 100%;
+}
+
+.vertically-compact {
+    padding-top: 1px;
+    padding-bottom: 1px;
+}
+
+.axe-fields > * {
+    min-width: 99%;
+}
+
+.space-after-fields {
+    padding-left: 1rem;
+    max-width: 99%;
+}

frontend/css/common_styles.css

@@ -209,3 +209,19 @@ vaadin-drawer-toggle {
 vaadin-icon[icon="vaadin:sign-in"] {
     padding-left: 0 !important;
 }
+
+.green {
+    color: green;
+}
+
+.red {
+    color: red;
+}
+
+.fit-in-window {
+    flex-wrap: wrap;
+}
+
+.fit-in-window > * {
+    flex: 1 0 auto;
+}

frontend/css/danger_dialog.css

@@ -0,0 +1,20 @@
+html {
+    --axe-warning-zone-color: rgb(231 235 239);
+}
+
+html[theme="dark"] {
+    --axe-warning-zone-color: rgb(55 72 95);
+}
+
+.danger-dialog {
+    max-width: min(501px,97%);
+}
+
+.italic-text {
+    font-style: italic;
+}
+
+.danger-dialog-warning-zone {
+    background: var(--axe-warning-zone-color);
+}
+

frontend/css/forgot_password_page.css

@@ -0,0 +1,3 @@
+.result-span {
+    padding-left: 1rem;
+}

frontend/css/login_page.css

@@ -0,0 +1,4 @@
+.forgot-password-section {
+    text-align: center;
+    width: 100%;
+}

frontend/css/profile_page.css

@@ -0,0 +1,28 @@
+.profile-title {
+    align-self: center;
+}
+
+.toggle-with-prefix-postfix {
+    margin-right: 0.3rem;
+    margin-left: 0.3rem;
+}
+
+.tab-content {
+    padding-left: 0!important;
+    padding-right: 0!important;
+}
+
+@media (max-width: 400px) {
+    .fit-in-section {
+        width: min-content;
+    }
+}
+
+.telegram-details {
+    display: block;
+    max-width: min(290px, 100%);
+}
+
+.telegram-details div {
+    margin: 0.5rem;
+}

frontend/css/registration_page.css

@@ -0,0 +1,8 @@
+.input {
+    flex-shrink: 0.3;
+    width: 100%;
+}
+
+.info-button {
+    border-radius: 100%;
+}

src/main/java/pm/axe/Axe.java

@@ -32,6 +32,7 @@ public static class C {
         public static final int ONE_SECOND_IN_MILLIS = 1000;
         public static final String TIME_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss z";
         public static final String MINUS = "-";
+        public static final String PLUS = "+";
     }
 
     public static class Defaults {

src/main/java/pm/axe/Endpoint.java

@@ -86,6 +86,12 @@ public static class UI {
         public static final String WELCOME_PAGE = "welcome";
         public static final String REGISTRATION_FAILED_PAGE = "registrationFailed";
         public static final String LOGIN_PAGE = "login";
+        public static final String REGISTRATION_PAGE = "register";
+        public static final String FORGOT_PASSWORD_PAGE = "forgot-password";
+        public static final String TOS_PAGE = "terms-of-service";
+        public static final String PROFILE_PAGE = "profile";
+        public static final String CONFIRM_ACCOUNT_PAGE = "confirm-account";
+        public static final String LOGIN_VERIFICATION_PAGE = "verify";
     }
 
     /**

src/main/java/pm/axe/api/user/PostUserRestController.java

@@ -103,7 +103,7 @@ public ResponseEntity<?> registerUser(final @RequestBody PostUserRequest request
             }
         } else {
             log.info("{} There is no user-defined Username in Request. Generating custom Username", TAG);
-            OperationResult usernameGenerationResult = usernameGenerator.generate();
+            OperationResult usernameGenerationResult = usernameGenerator.generateRandom();
             if (usernameGenerationResult.ok()) {
                 username = usernameGenerationResult.getStringPayload();
             } else {

src/main/java/pm/axe/core/IdentGenerator.java

@@ -34,9 +34,6 @@ public final class IdentGenerator {
     public static final String VALID_IDENT_PATTERN = "^[a-zA-Z0-9]([._-](?![._-])|[a-zA-Z0-9]){0,"
             + IDENT_MAX_LENGTH_WITHOUT_FIRST_AND_LAST_CHARS + "}[a-zA-Z0-9]$";
 
-    private static final int TOKEN_SUBSTRING_START_INDEX = 0;
-    private static final int TOKEN_SUBSTRING_END_INDEX = 7;
-
     private IdentGenerator() {
         throw new UnsupportedOperationException("Utility class");
     }
@@ -68,7 +65,9 @@ public static String generateTokenIdent(final Token token) {
 
     private static String generateAccountConfirmationIdent(final Token token) {
         String prefix = token.getTokenType().getIdentPrefix();
-        String firstPartOfToken = token.getToken().substring(TOKEN_SUBSTRING_START_INDEX, TOKEN_SUBSTRING_END_INDEX);
-        return String.join("", prefix, firstPartOfToken);
+        String randomNumber = RandomStringUtils.randomNumeric(1);
+        String randomChar = RandomStringUtils.randomAlphanumeric(1);
+        String randomNum = RandomStringUtils.randomNumeric(1);
+        return String.join("", prefix, randomNumber, randomChar, randomNum);
     }
 }

src/main/java/pm/axe/db/dao/AccountDao.java

@@ -21,6 +21,15 @@ public interface AccountDao extends CrudRepository<Account, Long> {
      */
     Optional<Account> findByUserAndType(User user, AccountType accountType);
 
+    /**
+     * Searching for User's Account by its {@link AccountType}.
+     *
+     * @param user        account's owner
+     * @param accountType type of account
+     * @return true - if found or false - if not.
+     */
+    boolean existsByUserAndType(User user, AccountType accountType);
+
     /**
      * Lists all {@link Account}s of given {@link AccountType}.
      *

src/main/java/pm/axe/db/dao/TokenDao.java

@@ -3,6 +3,7 @@
 import lombok.NonNull;
 import org.springframework.scheduling.annotation.Async;
 import pm.axe.db.dao.base.TimeAwareCrudDao;
+import pm.axe.db.models.Account;
 import pm.axe.db.models.Token;
 import pm.axe.db.models.User;
 import pm.axe.users.TokenType;
@@ -62,6 +63,17 @@ public interface TokenDao extends TimeAwareCrudDao<Token, Long> {
      */
     Token findByTokenTypeAndUser(TokenType tokenType, User user);
 
+    /**
+     * Finds {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN} by its {@link TokenType}, {@link User} and {@link Account}.
+     *
+     * @param tokenType normally {@link TokenType#ACCOUNT_CONFIRMATION_TOKEN}.
+     * @param user {@link Token}'s owner
+     * @param account {@link Account} to be confirmed
+     *
+     * @return {@link Optional} with found {@link Token} record or {@link Optional#empty()}.
+     */
+    Optional<Token> findByTokenTypeAndUserAndConfirmationFor(TokenType tokenType, User user, Account account);
+
     /**
      * Finds all {@link Token} records owned by {@link User}.
      *

src/main/java/pm/axe/db/models/Account.java

@@ -41,6 +41,21 @@ public static Account.Builder create(final AccountType accountType) {
         return new Builder(accountType);
     }
 
+    /**
+     * This method updates fields iof current {@link Account} record with values from another.
+     *
+     * @param anotherAccount another non-null {@link Account} record to copy values from.
+     * @throws IllegalArgumentException when anotherAccount is NULL.
+     */
+    public void copy(final Account anotherAccount) {
+        if (anotherAccount == null) throw new IllegalArgumentException("Another Account cannot be null");
+        this.setUser(anotherAccount.getUser());
+        this.setType(anotherAccount.getType());
+        this.setAccountName(anotherAccount.getAccountName());
+        this.setConfirmed(anotherAccount.isConfirmed());
+        this.setExtraInfo(anotherAccount.getExtraInfo());
+    }
+
     private Account(final AccountType accountType, final User user) {
         this.type = accountType;
         this.user = user;

src/main/java/pm/axe/db/models/Token.java

@@ -23,7 +23,7 @@ public class Token extends TimeModel {
     /**
      * Default length of Token (code).
      */
-    private static final int CODE_TOKEN_LEN = 6;
+    public static final int CODE_TOKEN_LEN = 6;
     @Column(name = "token", nullable = false, unique = true)
     private String token;
 

src/main/java/pm/axe/internal/HasTabInit.java

@@ -0,0 +1,16 @@
+package pm.axe.internal;
+
+import com.vaadin.flow.component.tabs.Tab;
+import pm.axe.db.models.User;
+
+/**
+ * This interface determines, that {@link Tab} has {@link #tabInit(User)} method.
+ */
+public interface HasTabInit {
+    /**
+     * Method, that should be called at initialization phase.
+     *
+     * @param user bound {@link User}. Usually stored within current session.
+     */
+    void tabInit(User user);
+}

src/main/java/pm/axe/mail/EmailConfirmationStatus.java

@@ -0,0 +1,19 @@
+package pm.axe.mail;
+
+import com.vaadin.flow.component.icon.VaadinIcon;
+import lombok.Getter;
+
+public enum EmailConfirmationStatus {
+    CONFIRMED(VaadinIcon.CHECK, "Email confirmed"),
+    PENDING(VaadinIcon.ELLIPSIS_CIRCLE, "Validation pending..."),
+    FAILED(VaadinIcon.FIRE, "Validation failed"),
+    NONE(VaadinIcon.COG, "No status defined yet");
+
+    @Getter
+    private final VaadinIcon icon;
+    @Getter private final String statusString;
+    EmailConfirmationStatus(final VaadinIcon icon, final String statusString) {
+        this.icon = icon;
+        this.statusString = statusString;
+    }
+}