25.09.2024_traduction en subdomain mais probleme avec conection utilisateur -> changement de plan plus de subdomain mais prefix url

Author: pythonhtmlcssjsarduino

flask_app/__init__.py

@@ -1,4 +1,4 @@
-from flask import Flask, redirect, url_for, flash, request, session
+from flask import Flask, redirect, flash, request, session, url_for
 from flask_login import LoginManager, current_user
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
@@ -9,6 +9,7 @@
 import os
 install()
 
+
 # met la langue en francais pour le formatage des dates
 import locale
 locale.setlocale(locale.LC_TIME,'')
@@ -24,6 +25,9 @@
 app.config['SECRET_KEY'] = 'secret_key' #! change that for deployment
 app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///site.db"
 app.config['BABEL_TRANSLATION_DIRECTORIES'] = f'{app.root_path}/translations'
+app.config['SESSION_COOKIE_PATH'] = '/'
+app.config['SESSION_COOKIE_DOMAIN'] = 'localhost'
+ic(app.config)
 app.jinja_env.add_extension('jinja2.ext.loopcontrols')
 app.url_map.default_subdomain = ''
 
@@ -93,24 +97,31 @@ def decorated_view(*args, **kwargs):
         return func(*args, **kwargs)
     return decorated_view
 
-def lang(func):
-    """
-    Modified login_required decorator to restrict access to admin group.
-    """
-
-    @wraps(func)
-    def decorated_view(*args, **kwargs):
-        lang = kwargs.pop('lang', 'fr')
-        if lang in LANGAGES:
-            session['lang'] = lang
-        return func(*args, **kwargs)
-    return decorated_view
+def lang_url_for(*args, **kwargs):
+    lang = kwargs.pop('lang', _('app.lang'))
+    if 'static' in args:
+        return url_for(*args, **kwargs)
+    if lang == 'fr':
+        return url_for(*args, lang='', **kwargs)
+    return url_for(*args, lang=lang, **kwargs)
 
-'''#* erreur 403 acces non autorisé
-def error403():
-    flash('tu doit etre connecté pour acceder a cette page.', 'danger')
-    return redirect(url_for('home'))
-login_manager.unauthorized_handler(error403)'''
+@app.context_processor
+def inject_lang_url_for():
+    return dict(url_for=lang_url_for)
+
+def set_route(blueprint, path, **options):
+    def decorator(func):
+        @blueprint.route(path, **options)
+        @blueprint.route(path, subdomain=options.pop('subdomain', '<lang>'), **options)
+        @wraps(func)
+        def wrap(*args, **kwargs):
+            lang = kwargs.pop('lang', 'fr')
+            if lang in LANGAGES:
+                session['lang'] = lang
+            return func(*args, **kwargs)
+        return wrap
+    
+    return decorator
 
 # defini les pages du site web
 from flask_app.users import users

flask_app/admin/__init__.py

@@ -1,6 +1,6 @@
 from flask import Blueprint, render_template
 from flask_login import login_required, current_user
-from flask_app import admin_required
+from flask_app import admin_required, set_route
 from flask_app.models import Event
 from flask_app.admin.editions import editions
 from flask_app.admin.parcours import parcours_bp
@@ -12,7 +12,7 @@
 admin.register_blueprint(coureurs)
 
 
-@admin.route('/event/<event_name>')
+@set_route(admin, '/event/<event_name>')
 @login_required
 @admin_required
 def home_event(event_name):

flask_app/admin/coureurs/__init__.py

@@ -1,12 +1,12 @@
 from flask import Blueprint, render_template
 from flask_login import current_user, login_required
-from flask_app import admin_required
+from flask_app import admin_required, set_route
 from flask_app.models import Event, User
 from flask_babel import _
 
 coureurs = Blueprint("coureurs", __name__, template_folder='templates')
 
-@coureurs.route('/event/<event_name>/coureurs')
+@set_route(coureurs, '/event/<event_name>/coureurs')
 @login_required
 @admin_required
 def coureurs_page(event_name):
@@ -15,7 +15,7 @@ def coureurs_page(event_name):
     user = current_user
     return render_template("coureurs.html", user_data=user, event_data=event_data, event_modif=True)
 
-@coureurs.route('/event/<event_name>/coureurs/<coureur>')
+@set_route(coureurs, '/event/<event_name>/coureurs/<coureur>')
 def view_coureur_page(event_name, coureur):
     event_data = Event.query.filter_by(name=event_name).first()
     coureur_data:User = User.query.get_or_404(coureur, _('admin.view.error.coureurdontexist:coureur').format(coureur=coureur))

flask_app/admin/editions/__init__.py

@@ -1,5 +1,5 @@
-from flask import Blueprint, flash, render_template, redirect, url_for, request
-from flask_app import admin_required, db
+from flask import Blueprint, flash, render_template, redirect, request
+from flask_app import admin_required, db, set_route, lang_url_for as url_for
 from flask_app.admin.editions.forms import Edition_form
 from flask_login import login_required, current_user
 from flask_app.models import  Event, Parcours, Edition
@@ -12,7 +12,7 @@
 editions.register_blueprint(dossard)
 editions.register_blueprint(passages)
 
-@editions.route('/event/<event_name>/editions', methods=['POST', 'GET'])
+@set_route(editions, '/event/<event_name>/editions', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def editions_page(event_name):
@@ -41,7 +41,7 @@ def editions_page(event_name):
 
     return render_template("editions.html", user_data=user, event_data=event, form=form, event_modif=True)
 
-@editions.route('/event/<event_name>/editions/<edition_name>/delete', methods=['POST', 'GET'])
+@set_route(editions, '/event/<event_name>/editions/<edition_name>/delete', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def delete_edition_page(event_name, edition_name):
@@ -56,7 +56,7 @@ def delete_edition_page(event_name, edition_name):
     flash('l\'edition a bien été supprimée', 'success')
     return redirect(url_for('admin.editions.editions_page',event_name=event.name))
 
-@editions.route('/event/<event_name>/editions/<edition_name>', methods=['POST', 'GET'])
+@set_route(editions, '/event/<event_name>/editions/<edition_name>', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def modify_edition_page(event_name, edition_name):
@@ -71,6 +71,7 @@ def modify_edition_page(event_name, edition_name):
                               'rdv_lng':edition.rdv_lng,
                               'parcours':[str((p.name, p.description)) for p in edition.parcours]})
     form.parcours.choices=[str((p.name, p.description)) for p in event.parcours.filter(or_(Parcours.archived==False, Parcours.editions.any(Edition.id==edition.id))).all()]
+    ic(dir(form.parcours)) # type: ignore
 
     #? desactiver le champs si dates deja passé
     form.edition_date.render_kw.pop("disabled", None)
@@ -92,7 +93,7 @@ def modify_edition_page(event_name, edition_name):
     #? fin desactivation des champs
     ic(form.parcours.data)
     ic([str((p.name, p.description)) for p in edition.parcours])
-    ic(request.form)
+    ic(request.form.to_dict())
 
     if form.validate_on_submit():
         print(form.parcours.data)
@@ -111,7 +112,7 @@ def modify_edition_page(event_name, edition_name):
             form.name.errors = list(form.name.errors)+['vous utiliser deja ce nom.']
     return render_template('modify_edition.html', user_data=user, event_data=event, edition_data=edition, form = form, now=datetime.now(), event_modif=True, edition_sidebar=True)
 
-@editions.route('/event/<event_name>/editions/<edition_name>/generate_dossard', methods=['POST', 'GET'])
+@set_route(editions, '/event/<event_name>/editions/<edition_name>/generate_dossard', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def generate_dossard(event_name, edition_name):
@@ -123,7 +124,7 @@ def generate_dossard(event_name, edition_name):
     return render_template('generate_dossard.html', user_data=user, event_data=event, edition_data=edition, now=datetime.now(), inscriptions=edition.inscriptions, event_modif=True, edition_sidebar=True)
 
 
-@editions.route('/event/<event_name>/editions/<edition_name>/generate_dossard/generate', methods=['POST', 'GET'])
+@set_route(editions, '/event/<event_name>/editions/<edition_name>/generate_dossard/generate', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def generate_all_dossard(event_name, edition_name):

flask_app/admin/editions/dossard/__init__.py

@@ -1,13 +1,13 @@
-from flask import Blueprint, flash, render_template, redirect, url_for
-from flask_app import admin_required, db
+from flask import Blueprint, flash, render_template, redirect
+from flask_app import admin_required, db, set_route
 from flask_app.admin.editions.forms import Edition_form
 from flask_login import login_required, current_user
 from flask_app.models import  Event, Parcours, Edition
 from datetime import datetime
 
 dossard = Blueprint('dossard', __name__, template_folder='templates')
 
-@dossard.route('/event/<event_name>/editions/<edition_name>/dossard', methods=['POST', 'GET'])
+@set_route(dossard, '/event/<event_name>/editions/<edition_name>/dossard', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def dossard_page(event_name, edition_name):

flask_app/admin/editions/passages/__init__.py

@@ -1,6 +1,6 @@
 import time
-from flask import Blueprint, redirect, render_template, flash, request, url_for, jsonify
-from flask_app import admin_required, db
+from flask import Blueprint, redirect, render_template, flash, request, jsonify
+from flask_app import admin_required, db, set_route, lang_url_for as url_for
 from flask_login import login_required, current_user
 from flask_app.models import  Event, Edition, PassageKey, Stand, Parcours, Passage, User, Inscription
 from datetime import datetime
@@ -11,7 +11,7 @@
 passages = Blueprint('passages', __name__, template_folder='templates')
 @login_required
 @admin_required
-@passages.route("/event/<event_name>/editions/<edition_name>/dashboard", methods=['get', 'post'])
+@set_route(passages, "/event/<event_name>/editions/<edition_name>/dashboard", methods=['get', 'post'])
 def dashboard(event_name, edition_name):
     user = current_user
     event = Event.query.filter_by(name= event_name).first_or_404()
@@ -53,7 +53,7 @@ def dashboard(event_name, edition_name):
 
     return render_template('dashboard.html', event_data=event, edition_data = edition, user_data=user, now = datetime.now(), keys=keys, passages=passages, form=form, event_modif=True, edition_sidebar=True)
 
-@passages.route('/chrono', methods=["GET", 'post'])
+@set_route(passages, '/chrono', methods=["GET", 'post'])
 def chrono_home():
     user = current_user if current_user.is_authenticated else None
 
@@ -67,7 +67,7 @@ def chrono_home():
 
     return render_template('chrono_home.html', user_data=user, form=form)
 
-@passages.route('/chrono/<key_code>')
+@set_route(passages, '/chrono/<key_code>')
 def chrono_page(key_code):
     user = current_user if current_user.is_authenticated else None
     key = PassageKey.query.filter_by(key=key_code).first_or_404()
@@ -80,7 +80,7 @@ def chrono_page(key_code):
     ic(key_passages)
     return render_template('chrono.html', user_data=user, key=key, passages=key_passages)
 
-@passages.route('/chrono/set', methods=['post'])
+@set_route(passages, '/chrono/set', methods=['post'])
 def set_passage():
     form = SetPassageForm()
     inscription = Inscription.query.filter(Inscription.dossard == form.dossard.data).first()

flask_app/admin/parcours/__init__.py

@@ -1,5 +1,5 @@
-from flask import Blueprint, flash, redirect, render_template, request, url_for
-from flask_app import admin_required, db
+from flask import Blueprint, flash, redirect, render_template, request
+from flask_app import admin_required, db, set_route, lang_url_for as url_for
 from flask_app.admin.parcours.forms import  Parcours_name_form, Etape_modif_form, Stand_modif_form, New_parcours_form
 from flask_login import login_required, current_user
 from flask_app.models import Event, Stand, Trace, Parcours
@@ -17,7 +17,7 @@ def midpoint(latlng1, latlng2):
     lng = (latlng1[1]+latlng2[1])/2
     return (lat, lng)
 
-@parcours_bp.route('/event/<event_name>/parcours/<parcours_name>/delete')
+@set_route(parcours_bp, '/event/<event_name>/parcours/<parcours_name>/delete')
 @login_required
 @admin_required
 def delete_parcours_page(event_name, parcours_name):
@@ -51,7 +51,7 @@ def delete_parcours_page(event_name, parcours_name):
 
     return redirect(url_for('admin.parcours.parcours_page', event_name=event.name))
 
-@parcours_bp.route('/event/<event_name>/parcours/<parcours_name>/archive')
+@set_route(parcours_bp, '/event/<event_name>/parcours/<parcours_name>/archive')
 @login_required
 @admin_required
 def archive_parcours_page(event_name, parcours_name):
@@ -61,7 +61,7 @@ def archive_parcours_page(event_name, parcours_name):
     db.session.commit()
     return redirect(url_for('admin.parcours.parcours_page', event_name=event.name))
 
-@parcours_bp.route('/event/<event_name>/parcours/<parcours_name>/unarchive')
+@set_route(parcours_bp, '/event/<event_name>/parcours/<parcours_name>/unarchive')
 @login_required
 @admin_required
 def unarchive_parcours_page(event_name, parcours_name):
@@ -71,7 +71,7 @@ def unarchive_parcours_page(event_name, parcours_name):
     db.session.commit()
     return redirect(url_for('admin.parcours.parcours_page', event_name=event.name))
 
-@parcours_bp.route('/event/<event_name>/parcours', methods=['POST', 'GET'])
+@set_route(parcours_bp, '/event/<event_name>/parcours', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def parcours_page(event_name):
@@ -380,7 +380,7 @@ def create_map_and_alt_graph(parcours:Parcours, modif= False, rdv=None):
     return element_name, last_path_name, next_path_name, markers_name, program_list, map, graph
 
 
-@parcours_bp.route('/event/<event_name>/parcours/<parcours_name>', methods=['POST', 'GET'])
+@set_route(parcours_bp, '/event/<event_name>/parcours/<parcours_name>', methods=['POST', 'GET'])
 @login_required
 @admin_required
 def modify_parcours(event_name, parcours_name):

flask_app/dev/__init__.py

@@ -1,5 +1,5 @@
-from flask import Blueprint, redirect, render_template, flash, url_for, jsonify, request
-from flask_app import admin_required, db, DEV_ENABLE, app, LANGAGES
+from flask import Blueprint, redirect, render_template, flash, jsonify, request
+from flask_app import admin_required, db, DEV_ENABLE, app, LANGAGES, lang_url_for as url_for
 from functools import wraps
 import glob, os
 from babel.messages.pofile import read_po, write_po

flask_app/routes.py

@@ -1,5 +1,5 @@
 from flask import render_template, request, session, redirect
-from flask_app import app, LANGAGES
+from flask_app import app, LANGAGES, set_route
 from flask_login import current_user
 from flask_app.models import Edition, Inscription, Event
 from sqlalchemy import and_
@@ -8,7 +8,7 @@
 
 
 
-@app.route('/')
+@set_route(app, '/')
 def home():
     # * home page of the web site
     if current_user.is_authenticated:
@@ -21,9 +21,12 @@ def home():
     next_events = Event.query.filter(Event.editions.any(and_(Edition.edition_date>=date,Edition.last_inscription>=date))).all()
     return render_template("0-home.html", user_data=user, inscriptions=inscriptions, events = next_events, time = date)
 
-@app.route('/lang/<lang>')
-def change_lang(lang):
-    next=request.args.get('next', '/')
-    if lang in LANGAGES:
-        session['lang'] = lang
-    return redirect(next)
+@app.route('/lang/<lang>/<path:next>')
+def change_lang(lang, next:str):
+    ic(lang, next)
+    next=next.removeprefix('http://')
+    ic(lang, next)
+    ic('.'.join(next.split('.')[1:]), next.find(app.config['SERVER_NAME']))
+    next = '.'.join(next.split('.')[1:]) if next.find(app.config['SERVER_NAME'])!=0 else next
+    ic(lang, next)
+    return redirect('http://'+lang+'.'+next)

flask_app/templates/layout.html

@@ -10,7 +10,7 @@
     <title>{{ _('app.name') }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css" />
-    <link rel="stylesheet" href="/static/style.css" />
+    <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}" />
     <!-- Bootstrap CSS -->
     <link
       href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
@@ -54,7 +54,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
     <header>
       <nav
-        class="navbar navbar-expand-sm bg-info fixed-top"
+        class="navbar navbar-expand-md bg-info fixed-top"
         style="min-height: 70px"
       >
         <div class="container-fluid">
@@ -97,6 +97,7 @@
               <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">{{ _('app.languages') }} : {{ _('app.lang') }}</a>
                 <ul class="dropdown-menu">
+                  {{ request.url }}
                   <li><a class="dropdown-item" href="{{ url_for('change_lang', lang='fr', next=request.url ) }}">Francais</a></li>
                   <li><a class="dropdown-item" href="{{ url_for('change_lang', lang='en', next=request.url ) }}">English</a></li>
                   <li><a class="dropdown-item" href="{{ url_for('change_lang', lang='de', next=request.url ) }}">Deutsch</a></li>