@necrolab/dashboard 0.4.213 → 0.4.215

package/backend/api.js

@@ -136,7 +136,7 @@ app.ws("/api/updates", async function (ws, req) {
             pushWSUpdate({ event: "startup", message: "Starting Bot", user: currentUser.name });
             await utils.sleep(750);
 
-            pushWSUpdate({ event: "startup", done: true, user: currentUser.name });
+            pushWSUpdate({ event: "startup", done: true, user: currentUser.name, version: "1.0" });
             ws.send(
                 JSON.stringify([
                     { event: "set-button-disabled", button: "add-tasks", value: false },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@necrolab/dashboard",
-    "version": "0.4.213",
+    "version": "0.4.215",
     "scripts": {
         "build": "npx workbox-cli generateSW workbox-config.js && vite build",
         "dev": "vite",

package/src/components/Tasks/QuickSettings.vue

@@ -49,7 +49,11 @@
             />
         </div>
         <div class="flex mt-5 justify-between flex-row items-center">
-            <span class="text-light-400 text-sm">v{{ version }}</span>
+            <div>
+                <p class="text-light-400 text-sm">Dashboard: v{{ version }}</p>
+                <p class="text-light-400 text-sm">Bot: v{{ ui.botVersion }}</p>
+            </div>
+
             <div class="flex gap-5">
                 <button
                     class="button-default hover:opacity-70 active:opacity-50 bg-dark-400 w-24 text-xs flex items-center justify-center gap-x-2"

package/src/components/ui/Navbar.vue

@@ -98,9 +98,15 @@
                     <!-- <div class="w-10 h-10 rounded-full bg-light-300"></div> -->
                     <img :src="ui.profile?.profilePicture" alt="" class="h-10 w-10 rounded-full" />
                 </div>
-                <span class="bg-dark-500 rounded-full text-sm shadow-lg p-2 px-3 text-light-400 mx-auto mt-6 mb-14"
-                    >v{{ version }}</span
-                >
+
+                <div class="mx-auto mt-6 mb-14 flex gap-3">
+                    <span class="bg-dark-500 rounded-full text-sm shadow-lg p-2 px-3 text-light-400"
+                        >Dashboard: v{{ dashVersion }}</span
+                    >
+                    <span class="bg-dark-500 rounded-full text-sm shadow-lg p-2 px-3 text-light-400"
+                        >Bot: v{{ ui.botVersion }}</span
+                    >
+                </div>
             </div>
         </transition>
     </div>
@@ -175,7 +181,7 @@ window.matchMedia("(orientation: portrait)").addEventListener("change", (e) => {
     else landscapeIos.value = false;
 });
 
-const version = __APP_VERSION__;
+const dashVersion = __APP_VERSION__;
 const ui = useUIStore();
 const menuOpen = storeToRefs(ui).menuOpen;
 const toggleMenu = () => {

package/src/libs/Filter.js

@@ -8,23 +8,13 @@ const colors = {
     UNSELECTABLE: "#311432"
 };
 
-const BASE_CSS =
-    `path[row]:hover {stroke: ${colors.HIGHLIGHT};pointer-events:all;cursor:pointer;}` +
-    `path[generaladmission]:hover {fill: ${colors.HIGHLIGHT};pointer-events:all;cursor:pointer;}`;
+const BASE_CSS = `path[generaladmission]:hover {fill: ${colors.HIGHLIGHT};pointer-events:all;cursor:pointer;}`;
 
 const isWheelchair = (p) => {
     if (p.row === "W" || p.sectionName === "W") return false;
     return [("W", "ADA")].some((part) => p.row !== "W" && (p.row?.includes(part) || p.sectionName?.includes(part)));
 };
 
-const getWheelChairRows = () => {
-    const rows = [...document.querySelectorAll("path[row]")];
-    return rows
-        .map((p) => {
-            return { row: p.attributes.row.nodeValue, sectionName: p.attributes.sectionname.nodeValue };
-        })
-        .filter(isWheelchair);
-};
 const sortAlphaNum = (a, b) => {
     var reA = /[^a-zA-Z]/g;
     var reN = /[^0-9]/g;
@@ -100,25 +90,6 @@ const cleanupFilter = (f) => {
     return ret;
 };
 
-const getFirstRows = (rows) => {
-    const firstRows = {};
-    const parsedRows = rows.map((row) => {
-        return { sec: row.attributes.sectionname.nodeValue, row: row.attributes.row.nodeValue };
-    });
-    // log("getFirstRows: parsedRows=", parsedRows);
-    parsedRows.forEach((row) => {
-        if (!firstRows[row.sec]) firstRows[row.sec] = [];
-        firstRows[row.sec].push(row.row);
-    });
-    // log("A getFirstRows: firstRows=", firstRows);
-    Object.entries(firstRows).forEach(([sec, rows]) => {
-        log(`sort:`, sec, rows);
-        firstRows[sec] = rows.sort(sortAlphaNum);
-    });
-    // log("B getFirstRows: firstRows=", firstRows);
-    return firstRows;
-};
-
 const getSectionNameMapping = () => {
     const sectionRealName = {};
     [...document.querySelectorAll("tspan")].forEach((t) => {
@@ -131,15 +102,6 @@ const getSectionNameMapping = () => {
     return sectionRealName;
 };
 
-// const getFloorSections = () => {
-//     const tspans = [...document.querySelectorAll("tspan")];
-//     const blacklist = ["BL", "BARSTOOLS", "BW", "NL"];
-//     return tspans
-//         .map((t) => t.attributes.section.nodeValue)
-//         .filter((t) => t.match(/^[a-zA-Z]+\s?[\w\d]?$/))
-//         .filter((name) => !blacklist.some((b) => name.includes(b)));
-// };
-
 export default class FilterBuilder {
     constructor() {
         this.filters = [];
@@ -157,7 +119,6 @@ export default class FilterBuilder {
             CATCH_ALL_GA: 1,
             NORMAL: 2,
             NORMAL_FIRSTROW: 3,
-            GLOBAL_FIRSTROW: 4,
             CATCH_ALL_FLOOR: 5
         };
 
@@ -194,24 +155,72 @@ export default class FilterBuilder {
         if (filter.buyAny) return this.filterTypes.CATCH_ALL;
         else if (filter.floor) return this.filterTypes.CATCH_ALL_FLOOR;
         else if (filter.generalAdmission) return this.filterTypes.CATCH_ALL_GA;
-        // else if (!!filter.section && filter.firstRow) return this.filterTypes.NORMAL_FIRSTROW;
-        // else if (!filter.section && filter.firstRow) return this.filterTypes.GLOBAL_FIRSTROW;
         else if (filter.section) return this.filterTypes.NORMAL;
         else return this.filterTypes.INVALID;
     }
 
+    addRowHandlers() {
+        for (let i = 0; i < this.rows.length; i++) {
+            const row = this.rows[i];
+            row.onclick = () => {
+                const parsed = {
+                    section: row.attributes.sectionname.nodeValue,
+                    row: row.attributes.row.nodeValue,
+                    id: row.attributes.id.nodeValue
+                };
+                log(`Adding filter ${parsed.section}`);
+                const matchingFilter = this.filters.find(
+                    (f) =>
+                        this.isForCurrentEvent(f) &&
+                        f.section === parsed.section &&
+                        (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
+                );
+                if (matchingFilter) {
+                    log(`Filter for ${parsed.section}/${parsed.row} already exists (${matchingFilter.id})`);
+                    if (this.expandedFilter === matchingFilter.id) this.setExpandedFilter(null);
+                    else this.setExpandedFilter(matchingFilter.id);
+                    this.updateCss();
+                    return;
+                }
+
+                this.addFilter({
+                    section: parsed.section,
+                    event: this.currentEventId
+                });
+            };
+
+            row.onmouseover = () => {
+                const parsed = {
+                    section: row.attributes.sectionname.nodeValue,
+                    row: row.attributes.row.nodeValue,
+                    id: row.attributes.id.nodeValue
+                };
+                const matchingFilter = this.filters.find(
+                    (f) =>
+                        this.isForCurrentEvent(f) &&
+                        f.section === parsed.section &&
+                        (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
+                );
+                if (!matchingFilter) return;
+                if (Array.isArray(matchingFilter.rows))
+                    matchingFilter.rows.forEach((row) => this.highlight({ section: parsed.section, row: row }));
+                else this.highlight({ section: matchingFilter.section });
+            };
+            row.onmouseout = () => {
+                if (!this.isDragging) this.clearHighlight();
+            };
+        }
+    }
+
     reload(eventId) {
         const paths = document.querySelectorAll("path");
         this.rows = [...paths].filter((r) => r.id.startsWith("s_"));
 
         this.addLabelHandlers();
-        this.addRowHandlers();
         this.addGAHandlers();
+        this.addRowHandlers();
         this.currentEventId = eventId;
 
-        const wcRows = getWheelChairRows();
-        log("wcRows:", wcRows);
-        wcRows.forEach((r) => this.makeRowUnselectable(r.sectionName, r.row));
         this.updateCss();
     }
 
@@ -275,23 +284,6 @@ export default class FilterBuilder {
         this.updateCss();
     }
 
-    selectFirstRow() {
-        const paths = document.querySelectorAll("path");
-        const rows = [...paths].filter((r) => r.id.startsWith("s_"));
-        const firstRows = getFirstRows(rows);
-
-        Object.entries(firstRows).forEach(([sec, rows]) => {
-            if (this.filters.some((f) => f.section === sec && f.rows.includes(rows[0]) && this.isForCurrentEvent(f))) {
-                log(`Filter for ${sec}/${rows[0]} already exists`);
-                return;
-            }
-            if (this.isUnselectable(sec, rows[0])) return;
-            this.addFilter({ event: this.currentEventId, section: sec, rows: [rows[0]] });
-        });
-
-        this.updateCss();
-    }
-
     updateCss() {
         this.cssClasses = BASE_CSS;
         const gaSectionNameMapping = this.getSectionNameMapping();
@@ -442,62 +434,6 @@ export default class FilterBuilder {
         }
     }
 
-    addRowHandlers() {
-        for (let i = 0; i < this.rows.length; i++) {
-            const row = this.rows[i];
-            row.onclick = () => {
-                const parsed = {
-                    section: row.attributes.sectionname.nodeValue,
-                    row: row.attributes.row.nodeValue,
-                    id: row.attributes.id.nodeValue
-                };
-                log(`Adding filter ${parsed.section}/${parsed.row}`);
-                const matchingFilter = this.filters.find(
-                    (f) =>
-                        this.isForCurrentEvent(f) &&
-                        f.section === parsed.section &&
-                        (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
-                );
-                if (matchingFilter) {
-                    log(`Filter for ${parsed.section}/${parsed.row} already exists (${matchingFilter.id})`);
-                    if (this.expandedFilter === matchingFilter.id) this.setExpandedFilter(null);
-                    else this.setExpandedFilter(matchingFilter.id);
-                    this.updateCss();
-                    return;
-                }
-
-                if (this.isUnselectable(parsed.section, parsed.row)) return;
-
-                this.addFilter({
-                    section: parsed.section,
-                    rows: [parsed.row],
-                    event: this.currentEventId
-                });
-            };
-
-            row.onmouseover = () => {
-                const parsed = {
-                    section: row.attributes.sectionname.nodeValue,
-                    row: row.attributes.row.nodeValue,
-                    id: row.attributes.id.nodeValue
-                };
-                const matchingFilter = this.filters.find(
-                    (f) =>
-                        this.isForCurrentEvent(f) &&
-                        f.section === parsed.section &&
-                        (f.rows?.includes(parsed.row) || !Array.isArray(f.rows))
-                );
-                if (!matchingFilter) return;
-                if (Array.isArray(matchingFilter.rows))
-                    matchingFilter.rows.forEach((row) => this.highlight({ section: parsed.section, row: row }));
-                else this.highlight({ section: matchingFilter.section });
-            };
-            row.onmouseout = () => {
-                if (!this.isDragging) this.clearHighlight();
-            };
-        }
-    }
-
     deleteFilterById(id) {
         this.filters = this.filters.filter((f) => f.id !== id);
         // this.updateHooks = this.updateHooks.filter((i) => id !== i);
@@ -551,13 +487,4 @@ export default class FilterBuilder {
     clearHighlight() {
         this.temporaryCSS = "";
     }
-
-    makeRowUnselectable(section, row) {
-        log("adding unselectable:", section, row);
-        this.unselectable.push(`${section}/${row}`);
-    }
-
-    isUnselectable(section, row) {
-        return this.unselectable.includes(`${section}/${row}`);
-    }
 }

package/src/stores/connection.js

@@ -7,8 +7,10 @@ export class ConnectionHandler {
     handleWebsocketMessages(msg) {
         switch (msg.event) {
             case "startup":
-                if (msg.done) this.ui.hideSpinner();
-                else this.ui.startSpinner(msg.message || "Starting Bot");
+                if (msg.done) {
+                    this.ui.hideSpinner();
+                    this.ui.setBotVersion(msg.version || "-");
+                } else this.ui.startSpinner(msg.message || "Starting Bot");
                 break;
 
             case "stop-all":

package/src/stores/ui.js

@@ -26,6 +26,8 @@ export const useUIStore = defineStore("ui", () => {
     const tasks = ref({});
 
     const showSpinner = ref(false);
+    const botVersion = ref("-");
+
     const spinnerMessage = ref("");
 
     const profile = ref({
@@ -537,6 +539,10 @@ export const useUIStore = defineStore("ui", () => {
             showSpinner.value = false;
             enableScroll();
         },
+        setBotVersion: (version) => {
+            botVersion.value = version;
+        },
+        botVersion,
 
         spinnerMessage,
         showSpinner,

package/src/views/FilterBuilder.vue

@@ -48,13 +48,6 @@
                     </div>
                     <div class="col-span-2 mt-10">
                         <div class="flex justify-between mb-2 items-center text-white">
-                            <button
-                                @click="filterBuilder.selectFirstRow"
-                                class="border-2 rounded border-dark-550 px-1 h-8 w-full min-w-14 text-gray bg-dark-500 overflow-hidden smooth-hover"
-                            >
-                                First rows
-                            </button>
-
                             <div class="rounded flex justify-between gap-2 items-center" v-if="hasLoaded">
                                 <PriceSortToggle
                                     :current="filterBuilder.globalFilter.priceSort"
@@ -349,7 +342,6 @@ const updateShownVenue = async () => {
         return;
     }
 
-    debugger;
     renderer = rendererFactory.createRenderer(eventId.value, "", country);
     filterBuilder.value.highlightedSeatColor = renderer.c.highlightedSeatColor;
     renderer.c.logFullError = true;