From 377e379883b90c88e5528064af6634e2f1a061bb Mon Sep 17 00:00:00 2001 From: ske087 Date: Sat, 26 Jul 2025 18:50:42 +0300 Subject: [PATCH] Finalize mail settings admin UI and Mailrise compatibility --- .env.example | 6 + app/__init__.py | 18 +++ app/models.py | 32 +++++ app/routes/admin.py | 79 +++++++++++- app/routes/auth.py | 46 +++++-- app/routes/mail.py | 2 + app/routes/reset_password.py | 12 ++ app/static/map_iframe_single.html | 39 ++---- app/templates/admin/base.html | 5 + app/templates/admin/mail_settings.html | 66 ++++++++++ app/templates/admin/user_detail.html | 13 ++ app/templates/auth/forgot_password.html | 27 +++++ app/templates/auth/reset_password.html | 38 ++++++ app/utils/token.py | 19 +++ config.py | 1 + create_admin.py | 25 ++++ migrations/README | 1 + migrations/add_media_folder.py | 28 ----- migrations/alembic.ini | 50 ++++++++ migrations/create_map_routes.py | 103 ---------------- migrations/env.py | 113 ++++++++++++++++++ migrations/script.py.mako | 24 ++++ ...add_mail_settings_and_sent_email_tables.py | 52 ++++++++ 23 files changed, 629 insertions(+), 170 deletions(-) create mode 100644 app/routes/mail.py create mode 100644 app/routes/reset_password.py create mode 100644 app/templates/admin/mail_settings.html create mode 100644 app/templates/auth/forgot_password.html create mode 100644 app/templates/auth/reset_password.html create mode 100644 app/utils/token.py create mode 100644 create_admin.py create mode 100644 migrations/README delete mode 100644 migrations/add_media_folder.py create mode 100644 migrations/alembic.ini delete mode 100644 migrations/create_map_routes.py create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/df85d77e2474_add_mail_settings_and_sent_email_tables.py diff --git a/.env.example b/.env.example index e69de29..58a3d54 100644 --- a/.env.example +++ b/.env.example @@ -0,0 +1,6 @@ +# Secret for password reset tokens +RESET_TOKEN_SECRET=your-very-secret-reset-token-key +# Example .env for admin creation +ADMIN_EMAIL=admin@example.com +ADMIN_NICKNAME=admin +ADMIN_PASSWORD=changeme diff --git a/app/__init__.py b/app/__init__.py index c50e275..ce0dfab 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -92,5 +92,23 @@ def create_app(config_name=None): os.makedirs(upload_dir, exist_ok=True) os.makedirs(os.path.join(upload_dir, 'images'), exist_ok=True) os.makedirs(os.path.join(upload_dir, 'gpx'), exist_ok=True) + + # --- Initial Admin Creation from .env --- + from app.models import User + with app.app_context(): + admin_email = os.environ.get('ADMIN_EMAIL') + admin_nickname = os.environ.get('ADMIN_NICKNAME') + admin_password = os.environ.get('ADMIN_PASSWORD') + if admin_email and admin_nickname and admin_password: + if not User.query.filter_by(email=admin_email).first(): + user = User(nickname=admin_nickname, email=admin_email, is_admin=True, is_active=True) + user.set_password(admin_password) + db.session.add(user) + db.session.commit() + print(f"[INFO] Admin user {admin_nickname} <{admin_email}> created from .env.") + else: + print(f"[INFO] Admin with email {admin_email} already exists.") + else: + print("[INFO] ADMIN_EMAIL, ADMIN_NICKNAME, or ADMIN_PASSWORD not set in .env. Skipping admin creation.") return app diff --git a/app/models.py b/app/models.py index 5994610..71b1832 100644 --- a/app/models.py +++ b/app/models.py @@ -273,3 +273,35 @@ class PageView(db.Model): def __repr__(self): return f'' + + +# --- Mail Server Management Models --- +class MailSettings(db.Model): + __tablename__ = 'mail_settings' + id = db.Column(db.Integer, primary_key=True) + enabled = db.Column(db.Boolean, default=False, nullable=False) + server = db.Column(db.String(255), nullable=False) + port = db.Column(db.Integer, nullable=False) + use_tls = db.Column(db.Boolean, default=True, nullable=False) + username = db.Column(db.String(255)) + password = db.Column(db.String(255)) + default_sender = db.Column(db.String(255)) + provider = db.Column(db.String(50), default='smtp') # 'smtp' or 'mailrise' + updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) + + def __repr__(self): + return f'' + +class SentEmail(db.Model): + __tablename__ = 'sent_emails' + id = db.Column(db.Integer, primary_key=True) + recipient = db.Column(db.String(255), nullable=False) + subject = db.Column(db.String(255), nullable=False) + body = db.Column(db.Text, nullable=False) + status = db.Column(db.String(50), default='sent') # sent, failed, etc. + error = db.Column(db.Text) + sent_at = db.Column(db.DateTime, default=datetime.utcnow) + provider = db.Column(db.String(50), default='smtp') + + def __repr__(self): + return f'' diff --git a/app/routes/admin.py b/app/routes/admin.py index e4273ee..5ee188a 100644 --- a/app/routes/admin.py +++ b/app/routes/admin.py @@ -1,13 +1,88 @@ + + from flask import Blueprint, render_template, request, flash, redirect, url_for, jsonify, current_app +from flask_mail import Message from flask_login import login_required, current_user from functools import wraps from datetime import datetime, timedelta from sqlalchemy import func, desc +import secrets +from app.routes.mail import mail from app.extensions import db -from app.models import User, Post, PostImage, GPXFile, Comment, Like, PageView +from app.models import User, Post, PostImage, GPXFile, Comment, Like, PageView, MailSettings, SentEmail admin = Blueprint('admin', __name__, url_prefix='/admin') +def admin_required(f): + """Decorator to require admin access""" + @wraps(f) + def decorated_function(*args, **kwargs): + if not current_user.is_authenticated or not current_user.is_admin: + flash('Admin access required.', 'error') + return redirect(url_for('auth.login')) + return f(*args, **kwargs) + return decorated_function + +@admin.route('/mail-settings', methods=['GET', 'POST']) +@login_required +@admin_required +def mail_settings(): + settings = MailSettings.query.first() + if request.method == 'POST': + enabled = bool(request.form.get('enabled')) + provider = request.form.get('provider') + server = request.form.get('server') + port = int(request.form.get('port') or 0) + use_tls = bool(request.form.get('use_tls')) + username = request.form.get('username') + password = request.form.get('password') + default_sender = request.form.get('default_sender') + if not settings: + settings = MailSettings() + db.session.add(settings) + settings.enabled = enabled + settings.provider = provider + settings.server = server + settings.port = port + settings.use_tls = use_tls + settings.username = username + settings.password = password + settings.default_sender = default_sender + db.session.commit() + flash('Mail settings updated.', 'success') + sent_emails = SentEmail.query.order_by(SentEmail.sent_at.desc()).limit(50).all() + return render_template('admin/mail_settings.html', settings=settings, sent_emails=sent_emails) + + +## Duplicate imports and Blueprint definitions removed + +# Password reset token generator (simple, for demonstration) +def generate_reset_token(user): + # In production, use itsdangerous or Flask-Security for secure tokens + return secrets.token_urlsafe(32) + +# Admin: Send password reset email to user +@admin.route('/users//reset-password', methods=['POST']) +@login_required +@admin_required +def reset_user_password(user_id): + user = User.query.get_or_404(user_id) + token = generate_reset_token(user) + # In production, save token to DB or cache, and validate on reset + reset_url = url_for('auth.reset_password', token=token, _external=True) + msg = Message( + subject="Password Reset Request", + recipients=[user.email], + body=f"Hello {user.nickname},\n\nAn admin has requested a password reset for your account. Click the link below to reset your password:\n{reset_url}\n\nIf you did not request this, please ignore this email." + ) + try: + mail.send(msg) + flash(f"Password reset email sent to {user.email}.", "success") + except Exception as e: + current_app.logger.error(f"Error sending reset email: {e}") + flash(f"Failed to send password reset email: {e}", "danger") + return redirect(url_for('admin.user_detail', user_id=user.id)) + def admin_required(f): """Decorator to require admin access""" @wraps(f) @@ -98,7 +173,7 @@ def dashboard(): def posts(): """Admin post management - review posts""" page = request.args.get('page', 1, type=int) - status = request.args.get('status', 'pending') # pending, published, all + status = request.args.get('status', 'all') # pending, published, all query = Post.query diff --git a/app/routes/auth.py b/app/routes/auth.py index f981e1f..9f412b3 100644 --- a/app/routes/auth.py +++ b/app/routes/auth.py @@ -3,8 +3,12 @@ from flask_login import login_user, logout_user, login_required, current_user from werkzeug.security import check_password_hash from app.models import User, db from app.forms import LoginForm, RegisterForm, ForgotPasswordForm +from app.routes.reset_password import RequestResetForm, ResetPasswordForm +from flask_mail import Message +from app.routes.mail import mail +from app.utils.token import generate_reset_token, verify_reset_token import re - +from app.forms import LoginForm, RegisterForm, ForgotPasswordForm auth = Blueprint('auth', __name__) @auth.route('/login', methods=['GET', 'POST']) @@ -83,18 +87,44 @@ def forgot_password(): """Forgot password page""" if current_user.is_authenticated: return redirect(url_for('main.index')) - - form = ForgotPasswordForm() + form = RequestResetForm() if form.validate_on_submit(): user = User.query.filter_by(email=form.email.data).first() if user: - # TODO: Implement email sending for password reset - flash('If an account with that email exists, we\'ve sent password reset instructions.', 'info') - else: - flash('If an account with that email exists, we\'ve sent password reset instructions.', 'info') + token = generate_reset_token(user.email) + reset_url = url_for('auth.reset_password', token=token, _external=True) + msg = Message( + subject="Password Reset Request", + recipients=[user.email], + body=f"Hello {user.nickname},\n\nTo reset your password, click the link below:\n{reset_url}\n\nIf you did not request this, please ignore this email." + ) + try: + mail.send(msg) + except Exception as e: + flash(f"Failed to send reset email: {e}", "danger") + flash('If an account with that email exists, we\'ve sent password reset instructions.', 'info') return redirect(url_for('auth.login')) - return render_template('auth/forgot_password.html', form=form) +# Password reset route +@auth.route('/reset-password/', methods=['GET', 'POST']) +def reset_password(token): + if current_user.is_authenticated: + return redirect(url_for('main.index')) + email = verify_reset_token(token) + if not email: + flash('Invalid or expired reset link.', 'danger') + return redirect(url_for('auth.forgot_password')) + user = User.query.filter_by(email=email).first() + if not user: + flash('Invalid or expired reset link.', 'danger') + return redirect(url_for('auth.forgot_password')) + form = ResetPasswordForm() + if form.validate_on_submit(): + user.set_password(form.password.data) + db.session.commit() + flash('Your password has been reset. You can now log in.', 'success') + return redirect(url_for('auth.login')) + return render_template('auth/reset_password.html', form=form) def is_valid_password(password): """Validate password strength""" diff --git a/app/routes/mail.py b/app/routes/mail.py new file mode 100644 index 0000000..8feb6db --- /dev/null +++ b/app/routes/mail.py @@ -0,0 +1,2 @@ +from flask_mail import Mail +mail = Mail() diff --git a/app/routes/reset_password.py b/app/routes/reset_password.py new file mode 100644 index 0000000..4d9ef80 --- /dev/null +++ b/app/routes/reset_password.py @@ -0,0 +1,12 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, PasswordField, SubmitField +from wtforms.validators import DataRequired, Email, EqualTo, Length + +class RequestResetForm(FlaskForm): + email = StringField('Email', validators=[DataRequired(), Email()]) + submit = SubmitField('Request Password Reset') + +class ResetPasswordForm(FlaskForm): + password = PasswordField('New Password', validators=[DataRequired(), Length(min=6)]) + confirm_password = PasswordField('Confirm Password', validators=[DataRequired(), EqualTo('password')]) + submit = SubmitField('Reset Password') diff --git a/app/static/map_iframe_single.html b/app/static/map_iframe_single.html index e199e89..9d25c7c 100644 --- a/app/static/map_iframe_single.html +++ b/app/static/map_iframe_single.html @@ -38,17 +38,24 @@ window.addEventListener('resize', resizeMap); resizeMap(); // Add OSM tiles -L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { - attribution: 'Ā© OpenStreetMap contributors' +// Use CartoDB Positron for English map labels (clean, readable, English by default) +L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', { + attribution: 'Ā© OpenStreetMap contributors & CartoDB', + subdomains: 'abcd', + maxZoom: 19 }).addTo(map); +// Ensure map is always north-up (default in Leaflet) +// Prevent any future rotation plugins or gestures +map.dragRotate && map.dragRotate.disable && map.dragRotate.disable(); +map.touchZoomRotate && map.touchZoomRotate.disableRotation && map.touchZoomRotate.disableRotation(); // Fetch route data if (routeId) { fetch(`/community/api/route/${routeId}`) .then(response => response.json()) .then(data => { if (data && data.coordinates && data.coordinates.length > 0) { - const latlngs = data.coordinates.map(pt => [pt[1], pt[0]]); + const latlngs = data.coordinates.map(pt => [pt[0], pt[1]]); const polyline = L.polyline(latlngs, { color: '#ef4444', weight: 5, opacity: 0.9 }).addTo(map); map.fitBounds(polyline.getBounds(), { padding: [20, 20], maxZoom: 15 }); // Start marker @@ -70,30 +77,4 @@ if (routeId) { } - - color: '#f97316', weight: 5, opacity: 0.9, smoothFactor: 1 - }).addTo(routeLayer); - polyline.bindPopup(`

šŸļø ${route.title}

Distance: ${route.distance.toFixed(2)} km
Elevation Gain: ${route.elevation_gain.toFixed(0)} m
`); - // Always fit bounds to the route and bind to frame size - function fitRouteBounds() { - map.invalidateSize(); - map.fitBounds(polyline.getBounds(), { padding: [10, 10], maxZoom: 18 }); - } - fitRouteBounds(); - window.addEventListener('resize', fitRouteBounds); - }) - .catch(error => showError(error.message)); - } - function showError(msg) { - const loading = document.getElementById('map-loading'); - loading.innerHTML = `
āš ļø
${msg}
`; - } - if (document.readyState === 'loading') { - document.addEventListener('DOMContentLoaded', initializeMap); - } else { - initializeMap(); - } - window.addEventListener('resize', () => { if (map) setTimeout(() => map.invalidateSize(), 100); }); - - diff --git a/app/templates/admin/base.html b/app/templates/admin/base.html index e0fa4a0..5c2071c 100644 --- a/app/templates/admin/base.html +++ b/app/templates/admin/base.html @@ -173,6 +173,11 @@ Analytics +
  • + + Mail Server Settings + +
    • diff --git a/app/templates/admin/mail_settings.html b/app/templates/admin/mail_settings.html new file mode 100644 index 0000000..58ba4cd --- /dev/null +++ b/app/templates/admin/mail_settings.html @@ -0,0 +1,66 @@ +{% extends 'admin/base.html' %} +{% block admin_content %} +

    Mail Server Settings

    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    +
    +

    Sent Emails Log

    + + + + + + + + + + + + {% for email in sent_emails %} + + + + + + + + {% endfor %} + +
    DateRecipientSubjectStatusError
    {{ email.sent_at.strftime('%Y-%m-%d %H:%M') }}{{ email.recipient }}{{ email.subject }}{{ email.status }}{{ email.error or '' }}
    +{% endblock %} diff --git a/app/templates/admin/user_detail.html b/app/templates/admin/user_detail.html index 7737a60..45e04ac 100644 --- a/app/templates/admin/user_detail.html +++ b/app/templates/admin/user_detail.html @@ -17,6 +17,19 @@
    + +
    +
    +
    Admin: Reset Password
    +
    +
    +
    + +
    +
    +
    User Information
    diff --git a/app/templates/auth/forgot_password.html b/app/templates/auth/forgot_password.html new file mode 100644 index 0000000..052404a --- /dev/null +++ b/app/templates/auth/forgot_password.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% block title %}Forgot Password{% endblock %} +{% block content %} +
    +
    +
    +

    Forgot your password?

    +

    Enter your email to receive a reset link.

    +
    +
    + {{ form.hidden_tag() }} +
    + {{ form.email.label(class="block text-sm font-medium text-gray-700 mb-1") }} + {{ form.email(class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent") }} + {% if form.email.errors %} +
    + {% for error in form.email.errors %} +

    {{ error }}

    + {% endfor %} +
    + {% endif %} +
    + {{ form.submit(class="w-full bg-gradient-to-r from-blue-600 to-purple-600 text-white py-2 px-4 rounded-lg hover:from-blue-700 hover:to-purple-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition font-medium") }} +
    +
    +
    +{% endblock %} diff --git a/app/templates/auth/reset_password.html b/app/templates/auth/reset_password.html new file mode 100644 index 0000000..516c889 --- /dev/null +++ b/app/templates/auth/reset_password.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} +{% block title %}Reset Password{% endblock %} +{% block content %} +
    +
    +
    +

    Reset your password

    +

    Enter your new password below.

    +
    +
    + {{ form.hidden_tag() }} +
    + {{ form.password.label(class="block text-sm font-medium text-gray-700 mb-1") }} + {{ form.password(class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent") }} + {% if form.password.errors %} +
    + {% for error in form.password.errors %} +

    {{ error }}

    + {% endfor %} +
    + {% endif %} +
    +
    + {{ form.confirm_password.label(class="block text-sm font-medium text-gray-700 mb-1") }} + {{ form.confirm_password(class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-purple-500 focus:border-transparent") }} + {% if form.confirm_password.errors %} +
    + {% for error in form.confirm_password.errors %} +

    {{ error }}

    + {% endfor %} +
    + {% endif %} +
    + {{ form.submit(class="w-full bg-gradient-to-r from-blue-600 to-purple-600 text-white py-2 px-4 rounded-lg hover:from-blue-700 hover:to-purple-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 transition font-medium") }} +
    +
    +
    +{% endblock %} diff --git a/app/utils/token.py b/app/utils/token.py new file mode 100644 index 0000000..cf8fb5d --- /dev/null +++ b/app/utils/token.py @@ -0,0 +1,19 @@ +import os +from itsdangerous import URLSafeTimedSerializer +from flask import current_app + +def get_serializer(): + secret = os.environ.get('RESET_TOKEN_SECRET') or current_app.config.get('SECRET_KEY') + return URLSafeTimedSerializer(secret) + +def generate_reset_token(email): + s = get_serializer() + return s.dumps(email, salt='password-reset') + +def verify_reset_token(token, max_age=3600): + s = get_serializer() + try: + email = s.loads(token, salt='password-reset', max_age=max_age) + return email + except Exception: + return None diff --git a/config.py b/config.py index 511771d..7aca00f 100644 --- a/config.py +++ b/config.py @@ -23,6 +23,7 @@ class Config: ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif', 'webp', 'gpx'} # Email Configuration + MAIL_ENABLED = os.environ.get('MAIL_ENABLED', 'true').lower() in ['true', 'on', '1'] MAIL_SERVER = os.environ.get('MAIL_SERVER') or 'smtp.gmail.com' MAIL_PORT = int(os.environ.get('MAIL_PORT') or 587) MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS', 'true').lower() in ['true', 'on', '1'] diff --git a/create_admin.py b/create_admin.py new file mode 100644 index 0000000..97858ba --- /dev/null +++ b/create_admin.py @@ -0,0 +1,25 @@ +import os +from app import create_app +from app.extensions import db +from app.models import User + +def create_admin(): + app = create_app() + with app.app_context(): + admin_email = os.environ.get('ADMIN_EMAIL') + admin_nickname = os.environ.get('ADMIN_NICKNAME') + admin_password = os.environ.get('ADMIN_PASSWORD') + if not (admin_email and admin_nickname and admin_password): + print("Missing ADMIN_EMAIL, ADMIN_NICKNAME, or ADMIN_PASSWORD in environment.") + return + if User.query.filter_by(email=admin_email).first(): + print(f"Admin with email {admin_email} already exists.") + return + user = User(nickname=admin_nickname, email=admin_email, is_admin=True, is_active=True) + user.set_password(admin_password) + db.session.add(user) + db.session.commit() + print(f"Admin user {admin_nickname} <{admin_email}> created.") + +if __name__ == "__main__": + create_admin() diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..0e04844 --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Single-database configuration for Flask. diff --git a/migrations/add_media_folder.py b/migrations/add_media_folder.py deleted file mode 100644 index adbab7d..0000000 --- a/migrations/add_media_folder.py +++ /dev/null @@ -1,28 +0,0 @@ -"""Add media_folder to posts table - -This migration adds a media_folder column to the posts table to support -organized file storage for each post. - -Usage: - flask db upgrade - -Revision ID: add_media_folder -""" - -from alembic import op -import sqlalchemy as sa - -# revision identifiers -revision = 'add_media_folder' -down_revision = None -depends_on = None - -def upgrade(): - """Add media_folder column to posts table""" - # Add the media_folder column - op.add_column('posts', sa.Column('media_folder', sa.String(100), nullable=True)) - -def downgrade(): - """Remove media_folder column from posts table""" - # Remove the media_folder column - op.drop_column('posts', 'media_folder') diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..ec9d45c --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,50 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic,flask_migrate + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[logger_flask_migrate] +level = INFO +handlers = +qualname = flask_migrate + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/create_map_routes.py b/migrations/create_map_routes.py deleted file mode 100644 index ebf64e3..0000000 --- a/migrations/create_map_routes.py +++ /dev/null @@ -1,103 +0,0 @@ -""" -Database migration to add MapRoute table for efficient map loading -Run this script to create the new table structure -""" - -import os -import sys -from flask import Flask -from flask_sqlalchemy import SQLAlchemy - -# Add the project root to Python path -sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) - -from app import create_app, db - -def create_map_route_table(): - """Create the MapRoute table""" - - app = create_app() - - with app.app_context(): - try: - # Create the MapRoute table - db.create_all() - print("āœ… MapRoute table created successfully!") - - # Show current tables - inspector = db.inspect(db.engine) - tables = inspector.get_table_names() - print(f"Current tables: {', '.join(tables)}") - - if 'map_routes' in tables: - print("āœ… map_routes table confirmed in database") - else: - print("āŒ map_routes table not found") - - except Exception as e: - print(f"āŒ Error creating MapRoute table: {e}") - return False - - return True - -def populate_existing_routes(): - """Process existing published posts with GPX files to create map routes""" - - app = create_app() - - with app.app_context(): - try: - from app.models import Post, GPXFile, MapRoute - from app.utils.gpx_processor import create_map_route_from_gpx - - # Find published posts with GPX files that don't have map routes yet - posts_with_gpx = db.session.query(Post).join(GPXFile).filter( - Post.published == True - ).distinct().all() - - print(f"Found {len(posts_with_gpx)} published posts with GPX files") - - processed = 0 - errors = 0 - - for post in posts_with_gpx: - # Check if map route already exists - existing_route = MapRoute.query.filter_by(post_id=post.id).first() - if existing_route: - print(f"ā­ļø Post {post.id} already has a map route, skipping") - continue - - # Get the first GPX file for this post - gpx_file = GPXFile.query.filter_by(post_id=post.id).first() - if gpx_file: - print(f"šŸ”„ Processing post {post.id}: {post.title}") - success = create_map_route_from_gpx(gpx_file.id) - if success: - processed += 1 - print(f"āœ… Created map route for post {post.id}") - else: - errors += 1 - print(f"āŒ Failed to create map route for post {post.id}") - else: - print(f"āš ļø No GPX file found for post {post.id}") - - print(f"\nšŸ“Š Summary:") - print(f"- Processed: {processed}") - print(f"- Errors: {errors}") - print(f"- Total posts with GPX: {len(posts_with_gpx)}") - - except Exception as e: - print(f"āŒ Error populating existing routes: {e}") - return False - - return True - -if __name__ == "__main__": - print("šŸš€ Creating MapRoute table and processing existing data...") - - # Create the table - if create_map_route_table(): - print("\nšŸ”„ Processing existing published posts with GPX files...") - populate_existing_routes() - - print("\nāœ… Migration completed!") diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..4c97092 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,113 @@ +import logging +from logging.config import fileConfig + +from flask import current_app + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + + +def get_engine(): + try: + # this works with Flask-SQLAlchemy<3 and Alchemical + return current_app.extensions['migrate'].db.get_engine() + except (TypeError, AttributeError): + # this works with Flask-SQLAlchemy>=3 + return current_app.extensions['migrate'].db.engine + + +def get_engine_url(): + try: + return get_engine().url.render_as_string(hide_password=False).replace( + '%', '%%') + except AttributeError: + return str(get_engine().url).replace('%', '%%') + + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +config.set_main_option('sqlalchemy.url', get_engine_url()) +target_db = current_app.extensions['migrate'].db + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def get_metadata(): + if hasattr(target_db, 'metadatas'): + return target_db.metadatas[None] + return target_db.metadata + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=get_metadata(), literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + conf_args = current_app.extensions['migrate'].configure_args + if conf_args.get("process_revision_directives") is None: + conf_args["process_revision_directives"] = process_revision_directives + + connectable = get_engine() + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=get_metadata(), + **conf_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/df85d77e2474_add_mail_settings_and_sent_email_tables.py b/migrations/versions/df85d77e2474_add_mail_settings_and_sent_email_tables.py new file mode 100644 index 0000000..81c687a --- /dev/null +++ b/migrations/versions/df85d77e2474_add_mail_settings_and_sent_email_tables.py @@ -0,0 +1,52 @@ +"""add mail settings and sent email tables + +Revision ID: df85d77e2474 +Revises: +Create Date: 2025-07-26 18:26:25.676774 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'df85d77e2474' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('mail_settings', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('enabled', sa.Boolean(), nullable=False), + sa.Column('server', sa.String(length=255), nullable=False), + sa.Column('port', sa.Integer(), nullable=False), + sa.Column('use_tls', sa.Boolean(), nullable=False), + sa.Column('username', sa.String(length=255), nullable=True), + sa.Column('password', sa.String(length=255), nullable=True), + sa.Column('default_sender', sa.String(length=255), nullable=True), + sa.Column('provider', sa.String(length=50), nullable=True), + sa.Column('updated_at', sa.DateTime(), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('sent_emails', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('recipient', sa.String(length=255), nullable=False), + sa.Column('subject', sa.String(length=255), nullable=False), + sa.Column('body', sa.Text(), nullable=False), + sa.Column('status', sa.String(length=50), nullable=True), + sa.Column('error', sa.Text(), nullable=True), + sa.Column('sent_at', sa.DateTime(), nullable=True), + sa.Column('provider', sa.String(length=50), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('sent_emails') + op.drop_table('mail_settings') + # ### end Alembic commands ###