sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2023-12-03 19:27:11 +03:00
parent 61e4f7e450 3b52cab162
commit 421a3a2dab
5 changed files with 116 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AuthApp/forms.py
View File

@@ -34,9 +34,9 @@ class RegistrationForm(forms.Form):
i = 0
names = list(cleaned_data.keys())
while i < len(names):
# for name, val in cleaned_data.items():
if not cleaned_data[names[i]]:
self.add_error(names[i], _('Обязательное поле'))
if self.fields[names[i]].required:
self.add_error(names[i], _('Обязательное поле'))
i += 1
if cleaned_data and 'confirm_password' in cleaned_data and 'password' in cleaned_data:

16
static/css/styles.css
View File

@@ -821,13 +821,15 @@ section.register>form {
}
.agree {
display: flex;
/*display: flex;*/
margin-bottom: 40px;
align-items: end;
display: inline-block;
}
.agree>.checkbox{
width: 50px;
display: inline-block;
}
.agree_text {
@@ -837,6 +839,8 @@ section.register>form {
font-style: normal;
font-weight: 400;
line-height: 20px;
display: inline-block;
width: 90%;
}
.button_register>button {
@@ -1370,14 +1374,14 @@ h2.title_new_route{
width: 100%;
}
.errorlist{
position: absolute;
/*position: absolute;*/
}
.errorlist>li{
color:red;
margin-left: 12px;
font-size: 14px;
font-size: 12px;
}
span.errorlist{
color: red;
@@ -1670,6 +1674,12 @@ div.departure_arrival>div>input{
.input_list .hide{
display: none;
}
span.hide{
display: none;
}
#agreement_check.hide{
display: none;
}

7
static/js/user_profile.js
View File

@@ -963,16 +963,17 @@ function hideErrors(el) {
let counter_text = document.querySelector('.counter-text')
let footer_button = document.getElementById('footer_input_button')
let error_footer = document.getElementById('error_footer')
let agree_error = document.getElementById('reg_agree_error')
if(error_feeedback === counter_text && error_feeedback !== null && error_feeedback_text !== null ){
error_feeedback_text.classList.add('hide')
} else if(error_feeedback === footer_button && error_footer !== null ){
error_footer.classList.add('hide')
}
else if(error_feeedback !== null) {
} else if(error_feeedback !== null) {
error_feeedback.classList.add('hide')
} else if(el.id === 'agreement_check'){
agree_error.classList.add('hide')
}

127
templates/forms/f_registration.html
View File

@@ -15,52 +15,97 @@
<div class="inputs">
<div class="inp_firstname">
<input name="firstname" type="text" placeholder="{{ p_name }}"{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
<input
name="firstname"
onkeydown = "hideErrors(this)"
type="text"
placeholder="{{ p_name }}"
{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
{% if form.errors and form.errors.firstname %}
<span>{{ form.errors.firstname }}</span>
<span>{{ form.errors.firstname }}</span>
{% endif %}
</div>
<div><input name="lastname" type="text" placeholder="{{ p_lastname }}"{% if form.data.lastname %} value="{{ form.data.lastname }}"{% endif %}>
{% if form.errors and form.errors.lastname %}
<span>{{ form.errors.lastname }}</span>
{% endif %}
</div>
</div>
<div class="inputs">
<div class="inp_firstname"><input name="email" type="text" placeholder="E-mail"{% if form.data.email %} value="{{ form.data.email }}"{% endif %}>
{% if form.errors and form.errors.email %}
<span>{{ form.errors.email }}</span>
{% endif %}
</div>
<div><input name="tel" type="text" placeholder="{{ p_tel }}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
{% if form.errors and form.errors.tel %}
<span>{{ form.errors.tel }}</span>
{% endif %}
</div>
</div>
<div class="inputs">
<div class="inp_firstname"><input name="password" type="password" placeholder="{{ p_password }}"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.errors and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
</div>
<div><input name="confirm_password" type="password" placeholder="{{ p_con_password }}"{% if form.data.confirm_password %} value="{{ form.data.confirm_password }}"{% endif %}>
{% if form.errors and form.errors.confirm_password %}
<span>{{ form.errors.confirm_password }}</span>
{% endif %}
</div>
</div>
<div class="agree">
<div class="checkbox">
<input class="custom-checkbox" type="checkbox" id="agreement" name="agreement" value="true" {% if form.data.agreement %} value="{{ form.data.agreement}}"{% endif %}>
<label for="agreement"></label>
</div>
{% if form.errors and form.errors.agreement %}
<span>{{ form.errors.agreement }}</span>
{% endif %}
<div class="agree_text">{% translate "Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности" %}</div>
<div><input
name="lastname"
onkeydown = "hideErrors(this)"
type="text"
placeholder="{{ p_lastname }}"
{% if form.data.lastname %} value="{{ form.data.lastname }}"{% endif %}>
{% if form.errors and form.errors.lastname %}
<span>{{ form.errors.lastname }}</span>
{% endif %}
</div>
</div>
<div class="inputs">
<div class="inp_firstname">
<input
name="email"
onkeydown = "hideErrors(this)"
type="text"
placeholder="E-mail"
{% if form.data.email %} value="{{ form.data.email }}"{% endif %}>
{% if form.errors and form.errors.email %}
<span>{{ form.errors.email }}</span>
{% endif %}
</div>
<div><input
name="tel"
onkeydown = "hideErrors(this)"
type="text"
placeholder="{{ p_tel }}"
{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
{% if form.errors and form.errors.tel %}
<span>{{ form.errors.tel }}</span>
{% endif %}
</div>
</div>
<div class="inputs">
<div class="inp_firstname">
<input
name="password"
onkeydown = "hideErrors(this)"
type="password"
placeholder="{{ p_password }}"
{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.errors and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
</div>
<div><input
name="confirm_password"
onkeydown = "hideErrors(this)"
type="password"
placeholder="{{ p_con_password }}"
{% if form.data.confirm_password %} value="{{ form.data.confirm_password }}"{% endif %}>
{% if form.errors and form.errors.confirm_password %}
<span>{{ form.errors.confirm_password }}</span>
{% endif %}
</div>
</div>
<div class="agree">
<div class="checkbox">
<input class="custom-checkbox" type="checkbox" id="agreement" name="agreement" value="true" {% if form.data.agreement %} value="{{ form.data.agreement}}"{% endif %}>
<label id="agreement_check" for="agreement" onclick="hideErrors(this)"></label>
</div>
<div class="agree_text">{% translate "Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности" %}</div>
{% if form.errors and form.errors.agreement %}
<span id="reg_agree_error">{{ form.errors.agreement }}</span>
{% endif %}
</div>
<div class="button_register">
<button id="registration" onclick="SendRegistrationForm(this)"> {% translate "Зарегистрироваться" %} </button>
</div>

20
templates/widgets/w_message.html
View File

@@ -8,15 +8,8 @@
</div>
<div class="block_text_message {% get_msg_side user ticket msg %}">
<div class="container_text_message {% get_msg_side user ticket msg %}">
{% if msg.text %}
<span class="text_message">
{{ msg.text }}
</span>
{% elif ticket %}
<span class="text_message">
{{ ticket.text }}
</span>
{% elif msg.files %}
{% if msg.files %}
{% for file in msg.files %}
<div class="file_border_cont {{ msg.id }}_ident">
<div class="left_part_file_w">
@@ -29,6 +22,15 @@
<div class="clear_both"></div>
</div>
{% endfor %}
{% elif msg.text %}
<span class="text_message">
{{ msg.text }}
</span>
{% elif ticket and ticket.text %}
<span class="text_message">
{{ ticket.text }}
</span>
{% endif %}
</div>
<div class="data_send_message {% get_msg_side user ticket msg %}">