royrga/bachemap
1
0
Fork 0
forked from orson/bachemap
Code Pull Requests Activity

Code clean up on app and forms

Browse Source
This commit is contained in:
depress_ed 2024-10-06 18:12:31 -06:00
parent a3e9179954
commit c2f988b899
2 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app.py
View File

@ -1,15 +1,9 @@
from flask import Flask, render_template, request, redirect, url_for, flash, send_from_directory 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 flask_login import LoginManager, UserMixin, login_user, login_required, current_user, logout_user
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
#from datetime import datetime
#from flask_pymongo import ObjectId
import os import os
from uuid import uuid4 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 import requests
from config import Config from config import Config
from geopy.geocoders import Nominatim from geopy.geocoders import Nominatim
@ -25,51 +19,7 @@ def create_app(config=Config):
login_manager = LoginManager(app) login_manager = LoginManager(app)
login_manager.session_protection = "strong" 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']) @app.route('/', methods=['GET', 'POST'])
def index(): def index():
if request.method == 'GET': if request.method == 'GET':

8
forms.py
View File

@ -47,10 +47,10 @@ def Unique(model, field, message=None):
return _unique return _unique
class RegistrationForm(FlaskForm): class RegistrationForm(FlaskForm):
username = StringField('Nombre de usuarix', validators=[DataRequired(), Unique('users', StringField('username', message="Este usuario ya existe"))]) 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"))]) 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()]) referral = StringField('ID de quien te invito', [DataRequired()])
submit = SubmitField('Registrar') submit = SubmitField('Registrar')
#restrict allowed file types~ #restrict allowed file types~