@necrolab/dashboard 0.4.61 → 0.4.208

package/src/stores/ui.js

@@ -3,11 +3,11 @@ import { defineStore } from "pinia";
 import { ConnectionHandler } from "@/stores/connection.js";
 import { toast } from "vue3-toastify";
 import { createLogger } from "@/stores/logger";
-import { timeDifference, betterSort, sortTaskIds } from "@/stores/utils";
+import { timeDifference, sortAlphaNum } from "@/stores/utils";
 
 import mockTaskData from "@/stores/sampleData.js";
 import { useRouter } from "vue-router";
-import { DEBUG } from "@/utils/debug";
+const DEBUG = window.location.href.startsWith("http://localhost:5173");
 
 const ALL_SELECTED = 0;
 const SOME_SELECTED = 1;
@@ -26,13 +26,11 @@ export const useUIStore = defineStore("ui", () => {
     const tasks = ref({});
 
     const showSpinner = ref(false);
-    const botVersion = ref("0.0.0");
-
     const spinnerMessage = ref("");
 
     const profile = ref({
         profileTags: [],
-        tags: [],
+        accountTags: [],
         admin: false,
         name: ""
     });
@@ -103,48 +101,16 @@ export const useUIStore = defineStore("ui", () => {
         const t1 = new Date();
         for (const [key, value] of Object.entries(tasks.value)) {
             if (value.expirationTime)
-                tasks.value[key]._timeLeftString =
-                    value.expirationTime == "Invalid Date"
-                        ? "No Cartholds"
-                        : timeDifference(Date.parse(value.expirationTime), t1.getTime());
+                tasks.value[key]._timeLeftString = timeDifference(Date.parse(value.expirationTime), t1.getTime());
+            else if (value.noCartholds) tasks.value[key]._timeLeftString = "No Cartholds";
             else tasks.value[key]._timeLeftString = undefined;
         }
-
-        if (t1.getSeconds() % 10 === 0) {
-            const allIds = new Set(Object.keys(tasks.value));
-            const orderIds = new Set(taskIdOrder.value);
-
-            const missingIds = [...allIds].filter((id) => !orderIds.has(id));
-            const extraIds = [...orderIds].filter((id) => !allIds.has(id));
-
-            if (missingIds.length > 0 || extraIds.length > 0) {
-                taskIdOrder.value = taskIdOrder.value.filter((id) => allIds.has(id));
-
-                if (missingIds.length > 0) {
-                    missingIds.sort(sortTaskIds);
-                    for (const id of missingIds) {
-                        let pos = taskIdOrder.value.length;
-                        for (let i = 0; i < taskIdOrder.value.length; i++) {
-                            if (sortTaskIds(id, taskIdOrder.value[i]) < 0) {
-                                pos = i;
-                                break;
-                            }
-                        }
-                        taskIdOrder.value.splice(pos, 0, id);
-                    }
-                }
-            }
-        }
     }, 1000);
 
     connection.init("/api/updates?type=tasks");
 
     const pd = (e) => {
-        if (
-            !e.target.closest(".scrollable") &&
-            !e.target.closest(".dropdown-menu") &&
-            !e.target.closest(".option-list")
-        ) {
+        if (!e.target.closest(".scrollable")) {
             e.preventDefault();
         }
     };
@@ -234,21 +200,22 @@ export const useUIStore = defineStore("ui", () => {
 
         let relevantTasks = Object.values(tasks.value).filter((t) => t.siteId === currentCountry.value.siteId);
         if (currentEvent.value) relevantTasks = relevantTasks.filter((t) => t.eventId === currentEvent.value);
+        // logger.Info("mqm tasks:", relevantTasks);
+        const tasksInQueue = relevantTasks.filter((t) => t.status.includes(" - ETA:"));
 
-        queueStats.value.queued = relevantTasks.filter((t) => t.inQueue).length || 0;
+        queueStats.value.total = 0;
+        queueStats.value.queued =
+            tasksInQueue.length + relevantTasks.filter((t) => t.status?.toLowerCase()?.includes("queueit")).length || 0;
+        queueStats.value.show = queueStats.value.total > 0;
         const sleepingStatuses = ["sleeping in queue", "waiting for drop", "waiting for carting", "waiting for queue"];
         queueStats.value.sleeping = relevantTasks.filter((t) =>
             sleepingStatuses.includes(t.status.toLowerCase())
         ).length;
-        const positions = relevantTasks
-            .map((t) => t.queuePosition)
-            .filter((e) => !isNaN(e))
-            .filter(Boolean);
+        const positions = tasksInQueue
+            .map((t) => parseInt(t.status.split(" users ahead - ETA:")[0]))
+            .filter((e) => !isNaN(e));
         queueStats.value.nextQueuePasses = positions.sort((a, b) => a - b);
-
-        // Only show stats if there are any queued tasks, sleeping tasks, or queue positions
-        queueStats.value.show =
-            queueStats.value.queued > 0 || queueStats.value.sleeping > 0 || queueStats.value.nextQueuePasses.length > 0;
+        // logger.Info("Refreshing queue stats", queueStats.value);
     };
 
     const toggleModal = (name, clearValue = false) => {
@@ -268,28 +235,13 @@ export const useUIStore = defineStore("ui", () => {
 
     const sortTasks = () => {
         try {
-            if (!sortData.value.sortBy) {
-                // When no specific sort column is set, default to sorting by taskId
-                const taskArr = Object.entries(tasks.value).map(([taskId, task]) => ({ taskId, ...task }));
-                taskArr.sort((a, b) => sortTaskIds(a.taskId, b.taskId));
-                taskIdOrder.value = taskArr.map((task) => task.taskId);
-
-                if (sortData.value.reversed) {
-                    taskIdOrder.value.reverse();
-                }
-                return;
-            }
-
+            if (!sortData.value.sortBy) return;
             logger.Info("Sorting", sortData.value.sortBy);
             const taskArr = Object.entries(tasks.value).map(([taskId, task]) => ({ taskId, ...task }));
-
-            if (sortData.value.sortBy === "taskId") {
-                taskArr.sort((a, b) => sortTaskIds(a.taskId, b.taskId));
-            } else {
-                taskArr.sort((a, b) => betterSort(a[sortData.value.sortBy], b[sortData.value.sortBy]));
-            }
-
-            taskIdOrder.value = taskArr.map((task) => task.taskId);
+            const sortedTaskArr = taskArr.sort((a, b) =>
+                sortAlphaNum(a[sortData.value.sortBy], b[sortData.value.sortBy])
+            );
+            taskIdOrder.value = sortedTaskArr.map((task) => task.taskId);
             if (sortData.value.reversed) {
                 taskIdOrder.value.reverse();
             }
@@ -468,9 +420,10 @@ export const useUIStore = defineStore("ui", () => {
         deleteTasks: () => {
             if (!confirm("Do you want do delete all selected tasks?")) return;
             const selectedTasks = getSelectedTasks();
-            for (const value of Object.values(selectedTasks)) connection.sendDeleteTask(value.taskId);
+            if (selectedTasks.length === Object.keys(tasks.value).length) connection.sendDeleteAllTasks();
+            else for (const value of Object.values(selectedTasks)) connection.sendDeleteTask(value.taskId);
         },
-        foldTasks: () => {
+        decreaseTasks: () => {
             const selectedTasks = getSelectedTasks();
             for (const key of Object.keys(selectedTasks)) tasks.value[key].isExpanded = false;
         },
@@ -480,11 +433,17 @@ export const useUIStore = defineStore("ui", () => {
         },
         startTasks: () => {
             const selectedTasks = getSelectedTasks();
-            for (const value of Object.values(selectedTasks)) if (!value.active) connection.sendStartTask(value.taskId);
+            if (selectedTasks.length === Object.keys(tasks.value).length) connection.sendStartAllTasks();
+            else
+                for (const value of Object.values(selectedTasks))
+                    if (!value.active) connection.sendStartTask(value.taskId);
         },
         stopTasks: () => {
             const selectedTasks = getSelectedTasks();
-            for (const value of Object.values(selectedTasks)) if (value.active) connection.sendStopTask(value.taskId);
+            if (selectedTasks.length === Object.keys(tasks.value).length) connection.sendStopAllTasks();
+            else
+                for (const value of Object.values(selectedTasks))
+                    if (value.active) connection.sendStopTask(value.taskId);
         },
         toggleTaskSelected: (taskId) => {
             tasks.value[taskId].selected = !tasks.value[taskId].selected;
@@ -492,45 +451,22 @@ export const useUIStore = defineStore("ui", () => {
         },
 
         toggleProfileSelected: (id) => {
-            const idx = profiles.value.findIndex((p) => p.id === id);
+            const idx = profiles.value.findIndex((p) => p._id === id);
             profiles.value[idx].selected = !profiles.value[idx].selected;
         },
         toggleAccountSelected: (id) => {
-            const idx = accounts.value.findIndex((p) => p.id === id);
+            const idx = accounts.value.findIndex((p) => p._id === id);
             accounts.value[idx].selected = !accounts.value[idx].selected;
         },
 
         // proxy for connection functions
-        checkStock: (eventId, presaleCode, eventDid, clOrigin) =>
-            connection.sendCheckStock(eventId, presaleCode, eventDid, clOrigin),
+        checkStock: (eventId, presaleCode) => connection.sendCheckStock(eventId, presaleCode),
         scrapeVenue: (eventId) => connection.sendScrapeMap(eventId),
         massEditPresaleCode: (eventId, presaleCode) => connection.sendMassEditPresaleCode(eventId, presaleCode),
 
         // alerts
-        showError: (err) =>
-            toast.error(err, {
-                autoClose: 1400,
-                pauseOnHover: false,
-                hideProgressBar: false,
-                closeOnClick: true,
-                pauseOnFocusLoss: false,
-                transition: "slide",
-                position: "top-right",
-                closeButton: true,
-                newestOnTop: true
-            }),
-        showSuccess: (msg) =>
-            toast.success(msg, {
-                autoClose: 1400,
-                pauseOnHover: false,
-                hideProgressBar: false,
-                closeOnClick: true,
-                pauseOnFocusLoss: false,
-                transition: "slide",
-                position: "top-right",
-                closeButton: true,
-                newestOnTop: true
-            }),
+        showError: (err) => toast.error(err, { autoClose: 2000 }),
+        showSuccess: (msg) => toast.success(msg, { autoClose: 2000 }),
         // Country
         currentCountry,
         setCurrentCountry: (country, closeModal, newModule) => {
@@ -546,8 +482,8 @@ export const useUIStore = defineStore("ui", () => {
         // Event
         currentEvent,
         setCurrentEvent: (event) => {
-            if (event) logger.Info("Setting current event to:", event);
-            currentEvent.value = event?.match(/\s\((.*?)\)$/)?.[1] || "";
+            logger.Info("Setting current event", event);
+            currentEvent.value = event;
             localStorage.setItem("current-event", currentEvent.value);
             refreshQueueStats();
         },
@@ -563,26 +499,26 @@ export const useUIStore = defineStore("ui", () => {
         accounts,
         addAccount: (acc) => {
             if (!DEBUG) return connection.sendSaveAccount(acc);
-            const isEdit = accounts.value.findIndex((p) => p.id === acc.id);
+            const isEdit = accounts.value.findIndex((p) => p._id === acc._id);
             if (DEBUG && isEdit !== -1) {
                 Object.keys(acc).forEach((k) => (accounts.value[isEdit][k] = acc[k]));
-            } else accounts.value.push({ ...acc, id: Math.random() });
+            } else accounts.value.push({ ...acc, _id: Math.random() });
         },
         setAccounts: (accs) => accounts.value.push(...accs),
         profiles,
         addProfile: (profile) => {
             if (!DEBUG) return connection.sendSaveProfile(profile);
-            const isEdit = profiles.value.findIndex((p) => p.id === profile.id);
+            const isEdit = profiles.value.findIndex((p) => p._id === profile._id);
 
             if (DEBUG && isEdit !== -1) {
                 Object.keys(profile).forEach((k) => (accounts.value[isEdit][k] = profile[k]));
             } else {
-                profiles.value.push({ ...profile, id: Math.random() });
+                profiles.value.push({ ...profile, _id: Math.random() });
             }
         },
         deleteProfile: (id) => {
             if (!DEBUG) return connection.sendDeleteProfile(id);
-            else profiles.value = profiles.value.filter((p) => p.id != id);
+            else profiles.value = profiles.value.filter((p) => p._id != id);
         },
         setProfiles: (profs) => (profiles.value = profs),
         proxies,
@@ -601,10 +537,6 @@ export const useUIStore = defineStore("ui", () => {
             showSpinner.value = false;
             enableScroll();
         },
-        setBotVersion: (version) => {
-            botVersion.value = version;
-        },
-        botVersion,
 
         spinnerMessage,
         showSpinner,

package/src/stores/utils.js

@@ -361,29 +361,7 @@ const timeDifference = (date1, date2) => {
     return str;
 };
 
-const parseAxsEventUrl = (url) => {
-    const HOST = "www.axs.com";
-
-    if (!url.startsWith("https://")) return { eventId: url };
-    if (!url.includes(`https://${HOST}`)) return {};
-
-    const siteMatch = url.match(new RegExp(`https://${HOST}(/uk)?`));
-    const eventMatch = url.match(/\/events\/(\d+)/);
-    const promoMatch = url.match(/\/promopage\/(\d+)/);
-
-    if (!siteMatch || !eventMatch) return {};
-
-    const siteId = siteMatch[1] === "/uk" ? "AXS_UK" : "AXS_US";
-    const eventId = eventMatch[1];
-    const promoId = promoMatch?.[1];
-
-    const result = { eventId, siteId };
-    if (promoId) result.promoId = promoId;
-
-    return result;
-};
-
-const parseTmEventUrl = (url) => {
+const parseEventUrl = (url) => {
     if (!url.includes("https://")) {
         return { eventId: url };
     }
@@ -398,17 +376,16 @@ const parseTmEventUrl = (url) => {
     };
 };
 
-const isEU = (siteId) => !["US", "AU", "UK", "CA", "NZ", "IE"].includes(siteId.split("_")?.[1] || siteId);
+const isEU = (siteId) => !["US", "AU", "UK", "LN", "CA", "NZ", "IE"].includes(siteId.replaceAll("TM_", ""));
 
 const removeDuplicates = (arr) => [...new Set(arr)];
 
 const pickRandom = (arr) => arr[Math.floor(Math.random() * arr.length)];
 
 const fakeId = () => {
-    const cityInfo = pickRandom(cities.filter((x) => x[2] != "GA" && x[2] != "PR" && x[0] > 10000));
-
+    const cityInfo = pickRandom(cities);
     const profile = {
-        zipCode: String(cityInfo[0]),
+        zipCode: cityInfo[0],
         address: generateStreetAddress()
     };
 
@@ -505,76 +482,15 @@ function validateCard(cardNumber) {
     };
 }
 
-function sortTaskIds(a, b) {
-    const parseId = (id) => {
-        if (!id) return { prefix: "", num: -1 };
-
-        if (/^\d+$/.test(id)) {
-            return { prefix: "", num: parseInt(id, 10) };
-        }
-
-        const match = id.match(/^([A-Za-z-]+)(\d+)$/);
-        if (match) {
-            return { prefix: match[1], num: parseInt(match[2], 10) };
-        }
-
-        return { prefix: id, num: -1 };
-    };
-
-    const aInfo = parseId(a);
-    const bInfo = parseId(b);
-
-    if (aInfo.prefix !== bInfo.prefix) {
-        return aInfo.prefix.localeCompare(bInfo.prefix);
-    }
-
-    return aInfo.num - bInfo.num;
-}
-
-const firstUpper = (str) => `${str[0].toUpperCase()}${str.slice(1).toLowerCase()}`;
-
-function betterSort(a, b) {
-    if (a === undefined || a === null) return b === undefined || b === null ? 0 : -1;
-    if (b === undefined || b === null) return 1;
-
-    const aStr = String(a);
-    const bStr = String(b);
-
-    if (!isNaN(aStr) && !isNaN(bStr)) {
-        return Number(aStr) - Number(bStr);
-    }
-
-    const aParts = aStr.split(/(\d+)/).filter(Boolean);
-    const bParts = bStr.split(/(\d+)/).filter(Boolean);
-
-    const len = Math.min(aParts.length, bParts.length);
-    for (let i = 0; i < len; i++) {
-        if (!isNaN(aParts[i]) && !isNaN(bParts[i])) {
-            const numA = parseInt(aParts[i], 10);
-            const numB = parseInt(bParts[i], 10);
-            if (numA !== numB) return numA - numB;
-        } else {
-            const cmp = aParts[i].localeCompare(bParts[i]);
-            if (cmp !== 0) return cmp;
-        }
-    }
-
-    return aParts.length - bParts.length;
-}
-
 export {
     generateStreetAddress,
     timeDifference,
     sortAlphaNum,
-    parseAxsEventUrl,
-    parseTmEventUrl,
+    parseEventUrl,
     isEU,
     removeDuplicates,
     pickRandom,
     fakeId,
     getCardType,
-    validateCard,
-    sortTaskIds,
-    firstUpper,
-    betterSort
+    validateCard
 };

package/src/views/Accounts.vue

@@ -1,14 +1,11 @@
 <template>
     <div>
-        <div class="flex-between pt-5 pb-2">
+        <div class="flex items-center">
             <!-- Heading -->
-            <div class="flex-center gap-4">
-                <MailIcon class="cursor-pointer smooth-hover text-white" />
-                <h4 class="text-heading">
-                    Accounts
-                    <span class="text-subheading pl-1">{{ ui.getSelectedAccounts().length }}</span>
-                </h4>
-            </div>
+            <h4 class="text-white text-base font-bold mb-5 pt-5">
+                Accounts
+                <span class="text-light-300 pl-1">{{ ui.getSelectedAccounts().length }}</span>
+            </h4>
             <ul class="mobile-icons">
                 <li>
                     <EyeToggle v-model="privacy" />
@@ -17,16 +14,16 @@
                     <button
                         :disabled="ui.disabledButtons['create-accounts']"
                         @click="ui.toggleModal('account-creator', true)"
-                        class="smooth-hover">
-                        <PlayIcon class="w-4 h-4" />
+                    >
+                        <PlayIcon />
                     </button>
                 </li>
                 <li>
                     <button
                         :disabled="ui.disabledButtons['add-accounts']"
                         @click="ui.toggleModal('create-account', true)"
-                        class="smooth-hover">
-                        <PlusIcon class="w-4 h-4" />
+                    >
+                        <PlusIcon />
                     </button>
                 </li>
             </ul>
@@ -37,16 +34,13 @@
                 <TagToggle
                     class="smooth-hover rounded-l min-w-9"
                     :options="['All', 'Enabled', 'Disabled']"
-                    @change="(f) => (ui.search.accounts.show = f)" />
+                    @change="(f) => (ui.search.accounts.show = f)"
+                />
                 <input
                     class="h-10 w-44 text-white text-sm p-2 bg-dark-500 flex items-center relative border-2 border-dark-550"
                     placeholder="Search Email"
-                    autocomplete="new-password"
-                    data-dashlane-rid=""
-                    data-dashlane-label=""
-                    data-dashlane-classification=""
-                    data-form-type="other"
-                    v-model="ui.search.accounts.query" />
+                    v-model="ui.search.accounts.query"
+                />
 
                 <!-- <Dropdown
                     class="min-w-16 text-sm lg:w-24 bg-dark-550 rounded-none"
@@ -63,34 +57,37 @@
                 /> -->
 
                 <Dropdown
-                    class="dropdown-base rounded-r-lg min-w-32 relative z-50 search-dropdown"
+                    class="rounded-r min-w-32 bg-dark-500 relative z-50 border-2 border-dark-550"
+                    style="margin-left: 0 !important; border-width: 2px !important"
                     rightAmount="right-1"
                     default="Any"
                     :value="ui.search.accounts.tag"
                     :onClick="(f) => (ui.search.accounts.tag = f)"
                     :options="allTags"
-                    :includeAdjacentButtons="true"
-                    :capitalize="true" />
+                    :capitalize="true"
+                />
             </div>
 
             <div class="ml-auto gap-2 hidden lg:flex">
                 <div
-                    class="bg-dark-400 border border-dark-650 justify-between px-4 w-44 flex text-white text-xs font-medium items-center rounded-md ml-auto h-10">
+                    class="bg-dark-400 justify-between px-4 w-44 flex text-white text-sm items-center py-1 rounded-lg ml-auto h-10"
+                >
                     <p>Privacy</p>
                     <Switch class="scale-75" v-model="privacy" />
                 </div>
                 <button
                     :disabled="ui.disabledButtons['create-accounts']"
-                    class="bg-dark-400 disabled:opacity-70 smooth-hover border border-dark-650 hover:border-dark-700 w-44 flex text-white text-xs font-medium justify-center items-center rounded-md ml-auto h-10"
-                    @click="ui.toggleModal('account-creator')">
-                    Create Accounts
-                    <PlayIcon class="ml-2" />
+                    class="bg-dark-400 disabled:opacity-70 smooth-hover w-44 flex text-white text-sm justify-center items-center py-1 px-2 rounded-lg ml-auto h-10"
+                    @click="ui.toggleModal('account-creator')"
+                >
+                    Create Accounts <PlayIcon class="ml-2" />
                 </button>
 
                 <button
                     :disabled="ui.disabledButtons['add-accounts']"
-                    class="bg-dark-400 disabled:opacity-70 smooth-hover border border-dark-650 hover:border-dark-700 w-44 flex text-white text-xs font-medium justify-center items-center rounded-md ml-auto h-10"
-                    @click="ui.toggleModal('create-account')">
+                    class="bg-dark-400 disabled:opacity-70 smooth-hover w-44 flex text-white text-sm justify-center items-center py-1 px-2 rounded-lg ml-auto h-10"
+                    @click="ui.toggleModal('create-account')"
+                >
                     Add Account
                     <PlusIcon class="ml-2" />
                 </button>
@@ -98,10 +95,10 @@
         </div>
 
         <!-- Tasks (Table) -->
-        <AccountView :accounts="processedTasks" class="max-h-big-acc" />
+        <AccountView :tasks="processedTasks" class="max-h-big-acc" />
 
         <!-- Modal -->
-        <transition-group name="fade">
+        <transition-group name="fade" mode="out-in">
             <CreateAccount v-if="activeModal === 'create-account'" />
             <AccountCreator v-if="activeModal === 'account-creator'" />
         </transition-group>
@@ -111,14 +108,7 @@
 .custom-dropdown-content {
     top: 2.6rem !important;
     left: -13px;
-    @apply border border-dark-650;
-}
-
-/* Search dropdown should always be h-10 and have no left corners */
-.search-dropdown {
-    height: 2.5rem !important; /* Always 40px regardless of screen size */
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
+    @apply border border-light-300;
 }
 .max-h-big-acc {
     max-height: calc(100vh - 14rem);
@@ -127,11 +117,11 @@
 </style>
 <script setup>
 import { computed, watch, ref } from "vue";
-import AccountView from "@/components/Editors/Account/AccountView.vue";
-import AccountCreator from "@/components/Editors/Account/AccountCreator.vue";
-import CreateAccount from "@/components/Editors/Account/CreateAccount.vue";
+import AccountView from "@/components/editors/account/AccountView.vue";
+import AccountCreator from "@/components/editors/account/AccountCreator.vue";
+import CreateAccount from "@/components/editors/account/CreateAccount.vue";
 import { useUIStore } from "@/stores/ui";
-import { PlusIcon, PlayIcon, MailIcon } from "@/components/icons";
+import { PlusIcon, PlayIcon } from "@/components/icons";
 import Dropdown from "@/components/ui/controls/atomic/Dropdown.vue";
 import TagToggle from "@/components/Editors/TagToggle.vue";
 import Switch from "@/components/ui/controls/atomic/Switch.vue";
@@ -148,8 +138,9 @@ const filterAccounts = () => {
     if (show === "Enabled") accs = accs.filter((p) => p.enabled);
     if (show === "Disabled") accs = accs.filter((p) => !p.enabled);
     ui.logger.Info(`Filtered accounts for ${ui.currentModule}`);
-
+    console.log(accs);
     accs = accs.filter((acc) => acc.module === ui.currentModule);
+    console.log(accs);
 
     if (tag !== "Any") accs = accs.filter((p) => p.tags.includes(ui.search.accounts.tag));
     if (!query) return (ui.search.accounts.results = accs);