diff --git a/database/__init__.py b/database/__init__.py new file mode 100644 index 0000000..ee9864c --- /dev/null +++ b/database/__init__.py @@ -0,0 +1,12 @@ +from flask_sqlalchemy import SQLAlchemy +from sqlalchemy.sql import text +from webapp import webapp + +webapp.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///database.db' +db = SQLAlchemy(webapp) + +with webapp.app_context(): + with open('database/schema.sql', 'r') as f: + sql_script = f.read() + db.session.execute(text(sql_script)) + db.session.commit() diff --git a/webapp/models.py b/database/message.py similarity index 80% rename from webapp/models.py rename to database/message.py index b74a6c0..08be331 100644 --- a/webapp/models.py +++ b/database/message.py @@ -1,4 +1,5 @@ -from webapp import db +# from webapp import db +from database import db class Message(db.Model): id = db.Column(db.Integer, primary_key=True) diff --git a/schema.sql b/database/schema.sql similarity index 100% rename from schema.sql rename to database/schema.sql diff --git a/webapp/__init__.py b/webapp/__init__.py index ac0d2c9..1f5bac2 100644 --- a/webapp/__init__.py +++ b/webapp/__init__.py @@ -1,15 +1,5 @@ from flask import Flask -from flask_sqlalchemy import SQLAlchemy -from sqlalchemy.sql import text webapp = Flask(__name__) -webapp.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///database.db' -db = SQLAlchemy(webapp) -from webapp import routes - -with webapp.app_context(): - with open('schema.sql', 'r') as f: - sql_script = f.read() - db.session.execute(text(sql_script)) - db.session.commit() +from webapp import commandes, index, messages, moderation diff --git a/webapp/commandes.py b/webapp/commandes.py new file mode 100644 index 0000000..c81a936 --- /dev/null +++ b/webapp/commandes.py @@ -0,0 +1,6 @@ +from flask import render_template +from webapp import webapp + +@webapp.route("/commandes") +def commandes(): + return render_template("commandes.html") diff --git a/webapp/routes.py b/webapp/index.py similarity index 60% rename from webapp/routes.py rename to webapp/index.py index 2ff1dcb..63dff92 100644 --- a/webapp/routes.py +++ b/webapp/index.py @@ -1,6 +1,7 @@ -from flask import Flask, render_template -from webapp import webapp, db -from webapp.models import Message +from flask import render_template +from webapp import webapp +# from database import db +# from database.message import Message @webapp.route("/") def index(): diff --git a/webapp/messages.py b/webapp/messages.py new file mode 100644 index 0000000..ab2de0f --- /dev/null +++ b/webapp/messages.py @@ -0,0 +1,11 @@ +from flask import render_template +from webapp import webapp +# from database import db +# from database.message import Message + +@webapp.route("/messages") +def messages(): + # message = Message(text="bla bla", periodicity = 3600) + # db.session.add(message) + # db.session.commit() + return render_template("messages.html") diff --git a/webapp/moderation.py b/webapp/moderation.py new file mode 100644 index 0000000..842e0d0 --- /dev/null +++ b/webapp/moderation.py @@ -0,0 +1,6 @@ +from flask import render_template +from webapp import webapp + +@webapp.route("/moderation") +def moderation(): + return render_template("moderation.html") diff --git a/webapp/templates/commandes.html b/webapp/templates/commandes.html new file mode 100644 index 0000000..afcda8a --- /dev/null +++ b/webapp/templates/commandes.html @@ -0,0 +1,6 @@ +{% extends "template.html" %} + +{% block content %} +

Configuration des Commandes.

+

TODO

+{% endblock %} \ No newline at end of file diff --git a/webapp/templates/index.html b/webapp/templates/index.html index e58688b..dbe19cf 100644 --- a/webapp/templates/index.html +++ b/webapp/templates/index.html @@ -1,5 +1,7 @@ {% extends "template.html" %} {% block content %} -

Bienvenue sur l'interface d'administrationde Mamie.

+

Bienvenue sur l'interface d'administration de Mamie.

+

Nous devons définir ce que nous souhaitons afficher sur la page d'acceuil. Peut-être l'historique des derniere + modification ? de la modération ?

{% endblock %} \ No newline at end of file diff --git a/webapp/templates/messages.html b/webapp/templates/messages.html new file mode 100644 index 0000000..d96c5bb --- /dev/null +++ b/webapp/templates/messages.html @@ -0,0 +1,6 @@ +{% extends "template.html" %} + +{% block content %} +

Configuration des Messages.

+

TODO

+{% endblock %} \ No newline at end of file diff --git a/webapp/templates/moderation.html b/webapp/templates/moderation.html new file mode 100644 index 0000000..12ac839 --- /dev/null +++ b/webapp/templates/moderation.html @@ -0,0 +1,6 @@ +{% extends "template.html" %} + +{% block content %} +

Modération.

+

TODO

+{% endblock %} \ No newline at end of file diff --git a/webapp/templates/template.html b/webapp/templates/template.html index 02673e2..1f389b6 100644 --- a/webapp/templates/template.html +++ b/webapp/templates/template.html @@ -18,10 +18,9 @@