Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Forms and Layouts (#998) #1157

Draft
wants to merge 70 commits into
base: trunk
Choose a base branch
from
Draft

Forms and Layouts (#998) #1157

wants to merge 70 commits into from

Conversation

kyberorg
Copy link
Owner

@kyberorg kyberorg commented Feb 13, 2023 •
edited
Loading

Fix #998

Aleksandr Muravja added 30 commits January 11, 2023 12:51
Login Page (#998)
5d062fb 
Signed-off-by: Aleksandr Muravja <[email protected]>
Login Page. CSSex (#998)
1c4daa4 
Signed-off-by: Aleksandr Muravja <[email protected]>
Login Page. CSSex 2 (#998)
1352448 
Signed-off-by: Aleksandr Muravja <[email protected]>
Login Page. CSSex 3 (#998)
33be3a5 
Signed-off-by: Aleksandr Muravja <[email protected]>
ForgotPasswordPage (#998)
928bcab 
Signed-off-by: Aleksandr Muravja <[email protected]>
ForgotPasswordPage 2 (#998)
7859c1d 
Signed-off-by: Aleksandr Muravja <[email protected]>
ForgotPasswordPage 3 (#998)
5e06a01 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage (#998)
8d7d2f5 
Signed-off-by: Aleksandr Muravja <[email protected]>
TermsOfServicePage (#998)
5f2f726 
Signed-off-by: Aleksandr Muravja <[email protected]>
CSS (#998)
2176b77 
Signed-off-by: Aleksandr Muravja <[email protected]>
New stuff (#998)
cd14eec 
Signed-off-by: Aleksandr Muravja <[email protected]>
Tooltip test (#998)
6087dee 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage (#998)
3086d28 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. Magic (#998)
a92b095 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. Magic 2 (#998)
1425be7 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. Magic 3 (#998)
d419465 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. Magic 4 (#998)
75105d8 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. PasswordGenerator (#998)
34921b6 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. PasswordGenerator. CSS (#998)
cb2be02 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. PasswordGenerator. CSS 2 (#998)
2c4a3ee 
Signed-off-by: Aleksandr Muravja <[email protected]>
LoginPage. Easy login for Dev and ProfilePage [WIP] (#998)
a495f7a 
Signed-off-by: Aleksandr Muravja <[email protected]>
LoginPage. Easy login for Dev and ProfilePage (#998)
57ec50c 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage, OTP [WIP] and ConfirmAccountPage (#998)
62ab4cb 
Signed-off-by: Aleksandr Muravja <[email protected]>
Improvements (#998)
b77b1a5 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: Tabs and Telegram Stuff (#998)
9dc9c1c 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: Tabs and Telegram Stuff. Fix (#998)
8e95c75 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: Tabs and Telegram Stuff. Fix pack (#998)
f177a83 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: 2FA state [WIP] (#998)
972a12c 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: 2FA state (#998)
025a123 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfilePage: 2FA state - no save button (#998)
0c400f7 
Signed-off-by: Aleksandr Muravja <[email protected]>
Aleksandr Muravja added 14 commits January 31, 2023 17:47
ConfirmAccountPage (#998)
c3f4adc 
Signed-off-by: Aleksandr Muravja <[email protected]>
Redirect stuff (#998)
e119aed 
Signed-off-by: Aleksandr Muravja <[email protected]>
More CSS Stuff (#998)
890cec9 
Signed-off-by: Aleksandr Muravja <[email protected]>
LoginPage. Validation (#998)
01fc58e 
Signed-off-by: Aleksandr Muravja <[email protected]>
RegistrationPage. Validation (#998)
cf96c51 
Signed-off-by: Aleksandr Muravja <[email protected]>
Notification updates (#998)
4b498a8 
Signed-off-by: Aleksandr Muravja <[email protected]>
Notification updates 2 (#998)
656dc17 
Signed-off-by: Aleksandr Muravja <[email protected]>
DangerZone is done (#998)
a1f9a39 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfileTab (#998)
810d140 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfileTab. Css stuff (#998)
b1f1567 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfileTab. Email suffix (#998)
ce5e322 
Signed-off-by: Aleksandr Muravja <[email protected]>
ProfileTab. Email bug fixed (#998)
e1ccf63 
Signed-off-by: Aleksandr Muravja <[email protected]>
SecurityTab. Password update validation (#998)
3577ff7 
Signed-off-by: Aleksandr Muravja <[email protected]>
PasswordGenerator. Notification (#998)
3ceb975 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg kyberorg self-assigned this Feb 13, 2023
@kyberorg
Code fixes (#998)
41f90a5 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Code fixes 2 (#998)
9563458 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
New confirmation token ident generation logic (#998)
eabcf0d 
Signed-off-by: Aleksandr Muravja <[email protected]>
kyberorg
kyberorg commented Feb 13, 2023
View reviewed changes
Copy link
Owner Author

@kyberorg kyberorg left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Telegram span should fit window at phone (only at profile page).

  • Password generator should fit window at phone (at least buttons should be at next line). All pages affected.

  • Axe1@Dev dark mode sync issue. Axe2 user works.

  • Session duration/landing page updated notification should be success notification.

  • Profile tab (maybe focus on email if it is empty).

  • Profile tab on edit email (email empty). Save button does nothing and no way to - return back to edit button. Same on every email (valid or not).

  • Information notification should be visible at least for 3-4 seconds.

  • Confirm account page: validate email and show "not implemented yet" notification.

  • Hide section if account is confirmed.

  • Maybe reuse telegram token as well (this prevents "token already expired" message).

  • Profile tab: show tooltip with status (pending, validated, failed) for email. Same for validation page. Maybe extend email field with ValidationStatus enum.

frontend/css/profile_page.css
align-self: center;
}

.toggle-with-prefix-postfix {
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Toggle with prefix and postfix

src/main/java/pm/axe/internal/HasTabInit.java
/**
* Method, that should be called at initialization phase.
*
* @param user bound {@link User}. Usually stored within current session.
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current AxeSession

src/main/java/pm/axe/services/user/AccountService.java
* {@link OperationResult#generalFail()} with {@link #ERR_NO_EMAIL_ACCOUNT} message,
* when {@link User} has no {@link AccountType#EMAIL} {@link Account}.
*/
public OperationResult updateEmailAccount(final User user, final String email) {
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do nothing/return OpResult with Noop message, when account type is not email.

src/main/java/pm/axe/services/user/AccountService.java
*/
public void rollbackAccount(final Account oldAccount) {
if (oldAccount == null) throw new IllegalArgumentException("old account cannot be null");
Optional<Account> currentAccount = this.getAccount(oldAccount.getUser(), oldAccount.getType());
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not clear why current account got using old account data.

src/main/java/pm/axe/services/user/AccountService.java
if (currentAccount.isPresent()) {
currentAccount.get().copy(oldAccount);
} else {
accountDao.save(oldAccount);
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need current account? Let's save current account instead

src/main/java/pm/axe/services/user/TokenService.java
tokenDao.existsByTokenTypeAndUser(TokenType.ACCOUNT_CONFIRMATION_TOKEN, user);
if (userAlreadyHasConfirmationToken) {
return OperationResult.banned().withMessage(ERR_USER_ALREADY_HAS_TOKEN);
Optional<Token> optionalToken =
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional token -> existing token

src/main/java/pm/axe/services/user/UserOperationsService.java
log.warn("{} Unable to send created {} to {}. OpResult: {}",
TAG, confirmationToken.getTokenType(), input.getEmail(), sendResult);
log.warn("{} Requesting Rollback", TAG);
Optional<Token> confirmationToken = createConfirmationToken(userAccount);
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need own method here?

src/main/java/pm/axe/services/user/AccountService.java
if (currentAccount.isPresent()) {
currentAccount.get().copy(oldAccount);
} else {
accountDao.save(oldAccount);
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use update method instead

@kyberorg
Fixes (#998)
f37eea2 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
More fixes (#998)
d873dda 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
More fixes 2 (#998)
63969a1 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Update profile_page.css
ef4a9fb 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Percentage approach
12db48d 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
CSS fix (#998)
accb8c3 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Confirm Account page (#998)
159c05e 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Confirm Account page is ready (#998)
0f1333c 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Confirm Account page is ready. Removing get() (#998)
06770f4 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Updating channels as well (#998)
34061de 
Signed-off-by: Aleksandr Muravja <[email protected]>
@kyberorg
Code style (#998)
ff936c0 
Signed-off-by: Aleksandr Muravja <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kyberorg kyberorg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Forms and Layouts
1 participant
@kyberorg