add user management
This commit is contained in:
128
app.py
128
app.py
@@ -23,12 +23,21 @@ class User(UserMixin, db.Model):
|
||||
username = db.Column(db.String(80), unique=True, nullable=False)
|
||||
password_hash = db.Column(db.String(120), nullable=False)
|
||||
is_admin = db.Column(db.Boolean, default=False)
|
||||
can_add_recipes = db.Column(db.Boolean, default=False)
|
||||
recipes = db.relationship('Recipe', backref='author', lazy=True)
|
||||
|
||||
def set_password(self, password):
|
||||
self.password_hash = generate_password_hash(password)
|
||||
|
||||
def check_password(self, password):
|
||||
return check_password_hash(self.password_hash, password)
|
||||
|
||||
class Recipe(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
title = db.Column(db.String(200), nullable=False)
|
||||
title = db.Column(db.String(100), nullable=False)
|
||||
ingredients = db.Column(db.Text, nullable=False)
|
||||
instructions = db.Column(db.Text, nullable=False)
|
||||
user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=True)
|
||||
|
||||
@login_manager.user_loader
|
||||
def load_user(user_id):
|
||||
@@ -54,19 +63,25 @@ def recipe_detail(recipe_id):
|
||||
recipe = Recipe.query.get_or_404(recipe_id)
|
||||
return render_template('recipe_detail.html', recipe=recipe)
|
||||
|
||||
@app.route('/admin', methods=['GET'])
|
||||
@app.route('/admin')
|
||||
@login_required
|
||||
def admin():
|
||||
if not current_user.is_admin:
|
||||
if not current_user.is_admin and not current_user.can_add_recipes:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
recipes = Recipe.query.all()
|
||||
|
||||
# Admin sees all recipes, others see only their own
|
||||
if current_user.is_admin:
|
||||
recipes = Recipe.query.all()
|
||||
else:
|
||||
recipes = Recipe.query.filter_by(user_id=current_user.id).all()
|
||||
|
||||
return render_template('admin.html', recipes=recipes)
|
||||
|
||||
@app.route('/admin/recipe/add', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def add_recipe():
|
||||
if not current_user.is_admin:
|
||||
if not current_user.is_admin and not current_user.can_add_recipes:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
@@ -74,23 +89,29 @@ def add_recipe():
|
||||
recipe = Recipe(
|
||||
title=request.form['title'],
|
||||
ingredients=request.form['ingredients'],
|
||||
instructions=request.form['instructions']
|
||||
instructions=request.form['instructions'],
|
||||
user_id=current_user.id
|
||||
)
|
||||
db.session.add(recipe)
|
||||
db.session.commit()
|
||||
flash('Recipe added successfully!')
|
||||
return redirect(url_for('admin'))
|
||||
|
||||
return render_template('recipe_form.html')
|
||||
return render_template('add_recipe.html')
|
||||
|
||||
@app.route('/admin/recipe/edit/<int:recipe_id>', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def edit_recipe(recipe_id):
|
||||
if not current_user.is_admin:
|
||||
if not current_user.is_admin and not current_user.can_add_recipes:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
recipe = Recipe.query.get_or_404(recipe_id)
|
||||
|
||||
# Only allow editing if admin or if user created the recipe
|
||||
if not current_user.is_admin and recipe.user_id != current_user.id:
|
||||
flash('You can only edit your own recipes.')
|
||||
return redirect(url_for('admin'))
|
||||
|
||||
if request.method == 'POST':
|
||||
recipe.title = request.form['title']
|
||||
recipe.ingredients = request.form['ingredients']
|
||||
@@ -98,22 +119,97 @@ def edit_recipe(recipe_id):
|
||||
db.session.commit()
|
||||
flash('Recipe updated successfully!')
|
||||
return redirect(url_for('admin'))
|
||||
|
||||
return render_template('recipe_form.html', recipe=recipe)
|
||||
return render_template('edit_recipe.html', recipe=recipe)
|
||||
|
||||
@app.route('/admin/recipe/delete/<int:recipe_id>')
|
||||
@login_required
|
||||
def delete_recipe(recipe_id):
|
||||
if not current_user.is_admin:
|
||||
if not current_user.is_admin and not current_user.can_add_recipes:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
recipe = Recipe.query.get_or_404(recipe_id)
|
||||
|
||||
# Only allow deletion if admin or if user created the recipe
|
||||
if not current_user.is_admin and recipe.user_id != current_user.id:
|
||||
flash('You can only delete your own recipes.')
|
||||
return redirect(url_for('admin'))
|
||||
|
||||
db.session.delete(recipe)
|
||||
db.session.commit()
|
||||
flash('Recipe deleted successfully!')
|
||||
return redirect(url_for('admin'))
|
||||
|
||||
@app.route('/users')
|
||||
@login_required
|
||||
def list_users():
|
||||
if not current_user.is_admin:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
users = User.query.all()
|
||||
return render_template('users.html', users=users)
|
||||
|
||||
@app.route('/users/add', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def add_user():
|
||||
if not current_user.is_admin:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
if request.method == 'POST':
|
||||
username = request.form.get('username')
|
||||
password = request.form.get('password')
|
||||
can_add_recipes = 'can_add_recipes' in request.form
|
||||
|
||||
if User.query.filter_by(username=username).first():
|
||||
flash('Username already exists.')
|
||||
return redirect(url_for('add_user'))
|
||||
|
||||
user = User(username=username, can_add_recipes=can_add_recipes)
|
||||
user.set_password(password)
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
flash('User added successfully.')
|
||||
return redirect(url_for('list_users'))
|
||||
|
||||
return render_template('add_user.html')
|
||||
|
||||
@app.route('/users/<int:id>/edit', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def edit_user(id):
|
||||
if not current_user.is_admin:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
user = User.query.get_or_404(id)
|
||||
if request.method == 'POST':
|
||||
user.username = request.form.get('username')
|
||||
if request.form.get('password'):
|
||||
user.set_password(request.form.get('password'))
|
||||
user.can_add_recipes = 'can_add_recipes' in request.form
|
||||
db.session.commit()
|
||||
flash('User updated successfully.')
|
||||
return redirect(url_for('list_users'))
|
||||
|
||||
return render_template('edit_user.html', user=user)
|
||||
|
||||
@app.route('/users/<int:id>/delete', methods=['POST'])
|
||||
@login_required
|
||||
def delete_user(id):
|
||||
if not current_user.is_admin:
|
||||
flash('Access denied.')
|
||||
return redirect(url_for('index'))
|
||||
|
||||
user = User.query.get_or_404(id)
|
||||
if user.is_admin:
|
||||
flash('Cannot delete admin user.')
|
||||
return redirect(url_for('list_users'))
|
||||
|
||||
db.session.delete(user)
|
||||
db.session.commit()
|
||||
flash('User deleted successfully.')
|
||||
return redirect(url_for('list_users'))
|
||||
|
||||
# HTMX Endpoints
|
||||
@app.route('/recipes/search')
|
||||
def search_recipes():
|
||||
@@ -127,7 +223,7 @@ def search_recipes():
|
||||
@app.route('/recipe/<int:recipe_id>/delete', methods=['DELETE'])
|
||||
@login_required
|
||||
def delete_recipe_htmx(recipe_id):
|
||||
if not current_user.is_admin:
|
||||
if not current_user.is_admin and not current_user.can_add_recipes:
|
||||
return 'Unauthorized', 403
|
||||
|
||||
recipe = Recipe.query.get_or_404(recipe_id)
|
||||
@@ -143,9 +239,11 @@ def health_check():
|
||||
def login():
|
||||
if request.method == 'POST':
|
||||
user = User.query.filter_by(username=request.form['username']).first()
|
||||
if user and check_password_hash(user.password_hash, request.form['password']):
|
||||
if user and user.check_password(request.form['password']):
|
||||
login_user(user)
|
||||
return redirect(url_for('admin'))
|
||||
if user.is_admin or user.can_add_recipes:
|
||||
return redirect(url_for('admin'))
|
||||
return redirect(url_for('index'))
|
||||
flash('Invalid username or password')
|
||||
return render_template('login.html')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user