-
+ {% for message in messages %}
+
- {{ message }} + {% endfor %} +
+  }})
+
+
+
+
+
+ {% for dog in dogs %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dogs_around/webapp_dogs/templates/index.html b/dogs_around/webapp_dogs/templates/index.html
new file mode 100644
index 0000000..b461e89
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/index.html
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+ {% endfor %}
+
+  }})
+
+
+
+
+ Кличка: {{ dog.name_dog }}
+Порода: {{ dog.breed_dog }}
+Возраст: {{ dog.age_dog }}
+-
+ {% for message in messages %}
+
- {{ message }} + {% endfor %} +
+
+
+
+
+ {{page_title}}
+
+
+ Сегодня в круге:
+
+ {% for dog in dogs %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dogs_around/webapp_dogs/templates/login.css b/dogs_around/webapp_dogs/templates/login.css
new file mode 100644
index 0000000..67664a8
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/login.css
@@ -0,0 +1,6 @@
+.form-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ }
\ No newline at end of file
diff --git a/dogs_around/webapp_dogs/templates/login.html b/dogs_around/webapp_dogs/templates/login.html
new file mode 100644
index 0000000..94d4f7e
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/login.html
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+ {% endfor %}
+
+
+
+
+
+ Кличка: {{ dog.name_dog }}
+Порода: {{ dog.breed_dog }}
+Возраст: {{ dog.age_dog }}
+-
+ {% for message in messages %}
+
- {{ message }} + {% endfor %} +
+
+
+
+
+
+
+
+
+
+
diff --git a/dogs_around/webapp_dogs/templates/profile.html b/dogs_around/webapp_dogs/templates/profile.html
new file mode 100644
index 0000000..f598f7e
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/profile.html
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dogs_around/webapp_dogs/templates/registration.html b/dogs_around/webapp_dogs/templates/registration.html
new file mode 100644
index 0000000..43016d2
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/registration.html
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+ {{ page_title }}
+ +
+
+
+ {% with messages = get_flashed_messages() %}
+ {% if messages %}
+
+
+ {% for message in messages %}
+ {{ message }}
+ {% endfor %} +
+ {% endif %}
+ {% endwith %}
+ + {% endfor %} +
+ {% if user %}
+
+
+
+ {% endif %}
+ Имя: {{ user.first_name }}
+Фамилия: {{ user.last_name }}
+Ник: {{ user.user_name }}
+Почта: {{ user.email }}
+
+
+
+
+
+
+
+
+
diff --git a/dogs_around/webapp_dogs/templates/user_dogs.html b/dogs_around/webapp_dogs/templates/user_dogs.html
new file mode 100644
index 0000000..cbc2b4e
--- /dev/null
+++ b/dogs_around/webapp_dogs/templates/user_dogs.html
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+ Registration
+ +-
+ {% for message in messages %}
+
- {{ message }} + {% endfor %} +
+
+ Мои собачки:
+
+ {% for dog in dogs %}
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+ Кличка: {{ dog.name_dog }}
+Порода: {{ dog.breed_dog }}
+Возраст: {{ dog.age_dog }}
++
+
+Друзья собачек:
+
+ {% for friend in friends %}
+
+
+
+ {% endfor %}
+
+
+
+ Кличка: {{ friend.name_dog }}
+Порода: {{ friend.breed_dog }}
+Возраст: {{ friend.age_dog }}
++ +
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dogs_around/webapp_dogs/utils_dog.py b/dogs_around/webapp_dogs/utils_dog.py
new file mode 100644
index 0000000..0648637
--- /dev/null
+++ b/dogs_around/webapp_dogs/utils_dog.py
@@ -0,0 +1,63 @@
+from flask import Flask
+from webapp_dogs.model import db, User, Dog
+from webapp_dogs.config import SQLALCHEMY_DATABASE_URI
+from sqlalchemy.exc import SQLAlchemyError
+from flask_sqlalchemy import SQLAlchemy
+import hashlib
+import uuid
+
+def generate_id_user():
+ uuid_val = uuid.uuid4().bytes
+ # Получаем хэш от UUID с использованием sha256
+ hash_object = hashlib.sha256(uuid_val)
+ hex_dig = hash_object.hexdigest()
+ return hex_dig
+
+def generate_id_dog(name_dog, age_dog, breed_dog, response_date, city_dog):
+ input_str = f"{name_dog}-{age_dog}-{breed_dog}-{response_date}-{city_dog}"
+ # Получаем хэш от строки с использованием sha256
+ hash_object = hashlib.sha256(input_str.encode())
+ hex_dig = hash_object.hexdigest()
+ return hex_dig
+
+def get_or_create_user(id_user, first_name, last_name, user_name, email, hashed_password) -> None:
+ app = Flask(__name__)
+ app.config['SQLALCHEMY_DATABASE_URI'] = SQLALCHEMY_DATABASE_URI
+ try:
+ with app.app_context():
+ try:
+ db.init_app(app)
+ user_exists = User.query.filter(User.email == email).first()
+ if not user_exists:
+ new_user = User(id_user=id_user, first_name=first_name, last_name=last_name, user_name=user_name, email= email, password=hashed_password)
+ db.session.add(new_user)
+ db.session.commit()
+ return f'Пользователь с почтой {email} зарегистрирован.'
+ else:
+ return f'Пользователь с почтой {email} уже зарегистрирован.'
+ except SQLAlchemyError as sq:
+ print(f'Ошибка sqlalchemy записи пользователя tg в get_or_create_user в бд: {sq}')
+ except Exception as ex1:
+ print(f'Ошибка в функции обработки данных пользователя: {ex1}')
+
+def get_or_create_dog(id_dog, name_dog, age_dog, breed_dog, response_date,
+ city_dog, foto_dog, voice_dog, username) -> None:
+ app = Flask(__name__)
+ app.config['SQLALCHEMY_DATABASE_URI'] = SQLALCHEMY_DATABASE_URI
+ try:
+ with app.app_context():
+ try:
+ db.init_app(app)
+ user = User.query.filter_by(email=username).first()
+ dog_exists = Dog.query.filter(Dog.id_dog == id_dog).first()
+ if not dog_exists:
+ new_dog = Dog(id_dog=id_dog,name_dog=name_dog, age_dog=age_dog, breed_dog=breed_dog, response_date=response_date,
+ city_dog=city_dog, foto_dog=foto_dog, voice_dog=voice_dog)
+ user.dogs.append(new_dog)
+ db.session.add(new_dog)
+ db.session.commit()
+ return dog_exists
+ except SQLAlchemyError as sq:
+ print(f'Ошибка sqlalchemy записи пользователя tg в get_or_create_user в бд: {sq}')
+ except Exception as ex1:
+ print(f'Ошибка функции обработки данных собаки: {ex1}')
\ No newline at end of file
Заявки в друзья:
+
+ {% for request in friend_requests %}
+
+
+
+ {% endfor %}
+
+
+
+ Кличка: {{ request.name_dog }}
+Порода: {{ request.breed_dog }}
+Возраст: {{ request.age_dog }}
+