Events Manager (#159)

* Initializing Events_Manager for empty Pull Request

* proof of concept event manager

* fix ungrouped filter

* First things first, catch up to our modern practices (mostly)

* Experimental, probably not the final idea

* Changelog

* wip, but looking a lot better

* Delegate the searching down into the actual paginated bits, which fixes everything

* Adjustments

* Rework basically the whole thing to look and work nicer

* more better

* Get The buttons properly opening the events

* Not open by default --BETA

* Initial implementation of a new alpinized event list

* wip

* wip, but working

* Sorting sorted

* Cleaning house

* SortableJS is GOAT

* Cleaned up event manager implementation click events, fixed viewing event

* Whatever it is, it's better than what we had before

* Release ready!? --BETA

* Provide and use way to use the ID property of an event to open the modal

* Same for editing event --BETA

* Don't open this by default

* Fix issues

* Various little mobile improvements

* Hide filters on mobile

* Bunch of mobile improvements

* Undebug it --BETA

* Print visibility toggling

* Evaluate save button after any changes

* Update these triggers to look for `event_id`

* Removed unused code

* Fix access token creation

* Rerender calendar

* Naming consistency

* Remove unnecessary property

* Add event and cancel buttons at the bottom of the window

* Responsive work

* remove debugging flags

* Fix delete to use absolute ID instead of index

* opacity

* shorten highlight length

* Undebug it

---------

Co-authored-by: Haxxer <[email protected]>

Author: V13Axel

.php-version

@@ -0,0 +1 @@
+8.1

database/migrations/2023_12_11_043904_add_expires_at_column_to_personal_access_tokens_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('personal_access_tokens', function (Blueprint $table) {
+            $table->timestamp('expires_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('personal_access_tokens', function (Blueprint $table) {
+            //
+        });
+    }
+};

package-lock.json

@@ -56,6 +56,7 @@
         "serverless-s3-sync": "^1.14.4",
         "simplebar": "^6.2.4",
         "sortable": "^2.0.0",
+        "sortablejs": "^1.15.0",
         "sweetalert": "^2.1.2",
         "sweetalert2": "^9.17.4",
         "tailwindcss": "^3.2.4",

package.json

@@ -262,11 +262,12 @@
 * Fixed - Calendar export being broken on some calendars
 
 ### 2.0.14 - Time-traveling Efreet
-#### January 23, 2021
+#### January 28, 2021
 * Tweaked - Cycle condition dropdown now includes which cycle family the condition is point to
 * Tweaked - Enable season day color will now generate a new set of colors and sequence them properly
 * Fixed - Events landing on intercalary leap days that happen at the end of a month not appearing
 * Fixed - Nesting normal event groups inside of number event groups caused events to appear when they shouldn't
+* Updated - Dependency updates for security
 
 ### 2.0.13 - Squashing Efreet
 #### January 18, 2021

public/changelog.md

@@ -13,6 +13,7 @@ window.Perms = require('./perms');
 window.RenderDataGenerator = require('./render-data-generator')
 window.CalendarRenderer = require('./calendar-renderer')
 window.CalendarLayouts = require('./calendar-layouts')
+window.EventsManager = require('./events-manager')
 window.CalendarEventEditor = require('./calendar-events-editor')
 window.CalendarEventViewer = require('./calendar-events-viewer')
 window.CalendarHTMLEditor = require('./calendar-html-editor')
@@ -21,3 +22,6 @@ window.CalendarYearHeader = require('./calendar-year-header')
 // Calendar specific modules
 import IntervalsCollection from "./fantasycalendar/Collections/IntervalsCollection.js";
 window.IntervalsCollection = IntervalsCollection;
+
+import Sortable from 'sortablejs';
+window.Sortable = Sortable;

resources/js/app.js

@@ -351,7 +351,13 @@ const calendar_events_editor = {
 
 		this.creation_type = "Editing Event"
 
-		this.event_id = $event.detail.event_id;
+        let event_index = $event.detail.event_id;
+
+        if ($event.detail.event_db_id !== undefined) {
+            event_index = events.findIndex((item) => item.id === $event.detail.event_db_id);
+        }
+
+		this.event_id = event_index;
 
 		this.working_event = clone(events[this.event_id]);
 
@@ -384,9 +390,7 @@ const calendar_events_editor = {
 		let not_view_page = window.location.pathname.indexOf('/edit') > -1 || window.location.pathname.indexOf('/calendars/create') > -1;
 
 		if (not_view_page) {
-			if (this.new_event) {
-				add_event_to_sortable(events_sortable, this.event_id, events[this.event_id]);
-			} else {
+			if (!this.new_event) {
 				$(`.events_input[index="${this.event_id}"]`).find(".event_name").text(`Edit - ${sanitizeHtml(events[this.event_id].name)}`);
 			}
 
@@ -400,6 +404,8 @@ const calendar_events_editor = {
 			}
 		}
 
+    window.dispatchEvent(new CustomEvent("events-changed"));
+
 		this.close();
 
 	},
@@ -556,12 +562,12 @@ const calendar_events_editor = {
 				icon: "warning",
 			}).then((result) => {
 				if (!result.dismiss) {
-					window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { id: this.event_id, era: false, epoch: this.epoch } }));
+					window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { event_id: this.event_id, era: false, epoch: this.epoch } }));
 					this.close();
 				}
 			});
 		} else {
-			window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { id: this.event_id, era: false, epoch: this.epoch } }));
+			window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { event_id: this.event_id, era: false, epoch: this.epoch } }));
 			this.close();
 		}
 
@@ -2213,10 +2219,12 @@ const calendar_events_editor = {
 
 	confirm_delete_event($event) {
 
-		let event_editor_ui = this;
-
 		let delete_event_id = $event.detail.event_id;
 
+        if ($event.detail.event_db_id !== undefined) {
+            delete_event_id = events.findIndex((item) => item.id === $event.detail.event_db_id);
+        }
+
 		let warnings = [];
 
 		for (let eventId = 0; eventId < events.length; eventId++) {
@@ -2268,26 +2276,21 @@ const calendar_events_editor = {
 
 				if (!result.dismiss) {
 
-					if ($('#events_sortable').length) {
-
-						this.delete_event(delete_event_id);
+                    let not_view_page = window.location.pathname.indexOf('/edit') > -1 || window.location.pathname.indexOf('/calendars/create') > -1;
 
-						events_sortable.children(`[index='${delete_event_id}']`).remove();
+					if (not_view_page) {
 
-						events_sortable.children().each(function(i) {
-							events[i].sort_by = i;
-							$(this).attr('index', i);
-						});
+						this.delete_event(delete_event_id);
 
 						evaluate_save_button();
 
 					} else {
 
 						let event_id = events[delete_event_id].id;
 
-						submit_delete_event(event_id, function() {
-							event_editor_ui.delete_event(delete_event_id);
-						});
+						submit_delete_event(event_id, () => {
+							this.delete_event(delete_event_id);
+						})
 
 					}
 
@@ -2303,10 +2306,11 @@ const calendar_events_editor = {
 
         for (let eventId = 0; eventId < events.length; eventId++) {
 			if (events[eventId].data.connected_events !== undefined) {
-				for (let connectedId of events[eventId].data.connected_events) {
-					let number = Number(connectedId)
-					if (number > delete_event_id) {
-						events[eventId].data.connected_events[connectedId] = String(number - 1)
+                const connectedEvents = events[eventId].data.connected_events;
+				for (let connectedIndex = 0; connectedIndex < connectedEvents.length; connectedIndex++) {
+                    let connectedIdNumber = Number(connectedEvents[connectedIndex])
+					if (connectedIdNumber > delete_event_id) {
+						events[eventId].data.connected_events[connectedIndex] = connectedIdNumber - 1;
 					}
 				}
 			}
@@ -2318,6 +2322,8 @@ const calendar_events_editor = {
 
 		rerender_calendar();
 
+        window.dispatchEvent(new CustomEvent("events-changed"));
+
 	},
 
 	build_seasons: false,

resources/js/calendar-events-editor.js

@@ -23,9 +23,14 @@ const calendar_events_viewer = {
 	},
 
 	view_event($event){
+        let event_index = $event.detail.event_id;
 
-		this.id = $event.detail.id;
-		this.era = $event.detail.era;
+        if ($event.detail.event_db_id !== undefined) {
+            event_index = events.findIndex((item) => item.id === $event.detail.event_db_id);
+        }
+
+		this.id = event_index;
+		this.era = $event.detail.era ?? false;
 		this.epoch = $event.detail.epoch;
 
 		if(this.era){

resources/js/calendar-events-viewer.js

@@ -94,12 +94,12 @@ const calendar_html_editor = {
 				icon: "warning",
 			}).then((result) => {
 				if (!result.dismiss) {
-					window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { id: this.era_id, era: true } }));
+					window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { event_id: this.era_id, era: true } }));
 					this.close();
 				}
 			});
 		} else {
-			window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { id: this.era_id, era: true } }));
+			window.dispatchEvent(new CustomEvent('event-viewer-modal-view-event', { detail: { event_id: this.era_id, era: true } }));
 			this.close();
 		}
 

resources/js/calendar-html-editor.js

@@ -1704,3 +1704,4 @@ function has_year_ending_era(static_data, year){
 }
 
 
+