prep for pr

This commit is contained in:
mitch 2021-04-11 21:43:02 -04:00 committed by Mitch Ross
parent 13fb9b2d0a
commit 4f56b9325f
3 changed files with 5 additions and 7 deletions

View File

@ -58,6 +58,5 @@ RUN chmod +x /run.sh
EXPOSE 5000 EXPOSE 5000
EXPOSE 1935 EXPOSE 1935
EXPOSE 5678
CMD ["/run.sh"] CMD ["/run.sh"]

View File

@ -191,7 +191,8 @@ def delete_event(id):
try: try:
event = Event.get(Event.id == id) event = Event.get(Event.id == id)
except DoesNotExist: except DoesNotExist:
return "Event not found", 404 return make_response(jsonify({"success": False, "message": "Event" + id + " not found"}),404)
media_name = f"{event.camera}-{event.id}" media_name = f"{event.camera}-{event.id}"
if event.has_snapshot: if event.has_snapshot:
@ -202,8 +203,10 @@ def delete_event(id):
media.unlink(missing_ok=True) media.unlink(missing_ok=True)
event.delete_instance() event.delete_instance()
return make_response(jsonify({"success": True, "message": "Event" + id + " deleted"}),204)
return '', 204
@bp.route('/events/<id>/thumbnail.jpg') @bp.route('/events/<id>/thumbnail.jpg')
def event_thumbnail(id): def event_thumbnail(id):

View File

@ -31,13 +31,9 @@ export default function Event({ eventId }) {
setDeleteStatus(FetchStatus.LOADING); setDeleteStatus(FetchStatus.LOADING);
let success; let success;
try { try {
debugger;
const response = await fetch(`${apiHost}/api/events/${eventId}`, { method: 'DELETE' }); const response = await fetch(`${apiHost}/api/events/${eventId}`, { method: 'DELETE' });
debugger;
const deleteEvent = await getJSON(response) const deleteEvent = await getJSON(response)
debugger;
success = deleteEvent.success; success = deleteEvent.success;
debugger;
setDeleteStatus(success ? FetchStatus.LOADED : FetchStatus.ERROR); setDeleteStatus(success ? FetchStatus.LOADED : FetchStatus.ERROR);
setDeleteMessage(deleteEvent.message); setDeleteMessage(deleteEvent.message);
} catch (e) { } catch (e) {