diff --git a/.gitignore b/.gitignore index 15201ac..b37a122 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ __pycache__/ *.py[cod] *$py.class - +entorno/ # C extensions *.so diff --git a/app.py b/app.py index 4720bd1..0a3ddae 100644 --- a/app.py +++ b/app.py @@ -1,22 +1,13 @@ from flask import Flask, render_template, request, redirect, url_for, render_template_string from flask import session -from data.db import DB -from dotenv import load_dotenv +from data import Users, Roles, Permissions, Modules import os import psycopg2 app = Flask(__name__) -load_dotenv() app.secret_key = os.environ.get('SECRET_KEY') -base = { - 'dbname': os.environ.get('DB_NAME'), - 'user': os.environ.get('DB_USER'), - 'password': os.environ.get('DB_PASSWORD'), - 'host': os.environ.get('DB_HOST'), - 'port': os.environ.get('DB_PORT') -} @app.route('/', methods=['GET', 'POST']) def login(): @@ -30,26 +21,16 @@ def login(): else: error = "El Usuario o Contraseña son Incorrectos." - return render_template_string(""" - {% if error %} -
{{ error }}
- {% endif %} - - """, error=error) + return render_template('login.html', error=error) def is_valid_user(username :str, password :str) -> bool: try: - db = DB(base) - user = db.connect().get_user_by_email(username) + user = Users().find(email=username) if not user: return False - if not user.login(password): + if user.password != password: return False session['user_id'] = user.id @@ -62,32 +43,170 @@ def is_valid_user(username :str, password :str) -> bool: @app.route('/datos') def show_data(): try: - connection = psycopg2.connect(**base) - cursor = connection.cursor() + if not session.get('user_id'): + return redirect(url_for('login')) + user = Users().find(id=session.get('user_id')) + return render_template('welcome.html', user=user) + + except Exception as e: + return f"Error: {e}" + +@app.route('/modules') +def show_modules(): + try: if not session.get('user_id'): - return redirect(url_for('login')) + return redirect(url_for('login')) + user = Users().find(id=session.get('user_id')) + modules = Modules().all() + + return render_template('modules.html', user=user, modules=modules) + + except Exception as e: + return f"Error: {e}" + + +@app.route('/modules/create') +def create_modules(): + try: + if not session.get('user_id'): + return redirect(url_for('login')) + + return render_template('modules_form.html', id=0) + + except Exception as e: + return f"Error: {e}" + + + +@app.route('/modules/edit/| ID | +Name | +Created At | +Actions | +
|---|---|---|---|
| {{ module.id }} | +{{ module.name }} | +{{ module.created_at }} | ++ + + | +
| ID | +Name | +Created At | +Actions | +
|---|---|---|---|
| {{ roles.id }} | +{{ roles.name }} | +{{ roles.created_at }} | ++ + + | +
We are glad to have you here. Enjoy your stay!
+