login patch

This commit is contained in:
unknown 2025-09-09 13:38:44 +03:00
parent 365e3a0bd2
commit 3ce48a1ee2
2 changed files with 48 additions and 49 deletions

View File

@ -40,13 +40,13 @@ def validate_password(password, is_login=False):
if not is_validate: msg = localizer.translate(msg)
return is_validate, msg
def validate_name(name):
# Optional field
if not name:
return True, ""
if len(name) >= 32:
return False, "Имя не должно превышать 32 символов"
return True, ""
# def validate_name(name):
# # Optional field
# if not name:
# return True, ""
# if len(name) >= 32:
# return False, "Имя не должно превышать 32 символов"
# return True, ""
class LoginView(QWidget):
@ -56,7 +56,8 @@ class LoginView(QWidget):
self.is_dark_theme = theme_manager.is_dark()
print("self.is_dark_theme", self.is_dark_theme)
self.setWindowTitle(config.APP_HEADER)
self.setFixedSize(400, 550)
# self.setFixedSize(400, 650)
self.setMinimumSize(400, 650)
self.lang_combo = None
self.is_registration = False
@ -165,28 +166,21 @@ class LoginView(QWidget):
self.reg_password_input.textChanged.connect(self.confirm_password_input.on_text_changed)
def show_login_form(self):
self.is_registration = False
self.title.setText(localizer.translate("Авторизация"))
def render_form(self):
self.clear_form()
# Очистка layout
self.clear_main_layout()
self.main_layout.addWidget(self.login_input)
self.main_layout.addWidget(self.password_input)
self.main_layout.addWidget(self.login_button)
self.main_layout.addSpacing(10)
self.main_layout.addWidget(self.register_switch)
def show_register_form(self):
self.is_registration = True
if self.is_registration:
self.title.setText(localizer.translate("Регистрация"))
self.clear_form()
self.clear_main_layout()
self.register_button.setText(localizer.translate("Зарегистрироваться"))
self.login_switch.setText(localizer.translate("Уже есть аккаунт? Войти"))
self.reg_login_input.input.setPlaceholderText(localizer.translate("Логин"))
self.reg_password_input.input.setPlaceholderText(localizer.translate("Пароль"))
self.confirm_password_input.input.setPlaceholderText(localizer.translate("Повторите пароль"))
self.invite_code_input.input.setPlaceholderText(localizer.translate("Инвайт-код"))
# self.main_layout.addWidget(self.name_input)
self.main_layout.addWidget(self.reg_login_input)
self.main_layout.addWidget(self.reg_password_input)
self.main_layout.addWidget(self.confirm_password_input)
@ -194,6 +188,28 @@ class LoginView(QWidget):
self.main_layout.addWidget(self.register_button)
self.main_layout.addSpacing(10)
self.main_layout.addWidget(self.login_switch)
else:
self.title.setText(localizer.translate("Авторизация"))
self.login_button.setText(localizer.translate("Войти"))
self.register_switch.setText(localizer.translate("Нет аккаунта? Регистрация"))
self.login_input.setPlaceholderText(localizer.translate("Логин"))
self.password_input.setPlaceholderText(localizer.translate("Пароль"))
self.main_layout.addWidget(self.login_input)
self.main_layout.addWidget(self.password_input)
self.main_layout.addWidget(self.login_button)
self.main_layout.addSpacing(10)
self.main_layout.addWidget(self.register_switch)
def show_login_form(self):
self.is_registration = False
self.render_form()
def show_register_form(self):
self.is_registration = True
self.render_form()
def clear_form(self):
self.login_input.clear()
@ -336,18 +352,4 @@ class LoginView(QWidget):
def update_ui_language(self):
self.theme_button.setText("🌞" if not self.is_dark_theme else "🌙")
if self.is_registration:
self.title.setText(localizer.translate("Регистрация"))
self.register_button.setText(localizer.translate("Зарегистрироваться"))
self.login_switch.setText(localizer.translate("Уже есть аккаунт? Войти"))
self.reg_login_input.input.setPlaceholderText(localizer.translate("Логин"))
self.reg_password_input.input.setPlaceholderText(localizer.translate("Пароль"))
self.confirm_password_input.input.setPlaceholderText(localizer.translate("Повторите пароль"))
self.invite_code_input.input.setPlaceholderText(localizer.translate("Инвайт-код"))
else:
self.title.setText(localizer.translate("Авторизация"))
self.login_button.setText(localizer.translate("Войти"))
self.register_switch.setText(localizer.translate("Нет аккаунта? Регистрация"))
self.login_input.setPlaceholderText(localizer.translate("Логин"))
self.password_input.setPlaceholderText(localizer.translate("Пароль"))
self.render_form()

View File

@ -32,9 +32,6 @@ class ValidationInput(QWidget):
input_layout.addWidget(self.input)
# input_layout.addWidget(self.status_label)
# self.error_label = QLabel()
# self.error_label.setStyleSheet("color: red;")
# self.error_label.hide()
self.error_label = QLabel()
self.error_label.setWordWrap(True)
self.error_label.setStyleSheet("color: red; font-size: 12px;")