diff --git a/app.py b/app.py index af5dffc..f759707 100644 --- a/app.py +++ b/app.py @@ -1,15 +1,9 @@ from flask import Flask, render_template, request, redirect, url_for, flash, send_from_directory -#from flask_pymongo import PyMongo, ObjectId from flask_login import LoginManager, UserMixin, login_user, login_required, current_user, logout_user from werkzeug.utils import secure_filename from werkzeug.security import generate_password_hash, check_password_hash -#from datetime import datetime -#from flask_pymongo import ObjectId import os from uuid import uuid4 -#from flask_wtf import FlaskForm -#from wtforms import StringField, FileField, SubmitField, DateTimeField, SelectField, PasswordField -#from wtforms.validators import DataRequired, Length import requests from config import Config from geopy.geocoders import Nominatim @@ -25,51 +19,7 @@ def create_app(config=Config): login_manager = LoginManager(app) login_manager.session_protection = "strong" - """ class User(UserMixin): - def __init__(self, user_data): - self.id = str(user_data['_id']) - self.username = user_data['username'] - self.referral_code = user_data['referral_code'] - self.invited_by = user_data.get('invited_by') - self.is_admin = user_data.get('is_admin', False) - self.pwd = user_data.get('pwd') - - @staticmethod - def get(user_id): - user_data = mongo.db.users.find_one({"_id": ObjectId(user_id)}) - if user_data: - return User(user_data) - else: - return None - - class PinForm(FlaskForm): - description = StringField('¿Qué estamos viendo?', validators=[DataRequired()]) - photo = FileField('Evidencia fotogénica', validators=[DataRequired()]) - timedate = DateTimeField(default=datetime.now()) - typeofpin = SelectField('Tipo de cosa', choices=['bache', 'coladera', 'obra sin terminar', 'escombro', 'robo-asalto', 'biciestacionamiento', 'mala iluminación', 'bici blanca', 'zapato blanco']) - - submit = SubmitField('Agregar') - - class LoginForm(FlaskForm): - username = StringField('Usuario', validators=[DataRequired()]) - pwd = PasswordField('Tu clave', validators=[DataRequired()]) - submit = SubmitField('Entrar') - - def Unique(model, field, message=None): - def _unique(form, field_data): - if mongo.db[model.__name__.lower()].find_one({field.name: field_data.data}): - raise ValidationError(message or f"{field.name} must be unique.") - return _unique - - class RegistrationForm(FlaskForm): - username = StringField('Nombre de usuarix', validators=[DataRequired(), Unique('users', StringField('username', message="Este usuario ya existe"))]) - pwd = PasswordField('Clave', validators=[DataRequired(), Length(min=10), Unique('users', StringField('pwd', message="Esta clave no es muy buena, escoge otra"))]) - referral = StringField('ID de quien te invito', [DataRequired()]) - submit = SubmitField('Registrar') - - def allowed_file(filename): - return '.' in filename and filename.rsplit('.', 1)[1].lower() in app.config['ALLOWED_EXTENSIONS'] - """ + @app.route('/', methods=['GET', 'POST']) def index(): if request.method == 'GET': diff --git a/forms.py b/forms.py index 383df0c..3bcc9ff 100644 --- a/forms.py +++ b/forms.py @@ -47,10 +47,10 @@ def Unique(model, field, message=None): return _unique class RegistrationForm(FlaskForm): - username = StringField('Nombre de usuarix', validators=[DataRequired(), Unique('users', StringField('username', message="Este usuario ya existe"))]) - pwd = PasswordField('Clave', validators=[DataRequired(), Length(min=10), Unique('users', StringField('pwd', message="Esta clave no es muy buena, escoge otra"))]) - referral = StringField('ID de quien te invito', [DataRequired()]) - submit = SubmitField('Registrar') + username = StringField('Nombre de usuarix', validators=[DataRequired(), Unique('users', StringField('username', message="Este usuario ya existe"))]) + pwd = PasswordField('Clave', validators=[DataRequired(), Length(min=10), Unique('users', StringField('pwd', message="Esta clave no es muy buena, escoge otra"))]) + referral = StringField('ID de quien te invito', [DataRequired()]) + submit = SubmitField('Registrar') #restrict allowed file types~