diff --git a/src/app.py b/src/app.py
index 1b3340c0fa..39b3cf3bca 100644
--- a/src/app.py
+++ b/src/app.py
@@ -1,7 +1,15 @@
"""
This module takes care of starting the API Server, Loading the DB and Adding the endpoints
"""
+from flask_cors import CORS as _CORS
+from datetime import datetime, timedelta
+import jwt
+from werkzeug.security import generate_password_hash, check_password_hash
+from flask_sqlalchemy import SQLAlchemy
+from flask_cors import CORS
+from flask import Flask, request, jsonify
import os
+from dotenv import load_dotenv
from flask import Flask, request, jsonify, url_for, send_from_directory
from flask_migrate import Migrate
from flask_swagger import swagger
@@ -11,62 +19,173 @@
from api.admin import setup_admin
from api.commands import setup_commands
-# from models import Person
-
ENV = "development" if os.getenv("FLASK_DEBUG") == "1" else "production"
static_file_dir = os.path.join(os.path.dirname(
os.path.realpath(__file__)), '../dist/')
app = Flask(__name__)
app.url_map.strict_slashes = False
-# database condiguration
+load_dotenv()
+if not os.path.exists('.env'):
+ load_dotenv('.env.example')
+
+_CORS(app)
db_url = os.getenv("DATABASE_URL")
if db_url is not None:
app.config['SQLALCHEMY_DATABASE_URI'] = db_url.replace(
"postgres://", "postgresql://")
else:
- app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:////tmp/test.db"
+ app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite:///database.db"
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
MIGRATE = Migrate(app, db, compare_type=True)
db.init_app(app)
-
-# add the admin
setup_admin(app)
-
-# add the admin
setup_commands(app)
-
-# Add all endpoints form the API with a "api" prefix
-app.register_blueprint(api, url_prefix='/api')
-
-# Handle/serialize errors like a JSON object
+app.register_blueprint(api)
@app.errorhandler(APIException)
def handle_invalid_usage(error):
return jsonify(error.to_dict()), error.status_code
-# generate sitemap with all your endpoints
-
+app.config['SECRET_KEY'] = os.getenv('JWT_SECRET_KEY') or os.getenv('JWT_SECRET', 'super-secret-key')
+
+
+@app.route('/signup', methods=['POST'])
+def signup():
+ data = request.get_json() or {}
+ email = data.get('email')
+ password = data.get('password')
+ first_name = data.get('first_name')
+ last_name = data.get('last_name')
+ from api.models import User
+ if User.query.filter_by(email=email).first():
+ return jsonify({'msg': 'Usuario ya existe'}), 400
+ hashed_password = generate_password_hash(password, method='pbkdf2:sha256')
+ user = User(email=email, password=hashed_password,
+ first_name=first_name, last_name=last_name, is_active=True)
+ db.session.add(user)
+ db.session.commit()
+ return jsonify({'msg': 'Usuario creado'}), 201
+
+
+@app.route('/login', methods=['POST'])
+def login():
+ data = request.get_json()
+ email = data.get('email')
+ password = data.get('password')
+ from api.models import User
+ user = User.query.filter_by(email=email).first()
+ if not user or not check_password_hash(user.password, password):
+ return jsonify({'msg': 'Credenciales inválidas'}), 401
+ access_token = jwt.encode({
+ 'user_id': user.id,
+ 'exp': datetime.utcnow() + timedelta(minutes=15)
+ }, app.config['SECRET_KEY'], algorithm='HS256')
+
+ refresh_token = jwt.encode({
+ 'user_id': user.id,
+ 'exp': datetime.utcnow() + timedelta(days=7),
+ 'type': 'refresh'
+ }, app.config['SECRET_KEY'], algorithm='HS256')
+
+ if isinstance(access_token, bytes):
+ access_token = access_token.decode('utf-8')
+ if isinstance(refresh_token, bytes):
+ refresh_token = refresh_token.decode('utf-8')
+
+ return jsonify({'token': access_token, 'refresh_token': refresh_token})
+
+
+@app.route('/refresh', methods=['POST'])
+def refresh():
+ data = request.get_json() or {}
+ refresh_token = data.get('refresh_token')
+ if not refresh_token:
+ return jsonify({'msg': 'Refresh token requerido'}), 400
+ try:
+ payload = jwt.decode(
+ refresh_token, app.config['SECRET_KEY'], algorithms=['HS256'])
+ if payload.get('type') != 'refresh':
+ return jsonify({'msg': 'Token inválido'}), 401
+ from api.models import User
+ user = User.query.get(payload.get('user_id'))
+ if not user:
+ return jsonify({'msg': 'Usuario no encontrado'}), 404
+ access_token = jwt.encode({
+ 'user_id': user.id,
+ 'exp': datetime.utcnow() + timedelta(minutes=15)
+ }, app.config['SECRET_KEY'], algorithm='HS256')
+ if isinstance(access_token, bytes):
+ access_token = access_token.decode('utf-8')
+ return jsonify({'token': access_token})
+ except jwt.ExpiredSignatureError:
+ return jsonify({'msg': 'Refresh token expirado'}), 401
+ except Exception:
+ return jsonify({'msg': 'Refresh token inválido'}), 401
+
+
+# La ruta /private está implementada en el blueprint `api`.
@app.route('/')
-def sitemap():
- if ENV == "development":
- return generate_sitemap(app)
- return send_from_directory(static_file_dir, 'index.html')
-
-# any other endpoint will try to serve it like a static file
-@app.route('/Rigo welcomes you to your API!!
+API HOST:
+Start working on your project by following the Quick Start
+Remember to specify a real endpoint path like:
+ + + + + ''' + + if __name__ == '__main__': - PORT = int(os.environ.get('PORT', 3001)) - app.run(host='0.0.0.0', port=PORT, debug=True) + with app.app_context(): + db.create_all() + app.run(host='0.0.0.0', port=3001) diff --git a/src/front/App.jsx b/src/front/App.jsx new file mode 100644 index 0000000000..94569a70f9 --- /dev/null +++ b/src/front/App.jsx @@ -0,0 +1,14 @@ +import { RouterProvider } from "react-router-dom"; +import { router } from "./routes"; +import "bootstrap/dist/css/bootstrap.min.css"; + +function App() { + return ( +
+
+ );
+}
+export default App;
diff --git a/src/front/assets/img/env-file.svg b/src/front/assets/img/env-file.svg
new file mode 100644
index 0000000000..33be61a95c
--- /dev/null
+++ b/src/front/assets/img/env-file.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/front/assets/img/fondo-inicio.webp b/src/front/assets/img/fondo-inicio.webp
new file mode 100644
index 0000000000..902c4cd568
Binary files /dev/null and b/src/front/assets/img/fondo-inicio.webp differ
diff --git a/src/front/assets/img/inicio-sesion.jpg b/src/front/assets/img/inicio-sesion.jpg
new file mode 100644
index 0000000000..3424b1977c
Binary files /dev/null and b/src/front/assets/img/inicio-sesion.jpg differ
diff --git a/src/front/assets/img/preview.svg b/src/front/assets/img/preview.svg
new file mode 100644
index 0000000000..318b2f3840
--- /dev/null
+++ b/src/front/assets/img/preview.svg
@@ -0,0 +1,5 @@
+
diff --git a/src/front/assets/img/registro.jpg b/src/front/assets/img/registro.jpg
new file mode 100644
index 0000000000..ebe62b2c64
Binary files /dev/null and b/src/front/assets/img/registro.jpg differ
diff --git a/src/front/assets/img/rigo-baby.jpg b/src/front/assets/img/rigo-baby.jpg
deleted file mode 100644
index da566a74a0..0000000000
Binary files a/src/front/assets/img/rigo-baby.jpg and /dev/null differ
diff --git a/src/front/assets/img/rigo-baby.svg b/src/front/assets/img/rigo-baby.svg
new file mode 100644
index 0000000000..ee4c2e0449
--- /dev/null
+++ b/src/front/assets/img/rigo-baby.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/front/components/BackendURL.jsx b/src/front/components/BackendURL.jsx
index ae80b8e43a..5222b98097 100644
--- a/src/front/components/BackendURL.jsx
+++ b/src/front/components/BackendURL.jsx
@@ -1,7 +1,7 @@
import React, { Component } from "react";
-import envFile from "../../../docs/assets/env-file.png"
+import envFile from "../assets/img/env-file.svg"
-const Dark = ({children}) => {children};
+const Dark = ({ children }) => {children};
export const BackendURL = () => (
+
+ Missing BACKEND_URL env variable
@@ -16,7 +16,7 @@ export const BackendURL = () => (
- 
+
Note: If you are publishing your website to Heroku, Render.com or any other hosting you probably need to follow other steps.