@necrolab/dashboard 0.4.61 → 0.4.208

package/src/components/Tasks/CreateTaskTM.vue

@@ -1,66 +1,79 @@
 <template>
-    <Modal class="max-w-screen overflow-y-scroll">
+    <Modal class="overflow-y-scroll max-w-screen">
         <template #header>
-            <div class="flex-center gap-2">
-                Create Task
-                <PencilIcon />
-            </div>
+            Create Task
+            <img src="@/assets/img/pencil.svg" class="ml-4" />
         </template>
 
+        <!-- <div v-if="displayConfigSelector" class="w-3/12 input-wrapper z-inf2 mt-4">
+            <div class="dropdown input-default p-2">
+                <span class="flex justify-between items-center z-inf2 text-white">
+                    <span class="text-sm">Load config</span>
+                    <DownIcon class="absolute right-5" />
+                </span>
+                <div class="dropdown-content z-inf2">
+                    <div
+                        v-bind:key="opt.name"
+                        class="py-1 my-1 cursor-pointer"
+                        v-for="opt in addTaskConfigs"
+                        @click="useConfig(opt.config)"
+                    >
+                        <p>{{ opt.name }}</p>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+
         <!-- Task Form -->
-        <div class="grid-responsive-1-2 gap-responsive mb-4 mt-4">
+        <div class="grid grid-cols-2 gap-x-4 gap-y-4 mt-4 mb-4">
             <!-- Event ID -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Event ID
+                <label class="label-override mb-2"
+                    >Event ID
                     <StadiumIcon />
                 </label>
-                <div class="input-default required">
+                <div class="input-default">
                     <input
                         :placeholder="!isEU(ui.currentCountry.siteId) ? '102PDA9125510GYU' : '529171'"
                         v-model="task.eventId"
-                        required />
+                    />
+                    <span class="text-red-400 my-auto mr-2 mt-3">* </span>
                 </div>
             </div>
             <!-- Email -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Email
+                <label class="label-override mb-2"
+                    >Email
                     <MailIcon />
                 </label>
                 <div class="input-default">
-                    <input
-                        placeholder="Email"
-                        v-model="task.email"
-                        autocomplete="off"
-                        data-form-type="other"
-                        name="tm_email_disableautocomplete" />
+                    <input placeholder="Email" v-model="task.email" />
                 </div>
             </div>
             <!-- Proxy -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Proxy
+                <label class="label-override mb-2"
+                    >Proxy
                     <CameraIcon />
                 </label>
                 <div class="input-default">
-                    <input placeholder="Proxy" v-model="task.proxy" autocomplete="off" />
+                    <input placeholder="Proxy" v-model="task.proxy" />
                 </div>
             </div>
             <!-- Presale Code -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Presale Code
+                <label class="label-override mb-2"
+                    >Presale Code
                     <AwardIcon />
                 </label>
                 <div class="input-default">
-                    <input placeholder="Code" v-model="task.presaleCode" maxlength="15" autocomplete="off" />
+                    <input placeholder="Code" v-model="task.presaleCode" maxlength="15" />
                 </div>
             </div>
             <!-- Ticket Quantity -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Ticket Quantity
+                <label class="label-override mb-2"
+                    >Ticket Quantity
                     <BagIcon />
                 </label>
                 <div class="input-default">
@@ -77,10 +90,7 @@
             </div>
             <!-- Ticket Quantity -->
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Amount
-                    <span class="ml-2 h-[18px]">#</span>
-                </label>
+                <label class="label-override mb-2">Amount <span class="ml-2" style="height: 18px">#</span></label>
                 <div class="input-default">
                     <input placeholder="20" min="1" type="number" pattern="\d*" v-model="task.taskQuantity" />
                     <div class="input-incrementer">
@@ -95,37 +105,35 @@
             </div>
 
             <!-- Profile Tag(s)  -->
-            <div class="input-wrapper relative-positioned z-tooltip">
-                <label class="label-override mb-2">
-                    Profile Tag(s)
+            <div class="input-wrapper" style="z-index: 50 !important">
+                <label class="label-override mb-2"
+                    >Profile Tag(s)
                     <TagIcon />
                 </label>
                 <MultiDropdown
-                    class="input-default w-full will-change-auto"
+                    class="w-full will-change-auto input-default"
                     :onSelect="(v) => (task.profileTags = v)"
                     default="Any"
                     :options="
                         profileTagsOptions.map((opt) => {
                             return { label: opt, value: opt };
                         })
-                    " />
+                    "
+                />
             </div>
 
             <!-- CL Origin -->
             <div v-if="isEU(ui.currentCountry.siteId)" class="input-wrapper">
-                <label class="label-override mb-2">
-                    CL Origin
-                    <AwardIcon />
-                </label>
+                <label class="label-override mb-2">CL Origin<AwardIcon /></label>
                 <div class="input-default">
                     <input placeholder="ORIGIN2" type="text" v-model="task.clOrigin" maxlength="15" />
                 </div>
             </div>
 
             <!-- Account Tag  -->
-            <div class="input-wrapper relative-positioned z-dropdown">
-                <label class="label-override mb-2">
-                    Account Tag
+            <div class="input-wrapper">
+                <label class="label-override mb-2"
+                    >Account Tag
                     <ScannerIcon />
                 </label>
 
@@ -136,14 +144,12 @@
                     :options="accountTagOptions"
                     :allowDefault="false"
                     :capitalize="true"
-                    class="input-default dropdown w-full p-4" />
+                    class="input-default dropdown p-4 w-full"
+                />
             </div>
 
             <div class="input-wrapper">
-                <label class="label-override mb-2">
-                    Start Offset (Minutes)
-                    <ShieldIcon />
-                </label>
+                <label class="label-override mb-2">Start Offset (Minutes)<ShieldIcon /></label>
                 <div class="input-default">
                     <input placeholder="120" type="number" pattern="\d*" v-model="task.startOffset" />
                 </div>
@@ -151,8 +157,8 @@
 
             <div v-if="!isEU(ui.currentCountry.siteId)">
                 <div class="input-wrapper">
-                    <label class="label-override mb-2">
-                        Presale DID
+                    <label class="label-override mb-2"
+                        >Presale DID
                         <AwardIcon />
                     </label>
                     <div class="input-default">
@@ -161,13 +167,12 @@
                 </div>
             </div>
         </div>
-        <div class="mb-3 border border-dark-650" />
+        <div class="border border-light-300 mb-3" />
         <!-- Task Switches -->
-        <div v-if="!isEU(ui.currentCountry.siteId)" class="task-switches grid grid-cols-3 justify-between gap-y-1">
-            <div class="switch-wrapper mb-2 flex flex-col">
-                <h4 class="text-responsive-sm">
-                    Aged
-                    <span class="hidden xs:block">Account</span>
+        <div v-if="!isEU(ui.currentCountry.siteId)" class="grid grid-cols-3 task-switches gap-y-1 justify-between">
+            <div class="switch-wrapper flex flex-col mb-2">
+                <h4>
+                    Aged <span class="hidden xs:block">Account</span>
                     <SandclockIcon />
                 </h4>
                 <Switch class="mx-auto" v-model="task.agedAccount" />
@@ -187,7 +192,7 @@
                 </h4>
                 <Switch class="mx-auto" v-model="task.doNotPay" />
             </div>
-            <div class="switch-wrapper flex flex-col">
+            <div class="flex flex-col switch-wrapper">
                 <h4>
                     <span class="hidden xs:block">Quick Queue</span>
                     <span class="block xs:hidden">Quick Q.</span>
@@ -195,7 +200,7 @@
                 </h4>
                 <Switch class="mx-auto" v-model="task.quickQueue" />
             </div>
-            <div class="switch-wrapper flex flex-col">
+            <div class="flex flex-col switch-wrapper">
                 <h4>
                     <span class="hidden xs:block">Login Later</span>
                     <span class="block xs:hidden">Login Lat.</span>
@@ -204,7 +209,7 @@
                 </h4>
                 <Switch class="mx-auto" v-model="task.loginAfterCart" />
             </div>
-            <div class="switch-wrapper flex flex-col">
+            <div class="flex flex-col switch-wrapper">
                 <h4>
                     <span class="hidden xs:block">Smart Timer</span>
                     <span class="block xs:hidden">Timer</span>
@@ -214,31 +219,28 @@
             </div>
             <div class="switch-wrapper flex flex-col">
                 <h4>
-                    <span class="hidden xs:block">Supports</span>
-                    OTP
-                    <MailIcon class="h-[17px] scale-90" />
+                    <span class="hidden xs:block">Supports </span> OTP
+                    <MailIcon class="scale-90" style="height: 17px" />
                 </h4>
                 <Switch class="mx-auto" v-model="task.otpAccount" />
             </div>
             <div class="switch-wrapper flex flex-col">
                 <h4>
-                    Presale
-                    <span class="hidden xs:block">Queue</span>
+                    Presale <span class="hidden xs:block"> Queue</span>
                     <AwardIcon class="scale-90" />
                 </h4>
                 <Switch class="mx-auto" v-model="task.presaleMode" />
             </div>
             <div class="switch-wrapper flex flex-col">
                 <h4>
-                    Strict
-                    <span class="hidden xs:block">Presale</span>
+                    Strict <span class="hidden xs:block"> Presale</span>
                     <AwardIcon class="scale-90" />
                 </h4>
                 <Switch class="mx-auto" v-model="task.presaleStrict" />
             </div>
         </div>
         <div v-if="isEU(ui.currentCountry.siteId)">
-            <div class="task-switches mb-4 grid grid-cols-4 justify-between gap-y-4">
+            <div class="grid grid-cols-4 gap-y-4 mb-4 justify-between task-switches">
                 <div class="switch-wrapper flex flex-col">
                     <h4 class="text-xs">
                         Manual
@@ -264,20 +266,18 @@
                 </div>
                 <div class="switch-wrapper flex flex-col">
                     <h4>
-                        <span class="hidden xs:block">Login Later</span>
-                        <span class="block xs:hidden">Login Lat.</span>
+                        Autologin
                         <GroupIcon class="scale-90" />
                     </h4>
                     <Switch class="mx-auto" v-model="task.loginAfterCart" />
                 </div>
             </div>
 
-            <div class="task-switches grid grid-cols-4 justify-between gap-y-4">
+            <div class="grid grid-cols-4 gap-y-4 justify-between task-switches">
                 <div class="switch-wrapper flex flex-col">
                     <h4>
                         <span class="hidden xs:block">Quick Queue</span>
-                        <span class="block xs:hidden">Quick Q.</span>
-                        <SkiIcon class="scale-90" />
+                        <span class="block xs:hidden">Quick Q.</span> <SkiIcon class="scale-90" />
                     </h4>
                     <Switch class="mx-auto" v-model="task.quickQueue" />
                 </div>
@@ -285,14 +285,13 @@
                 <div class="switch-wrapper flex flex-col">
                     <h4>
                         Supports OTP
-                        <MailIcon class="h-[17px] scale-90" />
+                        <MailIcon class="scale-90" />
                     </h4>
                     <Switch class="mx-auto" v-model="task.otpAccount" />
                 </div>
                 <div class="switch-wrapper flex flex-col">
                     <h4>
-                        Aged
-                        <span class="hidden xs:block">Account</span>
+                        Aged <span class="hidden xs:block">Account</span>
                         <SandclockIcon />
                     </h4>
                     <Switch class="mx-auto" v-model="task.agedAccount" />
@@ -301,8 +300,11 @@
         </div>
 
         <!-- Task prefab -->
-        <div class="my-3 border border-dark-650" />
-        <button class="btn-action mx-auto" @click="createTask">
+        <div class="border border-light-300 my-3" />
+        <button
+            class="button-default hover:opacity-70 active:opacity-50 bg-dark-400 w-48 text-xs mx-auto flex items-center justify-center gap-x-2"
+            @click="createTask"
+        >
             Create
             <EditIcon />
         </button>
@@ -331,23 +333,20 @@ import {
     UpIcon,
     DownIcon,
     SandclockIcon,
-    CartIcon,
-    PencilIcon
+    CartIcon
 } from "@/components/icons";
 import { useUIStore } from "@/stores/ui";
 import { countries } from "@/stores/countries";
 import Dropdown from "@/components/ui/controls/atomic/Dropdown.vue";
 import MultiDropdown from "@/components/ui/controls/atomic/MultiDropdown.vue";
-import { isEU, firstUpper, parseTmEventUrl, removeDuplicates } from "@/stores/utils";
+import { isEU, parseEventUrl, removeDuplicates } from "@/stores/utils";
 
 const ui = useUIStore();
 
-const accountTagOptions = ref(ui.profile.tags);
+const accountTagOptions = ref(ui.profile.accountTags);
 const defaultTags = ["Amex", "Visa", "Master"];
 
-const profileTagsOptions = ref(
-    removeDuplicates(["Any", ...defaultTags, ...ui.profile.profileTags.map((x) => firstUpper(x))])
-);
+const profileTagsOptions = ref(removeDuplicates(["Any", ...defaultTags, ...ui.profile.profileTags]));
 
 const baseTask = ref({
     selected: false,
@@ -363,6 +362,7 @@ const baseTask = ref({
     proxy: "",
     manual: true,
     doNotPay: false,
+    incapsulaBypass: false,
     quickQueue: false,
     loginAfterCart: false,
     smartTimer: false,
@@ -380,7 +380,7 @@ baseTask.value.loginAfterCart = isEU(ui.currentCountry.siteId);
 const task = ref(ui.modalData[`task_${ui.currentCountry.siteId}`] || baseTask);
 
 function createTask() {
-    ui.logger.Info("Created new task", task.value.taskId);
+    ui.logger.Info("Created new task", task.value);
     const eventIds = task.value.eventId.split(",").map((t) => t.trim());
     const presaleCodes = task.value.presaleCode ? task.value.presaleCode.split(",").map((t) => t.trim()) : [undefined];
     eventIds.forEach((eventId) => {
@@ -403,11 +403,7 @@ watch(
     }
 );
 
-watch(
-    () => task.value,
-    () => (ui.modalData[`task_${ui.currentCountry.siteId}`] = task.value),
-    { deep: true }
-);
+watch(() => task.value, (ui.modalData[`task_${ui.currentCountry.siteId}`] = task.value));
 
 watch(
     () => task.value.eventId,
@@ -426,21 +422,73 @@ watch(
             const country = countries.TM.find((c) => c.siteId === tmid);
             if (country) ui.setCurrentCountry(country, false, ui.currentModule);
 
-            const { eventId, eventDid, clOrigin } = parseTmEventUrl(url);
-            task.value.eventId = eventId;
-            task.value.eventDid = eventDid;
+            const { eventId, eventDid, clOrigin } = parseEventUrl(url);
             task.value.clOrigin = clOrigin;
+            task.value.eventDid = eventDid;
+            task.value.eventId = eventId;
         } catch (ex) {
             ui.logger.Error("Could not parse url (2)", ex);
         }
     }
 );
+
+// fetchConfigs();
 </script>
 
 <style lang="scss" scoped>
+.label-override {
+    @apply flex;
+    color: #6e7084 !important;
+
+    img {
+        @apply ml-2;
+    }
+}
+
+.task-switches {
+    h4 {
+        color: #6e7084;
+        @apply text-xs text-center flex items-center gap-x-2 mx-auto;
+    }
+
+    .switch-wrapper {
+        @apply gap-y-2;
+    }
+}
+
+@media (max-width: 720px) {
+    .task-switches {
+        h4 {
+            font-size: 12px !important;
+        }
+    }
+}
+</style>
+<style lang="scss">
+.label-override {
+    svg {
+        @apply ml-2;
+
+        path {
+            fill: #6e7084 !important;
+        }
+    }
+    @apply flex items-center;
+}
+
 .switch-wrapper {
-    svg path {
-        fill: #a0a0a6 !important;
+    svg {
+        path {
+            fill: #6e7084 !important;
+        }
     }
 }
+
+.z-inf {
+    z-index: 1000;
+}
+
+.z-inf2 {
+    z-index: 2000;
+}
 </style>

package/src/components/Tasks/MassEdit.vue

@@ -4,22 +4,21 @@
         <!-- Event ID -->
         <div class="input-wrapper mt-7 mb-4">
             <label class="label-override mb-2">Event ID <StadiumIcon /></label>
-            <div class="input-default required">
-                <input
-                    :placeholder="!isEU(ui.currentCountry.siteId) ? '102PDA9125510GYU' : '529171'"
-                    v-model="eventId"
-                />
+            <div class="input-default">
+                <input placeholder="102PDA9125510GYU" v-model="eventId" />
+                <span class="text-red-400 my-auto mr-2 mt-3">* </span>
             </div>
         </div>
-        <!-- Presale Code -->
+        <!-- Ticker Quantity -->
         <div class="input-wrapper mb-8">
             <label class="label-override mb-2">Presale Code <BagIcon /></label>
-            <div class="input-default required">
+            <div class="input-default">
                 <input placeholder="presale code" v-model="code" />
+                <span class="text-red-400 my-auto mr-2 mt-3">* </span>
             </div>
         </div>
         <button
-            class="button-default bg-dark-400 w-48 text-xs flex items-center justify-center gap-x-2 ml-auto border border-light-300 hover:border-light-400"
+            class="button-default hover:opacity-70 active:opacity-50 bg-dark-400 w-48 text-xs flex items-center justify-center gap-x-2 ml-auto"
             @click="done()"
         >
             Edit <EditIcon />
@@ -38,7 +37,6 @@ import Modal from "@/components/ui/Modal.vue";
 import { StadiumIcon, BagIcon, EditIcon } from "@/components/icons";
 import { useUIStore } from "@/stores/ui";
 import { ref } from "vue";
-import { isEU } from "@/stores/utils";
 
 const ui = useUIStore();
 const code = ref("");