From 9b0d08ca29a4d34897779081a07acbda6ce18c7a Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Fri, 3 Dec 2021 02:05:05 +0100 Subject: [PATCH 1/7] Ajout de la page web bateau --- app.py | 6 ++++++ pages.py | 33 +++++++++++++++++++++++++++++---- site.db | Bin 40960 -> 40960 bytes templates/bateau.html | 30 +++--------------------------- 4 files changed, 38 insertions(+), 31 deletions(-) diff --git a/app.py b/app.py index 025d143..03af405 100644 --- a/app.py +++ b/app.py @@ -11,9 +11,15 @@ def main(): return pages.main() @app.route('/sauveteurs/') +@app.route('/sauveteur/') def sauveteur(idsauveteur): return pages.sauveteur(idsauveteur) +@app.route('/bateaux/') +@app.route('/bateau/') +def bateau(idbateau): + return pages.bateau(idbateau) + @app.errorhandler(404) def error(e): return pages.error() diff --git a/pages.py b/pages.py index 8135828..8e6fad7 100644 --- a/pages.py +++ b/pages.py @@ -11,6 +11,27 @@ def main(): def error(): return render_template("error.html") +def bateau(idbateau): + dico = {} + dico["NomBateau"] = "Le Bateau" + dico["nom"] = "Le constructeur" + dico["Dimensions"] = 666 + dico["DateInstallation"] = "Aujourd'hui" + dico["DateCondamnation"] = "Demain" + dico["ville"] = "ici" + dico["HistoireBateau"] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam at odio cursus, rutrum odio non, dignissim risus. Pellentesque non varius ante. Vivamus scelerisque pulvinar mauris, nec imperdiet ante mattis et." + result = lib.ex_sql(dbname,"SELECT * FROM bateau WHERE ship_id=?",(idbateau,)) + if len(result)>=1: + result = result[0] + dico["nom"] = result["nom"] + print(result) + dico["Dimensions"] = result["dimension"] + dico["DateInstallation"] = result["date_naissance"] + dico["DateCondamnation"] = result["date_mort"] + return render_template("sauveteur.html",**dico) + else: + return error() + def sauveteur(idsauveteur): dico = {} dico["nom"] = "John" @@ -19,7 +40,11 @@ def sauveteur(idsauveteur): dico["nb_sauves"] = 666 dico["gratifications"] = 1 dico["description"] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam at odio cursus, rutrum odio non, dignissim risus. Pellentesque non varius ante. Vivamus scelerisque pulvinar mauris, nec imperdiet ante mattis et." - result = lib.ex_sql(dbname,"SELECT * FROM sauveteur WHERE personal_id=?",(idsauveteur,))[0] - dico["nom"] = result["nom"] - dico["prenom"] = result["prenom"] - return render_template("sauveteur.html",**dico) + result = lib.ex_sql(dbname,"SELECT * FROM sauveteur WHERE personal_id=?",(idsauveteur,)) + if len(result)==1: + result = result[0] + dico["nom"] = result["nom"] + dico["prenom"] = result["prenom"] + return render_template("sauveteur.html",**dico) + else: + return error() diff --git a/site.db b/site.db index 2add4a540beb515a8c5e77936f1c8a9beea81715..f4eea1a7861fda572d9089ed27be6a670fffaf62 100644 GIT binary patch delta 89 zcmZoTz|?SnX@WE(=R_H2R!#=J;Dn7Si~QNnG4j9QKet&>;1Iu&I1`(+sIV}DV@hsj rQDTm%VJ?@EiJ_6H5rY^bo3t=cCM2^YF)uUO6ewY7Xk=-$D8T^$Q$80z delta 90 zcmZoTz|?SnX@WE($3z)tRt^R|nGG9L7WuQCW#E6#e|EE=z(Iav2_`maQDIRA$CTX6 sqQo3i!(1*S6GL^S!z;xZ*`$SmG9j5IiFujHra%cxLnBKgu0;tB0FUYzegFUf diff --git a/templates/bateau.html b/templates/bateau.html index 3913bc5..ed969f1 100644 --- a/templates/bateau.html +++ b/templates/bateau.html @@ -9,10 +9,8 @@ origine histoire !--> - {{nom}} - - +

{{nom}}}

@@ -31,33 +29,11 @@ histoire Installation - {{Date}} + {{DateInstallation}} Condamnation - {{Date}} - - - Origine - {{ville}} - Nom - {{NomBateau}} - - - Constructeur - {{nom}} - - - Dimensions - {{Dimensions}} - - - Installation - {{Date}} - - - Condamnation - {{Date}} + {{DateCondamnation}} Origine From c4986d6aef6f3c25083fe059b30e93ce33d095fe Mon Sep 17 00:00:00 2001 From: Antoine Waehren Date: Fri, 3 Dec 2021 02:17:53 +0100 Subject: [PATCH 2/7] Fait de la merde sur app.py... --- app.py | 21 ++++++++++++++++----- templates/error.html | 12 +++++++++--- templates/sauveteur.html | 2 +- templates/search.html | 19 +++++++++++++++++++ 4 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 templates/search.html diff --git a/app.py b/app.py index 025d143..35a43d8 100644 --- a/app.py +++ b/app.py @@ -4,12 +4,15 @@ import pages app = Flask(__name__) -@app.route('/') -@app.route('/home') -@app.route('/home/') +@app.route('/', methods=['GET', 'POST']) +@app.route('/home', methods=['GET', 'POST']) +@app.route('/home/', methods=['GET', 'POST']) def main(): - return pages.main() - + if request.method == 'GET': + print(request) + else: + return pages.main() + @app.route('/sauveteurs/') def sauveteur(idsauveteur): return pages.sauveteur(idsauveteur) @@ -19,5 +22,13 @@ def error(e): return pages.error() +@app.route('/login', methods=['GET', 'POST']) +def login(): + if request.method == 'POST': + return do_the_login() + else: + return show_the_login_form() + + if __name__=="__main__": app.run(debug=True) diff --git a/templates/error.html b/templates/error.html index f324eed..2fb5109 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,11 +1,17 @@ - + + 404 Not Found - Sauveuteurs du dunkerquois + -

Erreur !

-

Retour à la page d'accueil

+ +

Page introuvable !

+

Retour à la page d'accueil.

diff --git a/templates/sauveteur.html b/templates/sauveteur.html index fab59a9..f38c1d8 100644 --- a/templates/sauveteur.html +++ b/templates/sauveteur.html @@ -14,7 +14,7 @@ description {{nom}} {{prenom}} - Sauveuteurs du dunkerquois - +