1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 17:10:10 +00:00

activity: add delete button

This commit is contained in:
Harvey Tindall 2023-10-21 13:38:11 +01:00
parent 44172074b9
commit 3cad30a8e5
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
4 changed files with 45 additions and 11 deletions

View File

@ -155,3 +155,15 @@ func (app *appContext) GetActivities(gc *gin.Context) {
gc.JSON(200, resp) gc.JSON(200, resp)
} }
// @Summary Delete the activity with the given ID. No-op if non-existent, always succeeds.
// @Produce json
// @Param id path string true "ID of activity to delete"
// @Success 200 {object} boolResponse
// @Router /activity/{id} [delete]
// @Security Bearer
// @tags Activity
func (app *appContext) DeleteActivity(gc *gin.Context) {
app.storage.DeleteActivityKey(gc.Param("id"))
respondBool(200, true, gc)
}

View File

@ -167,6 +167,7 @@
"telegramVerified": "Telegram account verified.", "telegramVerified": "Telegram account verified.",
"accountConnected": "Account connected.", "accountConnected": "Account connected.",
"referralsEnabled": "Referrals enabled.", "referralsEnabled": "Referrals enabled.",
"activityDeleted": "Activity Deleted.",
"errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.", "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.",
"errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.", "errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.",
"errorSettingsFailed": "Application failed.", "errorSettingsFailed": "Application failed.",

View File

@ -233,6 +233,7 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
} }
api.POST(p+"/activity", app.GetActivities) api.POST(p+"/activity", app.GetActivities)
api.DELETE(p+"/activity/:id", app.DeleteActivity)
if userPageEnabled { if userPageEnabled {
user.GET("/details", app.MyDetails) user.GET("/details", app.MyDetails)

View File

@ -1,4 +1,4 @@
import { _post, toDateString } from "../modules/common.js"; import { _post, _delete, toDateString } from "../modules/common.js";
export interface activity { export interface activity {
id: string; id: string;
@ -28,6 +28,8 @@ var activityTypeMoods = {
var moodColours = ["~warning", "~neutral", "~urge"]; var moodColours = ["~warning", "~neutral", "~urge"];
export var activityReload = new CustomEvent("activity-reload");
export class Activity { // FIXME: Add "implements" export class Activity { // FIXME: Add "implements"
private _card: HTMLElement; private _card: HTMLElement;
private _title: HTMLElement; private _title: HTMLElement;
@ -37,6 +39,7 @@ export class Activity { // FIXME: Add "implements"
private _source: HTMLElement; private _source: HTMLElement;
private _referrer: HTMLElement; private _referrer: HTMLElement;
private _expiryTypeBadge: HTMLElement; private _expiryTypeBadge: HTMLElement;
private _delete: HTMLElement;
private _act: activity; private _act: activity;
_genUserText = (): string => { _genUserText = (): string => {
@ -66,16 +69,18 @@ export class Activity { // FIXME: Add "implements"
this._act.type = v; this._act.type = v;
let mood = activityTypeMoods[v]; // 1 = positive, 0 = neutral, -1 = negative let mood = activityTypeMoods[v]; // 1 = positive, 0 = neutral, -1 = negative
this._card.classList.remove("~warning"); for (let el of [this._card, this._delete]) {
this._card.classList.remove("~neutral"); el.classList.remove("~warning");
this._card.classList.remove("~urge"); el.classList.remove("~neutral");
el.classList.remove("~urge");
if (mood == -1) { if (mood == -1) {
this._card.classList.add("~warning"); el.classList.add("~warning");
} else if (mood == 0) { } else if (mood == 0) {
this._card.classList.add("~neutral"); el.classList.add("~neutral");
} else if (mood == 1) { } else if (mood == 1) {
this._card.classList.add("~urge"); el.classList.add("~urge");
}
} }
/* for (let i = 0; i < moodColours.length; i++) { /* for (let i = 0; i < moodColours.length; i++) {
@ -209,6 +214,9 @@ export class Activity { // FIXME: Add "implements"
<div> <div>
<span class="content activity-referrer"></span> <span class="content activity-referrer"></span>
</div> </div>
<div>
<button class="button @low hover:~critical rounded-full px-1 py-px activity-delete" aria-label="${window.lang.strings("delete")}"><i class="ri-close-line"></i></button>
</div>
</div> </div>
`; `;
@ -218,11 +226,14 @@ export class Activity { // FIXME: Add "implements"
this._source = this._card.querySelector(".activity-source"); this._source = this._card.querySelector(".activity-source");
this._referrer = this._card.querySelector(".activity-referrer"); this._referrer = this._card.querySelector(".activity-referrer");
this._expiryTypeBadge = this._card.querySelector(".activity-expiry-type"); this._expiryTypeBadge = this._card.querySelector(".activity-expiry-type");
this._delete = this._card.querySelector(".activity-delete");
document.addEventListener("timefmt-change", () => { document.addEventListener("timefmt-change", () => {
this.time = this.time; this.time = this.time;
}); });
this._delete.addEventListener("click", this.delete);
this.update(act); this.update(act);
} }
@ -237,6 +248,14 @@ export class Activity { // FIXME: Add "implements"
this.type = act.type; this.type = act.type;
} }
delete = () => _delete("/activity/" + this._act.id, null, (req: XMLHttpRequest) => {
if (req.readyState != 4) return;
if (req.status == 200) {
window.notifications.customSuccess("activityDeleted", window.lang.notif("activityDeleted"));
}
document.dispatchEvent(activityReload);
});
asElement = () => { return this._card; }; asElement = () => { return this._card; };
} }
@ -273,5 +292,6 @@ export class activityList {
constructor() { constructor() {
this._activityList = document.getElementById("activity-card-list"); this._activityList = document.getElementById("activity-card-list");
document.addEventListener("activity-reload", this.reload);
} }
} }