Лидеры дна

+ +

+ {% with messages = get_flashed_messages() %} + {% if messages %} +

+ {% for message in messages %} + {{ message }}
+ {% endfor %} +

+ {% endif %} + {% endwith %} + +

Отзыв:

Краткое содержание: {{ news_list.short_feedback }}

+ {% if news_list %} +

Дата: {{ news_list.response_date.strftime('%d.%m.%Y') }}

Категория: {{ news_list.category }}

Банк: {{ news_list.bank_name }}

Город: {{ news_list.city }}

Отзыв: {{ news_list.review }}

+ {% endif %} +

') + def profile_dog(dog_id): + email = session.get('email') + dog = Dog.query.filter_by(id_dog=dog_id).first() + title = 'Профиль собачки' + return render_template('profile_dog.html', page_title=title, dog=dog) + + @app.route('/add_friend/', methods=['POST']) + @login_required + def add_friend(dog_id): + # user_id = session.get('user_id') + email = session.get('email') + my_dog = get_user_dogs(email)[0] + dog = Dog.query.get(dog_id) + if dog is None: + abort(404) + print(current_user.id_user) + print(my_dog) + if my_dog: + friendship_request = Friendship(sender_dog_id=my_dog.id_dog, receiver_dog_id=dog_id) + db.session.add(friendship_request) + db.session.commit() + flash(f'Вы отправили запрос на дружбу {dog.name_dog}!', 'success') + else: + flash('Произошла ошибка! Попробуйте еще раз.', 'danger') + return redirect(url_for('user_dogs')) + + @app.route('/accept_request/') + def accept_request(id_dog): + request = Friendship.query.filter_by(sender_dog_id=id_dog, status=FrendStatusEnum.pending.value).first() + if request: + request.accept_request() + return redirect(url_for('user_dogs')) + + @app.route('/reject_request/') + def reject_request(id_dog): + request = Friendship.query.filter_by(sender_dog_id=id_dog, status=FrendStatusEnum.pending.value).first() + if request: + request.decline_request() + return redirect(url_for('user_dogs')) + + + @app.route('/login', methods=['GET', 'POST']) + def login(): + title = "Авторизация" + form = LoginForm() + email = None + + if request.method == 'POST' and form.validate(): + user = User.query.filter_by(email=form.email.data).first() + if user and user.check_password(form.password.data): + login_user(user) # авторизация пользователя + print(user.get_mail()) + email = user.get_mail() + session['email'] = email + user_id = user.get_id() + session['user_id'] = user_id + flash('Вы успешно авторизовались!', 'success') + next_page = request.args.get('next') # получаем параметр next из URL + if next_page: + return redirect(next_page) # если параметр есть, переходим по нему + else: + return redirect(url_for('cabinet')) + else: + flash('Неправильное имя пользователя или пароль', 'danger') + + return render_template('login.html', form=form, title=title, email=email) + + @app.route('/logout') + def logout(): + logout_user() + flash('Вы успешно разлогинились') + return redirect(url_for('index')) + + @app.route('/registration', methods=['GET', 'POST']) + def registration(): + form = RegistrationForm() + if request.method == 'POST' and form.validate_on_submit(): + # Получение данных из формы + id_user = generate_id_user() + first_name = request.form['first_name'] + last_name = request.form['last_name'] + user_name = request.form['user_name'] + email = request.form['email'] + password = request.form['password'] + confirm_password = request.form['confirm_password'] + + # Валидация данных + error = None + if not first_name: + error = 'Имя пользователя обязательно для заполнения.' + elif not last_name: + error = 'Фамилия пользователя обязательна для заполнения.' + elif not password: + error = 'Пароль обязателен для заполнения.' + elif password != confirm_password: + error = 'Пароли не совпадают.' + + if error is None: + # Сохранение данных в бд + hashed_password = generate_password_hash(password) + res = get_or_create_user(id_user,first_name, last_name, user_name, email, hashed_password) + if res: + return redirect(url_for('login')) + # Если данные не прошли валидацию, показываем ошибки пользователю + return render_template('registration.html', error=error) + else: + print(form.errors) + # Если метод запроса GET, просто отображаем шаблон + return render_template('registration.html', form=form) + + @app.route('/user_dogs', methods=['GET']) + def user_dogs(): + email = session.get('email') # получаем email пользователя из запроса + print(email) + user_dogs = get_user_dogs(email) + print(user_dogs) + friend_requests = [dog.get_friend_requests() for dog in user_dogs][0] + print(f'Список запросов в друзья: {friend_requests}') + friends = [dog.get_friends() for dog in user_dogs][0] + print(friends) + if user_dogs: + return render_template('user_dogs.html', dogs= user_dogs, email = email, friend_requests = friend_requests, friends= friends) + else: + return {'message': 'User not found'}, 404 # возвращаем сообщение об ошибке, если пользователь не найден + + @app.route('/register_dog', methods=['GET', 'POST']) + @login_required + def register_dog(): + form = DogForm() + if request.method == 'POST' and form.validate_on_submit(): + username = current_user.email + print(username) + name_dog = form.name_dog.data + age_dog = form.age_dog.data + breed_dog = form.breed_dog.data + response_date = datetime.now() + city_dog = form.city_dog.data + foto_dog = form.foto_dog.data + voice_dog = form.voice_dog.data + id_dog = generate_id_dog(name_dog, age_dog, breed_dog, response_date, city_dog) + + # Валидация данных + error = None + if not name_dog: + error = 'Кличка собаки обязательна для заполнения.' + elif not age_dog: + error = 'Возраст собаки обязателен для заполнения.' + elif not breed_dog: + error = 'Порода обязательна для заполнения.' + elif not city_dog: + error = 'Город обязателе для заполнения.' + + if error is None: + get_or_create_dog(id_dog,name_dog, age_dog, breed_dog, response_date,city_dog, foto_dog, voice_dog, username) + flash('Респекты, ваш песель зарегистрирован!') + return redirect(url_for('cabinet')) + else: + print(form.errors) + return render_template('register_dog.html', form=form) + return app \ No newline at end of file diff --git a/dogs_around/webapp_dogs/forms.py b/dogs_around/webapp_dogs/forms.py new file mode 100644 index 0000000..309d79b --- /dev/null +++ b/dogs_around/webapp_dogs/forms.py @@ -0,0 +1,28 @@ +from flask_wtf import FlaskForm, CSRFProtect +from wtforms import StringField, PasswordField, SubmitField +from wtforms.validators import DataRequired, EqualTo, Email, Length + +csrf = CSRFProtect() + +class LoginForm(FlaskForm): + email = StringField('Почта пользователя', validators=[DataRequired()]) + password = PasswordField('Пароль', validators=[DataRequired()]) + submit = SubmitField('Отправить') + +class RegistrationForm(FlaskForm): + first_name = StringField('Имя пользователя', validators=[DataRequired(), Length(max=100)]) + last_name = StringField('Фамилия пользователя', validators=[DataRequired(),Length(max=200)]) + user_name = StringField('Ник пользователя', validators=[DataRequired()]) + email = StringField('Email', validators=[DataRequired(), Length(max=120)]) + password = PasswordField('Пароль', validators=[DataRequired()]) + confirm_password = PasswordField('Подтвердите пароль', validators=[DataRequired(), EqualTo('password')]) + submit = SubmitField('Зарегистрироваться') + +class DogForm(FlaskForm): + name_dog = StringField('Имя собаки', validators=[DataRequired()]) + age_dog = StringField('Возраст собаки', validators=[DataRequired()]) + breed_dog = StringField('Порода собаки', validators=[DataRequired()]) + city_dog = StringField('Город', validators=[DataRequired()]) + foto_dog = StringField('Фото собаки', validators=[DataRequired()]) + voice_dog = StringField('Голос собаки', validators=[DataRequired()]) + submit = SubmitField('Отправить') diff --git a/dogs_around/webapp_dogs/model.py b/dogs_around/webapp_dogs/model.py new file mode 100644 index 0000000..2db71bc --- /dev/null +++ b/dogs_around/webapp_dogs/model.py @@ -0,0 +1,127 @@ +from flask_sqlalchemy import SQLAlchemy +import enum +from werkzeug.security import check_password_hash +from flask_login import UserMixin + +db = SQLAlchemy() + +def get_user_dogs(email): + user = User.query.filter_by(email=email).first() # ищем пользователя в базе данных по email + if user: + dogs = user.dogs # получаем список собак, связанных с данным пользователем + print(dogs) + return dogs + +#для обарботки статусов дружбы accepted, declined, friendship +class FrendStatusEnum(enum.Enum): + pending = 0 + accepted = 1 + friendship = 2 + declined = 3 + +# таблица для связи многие-ко многим владелец-собака, так как у собаки может быть более 1 владельца +association_table = db.Table('association', + db.Column('user_id', db.String, db.ForeignKey('user.id_user')), + db.Column('dog_id', db.String, db.ForeignKey('dog.id_dog')) +) + +# а этот класс для отображаения "дружбы" между собакой и собакой/собаками пользователя через пользовтеля класс User +# status может принимать варианты accepted, declined, friendship - хранятся в config.py +class Friendship(db.Model): + id = db.Column(db.Integer, primary_key=True) + sender_dog_id = db.Column(db.String, db.ForeignKey('dog.id_dog')) + receiver_dog_id = db.Column(db.String, db.ForeignKey('dog.id_dog')) + status = db.Column(db.String, default=FrendStatusEnum.pending.value) + + def accept_request(self): + self.status = FrendStatusEnum.accepted.value + db.session.commit() + + def decline_request(self): + self.status = FrendStatusEnum.declined.value + db.session.commit() + + @classmethod + def add_friendship(cls, sender_dog, receiver_user): + # Создаем новый объект Friendship + friendship = cls(sender_dog_id=sender_dog.id_dog, receiver_dog_id=receiver_user.dogs[0].id_dog) + # Добавляем его в сессию для сохранения в базе данных + db.session.add(friendship) + db.session.commit() + + +class Dog(db.Model): + id_dog = db.Column(db.String, unique=True, primary_key=True, nullable=False) + name_dog = db.Column(db.String, nullable=False) + age_dog = db.Column(db.Integer, nullable=False, default=0) + breed_dog = db.Column(db.String, nullable=False) + response_date = db.Column(db.DateTime, nullable=False) + city_dog = db.Column(db.String, nullable=True) + foto_dog = db.Column(db.String, nullable=True) + voice_dog = db.Column(db.String, nullable=True) + users = db.relationship('User', secondary=association_table, back_populates='dogs') + + def add_friend_request(self, user_id): + friendship = Friendship(sender_dog_id=self.id_dog, receiver_dog_id=user_id) + db.session.add(friendship) + db.session.commit() + + def get_friends(self): + friends = [] + friendships = Friendship.query.filter_by(status=FrendStatusEnum.accepted.value).all() + for friendship in friendships: + if friendship.sender_dog_id == self.id_dog: + friend = Dog.query.filter_by(id_dog=friendship.receiver_dog_id).first() + if friend: + friends.append(friend) + elif friendship.receiver_dog_id == self.id_dog: + friend = Dog.query.filter_by(id_dog=friendship.sender_dog_id).first() + if friend: + friends.append(friend) + return friends + + def get_friend_requests(self): + friend_requests = [] + requests_from_user = Friendship.query.filter_by(receiver_dog_id=self.id_dog, status=FrendStatusEnum.pending.value).all() + print(requests_from_user) + for req in requests_from_user: + print(f'req.sender_dog_id: {req.sender_dog_id}') + dog = Dog.query.filter_by(id_dog=req.sender_dog_id).first() + print(f'DOG {dog}') + if dog: + friend_requests.append(dog) + print(f'Список DOG {friend_requests}') + return friend_requests + + + def __repr__(self): + return f'{self.id_dog}, {self.name_dog}, {self.breed_dog}, {self.age_dog}' + + + +class User(db.Model): + id_user = db.Column(db.String,unique=True, primary_key=True, nullable=False) + first_name = db.Column(db.String, nullable=False) + last_name = db.Column(db.String, nullable=False) + user_name = db.Column(db.String, nullable=True) + email = db.Column(db.String, nullable=False) + password = db.Column(db.String, nullable=False) + chat_id = db.Column(db.String,unique=True, nullable=True) + subscribed = db.Column(db.Boolean, default=False, nullable=True) + dogs = db.relationship('Dog', secondary=association_table, back_populates='users') + + def check_password(self, password): + return check_password_hash(self.password, password) + + def is_active(self): + # возвращает True, если пользователь активен, иначе - False + return True + + def get_id(self): + return str(self.id_user) + + def get_mail(self): + return str(self.email) + + def is_authenticated(self): + return True \ No newline at end of file diff --git a/dogs_around/webapp_dogs/static/logo.png b/dogs_around/webapp_dogs/static/logo.png new file mode 100644 index 0000000..8300489 Binary files /dev/null and b/dogs_around/webapp_dogs/static/logo.png differ diff --git a/dogs_around/webapp_dogs/static/logo_res.png b/dogs_around/webapp_dogs/static/logo_res.png new file mode 100644 index 0000000..0608b93 Binary files /dev/null and b/dogs_around/webapp_dogs/static/logo_res.png differ diff --git a/dogs_around/webapp_dogs/templates/cabinet.html b/dogs_around/webapp_dogs/templates/cabinet.html new file mode 100644 index 0000000..eb37bdc --- /dev/null +++ b/dogs_around/webapp_dogs/templates/cabinet.html @@ -0,0 +1,181 @@ + + + + + + + {{page_title}} + + + + + + {% with messages = get_flashed_messages() %} + {% if messages %} +

{{ message }}

+ {% endif %} + {% endwith %} +

Пользователь: {{ email }}

Мои собачки: {{ my_dogs }}

+ +

+ {% for dog in dogs %} +

+ ${{ dog.name_dog }}$ +

Кличка: {{ dog.name_dog }}

Порода: {{ dog.breed_dog }}

Возраст: {{ dog.age_dog }}

+ Профиль + + + + + +

+ {% endfor %} +

+ + + + + + + \ 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 @@ + + + + + + + {{page_title}} + + + + + + {% with messages = get_flashed_messages() %} + {% if messages %} +

{{ message }}

+ {% endif %} + {% endwith %} + +

+ {{page_title}} +

+ +

Сегодня в круге:

+ {% for dog in dogs %} +

+ ${{ dog.name_dog }}$ +

Кличка: {{ dog.name_dog }}

Порода: {{ dog.breed_dog }}

Возраст: {{ dog.age_dog }}

+ {% endfor %} +

+ + + + + + + \ 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 @@ + + + + + + + {{ page_title }} + + + + + + + + + {% with messages = get_flashed_messages() %} + {% if messages %} +

{{ message }}

+ {% endif %} + {% endwith %} +

+ + {{ form.hidden_tag() }} +

+ {{ form.email.label }} {{ form.email(size=20, class_='form-control', style='width:30%;') }} + {% for error in form.email.errors %} +

+ {% endfor %} +

+ {{ form.password.label }} {{ form.password(size=20, class_='form-control', style='width:30%;') }} + {% for error in form.password.errors %} +

+ {% endfor %} +

+ {{ form.submit }} + +

+ + + + + + + + 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 @@ + + + + + + + + + + + {{ page_title }} + + +

+ +

+ {% with messages = get_flashed_messages() %} + {% if messages %} +

+ {% for message in messages %} + {{ message }}
+ {% endfor %} +

+ {% endif %} + {% endwith %} +

+ {% if user %} +

Имя: {{ user.first_name }}

Фамилия: {{ user.last_name }}

Ник: {{ user.user_name }}

Почта: {{ user.email }}

+ {% endif %} +

+ + + + + + + + + + + + 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 }} + + + + + + + + +

Registration

+ + {{ form.csrf_token }} +

+ {{ form.first_name.label }} {{ form.first_name(size=20, class_='form-control', style='width:50%;') }} + {% for error in form.first_name.errors %} +

+ {% endfor %} +

+ {{ form.last_name.label }} {{ form.last_name(size=20, class_='form-control',style='width:50%;') }} + {% for error in form.last_name.errors %} +

+ {% endfor %} +

+ {{ form.user_name.label }} {{ form.user_name(size=20, class_='form-control', style='width:50%;') }} + {% for error in form.user_name.errors %} +

+ {% endfor %} +

+ {{ form.email.label }} {{ form.email(size=20, class_='form-control', style='width:50%;') }} + {% for error in form.email.errors %} +

+ {% endfor %} +

+ {{ form.password.label }} {{ form.password(size=20, class_='form-control', style='width:50%;') }} + {% for error in form.password.errors %} +

+ {% endfor %} +

+ {{ form.confirm_password.label }} {{ form.confirm_password(size=20, class_='form-control', style='width:50%;') }} + {% for error in form.confirm_password.errors %} +

+ {% endfor %} +

+ {{ form.submit(class_='btn btn-primary') }} +

+ +

+ + + + + + + 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 @@ + + + + + + + {{ page_title }} + + + + + + + + + + {% with messages = get_flashed_messages() %} + {% if messages %} +

{{ message }}

+ {% endif %} +{% endwith %} +

Мои собачки:

+ {% for dog in dogs %} +

+ ${{ dog.name_dog }}$ +

Кличка: {{ dog.name_dog }}

Порода: {{ dog.breed_dog }}

Возраст: {{ dog.age_dog }}

+ Профиль +

+ {% endfor %} +

+
+

Друзья собачек:

+ {% for friend in friends %} +

Кличка: {{ friend.name_dog }}

Порода: {{ friend.breed_dog }}

Возраст: {{ friend.age_dog }}

+ Профиль +

+ {% endfor %} +

+
+ +

Заявки в друзья:

+ {% for request in friend_requests %} +

Кличка: {{ request.name_dog }}

Порода: {{ request.breed_dog }}

Возраст: {{ request.age_dog }}

+ Принять заявку + Отклонить заявку +

+ {% endfor %} +

+ + + + + + + + \ 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 diff --git a/web_flask/.gitignore b/web_flask_track/.gitignore similarity index 100% rename from web_flask/.gitignore rename to web_flask_track/.gitignore diff --git a/web_flask/create_admin.py b/web_flask_track/create_admin.py similarity index 100% rename from web_flask/create_admin.py rename to web_flask_track/create_admin.py diff --git a/web_flask/create_db.py b/web_flask_track/create_db.py similarity index 100% rename from web_flask/create_db.py rename to web_flask_track/create_db.py diff --git a/web_flask/get_all_news.py b/web_flask_track/get_all_news.py similarity index 100% rename from web_flask/get_all_news.py rename to web_flask_track/get_all_news.py diff --git a/web_flask/migrations/README b/web_flask_track/migrations/README similarity index 100% rename from web_flask/migrations/README rename to web_flask_track/migrations/README diff --git a/web_flask/migrations/alembic.ini b/web_flask_track/migrations/alembic.ini similarity index 100% rename from web_flask/migrations/alembic.ini rename to web_flask_track/migrations/alembic.ini diff --git a/web_flask/migrations/env.py b/web_flask_track/migrations/env.py similarity index 100% rename from web_flask/migrations/env.py rename to web_flask_track/migrations/env.py diff --git a/web_flask/migrations/script.py.mako b/web_flask_track/migrations/script.py.mako similarity index 100% rename from web_flask/migrations/script.py.mako rename to web_flask_track/migrations/script.py.mako diff --git a/web_flask/migrations/versions/92ca0a22999f_added_email_to_user.py b/web_flask_track/migrations/versions/92ca0a22999f_added_email_to_user.py similarity index 100% rename from web_flask/migrations/versions/92ca0a22999f_added_email_to_user.py rename to web_flask_track/migrations/versions/92ca0a22999f_added_email_to_user.py diff --git a/web_flask/migrations/versions/e39062663631_users_and_news_tables.py b/web_flask_track/migrations/versions/e39062663631_users_and_news_tables.py similarity index 100% rename from web_flask/migrations/versions/e39062663631_users_and_news_tables.py rename to web_flask_track/migrations/versions/e39062663631_users_and_news_tables.py diff --git a/web_flask/python-org-news.html b/web_flask_track/python-org-news.html similarity index 100% rename from web_flask/python-org-news.html rename to web_flask_track/python-org-news.html diff --git a/web_flask/requirements.txt b/web_flask_track/requirements.txt similarity index 100% rename from web_flask/requirements.txt rename to web_flask_track/requirements.txt diff --git a/web_flask/run.sh b/web_flask_track/run.sh similarity index 100% rename from web_flask/run.sh rename to web_flask_track/run.sh diff --git a/web_flask/webapp/__init__.py b/web_flask_track/webapp/__init__.py similarity index 100% rename from web_flask/webapp/__init__.py rename to web_flask_track/webapp/__init__.py diff --git a/web_flask/webapp/bs_ex.py b/web_flask_track/webapp/bs_ex.py similarity index 100% rename from web_flask/webapp/bs_ex.py rename to web_flask_track/webapp/bs_ex.py diff --git a/web_flask/webapp/forms.py b/web_flask_track/webapp/forms.py similarity index 100% rename from web_flask/webapp/forms.py rename to web_flask_track/webapp/forms.py diff --git a/web_flask/webapp/model.py b/web_flask_track/webapp/model.py similarity index 100% rename from web_flask/webapp/model.py rename to web_flask_track/webapp/model.py diff --git a/web_flask/webapp/templates/index.html b/web_flask_track/webapp/templates/index.html similarity index 100% rename from web_flask/webapp/templates/index.html rename to web_flask_track/webapp/templates/index.html diff --git a/web_flask/webapp/templates/login.html b/web_flask_track/webapp/templates/login.html similarity index 100% rename from web_flask/webapp/templates/login.html rename to web_flask_track/webapp/templates/login.html diff --git a/web_flask/webapp/weather.py b/web_flask_track/webapp/weather.py similarity index 100% rename from web_flask/webapp/weather.py rename to web_flask_track/webapp/weather.py

Динамика погружения на дно за неделю

Лидеры дна

{{ page_title }}

Отзыв:

Краткое содержание: {{ news_list.short_feedback }}

Сегодня в круге:

{{ page_title }}

Registration

Мои собачки:

Друзья собачек:

Заявки в друзья: