mirror of
https://github.com/logos-co/open-law.git
synced 2025-01-26 14:48:49 +00:00
user delete works (waiting for customer description)
This commit is contained in:
parent
a0591386b2
commit
a2e9d0dd4d
File diff suppressed because one or more lines are too long
142830
app/static/js/main.js
142830
app/static/js/main.js
File diff suppressed because one or more lines are too long
20
app/templates/user/delete_profile_modal.html
Normal file
20
app/templates/user/delete_profile_modal.html
Normal file
@ -0,0 +1,20 @@
|
||||
<!-- prettier-ignore-->
|
||||
<div id="delete_profile_modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-50 hidden w-full p-4 overflow-x-hidden overflow-y-auto md:inset-0 h-[calc(100%-1rem)] max-h-full">
|
||||
<div class="relative w-full max-w-2xl max-h-full">
|
||||
<!-- Modal content -->
|
||||
<form action="{{ url_for('user.profile_delete') }}" method="post" class="relative bg-white rounded-lg shadow dark:bg-gray-700">
|
||||
{{ form_hidden_tag() }}
|
||||
<!-- Modal header -->
|
||||
<div class="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
|
||||
<h3 class="text-xl font-semibold text-gray-900 dark:text-white"> Delete profile </h3>
|
||||
<button id="modalAddCloseButton" data-modal-hide="delete_profile_modal" type="button" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"> <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path> </svg> </button>
|
||||
</div>
|
||||
<!-- Modal body -->
|
||||
|
||||
<!-- Modal footer -->
|
||||
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
|
||||
<button name="submit" type="submit" class="text-white bg-red-700 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-800">Confirm Deletion</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
@ -1,5 +1,6 @@
|
||||
<!-- prettier-ignore -->
|
||||
{% extends 'base.html' %}
|
||||
{% include 'user/delete_profile_modal.html' %}
|
||||
{% block content %}
|
||||
<!-- component -->
|
||||
<section>
|
||||
@ -7,8 +8,20 @@
|
||||
<div>
|
||||
<!-- prettier-ignore -->
|
||||
<div class="w-full lg:max-w-xl p-6 space-y-8 sm:p-8 bg-white rounded-lg shadow-xl dark:bg-gray-800">
|
||||
{% if current_user.is_activated %}
|
||||
<!-- prettier-ignore -->
|
||||
<h2 class="text-2xl font-bold text-gray-900 dark:text-white">Edit your profile</h2>
|
||||
{% endif %}
|
||||
{% if not current_user.is_activated %}
|
||||
<!-- prettier-ignore -->
|
||||
<h2 class="text-2xl font-bold text-gray-900 dark:text-white">Create your profile</h2>
|
||||
{% endif %}
|
||||
|
||||
<div>
|
||||
<!-- prettier-ignore -->
|
||||
<label class='block mb-2 text-sm font-medium text-gray-900 dark:text-white'>Account</label>
|
||||
<input type="text" class='bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500' autocomplete="off" onCopy="return false" readonly value="{{current_user.wallet_id}}">
|
||||
</div>
|
||||
|
||||
<!-- prettier-ignore -->
|
||||
<form class="mt-8 space-y-6 from" role="form" action="{{ url_for('user.profile') }}" method="post" enctype="multipart/form-data">
|
||||
@ -19,13 +32,23 @@
|
||||
{{form.name(autocomplete="off", class='bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500')}}
|
||||
</div>
|
||||
<!-- prettier-ignore -->
|
||||
<div class="mb-3">
|
||||
{{form.avatar_img.label(class='block mb-2 text-sm font-medium text-gray-900 dark:text-white')}}
|
||||
{{form.avatar_img.label(class='block mb-2 text-sm font-medium text-gray-900 dark:text-white')}}
|
||||
<div class="flex items-center mb-3">
|
||||
<div>
|
||||
{% if current_user.avatar_img %}
|
||||
<img class=" w-14 h-14 rounded-full mr-3" src="data:image/jpeg;base64,{{ current_user.avatar_img }}" alt="user avatar">
|
||||
{% else %}
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 56 56" stroke-width="1.5" stroke="currentColor" class="w-14 h-14"> <path stroke-linecap="round" stroke-linejoin="round" d="M17.982 18.725A7.488 7.488 0 0012 15.75a7.488 7.488 0 00-5.982 2.975m11.963 0a9 9 0 10-11.963 0m11.963 0A8.966 8.966 0 0112 21a8.966 8.966 0 01-5.982-2.275M15 9.75a3 3 0 11-6 0 3 3 0 016 0z" /> </svg>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div>
|
||||
|
||||
{{form.avatar_img(type='file', class='bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500', id="avatar_img",
|
||||
value=current_user.avatar_img if current_user.avatar_img else "")}}
|
||||
value=current_user.avatar_img if current_user.avatar_img else "")}}</div>
|
||||
</div>
|
||||
<button type="submit" class="w-full px-5 py-3 text-base font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 sm:w-auto dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Save changes</button>
|
||||
</form>
|
||||
<button type="button" data-modal-target="delete_profile_modal" data-modal-toggle="delete_profile_modal" class="text-red-700 hover:text-white border border-red-700 hover:bg-red-800 focus:ring-4 focus:outline-none focus:ring-red-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center mr-2 mb-2 dark:border-red-500 dark:text-red-500 dark:hover:text-white dark:hover:bg-red-600 dark:focus:ring-red-900">Delete you profile</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,7 +1,7 @@
|
||||
import base64
|
||||
|
||||
from flask import Blueprint, render_template, request, flash, redirect, url_for, jsonify
|
||||
from flask_login import login_required, current_user
|
||||
from flask_login import login_required, current_user, logout_user
|
||||
from app.controllers import create_pagination
|
||||
from sqlalchemy import not_
|
||||
|
||||
@ -98,20 +98,16 @@ def create():
|
||||
return redirect(url_for("user.get_all"))
|
||||
|
||||
|
||||
@bp.route("/delete/<id>", methods=["DELETE"])
|
||||
@bp.route("/profile_delete", methods=["POST"])
|
||||
@login_required
|
||||
def delete(id):
|
||||
u = m.User.query.filter_by(id=id).first()
|
||||
if not u:
|
||||
log(log.INFO, "There is no user with id: [%s]", id)
|
||||
flash("There is no such user", "danger")
|
||||
return "no user", 404
|
||||
|
||||
db.session.delete(u)
|
||||
db.session.commit()
|
||||
log(log.INFO, "User deleted. User: [%s]", u)
|
||||
def profile_delete():
|
||||
user: m.User = db.session.get(m.User, current_user.id)
|
||||
logout_user()
|
||||
user.is_deleted = True
|
||||
user.save()
|
||||
log(log.INFO, "User deleted. User: [%s]", user)
|
||||
flash("User deleted!", "success")
|
||||
return "ok", 200
|
||||
return redirect(url_for("home.get_all"))
|
||||
|
||||
|
||||
@bp.route("/search", methods=["GET"])
|
||||
|
Loading…
x
Reference in New Issue
Block a user