High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Ditch Buefy UI completely and port to Oat (!)
Kailash Nadhc430b1bc8ab8
diff --git a/frontend/index.html b/frontend/index.htmlindex 07d91a7a..4d58f6de 100644--- a/frontend/index.html+++ b/frontend/index.html@@ -4,12 +4,13 @@<meta charset="utf-8" /><meta http-equiv="X-UA-Compatible" content="IE=edge" /><meta name="viewport" content="width=device-width,initial-scale=1.0" />- <link rel="icon" href="/admin/static/favicon.png?v=asset_version" />- <link href="/admin/custom.css?v=asset_version" rel="stylesheet" type="text/css">- <script src="/admin/custom.js?v=asset_version" async defer></script>+ <link rel="icon" href="static/favicon.png?v=asset_version" />+ <script src="static/oat.min.js?v=asset_version" defer></script>+ <link href="custom.css?v=asset_version" rel="stylesheet" type="text/css">+ <script src="custom.js?v=asset_version" async defer></script><title>listmonk</title></head>- <body>+ <body data-sidebar-layout><noscript><strong>We're sorry but listmonk doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript>diff --git a/frontend/package.json b/frontend/package.jsonindex 7318fa79..8fe743fa 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -24,8 +24,6 @@"@lezer/highlight": "^1.2.1","@tinymce/tinymce-vue": "^3","axios": "^1.16.0",- "buefy": "^0.9.25",- "bulma": "^0.9.4","chart.js": "^4.4.1","codemirror": "^6.0.0","dayjs": "^1.11.10",@@ -54,7 +52,6 @@"eslint-define-config": "^2.0.0","eslint-plugin-import": "^2.23.3","eslint-plugin-vue": "^9.19.2",- "sass": "^1.34.0","vite": "^5.4.21","vue-eslint-parser": "^9.3.2","vue-template-compiler": "^2.6.12"@@ -63,4 +60,4 @@"jackspeak": "2.1.1"},"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"-}\ No newline at end of file+}diff --git a/frontend/src/App.vue b/frontend/src/App.vueindex c208c2a8..6a1adeac 100644--- a/frontend/src/App.vue+++ b/frontend/src/App.vue@@ -1,111 +1,105 @@<template>- <div id="app">- <b-navbar :fixed-top="true" v-if="$root.isLoaded">- <template #brand>- <div class="logo">- <router-link :to="{ name: 'dashboard' }">- <img class="full" src="@/assets/logo.svg" alt="" />- <img class="favicon" src="@/assets/favicon.png" alt="" />- </router-link>- </div>- </template>- <template #end>- <navigation v-if="isMobile" :is-mobile="isMobile" :active-item="activeItem" :active-group="activeGroup"- @toggleGroup="toggleGroup" @doLogout="doLogout" />-- <b-navbar-item tag="a" href="#" @click.prevent="emitPageRefresh" data-cy="btn-refresh"- :aria-label="$t('globals.buttons.refresh')">- <b-tooltip :label="$t('globals.buttons.refresh')" type="is-dark" position="is-bottom">- <b-icon icon="refresh" /> <span class="is-hidden-tablet">{{ $t('globals.buttons.refresh') }}</span>- </b-tooltip>- </b-navbar-item>-- <b-navbar-dropdown class="user" tag="div" right>- <template v-if="profile.username" #label>- <span class="user-avatar">- <img v-if="profile.avatar" :src="profile.avatar" alt="" />- <span v-else>{{ profile.username[0].toUpperCase() }}</span>- </span>- </template>-- <b-navbar-item class="user-name" tag="router-link" to="/user/profile">- <strong>{{ profile.username }}</strong>- <div class="is-size-7">{{ profile.name }}</div>- </b-navbar-item>-- <b-navbar-item href="#">- <router-link to="/user/profile">- <b-icon icon="account-outline" /> {{ $t('users.profile') }}+ <div id="app" data-sidebar-layout>+ <template v-if="$root.isLoaded">+ <nav data-topnav>+ <div class="row">+ <div class="col-4 branding">+ <button data-sidebar-toggle type="button" aria-label="Toggle sidebar menu" class="small">+ <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"+ stroke-linecap="round" role="img" aria-label="Menu icon">+ <line x1="4" y1="7" x2="20" y2="7" />+ <line x1="4" y1="12" x2="20" y2="12" />+ <line x1="4" y1="17" x2="16" y2="17" />+ </svg>+ </button>+ <router-link :to="{ name: 'dashboard' }" class="favicon">+ <img src="@/assets/favicon.png" alt="listmonk" />+ </router-link>+ <router-link :to="{ name: 'dashboard' }" class="logo">+ <img src="@/assets/logo.svg" alt="listmonk" /></router-link>- </b-navbar-item>- <b-navbar-item href="#">- <a href="#" @click.prevent="doLogout"><b-icon icon="logout-variant" /> {{ $t('users.logout') }}</a>- </b-navbar-item>- </b-navbar-dropdown>- </template>- </b-navbar>-- <div class="wrapper" v-if="$root.isLoaded">- <section class="sidebar">- <b-sidebar position="static" mobile="hide" :fullheight="true" :open="true" :can-cancel="false">- <div>- <b-menu :accordion="false">- <navigation v-if="!isMobile" :is-mobile="isMobile" :active-item="activeItem" :active-group="activeGroup"- @toggleGroup="toggleGroup" />- </b-menu>- </div>- </b-sidebar>- </section>- <!-- sidebar-->-- <!-- body //-->- <div class="main">- <div class="global-notices" v-if="isGlobalNotices">- <div v-if="serverConfig.needs_restart" class="notification is-danger">- {{ $t('settings.needsRestart') }}- —- <b-button class="is-primary" size="is-small"- @click="$utils.confirm($t('settings.confirmRestart'), reloadApp)">- {{ $t('settings.restart') }}- </b-button></div>- <template v-if="serverConfig.update">- <div v-if="serverConfig.update.update.is_new" class="notification is-success">- {{ $t('settings.updateAvailable', {- version: `${serverConfig.update.update.release_version}- (${$utils.getDate(serverConfig.update.update.release_date).format('DD MMM YY')})`,- }) }}- <a :href="serverConfig.update.update.url" target="_blank" rel="noopener noreferer">View</a>+ <div class="col-8 justify-end hstack">+ <button type="button" class="ghost small" @click="emitPageRefresh" data-cy="btn-refresh"+ :aria-label="$t('globals.buttons.refresh')" :title="$t('globals.buttons.refresh')">+ <oat-icon icon="refresh" />+ </button>++ <ot-dropdown v-if="profile.username">+ <button popovertarget="user-menu" type="button" class="outline small user-trigger">+ <span class="user-avatar">+ <img v-if="profile.avatar" :src="profile.avatar" alt="" />+ <span v-else>{{ profile.username[0].toUpperCase() }}</span>+ </span>+ <span class="user-label">{{ profile.username }}</span>+ </button>+ <menu popover id="user-menu">+ <router-link to="/user/profile" role="menuitem">+ <oat-icon icon="account-outline" /> {{ $t('users.profile') }}+ </router-link>+ <button type="button" role="menuitem" class="ghost" @click="doLogout">+ <oat-icon icon="logout-variant" /> {{ $t('users.logout') }}+ </button>+ </menu>+ </ot-dropdown>+ </div>+ </div>+ </nav>++ <aside data-sidebar>+ <navigation :is-mobile="isMobile" :active-item="activeItem" :active-group="activeGroup"+ @toggleGroup="toggleGroup" />+ </aside>++ <main>+ <div class="container">+ <div class="global-notices" v-if="isGlobalNotices">+ <div v-if="serverConfig.needs_restart" role="alert">+ {{ $t('settings.needsRestart') }}+ —+ <button type="button" data-variant="danger"+ @click="$utils.confirm($t('settings.confirmRestart'), reloadApp)">+ {{ $t('settings.restart') }}+ </button></div>- <template v-if="serverConfig.update.messages && serverConfig.update.messages.length > 0">- <div v-for="m in serverConfig.update.messages" class="notification"- :class="{ [m.priority === 'high' ? 'is-danger' : 'is-info']: true }" :key="m.title">- <h3 class="is-size-5" v-if="m.title"><strong>{{ m.title }}</strong></h3>- <p v-if="m.description">{{ m.description }}</p>- <a v-if="m.url" :href="m.url" target="_blank" rel="noopener noreferer">View</a>+ <template v-if="serverConfig.update">+ <div v-if="serverConfig.update.update.is_new" role="status">+ {{ $t('settings.updateAvailable', {+ version: `${serverConfig.update.update.release_version}+ (${$utils.getDate(serverConfig.update.update.release_date).format('DD MMM YY')})`,+ }) }}+ <a :href="serverConfig.update.update.url" target="_blank" rel="noopener noreferer">View</a></div>++ <template v-if="serverConfig.update.messages && serverConfig.update.messages.length > 0">+ <div v-for="m in serverConfig.update.messages" role="status" :key="m.title">+ <h3 v-if="m.title"><strong>{{ m.title }}</strong></h3>+ <p v-if="m.description">{{ m.description }}</p>+ <a v-if="m.url" :href="m.url" target="_blank" rel="noopener noreferer">View</a>+ </div>+ </template></template>- </template>-- <div v-if="serverConfig.has_legacy_user" class="notification is-danger">- <b-icon icon="warning-empty" />- Remove the <code>admin_username</code> and <code>admin_password</code> fields from the TOML- configuration file or environment variables. If you are using APIs, create and use new API credentials- before removing them. Visit- <router-link :to="{ name: 'users' }">- Admin -> Settings -> Users- </router-link> dashboard. <a href="https://listmonk.app/docs/upgrade/#upgrading-to-v4xx" target="_blank"- rel="noopener noreferer">Learn more.</a>++ <div v-if="serverConfig.has_legacy_user" role="alert">+ <oat-icon icon="warning-empty" />+ Remove the <code>admin_username</code> and <code>admin_password</code> fields from the TOML+ configuration file or environment variables. If you are using APIs, create and use new API credentials+ before removing them. Visit+ <router-link :to="{ name: 'users' }">+ Admin -> Settings -> Users+ </router-link> dashboard. <a href="https://listmonk.app/docs/upgrade/#upgrading-to-v4xx" target="_blank"+ rel="noopener noreferer">Learn more.</a>+ </div></div>- </div>- <router-view :key="$route.fullPath" />- </div>- </div>+ <router-view :key="$route.fullPath" />+ </div>+ </main>+ </template>- <b-loading v-if="!$root.isLoaded" active />+ <oat-loading v-if="!$root.isLoaded" active /></div></template>@@ -189,7 +183,7 @@ export default Vue.extend({const d = JSON.parse(e.data);if (d && d.type === 'error') {const msg = reMatchLog.exec(d.message.trim());- this.$utils.toast(msg[2], 'is-danger', null, true);+ this.$utils.toast(msg[2], '', null, true);}};},@@ -229,7 +223,8 @@ export default Vue.extend({});</script>-<style lang="scss">-@import "assets/style.scss";+<style>+@import "assets/vendor/oat.min.css";@import "assets/icons/fontello.css";+@import "assets/style.css";</style>diff --git a/frontend/src/api/index.js b/frontend/src/api/index.jsindex cac1af8f..648b9a11 100644--- a/frontend/src/api/index.js+++ b/frontend/src/api/index.js@@ -1,4 +1,3 @@-import { ToastProgrammatic as Toast } from 'buefy';import axios from 'axios';import qs from 'qs';import store from '../store';@@ -78,13 +77,7 @@ http.interceptors.response.use((resp) => {}if (!err.config.disableToast) {- Toast.open({- message: msg,- type: 'is-danger',- queue: false,- position: 'is-top',- pauseOnHover: true,- });+ utils.toast(msg, 'is-danger');}return Promise.reject(err);diff --git a/frontend/src/assets/style.css b/frontend/src/assets/style.cssnew file mode 100644index 00000000..bc944828--- /dev/null+++ b/frontend/src/assets/style.css@@ -0,0 +1,907 @@+@font-face {+ font-family: "Inter";+ font-style: normal;+ font-weight: 400;+ src: url("./fonts/Inter-Regular.woff2") format("woff2");+}++@font-face {+ font-family: "Inter";+ font-style: normal;+ font-weight: 600;+ src: url("./fonts/Inter-Bold.woff2") format("woff2");+}++* {+ --primary: #0055d4;+ --container-max: 95%;+ --border: light-dark(#e5e7eb, #52525b);+ --font-sans: "Inter", system-ui, sans-serif;+}++body {+ background: light-dark(#fafafa, #1a1a1a);+}++a {+ text-decoration: none;+}++.text-1 { font-size: var(--text-1); }+.text-2 { font-size: var(--text-2); }+.text-3 { font-size: var(--text-3); }+.text-4 { font-size: var(--text-4); }+.text-5 { font-size: var(--text-5); }+.text-6 { font-size: var(--text-6); }+.text-7 { font-size: var(--text-7); }+.text-8 { font-size: var(--text-8); }+.font-normal { font-weight: var(--font-normal); }+.font-medium { font-weight: var(--font-medium); }+.font-semibold { font-weight: var(--font-semibold); }+.text-primary { color: var(--primary); }+.text-success { color: var(--success); }+.text-danger { color: var(--danger); }+.italic { font-style: italic; }+.capitalize { text-transform: capitalize; }+.uppercase { text-transform: uppercase; }+.mb-0 { margin-block-end: 0; }+.mb-3 { margin-block-end: var(--space-3); }+.mb-5 { margin-block-end: var(--space-5); }+.mt-5 { margin-block-start: var(--space-5); }+.ml-6 { margin-inline-start: var(--space-6); }+.ml-3 { margin-inline-start: var(--space-3); }+.mr-4 { margin-inline-end: var(--space-4); }+.p-6 { padding: var(--space-6); }+.py-6 { padding-block: var(--space-6); }+.pb-0 { padding-block-end: 0; }++.clearfix::after {+ clear: both;+ content: "";+ display: table;+}++.badge {+ border: 0;++ &.private,+ &.scheduled,+ &.paused,+ &.tx,+ &.api,+ &.double,+ &.status-unconfirmed,+ &.status_unconfirmed,+ &.unconfirmed {+ background: #fff1e0;+ color: #ed7b00;+ }++ &.public,+ &.running,+ &.list,+ &.campaign,+ &.user,+ &.primary,+ &.single {+ background: #e6f7ff;+ color: #3b8cff;+ }++ &.finished,+ &.enabled,+ &.status-confirmed,+ &.status_confirmed,+ &.confirmed {+ background: #dcfce7;+ color: #36995b;+ }++ &.blocklisted,+ &.cancelled,+ &.status-unsubscribed,+ &.status_unsubscribed,+ &.unsubscribed,+ &.campaign_visual {+ background: #fff1f0;+ color: #ff5722;+ }++ &.disabled,+ &.draft,+ &.optin,+ .oat-tag-input & {+ background: #eee;+ color: #7a7a7a;+ }++ &.is-restricted {+ opacity: 0.6;+ font-style: italic;+ }++ sup {+ font-weight: 600;+ letter-spacing: 0.03em;+ }++ &.unsubscribed sup,+ &.status-unsubscribed sup,+ &.status_unsubscribed sup {+ color: #fa8c16;+ }++ &.confirmed sup,+ &.status-confirmed sup,+ &.status_confirmed sup {+ color: #52c41a;+ }+}++html,+body {+ height: 100%;+}++body[data-sidebar-layout] {+ display: block;+}++#app {+ min-height: 100dvh;+}++nav[data-topnav] {+ font-size: var(--text-7);++ button[data-sidebar-toggle] {+ border: 0;+ color: var(--foreground);+ height: 100%;+ line-height: 1;+ margin-left: calc(-1.1 * var(--space-4));+ margin-right: 10px;+ padding: 6px 10px;+ transition: background-color var(--transition-fast), transform var(--transition-fast);++ &:hover {+ background-color: var(--accent);+ }++ &:active {+ transform: translateY(1px);+ }++ svg {+ opacity: 0.8;+ }+ }++ a,+ button {+ color: var(--muted-foreground);+ }++ img {+ display: block;+ height: 24px;+ max-height: 24px;+ width: auto;+ }++ .branding {+ align-items: center;+ display: flex;+ gap: var(--space-2);++ img {+ max-height: 17px;+ }+ }++ .favicon {+ display: none;+ line-height: 1;+ }++ .logo {+ display: inline-block;+ }++ .hstack {+ gap: var(--space-6);+ }++ > .row {+ grid-template-columns: minmax(0, 1fr) auto;++ > .branding,+ > .hstack {+ grid-column: auto;+ }+ }++ @media (max-width: 768px) {+ > .row {+ --grid-cols: 12;+ grid-template-columns: minmax(0, 1fr) auto;+ }++ .favicon {+ display: inline-block;+ }++ .logo {+ display: none;+ }++ .user-label {+ display: none;+ }++ .hstack {+ gap: var(--space-2);+ }+ }+}++.user-trigger {+ gap: var(--space-2);+}++.user-avatar {+ img,+ span {+ align-items: center;+ border-radius: 50%;+ display: inline-flex;+ height: 32px;+ justify-content: center;+ width: 32px;+ }++ span {+ background: var(--muted);+ font-weight: 700;+ }+}++.user-label {+ max-width: 12rem;+ overflow: hidden;+ text-overflow: ellipsis;+}++.global-notices {+ display: grid;+ gap: var(--space-2);+ margin-block-end: var(--space-4);+}++.spaced-links {+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-2);+}++.disabled {+ opacity: 0.4;+}++ul.no,+ol.no {+ list-style: none;+ margin: 0;+ padding: 0;+}++.relative {+ position: relative;+}++.content pre {+ white-space: pre-wrap;+}++.wrap {+ max-width: 1100px;+}++.narrow,+.section-mini {+ max-width: 500px;+}++.app-section {+ border: 1px dashed var(--border);+ border-radius: var(--radius-medium);+ color: var(--muted-foreground);+ padding: var(--space-8);+}++.copy-text {+ color: inherit;+ display: inline-flex;+ gap: var(--space-1);+ text-decoration: none;++ .icon {+ visibility: hidden;+ }++ &:hover {+ color: var(--primary);++ .icon {+ visibility: visible;+ }+ }+}++.page-404 h1 {+ font-size: 6rem;+}++.page-header h1,+.page-header h4 {+ margin-block-end: 0;+}++.page-content {+ margin-block-end: var(--space-6);+}++.has-kbd {+ align-items: center;+ display: inline-flex;+ gap: var(--space-2);+}++.kbd {+ border: 1px solid color-mix(in srgb, var(--primary), white 35%);+ border-radius: var(--radius-small);+ border-width: 1px 2px 2px 1px;+ color: color-mix(in srgb, var(--primary), white 40%);+ display: inline-block;+ font-family: var(--font-mono);+ font-size: 0.625rem;+ line-height: 1.2;+ padding: 1px var(--space-2);+}++.oat-data-table {+ font-size: var(--text-7);+}++.oat-data-table .table {+ min-width: 100%;+}++.oat-data-table thead th {+ background: var(--faint);+ border-bottom: 1px solid var(--border);+}++.oat-data-table thead th,+.oat-data-table tbody td {+ border-color: var(--border);+ padding: var(--space-4) var(--space-3);+ vertical-align: top;+}++.oat-data-table th button.ghost {+ color: inherit;+ font-size: inherit;+ font-weight: inherit;+ justify-content: flex-start;+ padding: 0;+}++.oat-data-table .actions {+ white-space: nowrap;++ a,+ .a,+ button {+ align-items: center;+ display: inline-flex;+ margin-inline: var(--space-2);+ text-decoration: none;+ vertical-align: middle;+ }++ a[data-disabled],+ .a[data-disabled] {+ color: var(--faint-foreground);+ cursor: not-allowed;+ pointer-events: none;+ }+}++.table-toolbar .actions {+ align-items: center;+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-4);++ .a,+ a {+ align-items: center;+ display: inline-flex;+ gap: var(--space-1);+ text-decoration: none;+ }+}++.field-list {+ font-size: var(--text-7);++ p {+ align-items: baseline;+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-2);+ line-height: 1.15;+ margin-block-end: var(--space-2);+ }++ label {+ color: var(--muted-foreground);+ flex: 0 0 6.5rem;+ font-weight: var(--font-semibold);+ padding-block-end: 0;+ text-align: start;+ }++ span,+ a {+ display: inline-block;+ }++ a {+ text-decoration: none;+ }+}++.field-list.stats {+ label {+ flex-basis: 5.5rem;+ }+}++.badge-list {+ display: inline-flex;+ flex-wrap: wrap;+ gap: var(--space-1);+ margin-block-start: var(--space-1);+}++td .badge,+.oat-data-table .badge {+ margin-block: 1px;+}++section.lists {+ td .badge {+ min-width: 65px;+ }++ .view {+ color: var(--faint-foreground);+ display: block;+ font-size: var(--text-8);++ &:hover {+ color: var(--primary);+ }+ }+}++section.templates {+ td .badge {+ min-width: 100px;+ }+}++section.users {+ td .badge {+ margin-inline: var(--space-1);+ }+}++.subscribers {+ .toggle-advanced {+ margin-block-start: var(--space-3);+ }++ .blocklisted {+ color: var(--danger);+ }++ td.link-click-url {+ max-width: 220px;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ }+}++.bounces {+ tr.details td,+ tr.detail td {+ max-width: 0;+ }++ pre {+ max-width: 100%;+ overflow-x: auto;+ padding: var(--space-2) var(--space-3);+ }++ .blocklisted {+ color: var(--danger);+ }+}++section.campaigns {+ tbody {+ .spinner {+ display: inline-flex;+ margin-inline-start: var(--space-2);+ vertical-align: middle;+ }++ tr.running {+ background: color-mix(in srgb, var(--primary) 8%, transparent);++ td {+ border-bottom-color: color-mix(in srgb, var(--primary) 20%, var(--border));+ }+ }++ td.lists ul {+ font-size: var(--text-7);+ list-style-type: circle;+ margin: 0;+ padding-inline-start: var(--space-4);+ }++ td.draft {+ color: var(--faint-foreground);+ }++ .send-rate,+ .scheduled {+ font-size: var(--text-7);+ }+ }+}++section.analytics {+ .charts {+ min-height: 100px;+ position: relative;+ }++ .chart {+ margin-block-end: var(--space-16);+ max-width: 100%;+ }++ .donut-container {+ position: relative;+ }+}++.chart canvas {+ height: 400px;+ max-width: 100%;+}++.preview {+ padding: 0;+ position: relative;++ #iframe {+ border: 0;+ margin: 0 0 -5px;+ max-height: 100%;+ min-height: 70vh;+ padding: 0;+ width: 100%;+ }+}++.plain-editor,+.plain-editor textarea,+.code-editor {+ border: 1px solid var(--border);+ border-radius: var(--radius-small);+ min-height: 250px;+ position: relative;+ width: 100%;+}++.code-editor {+ height: 65vh;++ .cm-editor {+ height: 100%;+ }++ .cm-lineNumbers .cm-gutterElement {+ color: var(--faint-foreground);+ font-size: var(--text-7);+ padding-inline-end: var(--space-3);+ }++ .cm-gutters {+ margin-inline-end: var(--space-3);+ }+}++.alt-body textarea {+ height: 30vh;+}++.editor {+ margin-block-end: var(--space-8);++ .copy-visual-template-list {+ min-width: 200px;+ }+}++.richtext-editor {+ .tox-tinymce {+ border: 1px solid var(--border);+ border-radius: var(--radius-medium);+ box-shadow: var(--shadow-small);+ height: 100%;+ }++ .tox-statusbar__branding {+ display: none;+ }++ .tox .tox-statusbar {+ border: 0;+ }+}++.tox.tox-silver-sink {+ z-index: 850;+}++.tox.tox-silver-sink .tox-dialog-wrap {+ z-index: 900;+}++.log-view {+ .lines {+ border: 1px solid var(--border);+ font-family: var(--font-mono);+ font-size: 0.9rem;+ height: 70vh;+ overflow-y: auto;+ padding: var(--space-4);+ }++ .line {+ display: block;+ margin-block-end: 2px;++ &:hover {+ background: var(--faint);+ }+ }++ .timestamp,+ .file {+ color: var(--primary);+ display: inline-block;+ margin-inline-end: var(--space-2);+ min-width: 175px;+ user-select: auto;+ }++ .timestamp {+ margin-inline-end: var(--space-4);+ }+}++section.import {+ .delimiter input {+ max-width: 100px;+ }++ .status {+ padding: var(--space-12);+ }++ .log-view .lines {+ max-height: 240px;+ text-align: start;+ }+}++.media-files {+ img {+ border-radius: var(--radius-small);+ height: 100%;+ max-height: 170px;+ max-width: 170px;+ object-fit: cover;+ transition: transform var(--transition);+ width: 100%;+ }++ .grid {+ display: grid;+ gap: var(--space-6);+ grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));+ padding-block: var(--space-4);+ }++ .item {+ background: var(--card);+ border: 1px solid var(--border);+ border-radius: var(--radius-medium);+ box-shadow: var(--shadow-small);+ overflow: hidden;+ transition: transform var(--transition), box-shadow var(--transition);++ &:hover {+ box-shadow: var(--shadow-medium);+ transform: translateY(-2px);++ img {+ transform: scale(1.05);+ }++ .actions {+ opacity: 1;+ }+ }+ }++ .thumb {+ aspect-ratio: 1;+ overflow: hidden;+ position: relative;+ }++ .thumb-link,+ .thumb-container {+ display: block;+ height: 100%;+ width: 100%;+ }++ .thumb-container,+ .thumb-placeholder {+ align-items: center;+ background: var(--faint);+ display: flex;+ justify-content: center;+ }++ .thumb-placeholder {+ background: var(--muted-foreground);+ color: var(--background);+ height: 100%;+ width: 100%;+ }++ .file-ext {+ text-transform: uppercase;+ }++ .actions {+ align-items: center;+ background: color-mix(in srgb, var(--background) 90%, transparent);+ border-radius: var(--radius-full);+ display: flex;+ height: 28px;+ justify-content: center;+ opacity: 0;+ position: absolute;+ right: var(--space-2);+ top: var(--space-2);+ transition: opacity var(--transition);+ width: 28px;+ }++ .info {+ padding: var(--space-3);+ }++ .filename {+ font-size: var(--text-7);+ margin-block-end: var(--space-1);+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ }++ .date {+ color: var(--faint-foreground);+ font-size: var(--text-8);+ margin-block-end: 0;+ }+}++.settings {+ .settings-wrap {+ max-width: 1240px;+ }++ .settings-tabs {+ min-width: 0;+ }++ .code-editor {+ height: 20vh;+ min-height: 350px;+ }+}++.user-api-token .copy-text {+ background: color-mix(in srgb, var(--success) 10%, transparent);+ border-radius: var(--radius-small);+ color: var(--success);+ display: block;+ font-size: 1.2rem;+ padding: var(--space-4);+ width: 100%;+}++.permissions-group {+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-3);++ label {+ display: flex;+ flex: 1 1 45%;+ max-width: 45%;+ }+}++th.role-toggle-select a {+ font-weight: var(--font-normal);+}++@media screen and (max-width: 1500px) {+ .table-toolbar {+ align-items: stretch;+ flex-direction: column;+ }+}++@media screen and (max-width: 1100px) {+ html,+ body {+ overflow-x: auto;+ }++ .table-toolbar .actions {+ align-items: flex-start;+ flex-direction: column;+ gap: var(--space-1);+ }++ td .badge:not(:last-child) {+ margin-inline-end: 0;+ }++ section.dashboard label {+ min-width: auto;+ }+}++@media screen and (max-width: 850px) {+ .settings .settings-tabs {+ display: block;+ }+}diff --git a/frontend/src/assets/style.scss b/frontend/src/assets/style.scssdeleted file mode 100644index fc6893f7..00000000--- a/frontend/src/assets/style.scss+++ /dev/null@@ -1,1422 +0,0 @@-/* Import Bulma to set variables */-@import "../node_modules/bulma/sass/utilities/_all";--/* import inter-regular */-@font-face {- font-family: 'Inter';- font-style: normal;- font-weight: 400;- src: local(''),- url('assets/fonts/Inter-Regular.woff2') format('woff2'),-}--/* import inter-600 */-@font-face {- font-family: 'Inter';- font-style: normal;- font-weight: 600;- src: local(''),- url('assets/fonts/Inter-Bold.woff2') format('woff2'),-}--$body-family: "Inter", "Helvetica Neue", sans-serif;-$body-size: 15px;-$background: $white-bis;-$body-background-color: $white-bis;-$primary: #0055d4;-$green: #36995b;-$turquoise: $green;-$red: #FF5722;--$link: $primary;-$input-placeholder-color: $grey-light;-$grey-lightest: #f3f3f3;--$colors: map-merge($colors, (- "turquoise": ($green, $green-invert),- "green": ($green, $green-invert),- "success": ($green, $green-invert),- "danger": ($red, $green-invert),-));--$sidebar-box-shadow: none;-$sidebar-width: 240px;-$menu-item-active-background-color: $white-bis;-$menu-item-active-color: $primary;---/* Buefy */-$modal-background-background-color: rgba(0, 0, 0, .30);--.line-chart {- min-height: 300px;-}--/* Import full Bulma and Buefy */-@import "bulma";-@import "buefy/src/scss/buefy";--/* Custom style overrides */-html, body {- height: 100%;-}--code {- color: $grey;-}--pre {- background: none;- border: 1px solid $grey-lightest;-}--ul.no {- list-style-type: none;- padding: 0;- margin: 0;-}--.relative {- position: relative;-}--.content pre {- white-space: pre-wrap;-}--section {- &.wrap {- max-width: 1100px;- }-- &.section-mini {- max-width: 500px;- }-}--.spinner.is-tiny {- display: inline-block;- height: 10px;- width: 10px;- position: relative;-- .loading-overlay {- .loading-background {- background: none;- }- .loading-icon::after {- width: 10px;- height: 10px;- top: 0;- left: 0;- position: static;- }- }-}--.is-disabled {- opacity: 0.30;-}--.b-checkbox.checkbox:hover input[type="checkbox"]:not(:disabled) + .check.is-primary:hover {- border-color: $primary;-}-.b-checkbox.checkbox input[type="checkbox"]:checked + .check.is-primary {- border-color: $primary;- background-color: $primary;-}--.has-text-primary {- color: $primary !important;-}--.box {- background: $white;- box-shadow: 2px 2px 0 #f3f3f3;- border: 1px solid #e6e6e6;-}- .box hr {- background-color: #efefef;- }--.navbar-item.user {- .navbar-link:not(.is-arrowless)::after {- margin-top: -0.6rem;- }-- .user-name {- display: block;- min-width: 150px;- }-}--.navbar-dropdown {- font-size: 1rem;-}--.user-avatar {- img {- display: inline-block;- border-radius: 100%;- width: 32px;- height: 32px;- max-height: none;- }- span {- background-color: #ddd;- border-radius: 100%;- width: 32px;- height: 32px;- text-align: center;- display: inline-block;- font-size: 0.875rem;- font-weight: bold;-- display: flex;- justify-content: center;- align-items: center;- }-}--.copy-text {- color: inherit;- .icon {- visibility: hidden;- }-- &:hover {- color: $primary;- .icon {- visibility: visible;- }- }-}--.spaced-links a {- margin-right: 15px;- display: inline-block;-}--/* Two column sidebar+body layout */-#app {- min-height: 100%;- .wrapper {- display: flex;- flex-direction: row;- min-height: 100vh;- margin-top: 0px;- }-- .sidebar {- flex-shrink: 1;- box-shadow: 0 0 3px $grey-lighter;- background: $white;- }-- .main {- background: $white;- margin-left: 15px;- padding: 30px;- flex-grow: 1;- position: relative;- }-}--.navbar {- box-shadow: 0 0 3px $grey-lighter;-}-.navbar-brand {- padding: 0 0 0 25px;- .favicon {- display: none;- }- .full {- max-height: 17px;- margin-top: 15px;- }- .favicon {- margin-top: 12px;- max-height: 24px;- }-}--.b-sidebar {- position: sticky;- top: 75px;-- .sidebar-content {- background: transparent;- }- .menu-list {- .router-link-exact-active {- border-right: 5px solid $primary;- outline: 0 none;- }- li ul {- margin-right: 0;- }- > li {- margin-bottom: 10px;- a {- padding-left: 25px;- }- }- a {- border-radius: 0;- }- .icon {- margin-right: 8px;- }- }-}--/* Fix for sidebar jumping on modals */-body.is-noscroll {- position: static;- overflow-y: visible;- width: auto;-}--/* Global notices */-.global-notices {- margin-bottom: 30px;-}-.notification {- padding: 10px 15px;- border-left: 10px solid #eee;-- &.is-danger {- background: $white-ter;- color: $black;- border-left-color: $red;- }- &.is-success {- background: $white-ter;- color: $black;- border-left-color: $green;- }- &.is-info {- background: $white-ter;- border-left-color: $primary;- color: $grey-dark;- }-}--/* WYSIWYG / HTML code editor */-.plain-editor textarea, .code-editor {- position: relative;- width: 100%;- min-height: 250px;- height: 65vh;- border: 1px solid $grey-lighter;- border-radius: 2px;-- .cm-editor {- height: 100%;- }-}--.code-editor {- .cm-lineNumbers .cm-gutterElement{- color: #aaa;- font-size: 0.875rem;- padding-right: 10px;- }- .cm-gutters {- margin-right: 10px;- }-}--.alt-body textarea {- height: 30vh;-}--.editor {- margin-bottom: 30px;-- .copy-visual-template-list {- select {- min-width: 200px;- }- }-}--.richtext-editor {- .tox-tinymce {- height: 100%;- box-shadow: 2px 2px 0 #f3f3f3;- border: 1px solid #e6e6e6;- border-radius: 3px;-- .tox-toolbar__primary {- border-color: #e6e6e6 !important;- }- }- .tox-statusbar__branding {- display: none;- }- .tox .tox-statusbar {- border: 0;- }-- .tox-tinymce--toolbar-sticky-on .tox-editor-header {- padding-top: 48px !important;- }-}--.tox.tox-silver-sink {- z-index: 850;-- .tox-dialog-wrap {- z-index: 900;- }- .tox-dialog {- @extend .box;- }-- .tox-track-link {- display: block;- cursor: pointer;-- margin: 5px 0 10px 0;- input {- margin-right: 5px;- }- }-- .tox-button {- border-radius: 4px;- }- .tox-button:not(.tox-button--secondary):not(.tox-button--naked) {- background: $primary;- }-- .tox-textfield {- box-shadow: 2px 2px 0 $white-ter;- border: 1px solid $grey-lighter;- }-}--.tox, .tox-tinymce, .tox-tinymce-aux, .tox .tox-button, .tox .tox-button-link, .tox .tox-dialog__title,- .tox .tox-textfield,- .tox .tox-toolbar-textfield,- .tox .tox-listboxfield .tox-listbox--select,- .tox .tox-textarea,- .tox .tox-selectfield select {- /* All TinyMCE components */- font-family: $body-family !important;- }--/* Table colors and padding */-.main table {- thead th {- background: $white-bis;- border-bottom: 1px solid $grey-lighter;- }- thead th, tbody td {- padding: 15px 10px;- border-color: $grey-lightest;- }-- .actions a, .actions .a {- margin: 0 10px;- display: inline-block;- }- .actions a[data-disabled],- .actions .icon[data-disabled] {- pointer-events: none;- cursor: not-allowed;- color: $grey-light;- }-- td {- .fields {- font-size: $size-7;-- p {- line-height: 0.775rem;- display: flex;- flex-direction: row;- flex-wrap: wrap;- }-- label {- font-weight: bold;- text-align: left;- padding-bottom: 6px;- min-width: 100px;- }- span {- display: inline-block;- }- [class*=" mdi-"]::before {- margin-left: 0;- }- }-- }-}--/* Modal */-.modal {- z-index: 950;-- &.has-overflow {- overflow: auto !important;- .modal-content {- overflow: visible !important;- }- .modal-card {- overflow: visible !important;- }- .modal-card-body {- overflow: visible !important;- }- }-}-.modal-background {- background: rgba(241, 241, 241, 0.7);-}-.modal-content, .modal.dialog .modal-card {- background: $white;- box-shadow: 0 0 10px #ddd;- border: 1px solid #ddd;- padding: 0;- border-radius: 5px;-}-.modal-card-head {- display: block;- border-bottom: 0;-}-.modal-card-body {- padding: 30px 20px;-}-.modal .modal-card-foot {- background: none;- justify-content: flex-end;- border-top: 0;-}-.modal .modal-card-foot button {- flex-grow: 1;- &.is-primary {- font-weight: bold;- }-}-.modal .modal-close.is-large {- display: none;-}---/* Table */-.b-table .level-left {- min-width: 60%;- display: block;-- .actions .a {- display: inline-block;- margin-right: 30px;- }-}---/* Fix for input colours */-.button {- &.is-primary {- background: $primary;-- &:hover, &:active {- background: darken($primary, 15%);- }- &:disabled {- background: $grey-light;- }- &:focus:not(:active), &.is-focused:not(:active) {- box-shadow: 0 0 0 0.2em rgba($primary, 0.25);- }-- .has-kbd {- display: inline-flex;- align-items: center;- gap: 0.5rem;- }-- .kbd {- font-size: 0.575rem;- font-family: monospace;- color: #cbdefa;- border: 1px solid #5381c5;- border-radius: 3px;- padding: 1px 5px;- display: inline-block;- border-width: 1px 2px 2px 1px;- }- }-- &.is-light.is-outlined {- background: lighten($primary, 55%);-- &.is-focused {- background: lighten($primary, 55%);- }-- &.is-selected {- border-color: $primary;- color: $primary;- font-weight: bold;- }- }-- &:not(.is-small) {- height: auto;- padding: 10px 20px;- }-}--.button.is-primary[disabled] {- border-color: $grey-light;-}-.has-addons {- .controls .button.is-primary {- border-top-left-radius: 0;- border-bottom-left-radius: 0;- }-- .input:hover {- box-shadow: none;- }-}--.autocomplete {- .dropdown-content {- background-color: $white-bis;- border: 1px solid $primary;- }- a.dropdown-item {- font-size: $size-6;- &:hover, &.is-hovered {- background-color: $grey-lightest;- color: $primary;- }- }- .dropdown-menu {- top: 92%;- }- .dropdown-menu.is-opened-top {- top: auto;- bottom: 92%;- }-}--.input, .taginput .taginput-container.is-focusable, .textarea {- box-shadow: 2px 2px 0 $white-ter;- border: 1px solid $grey-lighter;-}--.select:not(.is-multiple) {- height: auto;-}--.input, .select select {- height: auto;- padding: 10px 12px;-}- .control.has-icons-left .icon.is-left {- height: 3rem;- }--.taginput .taginput-container .autocomplete {- input {- padding: 16px 32px 17px 32px;- }-- .control.has-icons-left .icon.is-left {- height: 2rem;- }-}--/* Form fields */-.field {- &:not(:last-child) {- margin-bottom: 2rem;- }-- .control {- position: relative;-- .help.counter {- position: absolute;- top: -20px;- right: 0;- }- }-- label {- color: $grey-dark;- }-- &.is-floating-label label.label {- background-color: $white;- font-size: 0.875rem;- }-- .help {- color: $grey;- }-}-.has-numberinput .field, .field.is-grouped {- margin-bottom: 0;-}-.b-numberinput.field.is-grouped div.control {- flex-grow: 0;-}--/* Tabs */-.b-tabs {- .tab-content {- padding: 30px 20px;-- border: 1px solid #ddd;- border-width: 0 1px 1px 1px;- border-radius: 5px;-- box-shadow: 2px 2px 0 #f3f3f3;- }-- ul[role=tablist] {- margin-left: 0;- }-}--/* Tags */-.tag {- border-radius: 30px !important;- border: 0;- padding: 0 20px !important;-- &.is-small {- font-size: 0.65rem;- background: $white-ter;- // border: 1px solid $white-ter;- padding: 3px 5px;- min-width: auto !important;- }-- &:not(body) {- background-color: #eee;- font-size: 0.85em;- color: $grey;- }-- &.private, &.scheduled, &.paused, &.tx, &.api {- $color: #ed7b00;- color: $color;- background: lighten($color, 47);- }- &.public, &.running, &.list, &.campaign, &.user, &.primary {- $color: $primary;- color: lighten($color, 20%);- background: #e6f7ff;- }- &.finished, &.enabled, &.status-confirmed {- color: $green;- background: #dcfce7;- }- &.blocklisted, &.cancelled, &.status-unsubscribed, &.campaign_visual {- $color: $red;- color: $color;- background: #fff1f0;- }-- sup {- font-weight: $weight-semibold;- letter-spacing: 0.03em;- }- &.unsubscribed sup {- color: #fa8c16;- }- &.confirmed sup {- color: #52c41a;- }-- &:not(body) .icon:first-child:last-child {- margin-right: 1px;- }-}---/* Page header */-.page-header {- .buttons {- justify-content: flex-end;- }-}--.page-404 h1 {- font-size: 100px;-}--/* Dashboard */-section.dashboard {- .title {- margin-bottom: 0.5rem;- }-- .tile.notification {- @extend .box;- padding: 10px;- }-- .counts .column {- padding: 30px;- }-- .level-item {- background-color: $white-bis;- padding: 30px;- margin: 10px;-- &:first-child, &:last-child {- margin: 0;- }- }-- label {- font-weight: bold;- display: inline-block;- min-width: 50px;- text-align: right;- }-- .charts {- min-height: 200px;- }-- .notification {- border-width: 0;- }-}--/* Lists page */-section.lists {- td {- .tag {- min-width: 65px;- }- }-- .view {- display: block;- color: $grey-light;-- &:hover {- color: $primary;- }- }-}--/* List selector */-.list-tags {- margin-bottom: 1rem;-- .is-restricted {- opacity: 0.6;- font-style: italic;- }-}--/* Subscribers page */-.subscribers {- .subscribers-controls .buttons {- margin-top: 15px;- }-- .toggle-advanced {- margin-top: 10px;- }-- .blocklisted {- color: red;- }-- td.link-click-url {- max-width: 200px;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;- }-}--.b-table.subscriptions {- overflow-y: scroll;- max-height: 250px;-- thead th, tbody td {- padding: 10px;- }-- td.status .tag {- width: 100%;- }-}--.bounces {- tr.detail td {- max-width: 0;- }- pre {- padding: 5px 10px;- overflow-x: auto;- max-width: 100%;- }- .blocklisted {- color: red;- }-}--/* Import page */-section.import {- .delimiter input {- max-width: 100px;- }- .status {- padding: 60px;- }- .log-view .lines {- max-height: 240px;- text-align: left;- }-}--/* Campaigns page */-section.campaigns {- table tbody {- .spinner {- margin-left: 10px;- .loading-overlay .loading-icon::after {- border-bottom-color: lighten(#1890ff, 30%);- border-left-color: lighten(#1890ff, 30%);- }- }-- tr.running {- background: lighten(#1890ff, 43%);- td {- border-bottom: 1px solid lighten(#1890ff, 30%);- }- }-- td {- .tags {- margin-top: 5px;- }-- &.lists ul {- // font-size: $size-7;- list-style-type: circle;- }-- &.draft {- color: $grey-lighter;- }-- .progress-wrapper {- .progress.is-small {- height: 0.4em;- }- display: inline-block;- }- }- }-}--section.analytics {- .charts {- position: relative;- min-height: 100px;- }-- .chart {- margin-bottom: 100px;- max-width: 100%;- }-- .donut-container {- position: relative;- }-}--.chart canvas {- height: 400px;- max-width: 100%;-}--/* Campaign / template preview popup */-.preview {- padding: 0;-- /* Contain the spinner background in the content area. */- position: relative;-- #iframe {- border: 0;- width: 100%;- max-height: 100%;- min-height: 70vh;- padding: 0;- margin: 0 0 -5px 0;- }-}--/* Media gallery */-.media-files {- img {- border-radius: 3px;- max-width: 170px;- max-height: 170px;- width: 100%;- height: 100%;- object-fit: cover;- transition: transform 0.2s ease;-- .item:hover & {- transform: scale(1.05);- }- }-- .grid {- display: grid;- grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));- gap: 1.5rem;- padding: 1rem 0;- }-- .item {- background: $white;- box-shadow: 2px 2px 0 #f3f3f3;- border: 1px solid #e6e6e6;-- border-radius: 8px;- overflow: hidden;- transition: transform 0.2s ease, box-shadow 0.2s ease;-- &:hover {- transform: translateY(-2px);- box-shadow: 2px 2px 5px #eee;-- .actions {- opacity: 1;- }- }- }-- .thumb {- position: relative;- aspect-ratio: 1;- overflow: hidden;- }-- .thumb-link {- display: block;- width: 100%;- height: 100%;- }-- .thumb-container {- width: 100%;- height: 100%;- display: flex;- align-items: center;- justify-content: center;- background: #f8f9fa;- }-- .thumb-placeholder {- width: 100%;- height: 100%;- display: flex;- align-items: center;- justify-content: center;- background: $grey-dark;- color: white;- }-- .file-ext {- text-transform: uppercase;- }-- .actions {- background: rgba(255, 255, 255, 0.9);- border-radius: 50%;- width: 28px;- height: 28px;- display: flex;- align-items: center;- justify-content: center;-- position: absolute;- top: 8px;- right: 8px;- opacity: 0;- transition: opacity 0.2s ease;-- .item:hover & {- opacity: 1;- }- }-- .info {- padding: 10px;-- .filename {- margin-bottom: 5px;- font-size: 0.9rem;- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;- }-- .date {- font-size: 0.75rem;- color: $grey-light;- margin-bottom: 0;- }- }-}--/* Template form */-.templates {- td .tag {- min-width: 100px;- }-}-.template-modal {- .template-modal-content {- height: 95vh;- max-height: none;- }- .textarea {- max-height: none;- height: 55vh;- }-}--/* Settings */-.settings {- .settings-wrap {- max-width: 1240px;- }-- .settings-tabs {- flex-wrap: nowrap;-- > .tabs {- flex: 0 0 230px;-- a {- border: 0;- }- li.is-active {- background: $grey-lightest;- border-left: 5px solid $primary;- border-bottom: 0;- color: inherit;- }- }-- > .tab-content {- border: 0;- box-shadow: none;- padding: 0 0 0 45px;- min-width: 0;- }- }-- .disabled {- opacity: 0.30;- }- .box {- margin-bottom: 30px;- }- .code-editor {- height: 20vh;- min-height: 350px;- }-}--/* Logs */-.log-view {- .lines {- height: 70vh;- overflow-y: scroll;- font-family: monospace;- font-size: 0.90rem;-- padding: 15px;- border: 1px solid $grey-lightest;-- .line {- display: block;- margin-bottom: 2px;- }-- .timestamp, .file {- color: $primary;- display: inline-block;- min-width: 175px;- margin-right: 5px;- user-select: auto;- }- .timestamp {- margin-right: 15px;- }-- .line:hover {- background: $white-bis;- }- }-}--/* Users */-section.users {- td .tag {- margin: 0 3px;- }-}-.user-api-token .copy-text {- background: rgba($green, .1);- display: block;- width: 100%;- border-radius: 3px;- padding: 15px;- font-size: 1.2rem;- color: $green;-}--.permissions-group {- display: flex;- flex-wrap: wrap;- gap: 10px;-- label {- flex: 1 1 45%;- max-width: 45%;- display: flex;- }-}--th.role-toggle-select a {- font-weight: normal;-}--/* C3 charting lib */-.c3 {- .c3-text.c3-empty {- font-family: $body-family;- font-size: $size-6;- }- .c3-chart-lines .c3-line {- stroke-width: 2px;- }- .c3-axis-x .tick line,- .c3-axis-y .tick line {- display: none;- }- text {- fill: $grey;- font-family: $body-family;- font-size: 11px;- }- .c3-axis path, .c3-axis line {- stroke: #eee;- }-- .c3-tooltip {- @extend .box;- padding: 10px;- empty-cells: show;- opacity: 0.95;-- tr {- border: 0;- }- th {- background: $white;- }- }-}--/* Vue animations */-.slide-enter-active, .slide-leave-active {- transition: opacity 50ms;- max-height: none;-}-.slide-enter, .slide-leave-to {- transition: opacity 50ms;- opacity: 0;- max-height: none;-}-.slide-leave-active, .slide-leave-to {- transition: none;- display: none;-}---/* Toasts */-.notices {- .toast {- @extend .box;- border-left: 15px solid $grey;- border-radius: 3px;- padding: 20px;-- &.is-danger {- background: $white;- border-left-color: $red;- color: $grey-dark;- }- &.is-success {- background: $white;- border-left-color: $green;- color: $grey-dark;- }- }-}--@media screen and (max-width: 1500px) {- .b-table {- .top.level {- display: block;- }- }- .b-table .level-left {- display: block;- width: 100%;- min-width: 0;- }-}--@media screen and (max-width: 1100px) {- html, body {- overflow-x: auto;- }-- #app .main {- margin-left: 5px;- padding: 30px 20px 30px 20px;- }-- .navbar-brand {- .full {- display: none;- }- .favicon {- display: block;- }- padding-left: 10px;- }-- .b-sidebar {- top: 30px;- }-- /* Hide sidebar menu captions on mobile */- .b-sidebar .sidebar-content.is-mini-mobile {- max-width: 90px;- .menu-list {- li {- margin-bottom: 30px;-- span:nth-child(2) {- display: none;- }- .icon.is-small {- scale: 1.4;- }- }- > li {- a {- padding-left: 15px;- }- }- }- }-- td .tags {- .tag:not(:last-child) {- margin-right: 0;- }- }-- section.dashboard label {- min-width: auto;- }-- /* Tabs */- nav.tabs.is-boxed ul {- display: block;- text-align: left;- flex-grow: 1;-- li {- a {- justify-content: left;- border: 1px solid $grey-lighter !important;- }-- &.is-active a {- border-bottom: 1px solid $grey-lighter !important;- padding-left: 30px;- }- }- }-- /* Table top-left controls */- .b-table .level-left {- .actions .a {- display: block;- margin: 0 0 5px 0;- }- }-}--@media screen and (max-width: 1024px) {- .navbar-item.user {- border-top: 1px solid #ddd;- margin-top: 15px;- }- .navbar-item.user .navbar-link {- padding: 15px;- }-}--@media screen and (max-width: 850px) {- .page-header .buttons {- display: block;- }-- .b-tabs .tab-content {- padding: 15px 0 0 0;- }-- .settings {- .settings-tabs {- display: block;-- > .tabs {- margin-bottom: 20px;- }-- > .tab-content {- padding: 0;- }- }- }-}--/* On big sizes, keep the header buttons small and non-expanded. */-@media screen and (min-width: 769px) {- .page-header .button {- display: inline-block;- width: auto;- }-}diff --git a/frontend/src/assets/vendor/oat.min.css b/frontend/src/assets/vendor/oat.min.cssnew file mode 100644index 00000000..a2191fa6--- /dev/null+++ b/frontend/src/assets/vendor/oat.min.css@@ -0,0 +1 @@+@layer theme,base,components,animations,utilities;@layer base{*,*:before,*:after{box-sizing:border-box;-webkit-tap-highlight-color:transparent}*{margin:0}html{tab-size:4}body,dialog,[popover]{font-family:var(--font-sans);font-size:var(--text-regular);line-height:var(--leading-normal);color:var(--foreground)}body{background-color:var(--background);color:var(--foreground);-webkit-font-smoothing:antialiased}main{padding-block-start:var(--space-8)}img,picture,video,canvas,svg{max-width:100%}p,h1,h2,h3,h4,h5,h6{overflow-wrap:break-word}h1,h2,h3,h4,h5,h6{font-weight:var(--font-semibold);line-height:1.25;&:first-child{margin-block-start:0}}h1{font-size:var(--text-1);margin:var(--space-10) 0 var(--space-6)}h2{font-size:var(--text-2);margin:var(--space-8) 0 var(--space-5)}h3{font-size:var(--text-3);margin:var(--space-6) 0 var(--space-4)}h4{font-size:var(--text-4);margin:var(--space-5) 0 var(--space-3)}h5{font-size:var(--text-5);margin:var(--space-4) 0 var(--space-2)}h6{font-size:var(--text-regular);margin:var(--space-4) 0 var(--space-2)}p{margin-block-end:var(--space-4);&:last-child{margin-block-end:0}}a{color:var(--primary);text-decoration:underline;text-underline-offset:2px;transition:color var(--transition-fast);&:hover{color:rgb(from var(--primary) r g b / .8)}}strong,b{font-weight:var(--font-semibold)}em,i{font-style:italic}small{font-size:var(--text-7)}code{font-family:var(--font-mono);font-size:.875em;padding:calc(var(--space-1) / 2) var(--space-1);background-color:var(--faint);border-radius:var(--radius-small)}pre{font-family:var(--font-mono);padding:var(--space-4);background-color:var(--faint);border-radius:var(--radius-medium);overflow-x:auto;margin-block-end:var(--space-4);code{padding:0;background:none;border-radius:0}}blockquote{border-inline-start:4px solid var(--border);padding-inline-start:var(--space-4);margin:var(--space-4) 0;color:var(--muted-foreground);font-style:italic}hr{border:none;border-top:1px solid var(--border);margin:var(--space-8) 0}ul,ol{padding-inline-start:var(--space-6);margin-block-end:var(--space-4)}ul{list-style-type:disc}ol{list-style-type:decimal}li{margin-block-end:var(--space-1)}mark{background-color:rgb(from var(--warning) r g b / .3);padding:calc(var(--space-1) / 2) var(--space-1);border-radius:var(--radius-small)}[hidden]{display:none}:focus-visible{outline:2px solid var(--ring);outline-offset:2px}:disabled{opacity:.5;cursor:not-allowed}}@layer theme{:root{color-scheme:light dark;--background: light-dark(#fff, #09090b);--foreground: light-dark(#09090b, #fafafa);--card: light-dark(#fff, #18181b);--card-foreground: light-dark(#09090b, #fafafa);--primary: light-dark(#574747, #fafafa);--primary-foreground: light-dark(#fafafa, #18181b);--secondary: light-dark(#f4f4f5, #27272a);--secondary-foreground: light-dark(#574747, #fafafa);--muted: light-dark(#f4f4f5, #27272a);--muted-foreground: light-dark(#71717a, #a1a1aa);--faint: light-dark(#fafafa, #1e1e21);--faint-foreground: light-dark(#a1a1aa, #71717a);--accent: light-dark(#f4f4f5, #27272a);--danger: light-dark(#d32f2f, #f4807b);--danger-foreground: light-dark(#fafafa, #18181b);--success: light-dark(#008032, #6cc070);--success-foreground: light-dark(#fafafa, #18181b);--warning: light-dark(#a65b00, #f0a030);--warning-foreground: #09090b;--border: light-dark(#d4d4d8, #52525b);--input: light-dark(#d4d4d8, #52525b);--ring: light-dark(#574747, #d4d4d8);--space-1: .25rem;--space-2: .5rem;--space-3: .75rem;--space-4: 1rem;--space-5: 1.25rem;--space-6: 1.5rem;--space-8: 2rem;--space-10: 2.5rem;--space-12: 3rem;--space-14: 3.5rem;--space-16: 4rem;--space-18: 4.5rem;--radius-small: .125rem;--radius-medium: .375rem;--radius-large: .75rem;--radius-full: 9999px;--bar-height: .5rem;--font-sans: system-ui, sans-serif;--font-mono: ui-monospace, Consolas, monospace;--text-1: clamp(1.75rem, 1.5rem + 1.1vw, 2.25rem);--text-2: clamp(1.5rem, 1.3rem + .8vw, 1.875rem);--text-3: clamp(1.25rem, 1.1rem + .5vw, 1.5rem);--text-4: clamp(1.125rem, 1.05rem + .3vw, 1.25rem);--text-5: 1.125rem;--text-6: 1rem;--text-7: .875rem;--text-8: .75rem;--text-regular: var(--text-6);--leading-normal: 1.5;--font-normal: 400;--font-medium: 500;--font-semibold: 600;--font-bold: 600;--shadow-small: 0 1px 2px 0 rgb(0 0 0 / .05);--shadow-medium: 0 1px 3px 0 rgb(0 0 0 / .1), 0 1px 2px -1px rgb(0 0 0 / .1);--shadow-large: 0 4px 6px -1px rgb(0 0 0 / .1), 0 2px 4px -2px rgb(0 0 0 / .1);--transition-fast: .12s cubic-bezier(.4, 0, .2, 1);--transition: .2s cubic-bezier(.4, 0, .2, 1);--z-dropdown: 50;--z-modal: 200}}@layer animations{@media(prefers-reduced-motion:reduce){*,*:before,*:after{animation-duration:.01ms!important;animation-iteration-count:1!important;transition-duration:.01ms!important;scroll-behavior:auto!important}}.animate-pop-in{opacity:1;transform:perspective(1000px) rotateX(0) translateZ(0);transition:opacity .15s cubic-bezier(.4,0,.2,1),transform .15s cubic-bezier(.4,0,.2,1),overlay .15s cubic-bezier(.4,0,.2,1) allow-discrete,display .15s cubic-bezier(.4,0,.2,1) allow-discrete;@starting-style{opacity:0;transform:perspective(1000px) rotateX(-15deg) translateZ(-80px)}&[data-state=closing]{opacity:0;transform:perspective(1000px) rotateX(-15deg) translateZ(-80px)}&[data-state=closing]::backdrop{opacity:0}}dialog::backdrop{opacity:1;transition:opacity .15s cubic-bezier(.4,0,.2,1);@starting-style{opacity:0}}.animate-slide-in{opacity:1;transform:translate(0);transition:opacity .15s cubic-bezier(.16,1,.3,1),transform .15s cubic-bezier(.16,1,.3,1);@starting-style{opacity:0;transform:translate(100%)}&[data-state=closing]{opacity:0;transform:translate(100%)}}}@layer components{figure[data-variant=avatar]:not([role=group]){display:inline-flex;align-items:center;justify-content:center;width:var(--sz, 2.5rem);height:var(--sz, 2.5rem);color:var(--primary);background-color:var(--muted);border-radius:var(--radius-full);font-weight:var(--font-medium);overflow:hidden;>img{width:100%;height:100%;object-fit:cover}&.small{--sz: 2rem}&.large{--sz: 3.25rem}}figure[data-variant=avatar][role=group]{display:inline-flex;align-items:center;margin:0;& figure[data-variant=avatar]{isolation:isolate;margin-inline-end:calc(var(--space-5) * -1);border:2px solid var(--background);&:last-child{margin-inline-end:0}}&.small{--sz: 2rem;& figure[data-variant=avatar]{margin-inline-end:calc(var(--space-4) * -.8);border-width:1px}}&.large{--sz: 3.25rem;& figure[data-variant=avatar]{margin-inline-end:calc(var(--space-6) * -1)}}}}@layer base{:is(button,[type=submit],[type=reset],[type=button],a.button),::file-selector-button{--_hov: color-mix(in srgb, var(--primary), white 25%);display:inline-flex;align-items:center;justify-content:center;gap:var(--space-2);padding:var(--space-2) var(--space-4);font-size:var(--text-7);font-weight:var(--font-medium);line-height:var(--leading-normal);white-space:nowrap;text-decoration:none;background-color:var(--primary);color:var(--primary-foreground);border-radius:var(--radius-medium);border:1px solid;border-color:rgb(from #fff r g b / .15) rgb(from #000 r g b / .2) rgb(from #000 r g b / .2) rgb(from #fff r g b / .15);transition:background-color var(--transition-fast),opacity var(--transition-fast),transform var(--transition-fast);&:not(:disabled){cursor:pointer}&:hover:not(:disabled){background-color:var(--_hov)}&:active:not(:disabled){transform:translate(1px,1px)}&[data-variant=secondary]{--_hov: color-mix(in srgb, var(--secondary), black 10%);background-color:var(--secondary);color:var(--secondary-foreground);border-color:rgb(from #fff r g b / .5) rgb(from #000 r g b / .1) rgb(from #000 r g b / .1) rgb(from #fff r g b / .5)}&[data-variant=danger]{--_hov: color-mix(in srgb, var(--danger), black 15%);background-color:var(--danger);color:var(--danger-foreground)}&:is(.outline,.ghost){--_hov: var(--accent);background-color:transparent;color:var(--foreground);&[data-variant=danger]{--_hov: color-mix(in srgb, var(--danger), transparent 90%);color:var(--danger)}&[data-variant=secondary]{--_hov: color-mix(in srgb, var(--secondary), transparent 80%);color:var(--secondary-foreground)}}&.outline{border-color:var(--border);&[data-variant=danger]{border-color:var(--danger)}&[data-variant=secondary]{border-color:var(--secondary)}}&.ghost{border-color:transparent}&.small{padding:var(--space-1) var(--space-3);font-size:var(--text-8)}&.large{height:3rem;padding:0 var(--space-6);font-size:var(--text-regular)}&.icon{width:2.5rem;padding:0;&.small{width:2rem}&.large{width:3rem}}}::file-selector-button{background-color:transparent;color:var(--foreground);border:1px solid var(--border)}::file-selector-button:hover{background-color:var(--accent)}}@layer components{menu.buttons{list-style-type:none;padding-inline-start:0;display:inline-flex;>li{&:first-child>*{border-start-start-radius:var(--radius-medium);border-end-start-radius:var(--radius-medium)}&:last-child>*{border-start-end-radius:var(--radius-medium);border-end-end-radius:var(--radius-medium)}>*{border-radius:0}&:not(:last-child)>*{border-inline-end:1px solid rgb(from var(--primary-foreground) r g b / .2)}}}}@layer base{label{display:block;font-size:var(--text-7);font-weight:var(--font-medium);&:has(input:where([type=checkbox],[type=radio])){display:inline-flex;align-items:center;gap:var(--space-2);font-weight:var(--font-normal)}}:where(input:not([type=checkbox],[type=radio],[type=range],[type=file],[type=color]),textarea,select){width:100%;margin-block-start:var(--space-1);padding:var(--space-2) var(--space-3);font-size:var(--text-7);line-height:var(--leading-normal);background-color:var(--background);color:var(--foreground);border:1px solid var(--input);border-radius:var(--radius-medium);transition:border-color var(--transition-fast),box-shadow var(--transition-fast);&::placeholder{color:var(--muted-foreground)}&:focus{outline:none;border-color:var(--ring);box-shadow:0 0 0 2px rgb(from var(--ring) r g b / .2);z-index:1}&:disabled{background-color:var(--muted)}&:is([aria-invalid=true],:user-invalid){border-color:var(--danger);&:focus{box-shadow:0 0 0 2px rgb(from var(--danger) r g b / .2)}}}textarea{height:auto;min-height:5rem;padding:var(--space-3);resize:vertical}select{appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 24 24' fill='none' stroke='%2371717a' stroke-width='2'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right var(--space-2) center;padding-inline-end:var(--space-6)}input:where([type=checkbox],[type=radio]){appearance:none;width:1rem;height:1rem;margin:0;position:relative;background-color:var(--background);border:1px solid var(--input);transition:background-color var(--transition-fast),border-color var(--transition-fast);&:checked{background-color:var(--primary);border-color:var(--primary);&:after{content:"";position:absolute;inset:0;background-color:var(--primary-foreground);mask-position:center;mask-repeat:no-repeat;mask-size:100%}}}input[type=checkbox]{border-radius:var(--radius-small);&:checked:after{mask-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='4'%3E%3Cpolyline points='20 6 9 17 4 12'/%3E%3C/svg%3E")}&[role=switch]{--switch-height: calc(var(--bar-height) * 3);--switch-inset: 2px;--switch-thumb: calc(var(--switch-height) - var(--switch-inset) * 3);width:calc(var(--switch-height) * 2);height:var(--switch-height);border-radius:var(--radius-full);background-color:var(--input);&:before{content:"";position:absolute;top:50%;left:var(--switch-inset);transform:translateY(-50%);width:var(--switch-thumb);height:var(--switch-thumb);background-color:var(--background);border-radius:var(--radius-full);transition:transform var(--transition);box-shadow:var(--shadow-small)}&:checked{background-color:var(--primary);&:after{content:none}&:before{transform:translateY(-50%) translate(var(--switch-height))}}}}input[type=radio]{border-radius:var(--radius-full);&:checked:after{mask-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Ccircle cx='8' cy='8' r='4' fill='currentColor'/%3E%3C/svg%3E")}}:where(input:where([type=checkbox],[type=radio],[type=range]),select):not(:disabled),label:has(input:where([type=checkbox],[type=radio]):not(:disabled)){cursor:pointer}input[type=range]{width:100%;height:var(--bar-height);appearance:none;background:var(--muted);border-radius:var(--radius-full);&::-webkit-slider-thumb{appearance:none;width:1.25rem;height:1.25rem;background:var(--primary);border-radius:var(--radius-full);transition:transform var(--transition-fast);&:hover{transform:scale(1.1)}}&::-moz-range-thumb{width:1.25rem;height:1.25rem;background:var(--primary);border:none;border-radius:var(--radius-full)}}fieldset{border:1px solid var(--border);border-radius:var(--radius-medium);padding:var(--space-4);margin-block-end:var(--space-4)}legend{font-size:var(--text-7);font-weight:var(--font-medium);padding:0 var(--space-2)}}@layer components{fieldset.group{display:flex;align-items:stretch;border:none;padding:0;margin:0;>:is(input,textarea,select){flex:1;margin-block-start:0;&:not(:focus):not(:last-child){border-inline-end-color:transparent}}>:is(input,textarea,select,button){border-radius:0;&:first-child{border-radius:var(--radius-medium) 0 0 var(--radius-medium)}&:last-child{border-radius:0 var(--radius-medium) var(--radius-medium) 0}}>legend{float:inline-start;display:inline-flex;align-items:center;padding:0 var(--space-3);line-height:var(--leading-normal);font-weight:var(--font-normal);color:var(--muted-foreground);background-color:var(--muted);border:1px solid var(--input);border-inline-end:none;border-radius:var(--radius-medium) 0 0 var(--radius-medium)}}[data-field]{margin-block-end:var(--space-4);[data-hint],.error{font-size:var(--text-8);font-weight:var(--font-normal);color:var(--muted-foreground);margin-block-start:var(--space-1)}.error{display:none}&[data-field=error] .error{display:block;color:var(--danger)}}}@layer base{.table{min-width:320px;width:100%;overflow-x:auto}table{border-collapse:collapse;width:100%;font-size:var(--text-7)}thead{border-bottom:1px solid var(--border)}th,td{overflow-wrap:break-word}th{padding:var(--space-3) var(--space-2);text-align:start;font-weight:var(--font-medium);color:var(--muted-foreground)}td{padding:var(--space-3) var(--space-2)}tbody tr{border-bottom:1px solid var(--border);transition:background-color var(--transition-fast);&:last-child{border-bottom:none}&:hover{background-color:rgb(from var(--muted) r g b / .5)}}}@layer base{progress{appearance:none;width:100%;height:var(--bar-height);border:none;border-radius:var(--radius-full);overflow:hidden;background-color:var(--muted);&::-webkit-progress-bar{background-color:var(--muted);border-radius:var(--radius-full)}&::-webkit-progress-value{background-color:var(--primary);border-radius:var(--radius-full);transition:width var(--transition)}&::-moz-progress-bar{background-color:var(--primary);border-radius:var(--radius-full)}}meter{appearance:none;width:100%;height:var(--bar-height);border:none;border-radius:var(--radius-full);overflow:hidden;background:var(--muted);&::-webkit-meter-bar{background:var(--muted);border:none;border-radius:var(--radius-full);height:var(--bar-height)}&::-webkit-meter-optimum-value,&::-webkit-meter-suboptimum-value,&::-webkit-meter-even-less-good-value{border-radius:var(--radius-full)}&::-webkit-meter-optimum-value{background:var(--success)}&::-webkit-meter-suboptimum-value{background:var(--warning)}&::-webkit-meter-even-less-good-value{background:var(--danger)}&::-moz-meter-bar{background:var(--success);border-radius:var(--radius-full)}&:-moz-meter-sub-optimum::-moz-meter-bar{background:var(--warning)}&:-moz-meter-sub-sub-optimum::-moz-meter-bar{background:var(--danger)}}}@layer components{[aria-busy=true]{&:before{content:"";display:inline-block;inset:0;margin:auto;width:1.5rem;height:1.5rem;border:2px solid var(--muted);border-top-color:var(--primary);border-radius:var(--radius-full);animation:spin 1s linear infinite;text-align:center}&[data-spinner~=small]:before{width:1rem;height:1rem}&[data-spinner~=large]:before{width:2rem;height:2rem;border-width:3px}&[data-spinner~=overlay]{position:relative;>*{opacity:.3;pointer-events:none}&:before{position:absolute;inset:0;margin:auto;z-index:1}}}@keyframes spin{to{transform:rotate(360deg)}}}@layer components{:root{--grid-cols: 12;--grid-gap: 1.5rem;--container-max: 1280px;--container-pad: 1rem}.container{width:100%;max-width:var(--container-max);margin-inline:auto;padding-inline:var(--container-pad)}.row{display:grid;grid-template-columns:repeat(var(--grid-cols),1fr);gap:var(--grid-gap);width:100%}.col,[class*=col-]{grid-column-end:span calc(var(--span, var(--grid-cols)) + var(--offset, 0))}.col-1{--span: 1}.col-2{--span: 2}.col-3{--span: 3}.col-4{--span: 4}.col-5{--span: 5}.col-6{--span: 6}.col-7{--span: 7}.col-8{--span: 8}.col-9{--span: 9}.col-10{--span: 10}.col-11{--span: 11}.col-12{--span: 12}.offset-1{--offset: 1}.offset-2{--offset: 2}.offset-3{--offset: 3}.offset-4{--offset: 4}.offset-5{--offset: 5}.offset-6{--offset: 6}[class*=offset-]{margin-inline-start:calc(var(--offset) * (100% + var(--grid-gap)) / (var(--span) + var(--offset)))}.col-end{grid-column-start:span var(--span, 1);grid-column-end:-1}@media(max-width:768px){.row{--grid-cols: 4;--grid-gap: 1rem}.col,[class*=col-]{--span: 4}[class*=offset-]{--offset: 0;margin-inline-start:0}}}@layer components{.card{background-color:var(--card);color:var(--card-foreground);border:1px solid var(--border);border-radius:var(--radius-medium);box-shadow:var(--shadow-small);padding:var(--space-6)}}@layer components{[role=alert]{position:relative;display:flex;gap:var(--space-3);padding:var(--space-4) var(--space-6);background-color:var(--background);border:1px solid var(--border);border-radius:var(--radius-medium);font-size:var(--text-7);&[data-variant]{border:none}&[data-variant=error],&[data-variant=danger]{color:var(--danger);background-color:light-dark(color-mix(in srgb,var(--danger) 8%,transparent),color-mix(in srgb,var(--danger) 20%,transparent));& a{color:var(--danger)}}&[data-variant=success]{color:var(--success);background-color:light-dark(color-mix(in srgb,var(--success) 8%,transparent),color-mix(in srgb,var(--success) 20%,transparent));& a{color:var(--success)}}&[data-variant=warning]{color:var(--warning);background-color:light-dark(color-mix(in srgb,var(--warning) 8%,transparent),color-mix(in srgb,var(--warning) 20%,transparent));& a{color:var(--warning)}}}}@layer components{.badge{display:inline-flex;align-items:center;gap:var(--space-1);padding:var(--space-1) var(--space-4);font-size:var(--text-8);font-weight:var(--font-medium);line-height:var(--leading-normal);background-color:var(--primary);color:var(--primary-foreground);border-radius:var(--radius-full);&.secondary{background-color:var(--secondary);color:var(--secondary-foreground)}&.outline{background-color:transparent;color:var(--foreground);border:1px solid var(--border)}&.success{color:var(--success);background-color:light-dark(color-mix(in srgb,var(--success) 10%,transparent),color-mix(in srgb,var(--success) 30%,transparent))}&.warning{color:var(--warning);background-color:light-dark(color-mix(in srgb,var(--warning) 10%,transparent),color-mix(in srgb,var(--warning) 30%,transparent))}&.danger{color:var(--danger);background-color:light-dark(color-mix(in srgb,var(--danger) 10%,transparent),color-mix(in srgb,var(--danger) 30%,transparent))}}}@layer components{details{border:1px solid var(--border);border-radius:var(--radius-medium);overflow:hidden;+details{margin-top:-1px;border-start-start-radius:0;border-start-end-radius:0}&:has(+details){border-end-start-radius:0;border-end-end-radius:0}&[open] summary{border-bottom:1px solid var(--border)}}summary{display:flex;align-items:center;justify-content:space-between;gap:var(--space-2);padding:var(--space-4);font-weight:var(--font-medium);cursor:pointer;user-select:none;transition:background-color var(--transition-fast);&:hover{background-color:var(--muted)}&::-webkit-details-marker,&::marker{display:none}&:after{content:"";width:1em;height:1em;flex-shrink:0;background-color:currentColor;mask-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2'%3E%3Cpath d='m6 9 6 6 6-6'/%3E%3C/svg%3E");mask-size:contain;mask-repeat:no-repeat;transition:transform var(--transition-fast)}details[open] &:after{transform:rotate(180deg)}}details>*:not(summary){margin:var(--space-4)}}@layer components{[role=tablist]{display:inline-flex;align-items:center;gap:var(--space-1);padding:var(--space-1);background-color:var(--muted);border-radius:var(--radius-medium)}[role=tab]{display:inline-flex;align-items:center;justify-content:center;padding:var(--space-2) var(--space-3);font-size:var(--text-7);font-weight:var(--font-medium);white-space:nowrap;background-color:transparent;color:var(--foreground);border:none;border-radius:calc(var(--radius-medium) - 2px);cursor:pointer;transition:background-color var(--transition-fast),color var(--transition-fast);&:hover{color:var(--muted-foreground)}&[aria-selected=true]{background-color:var(--background);box-shadow:var(--shadow-small)}}[role=tabpanel]{padding:var(--space-4) 0;&:focus-visible{outline:none}}}@layer components{dialog{position:fixed;inset:0;z-index:var(--z-modal);width:min(100% - 2rem,32rem);max-height:85vh;margin:auto;padding:0;background-color:var(--card);border:1px solid var(--border);border-radius:var(--radius-large);box-shadow:var(--shadow-large);overflow:hidden;opacity:0;transform:scale(.95);transition:opacity .15s ease,transform .15s ease,overlay .15s ease allow-discrete,display .15s ease allow-discrete;&:is([open],:popover-open){opacity:1;transform:scale(1)}@starting-style{&:is([open],:popover-open){opacity:0;transform:scale(.95)}}&::backdrop{background-color:#0000;transition:background-color .15s ease,overlay .15s ease allow-discrete,display .15s ease allow-discrete}&:is([open],:popover-open)::backdrop{background-color:#00000080}@starting-style{&:is([open],:popover-open)::backdrop{background-color:#0000}}>header,>form>header{display:flex;flex-direction:column;gap:var(--space-1);padding:var(--space-6);padding-block-end:0;>h1,>h2,>h3,>h4,>h5,>h6{margin-block-end:0}>p{font-size:var(--text-7);color:var(--muted-foreground);margin-block-end:0}}>p,>div,>section,>form>p,>form>div,>form>section{padding:var(--space-6);overflow-y:auto}>footer,>form>footer{display:flex;justify-content:flex-end;gap:var(--space-2);padding:var(--space-6);padding-block-start:0}}}@layer components{ot-dropdown{[popover]{position:fixed;margin:0;min-width:12rem;background-color:var(--background);border:1px solid var(--border);border-radius:var(--radius-medium);box-shadow:var(--shadow-medium);opacity:0;transform:translateY(-4px);transition:opacity .15s ease-out,transform .15s ease-out,display .15s allow-discrete,overlay .15s allow-discrete;&:popover-open{opacity:1;transform:translateY(0)}@starting-style{&:popover-open{opacity:0;transform:translateY(-4px)}}}[role=menuitem]{display:flex;align-items:center;justify-content:start;gap:var(--space-2);width:100%;padding:var(--space-2) var(--space-3);font-size:var(--text-7);text-align:start;color:var(--foreground);background:none;border:none;border-radius:var(--radius-small);cursor:pointer;&:hover,&:focus{background-color:var(--accent);outline:none}}}}@layer components{.toast-container{position:fixed;display:flex;flex-direction:column;pointer-events:none;margin:0;padding:0;border:none;background:transparent;overflow:visible;&::backdrop{display:none}&[data-placement=top-left]{inset:var(--space-4) auto auto var(--space-4)}&[data-placement=top-center]{inset:var(--space-4) auto auto 50%;transform:translate(-50%)}&[data-placement=top-right]{inset:var(--space-4) var(--space-4) auto auto}&[data-placement=bottom-left]{inset:auto auto var(--space-4) var(--space-4);flex-direction:column-reverse}&[data-placement=bottom-center]{inset:auto auto var(--space-4) 50%;transform:translate(-50%);flex-direction:column-reverse}&[data-placement=bottom-right]{inset:auto var(--space-4) var(--space-4) auto;flex-direction:column-reverse}}.toast{--transition: .3s;--transition-in: calc(var(--transition) - 50ms);padding:var(--space-5) var(--space-4);max-width:28rem;min-width:20rem;pointer-events:auto;background-color:var(--card);border:1px solid var(--border);border-inline-start-width:var(--space-1);border-inline-start-style:solid;border-radius:var(--radius-medium);box-shadow:var(--shadow-small);transition:opacity var(--transition-in),transform var(--transition-in),margin var(--transition-in);line-height:1;.toast-title{font-weight:600;margin:0 0 var(--space-3) 0}.toast-message{color:var(--muted-foreground)}&[data-variant=success]{border-inline-start-color:var(--success);.toast-title{color:var(--success)}}&[data-variant=danger]{border-inline-start-color:var(--danger);.toast-title{color:var(--danger)}}&[data-variant=warning]{border-inline-start-color:var(--warning);.toast-title{color:var(--warning)}}>[data-close]{margin-inline-start:auto;background:none;border:none;padding:0;cursor:pointer;opacity:.5;&:hover{opacity:1}}margin:var(--space-2) 0;&[data-entering]{opacity:0;transform:translateY(-1rem)}&[data-exiting]{opacity:0;margin:0;padding-block:0;max-height:0;overflow:hidden;transition:opacity var(--transition),margin var(--transition),padding var(--transition),max-height var(--transition)}}}@layer components{[data-sidebar-layout]{display:grid;grid-template-columns:14rem 1fr;grid-template-rows:auto 1fr;height:100dvh;>main{grid-row:2;min-width:0;overflow-y:auto}>aside[data-sidebar]{grid-row:2;min-height:0;z-index:1;background-color:var(--background);border-inline-end:1px solid var(--border);box-shadow:var(--shadow-medium);display:flex;flex-direction:column;>:is(header,footer){flex-shrink:0;padding:var(--space-3)}>footer{margin-block-start:auto}>nav{flex:1;min-height:0;overflow-y:auto;padding:var(--space-3) var(--space-2);font-size:var(--text-7);ul{list-style:none;padding:0;margin:0;display:flex;flex-direction:column;gap:var(--space-1);li{margin:0}}a{display:flex;gap:var(--space-2);padding:var(--space-1) var(--space-3);color:var(--foreground);text-decoration:none;border-radius:var(--radius-small);transition:background-color var(--transition-fast);&:is(:hover,[aria-current]){background-color:var(--accent)}}details{border:none;overflow:visible;+details{margin-top:0}&[open] summary{border-bottom:none}>ul{margin-inline-start:var(--space-4);padding:var(--space-1) 0}}summary{justify-content:flex-start;padding:var(--space-2) var(--space-3);border-radius:var(--radius-small);&:after{width:.75rem;height:.75rem;margin-inline-start:auto}}}}>nav[data-topnav]{grid-column:1 / -1}}nav[data-topnav]{position:sticky;top:0;z-index:5;display:flex;align-items:center;gap:var(--space-3);padding:var(--space-2) var(--space-4);background-color:var(--background);border-bottom:1px solid var(--border);box-shadow:var(--shadow-small);a{text-decoration:none}}:is([data-sidebar-toggle],[data-sidebar-header]){display:none}[data-sidebar-toggle]{padding:0 var(--space-1);background:none;border:1px solid var(--border);border-radius:var(--radius-small)}@media(min-width:769px){[data-sidebar-layout=always]{transition:grid-template-columns var(--transition);[data-sidebar-toggle]{display:inline-block}>aside[data-sidebar]{transform:translate(0);opacity:1;transition:transform var(--transition),opacity var(--transition),visibility var(--transition)}&[data-sidebar-open]{grid-template-columns:0px 1fr;gap:0;>aside[data-sidebar]{overflow:hidden;min-width:0;transform:translate(-100%);opacity:0;visibility:hidden;border-inline-end:none}}}}@media(max-width:768px){[data-sidebar-layout]{grid-template-columns:1fr;>main{grid-column:1}>aside[data-sidebar]{grid-column:1;z-index:2;width:16rem;transform:translate(-100%);transition:transform var(--transition);box-shadow:var(--shadow-large)}&[data-sidebar-open]>aside[data-sidebar]{transform:translate(0)}}[data-sidebar-toggle]{display:inline-block}[data-sidebar-header]{display:flex;align-items:center;gap:var(--space-3);padding:var(--space-3) var(--space-4);border-bottom:1px solid var(--border)}}}@layer components{[role=status].skeleton{--_c: light-dark( color-mix(in srgb, var(--muted) 15%, white), color-mix(in srgb, var(--muted) 90%, var(--foreground)) );margin-block-end:var(--space-3);background:var(--muted);border-radius:var(--radius-medium);animation:anim 2s infinite;background-size:200% 100%;background-image:linear-gradient(90deg,var(--muted) 0%,var(--_c) 50%,var(--muted) 100%);&.box{width:4rem;height:4rem}&.line{height:1rem;width:100%}}[role=status].skeleton:last-child{margin-block-end:0}@keyframes anim{0%{background-position:200% 0}to{background-position:-200% 0}}}@layer components{[data-tooltip]{position:relative}[data-tooltip]:before,[data-tooltip]:after{position:absolute;inset-inline-start:50%;opacity:0;visibility:hidden;transition:opacity var(--transition-fast),transform var(--transition-fast),visibility var(--transition-fast);pointer-events:none;z-index:calc(var(--z-modal) + 10)}[data-tooltip]:after{content:attr(data-tooltip);inset-block-end:calc(100% + 10px);transform:translate(-50%) translateY(4px);padding:var(--space-2) var(--space-3);font-size:var(--text-7);line-height:1;white-space:nowrap;background:var(--foreground);color:var(--background);border-radius:var(--radius-medium)}[data-tooltip]:before{content:"";inset-block-end:calc(100% - 5px);transform:translate(-50%) translateY(4px);border:8px solid transparent;border-top-color:var(--foreground)}[data-tooltip]:is(:hover,:focus-visible):before,[data-tooltip]:is(:hover,:focus-visible):after{opacity:1;visibility:visible;transition-delay:.7s;transform:translate(-50%) translateY(0)}}@layer utilities{.align-left{text-align:start}.align-center{text-align:center}.align-right{text-align:end}.text-light{color:var(--muted-foreground)}.text-lighter{color:var(--faint-foreground)}.flex{display:flex}.flex-col{flex-direction:column}.items-center{align-items:center}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-end{justify-content:flex-end}.hstack{display:flex;align-items:center;gap:var(--space-3);flex-wrap:wrap;align-content:flex-start;height:auto;>*{margin:0}}.vstack{display:flex;flex-direction:column;gap:var(--space-3)}.gap-1{gap:var(--space-1)}.gap-2{gap:var(--space-2)}.gap-4{gap:var(--space-4)}.mt-2{margin-block-start:var(--space-2)}.mt-4{margin-block-start:var(--space-4)}.mt-6{margin-block-start:var(--space-6)}.mb-2{margin-block-end:var(--space-2)}.mb-4{margin-block-end:var(--space-4)}.mb-6{margin-block-end:var(--space-6)}.p-4{padding:var(--space-4)}.w-100{width:100%}:is(ul,ol,a).unstyled{list-style:none;text-decoration:none;padding:0}}diff --git a/frontend/src/components/CampaignPreview.vue b/frontend/src/components/CampaignPreview.vueindex 976c0cd0..c77e13fe 100644--- a/frontend/src/components/CampaignPreview.vue+++ b/frontend/src/components/CampaignPreview.vue@@ -1,14 +1,13 @@<template><div>- <b-modal scroll="keep" @close="close" :aria-modal="true" :active="isVisible">+ <oat-modal @close="close" :active="isVisible"><div>- <div class="modal-card" style="width: auto">- <header class="modal-card-head">+ <div class="dialog-card" style="width: auto">+ <header class="dialog-head"><h4>{{ title }}</h4></header></div>- <section expanded class="modal-card-body preview">- <b-loading :active="isLoading" :is-full-page="false" />+ <section class="dialog-body preview" :aria-busy="isLoading ? 'true' : null" data-spinner="large overlay"><form v-if="isPost" method="post" :action="previewURL" target="iframe" ref="form"><input v-if="templateId" type="hidden" name="template_id" :value="templateId" /><input v-if="contentType" type="hidden" name="content_type" :value="contentType" />@@ -18,15 +17,15 @@</form><iframe id="iframe" name="iframe" ref="iframe" :title="title" :src="isPost ? 'about:blank' : previewURL"- @load="onLoaded" sandbox="allow-scripts" />+ @load="onLoaded" sandcard="allow-scripts" /></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="close">+ <footer class="dialog-foot align-right">+ <button type="button" @click="close">{{ $t('globals.buttons.close') }}- </b-button>+ </button></footer></div>- </b-modal>+ </oat-modal></div></template>diff --git a/frontend/src/components/CopyText.vue b/frontend/src/components/CopyText.vueindex 82b21469..408026ae 100644--- a/frontend/src/components/CopyText.vue+++ b/frontend/src/components/CopyText.vue@@ -1,7 +1,7 @@<template><a href="#" class="copy-text" ref="text" @click.prevent="onClick"><template v-if="!hideText">{{ $props.text }}</template>- <b-icon icon="file-multiple-outline" size="is-small" />+ <oat-icon icon="file-multiple-outline" /></a></template>diff --git a/frontend/src/components/Editor.vue b/frontend/src/components/Editor.vueindex d1205a0f..116c25b5 100644--- a/frontend/src/components/Editor.vue+++ b/frontend/src/components/Editor.vue@@ -1,33 +1,34 @@<template><!-- Two-way Data-Binding --><section class="editor">- <div class="columns">- <div class="column is-three-quarters is-inline-flex">- <b-field :label="$t('campaigns.format')" label-position="on-border" class="mr-4 mb-0">- <b-select v-model="contentTypeSel" :disabled="disabled" name="content_type">+ <div class="row">+ <div class="col-9 flex">+ <oat-field :label="$t('campaigns.format')" class="mr-4 mb-0">+ <select aria-label="field" v-model="contentTypeSel" :disabled="disabled" name="content_type"><option v-for="(name, f) in contentTypes" :key="f" name="format" :value="f" :data-cy="`check-${f}`">{{ name }}</option>- </b-select>- </b-field>+ </select>+ </oat-field>- <b-field v-if="self.contentType !== 'visual'" :label="$tc('globals.terms.template')" label-position="on-border">- <b-select :placeholder="$t('globals.terms.none')" v-model="templateId" name="template" :disabled="disabled">+ <oat-field v-if="self.contentType !== 'visual'" :label="$tc('globals.terms.template')">+ <select aria-label="field" :placeholder="$t('globals.terms.none')" v-model="templateId" name="template"+ :disabled="disabled"><template v-for="t in validTemplates"><option :value="t.id" :key="t.id">{{ t.name }}</option></template>- </b-select>- </b-field>+ </select>+ </oat-field><div v-else>- <b-button v-if="!isVisualTplSelector" @click="onShowVisualTplSelector" type="is-ghost"- icon-left="file-find-outline" data-cy="btn-select-visual-tpl">+ <button type="button" v-if="!isVisualTplSelector" @click="onShowVisualTplSelector" class="ghost"+ data-cy="btn-select-visual-tpl">{{ $t('campaigns.importVisualTemplate') }}- </b-button>- <b-field v-else :label="$tc('globals.terms.template')" label-position="on-border">- <b-select :placeholder="$t('globals.terms.none')" v-model="visualTemplateId"+ </button>+ <oat-field v-else :label="$tc('globals.terms.template')">+ <select aria-label="field" :placeholder="$t('globals.terms.none')" v-model="visualTemplateId"@input="() => isVisualTplDisabled = false" name="template" :disabled="disabled"class="copy-visual-template-list"><template v-for="t in validTemplates">@@ -35,25 +36,21 @@{{ t.name }}</option></template>- </b-select>+ </select>- <b-button :disabled="disabled || isVisualTplDisabled || !visualTemplateId" class="ml-3"- @click="onImportVisualTpl" type="is-primary" icon-left="content-save-outline"- data-cy="btn-save-visual-tpl">+ <button type="button" :disabled="disabled || isVisualTplDisabled || !visualTemplateId || loading.templates"+ class="ml-3" :aria-busy="loading.templates ? 'true' : null" data-spinner="small"+ @click="onImportVisualTpl" data-variant="primary" data-cy="btn-save-visual-tpl">{{ $t('globals.terms.import') }}-- <span class="spinner is-tiny" v-if="loading.templates">- <b-loading :is-full-page="false" active />- </span>- </b-button>- </b-field>+ </button>+ </oat-field></div></div>- <div class="column is- has-text-right">- <b-button @click="onTogglePreview" type="is-primary" icon-left="file-find-outline" data-cy="btn-preview"+ <div class="col-12 align-right">+ <button type="button" @click="onTogglePreview" data-variant="primary" data-cy="btn-preview"aria-keyshortcuts="F9"><span class="has-kbd">{{ $t('campaigns.preview') }} <span class="kbd">F9</span></span>- </b-button>+ </button></div></div>@@ -71,11 +68,11 @@<code-editor lang="markdown" v-if="self.contentType === 'markdown'" v-model="self.body" key="editor-markdown" /><!-- plain text //-->- <b-input v-if="self.contentType === 'plain'" v-model="self.body" type="textarea" name="content" ref="plainEditor"- class="plain-editor" />+ <textarea aria-label="field" v-if="self.contentType === 'plain'" v-model="self.body" name="content"+ ref="plainEditor" class="plain-editor" /><!-- campaign preview //-->- <campaign-preview v-if="isPreviewing" is-post @close="onTogglePreview" type="campaign" :id="id" :title="title"+ <campaign-preview v-if="isPreviewing" @close="onTogglePreview" type="campaign" :id="id" :title="title":content-type="self.contentType" :template-id="templateId" :body="self.body" /></section></template>diff --git a/frontend/src/components/EmptyPlaceholder.vue b/frontend/src/components/EmptyPlaceholder.vueindex 44c1528f..c4e22676 100644--- a/frontend/src/components/EmptyPlaceholder.vue+++ b/frontend/src/components/EmptyPlaceholder.vue@@ -1,8 +1,8 @@<template>- <section class="section">- <div class="content has-text-grey has-text-centered">+ <section class="app-section">+ <div class="content text-light align-center"><p>- <b-icon :icon="!icon ? 'plus' : icon" size="is-large" />+ <oat-icon :icon="!icon ? 'plus' : icon" /></p><p>{{ !label ? $t('globals.messages.emptyState') : label }}</p></div>diff --git a/frontend/src/components/ListSelector.vue b/frontend/src/components/ListSelector.vueindex c3c0479f..668a1d32 100644--- a/frontend/src/components/ListSelector.vue+++ b/frontend/src/components/ListSelector.vue@@ -1,23 +1,23 @@<template>- <div class="field list-selector">+ <div class="list-selector"><div :class="['list-tags', ...classes]">- <b-taglist>- <b-tag v-for="l in selectedItems" :key="l.id" :class="[l.subscriptionStatus, { 'is-restricted': l.restricted }]"- :closable="!$props.disabled && !l.restricted" :data-id="l.id" @close="removeList(l.id)" class="list">+ <span class="badge-list hstack gap-1">+ <span v-for="l in selectedItems" :key="l.id"+ :class="['badge', 'list', l.subscriptionStatus, l.subscriptionStatus ? `status-${l.subscriptionStatus}` : '', { 'is-restricted': l.restricted }]"+ :closable="!$props.disabled && !l.restricted" :data-id="l.id" @close="removeList(l.id)">{{ l.name }}<sup v-if="l.optin === 'double' && l.subscriptionStatus">{{ $t(`subscribers.status.${l.subscriptionStatus}`) }}</sup>- </b-tag>- </b-taglist>+ </span>+ </span></div>- <b-field :message="message" :label="label + (selectedItems ? ` (${selectedItems.length})` : '')"- label-position="on-border">- <b-autocomplete v-model="query" :placeholder="placeholder" clearable dropdown-position="top"+ <oat-field :message="message" :label="label + (selectedItems ? ` (${selectedItems.length})` : '')">+ <oat-autocomplete v-model="query" :placeholder="placeholder" clearable dropdown-position="top":disabled="all.length === 0 || $props.disabled" :keep-first="true" :clear-on-select="true" :open-on-focus="true":data="filteredLists" @select="selectList" field="name" />- </b-field>+ </oat-field></div></template>diff --git a/frontend/src/components/LogView.vue b/frontend/src/components/LogView.vueindex 910de0a0..4b05073e 100644--- a/frontend/src/components/LogView.vue+++ b/frontend/src/components/LogView.vue@@ -1,6 +1,5 @@<template>- <section class="log-view">- <b-loading :active="loading" :is-full-page="false" />+ <section class="log-view" :aria-busy="loading ? 'true' : null" data-spinner="large overlay"><div class="lines" ref="lines"><template v-for="(l, i) in lines"><template v-if="l">diff --git a/frontend/src/components/Navigation.vue b/frontend/src/components/Navigation.vueindex 4d7c9a1c..ce176e07 100644--- a/frontend/src/components/Navigation.vue+++ b/frontend/src/components/Navigation.vue@@ -1,108 +1,173 @@<template>- <b-menu-list>- <b-menu-item :to="{ name: 'dashboard' }" tag="router-link" :active="activeItem.dashboard"- icon="view-dashboard-variant-outline" :label="$t('menu.dashboard')" /><!-- dashboard -->+ <nav>+ <ul>+ <li>+ <router-link :to="{ name: 'dashboard' }" :aria-current="activeItem.dashboard ? 'page' : null">+ <oat-icon icon="view-dashboard-variant-outline" />+ {{ $t('menu.dashboard') }}+ </router-link>+ </li>- <b-menu-item :expanded="activeGroup.lists" :active="activeGroup.lists" data-cy="lists"- @update:active="(state) => toggleGroup('lists', state)" icon="format-list-bulleted-square"- :label="$t('globals.terms.lists')">- <b-menu-item :to="{ name: 'lists' }" tag="router-link" :active="activeItem.lists" data-cy="all-lists"- icon="format-list-bulleted-square" :label="$t('menu.allLists')" />- <b-menu-item :to="{ name: 'forms' }" tag="router-link" :active="activeItem.forms" class="forms"- icon="newspaper-variant-outline" :label="$t('menu.forms')" />- </b-menu-item><!-- lists -->+ <li>+ <details :open="activeGroup.lists" data-cy="lists" @toggle="onToggle($event, 'lists')">+ <summary>+ <oat-icon icon="format-list-bulleted-square" />+ {{ $t('globals.terms.lists') }}+ </summary>+ <ul>+ <li>+ <router-link :to="{ name: 'lists' }" :aria-current="activeItem.lists ? 'page' : null" data-cy="all-lists">+ {{ $t('menu.allLists') }}+ </router-link>+ </li>+ <li>+ <router-link :to="{ name: 'forms' }" :aria-current="activeItem.forms ? 'page' : null" data-cy="forms">+ {{ $t('menu.forms') }}+ </router-link>+ </li>+ </ul>+ </details>+ </li>- <b-menu-item v-if="$can('subscribers:*')" :expanded="activeGroup.subscribers" :active="activeGroup.subscribers"- data-cy="subscribers" @update:active="(state) => toggleGroup('subscribers', state)" icon="account-multiple"- :label="$t('globals.terms.subscribers')">- <b-menu-item v-if="$can('subscribers:get_all', 'subscribers:get')" :to="{ name: 'subscribers' }" tag="router-link"- :active="activeItem.subscribers" data-cy="all-subscribers" icon="account-multiple"- :label="$t('menu.allSubscribers')" />- <b-menu-item v-if="$can('subscribers:import')" :to="{ name: 'import' }" tag="router-link"- :active="activeItem.import" data-cy="import" icon="file-upload-outline" :label="$t('menu.import')" />- <b-menu-item v-if="$can('bounces:get')" :to="{ name: 'bounces' }" tag="router-link" :active="activeItem.bounces"- data-cy="bounces" icon="email-bounce" :label="$t('globals.terms.bounces')" />- </b-menu-item><!-- subscribers -->+ <li v-if="$can('subscribers:*')">+ <details :open="activeGroup.subscribers" data-cy="subscribers" @toggle="onToggle($event, 'subscribers')">+ <summary>+ <oat-icon icon="account-multiple" />+ {{ $t('globals.terms.subscribers') }}+ </summary>+ <ul>+ <li v-if="$can('subscribers:get_all', 'subscribers:get')">+ <router-link :to="{ name: 'subscribers' }" :aria-current="activeItem.subscribers ? 'page' : null"+ data-cy="all-subscribers">+ {{ $t('menu.allSubscribers') }}+ </router-link>+ </li>+ <li v-if="$can('subscribers:import')">+ <router-link :to="{ name: 'import' }" :aria-current="activeItem.import ? 'page' : null" data-cy="import">+ {{ $t('menu.import') }}+ </router-link>+ </li>+ <li v-if="$can('bounces:get')">+ <router-link :to="{ name: 'bounces' }" :aria-current="activeItem.bounces ? 'page' : null"+ data-cy="bounces">+ {{ $t('globals.terms.bounces') }}+ </router-link>+ </li>+ </ul>+ </details>+ </li>- <b-menu-item v-if="$can('campaigns:*')" :expanded="activeGroup.campaigns" :active="activeGroup.campaigns"- data-cy="campaigns" @update:active="(state) => toggleGroup('campaigns', state)" icon="rocket-launch-outline"- :label="$t('globals.terms.campaigns')">- <b-menu-item v-if="$can('campaigns:get')" :to="{ name: 'campaigns' }" tag="router-link"- :active="activeItem.campaigns" data-cy="all-campaigns" icon="rocket-launch-outline"- :label="$t('menu.allCampaigns')" />- <b-menu-item v-if="$can('campaigns:manage')" :to="{ name: 'campaign', params: { id: 'new' } }" tag="router-link"- :active="activeItem.campaign" data-cy="new-campaign" icon="plus" :label="$t('menu.newCampaign')" />- <b-menu-item v-if="$can('media:*')" :to="{ name: 'media' }" tag="router-link" :active="activeItem.media"- data-cy="media" icon="image-outline" :label="$t('menu.media')" />- <b-menu-item v-if="$can('templates:get')" :to="{ name: 'templates' }" tag="router-link"- :active="activeItem.templates" data-cy="templates" icon="file-image-outline"- :label="$t('globals.terms.templates')" />- <b-menu-item v-if="$can('campaigns:get_analytics')" :to="{ name: 'campaignAnalytics' }" tag="router-link"- :active="activeItem.campaignAnalytics" data-cy="analytics" icon="chart-bar"- :label="$t('globals.terms.analytics')" />- </b-menu-item><!-- campaigns -->+ <li v-if="$can('campaigns:*')">+ <details :open="activeGroup.campaigns" data-cy="campaigns" @toggle="onToggle($event, 'campaigns')">+ <summary>+ <oat-icon icon="rocket-launch-outline" />+ {{ $t('globals.terms.campaigns') }}+ </summary>+ <ul>+ <li v-if="$can('campaigns:get')">+ <router-link :to="{ name: 'campaigns' }" :aria-current="activeItem.campaigns ? 'page' : null"+ data-cy="all-campaigns">+ {{ $t('menu.allCampaigns') }}+ </router-link>+ </li>+ <li v-if="$can('campaigns:manage')">+ <router-link :to="{ name: 'campaign', params: { id: 'new' } }"+ :aria-current="activeItem.campaign ? 'page' : null" data-cy="new-campaign">+ {{ $t('menu.newCampaign') }}+ </router-link>+ </li>+ <li v-if="$can('media:*')">+ <router-link :to="{ name: 'media' }" :aria-current="activeItem.media ? 'page' : null" data-cy="media">+ {{ $t('menu.media') }}+ </router-link>+ </li>+ <li v-if="$can('templates:get')">+ <router-link :to="{ name: 'templates' }" :aria-current="activeItem.templates ? 'page' : null"+ data-cy="templates">+ {{ $t('globals.terms.templates') }}+ </router-link>+ </li>+ <li v-if="$can('campaigns:get_analytics')">+ <router-link :to="{ name: 'campaignAnalytics' }"+ :aria-current="activeItem.campaignAnalytics ? 'page' : null" data-cy="analytics">+ {{ $t('globals.terms.analytics') }}+ </router-link>+ </li>+ </ul>+ </details>+ </li>- <b-menu-item v-if="$can('users:*', 'roles:*')" :expanded="activeGroup.users" :active="activeGroup.users"- data-cy="users" @update:active="(state) => toggleGroup('users', state)" icon="account-multiple"- :label="$t('globals.terms.users')">- <b-menu-item v-if="$can('users:get')" :to="{ name: 'users' }" tag="router-link" :active="activeItem.users"- data-cy="users" icon="account-multiple" :label="$t('globals.terms.users')" />- <b-menu-item v-if="$can('roles:get')" :to="{ name: 'userRoles' }" tag="router-link" :active="activeItem.userRoles"- data-cy="userRoles" icon="newspaper-variant-outline" :label="$t('users.userRoles')" />- <b-menu-item v-if="$can('roles:get')" :to="{ name: 'listRoles' }" tag="router-link" :active="activeItem.listRoles"- data-cy="listRoles" icon="format-list-bulleted-square" :label="$t('users.listRoles')" />- </b-menu-item><!-- users -->+ <li v-if="$can('users:*', 'roles:*')">+ <details :open="activeGroup.users" data-cy="users" @toggle="onToggle($event, 'users')">+ <summary>+ <oat-icon icon="account-multiple" />+ {{ $t('globals.terms.users') }}+ </summary>+ <ul>+ <li v-if="$can('users:get')">+ <router-link :to="{ name: 'users' }" :aria-current="activeItem.users ? 'page' : null" data-cy="users">+ {{ $t('globals.terms.users') }}+ </router-link>+ </li>+ <li v-if="$can('roles:get')">+ <router-link :to="{ name: 'userRoles' }" :aria-current="activeItem.userRoles ? 'page' : null"+ data-cy="userRoles">+ {{ $t('users.userRoles') }}+ </router-link>+ </li>+ <li v-if="$can('roles:get')">+ <router-link :to="{ name: 'listRoles' }" :aria-current="activeItem.listRoles ? 'page' : null"+ data-cy="listRoles">+ {{ $t('users.listRoles') }}+ </router-link>+ </li>+ </ul>+ </details>+ </li>- <b-menu-item v-if="$can('settings:*')" :expanded="activeGroup.settings" :active="activeGroup.settings"- data-cy="settings" @update:active="(state) => toggleGroup('settings', state)" icon="cog-outline"- :label="$t('menu.settings')">- <b-menu-item v-if="$can('settings:get')" :to="{ name: 'settings' }" tag="router-link"- :active="activeItem.settings" data-cy="all-settings" icon="cog-outline" :label="$t('menu.settings')" />- <b-menu-item v-if="$can('settings:maintain')" :to="{ name: 'maintenance' }" tag="router-link"- :active="activeItem.maintenance" data-cy="maintenance" icon="wrench-outline" :label="$t('menu.maintenance')" />- <b-menu-item v-if="$can('settings:get')" :to="{ name: 'logs' }" tag="router-link" :active="activeItem.logs"- data-cy="logs" icon="format-list-bulleted-square" :label="$t('menu.logs')" />- </b-menu-item><!-- settings -->- </b-menu-list>+ <li v-if="$can('settings:*')">+ <details :open="activeGroup.settings" data-cy="settings" @toggle="onToggle($event, 'settings')">+ <summary>+ <oat-icon icon="cog-outline" />+ {{ $t('menu.settings') }}+ </summary>+ <ul>+ <li v-if="$can('settings:get')">+ <router-link :to="{ name: 'settings' }" :aria-current="activeItem.settings ? 'page' : null"+ data-cy="all-settings">+ {{ $t('menu.settings') }}+ </router-link>+ </li>+ <li v-if="$can('settings:maintain')">+ <router-link :to="{ name: 'maintenance' }" :aria-current="activeItem.maintenance ? 'page' : null"+ data-cy="maintenance">+ {{ $t('menu.maintenance') }}+ </router-link>+ </li>+ <li v-if="$can('settings:get')">+ <router-link :to="{ name: 'logs' }" :aria-current="activeItem.logs ? 'page' : null" data-cy="logs">+ {{ $t('menu.logs') }}+ </router-link>+ </li>+ </ul>+ </details>+ </li>+ </ul>+ </nav></template><script>-import { mapState } from 'vuex';-export default {name: 'Navigation',-props: {activeItem: { type: Object, default: () => { } },activeGroup: { type: Object, default: () => { } },isMobile: Boolean,},-methods: {- toggleGroup(group, state) {- this.$emit('toggleGroup', group, state);- },-- doLogout() {- this.$emit('doLogout');+ onToggle(e, group) {+ this.$emit('toggleGroup', group, e.target.open);},},-- computed: {- ...mapState(['profile']),- },-- mounted() {- // A hack to close the open accordion burger menu items on click.- // Buefy does not have a way to do this.- if (this.isMobile) {- document.querySelectorAll('.navbar li a[href]').forEach((e) => {- e.onclick = () => {- document.querySelector('.navbar-burger').click();- };- });- }- },};-</script>diff --git a/frontend/src/components/OatAutocomplete.vue b/frontend/src/components/OatAutocomplete.vuenew file mode 100644index 00000000..df0c006d--- /dev/null+++ b/frontend/src/components/OatAutocomplete.vue@@ -0,0 +1,97 @@+<template>+ <div class="oat-autocomplete">+ <input v-bind="$attrs" :value="value" type="text" :placeholder="placeholder" :disabled="disabled"+ :aria-label="placeholder || 'Search'" @input="onInput" @focus="isOpen = true">+ <button v-if="clearable && value" type="button" class="ghost small" @click="clear">x</button>+ <menu v-if="isOpen && data.length > 0">+ <li v-for="(item, i) in data" :key="i">+ <button type="button" class="ghost" @click="select(item)">+ <slot name="default" :option="item">+ {{ item[field] || item }}+ </slot>+ </button>+ </li>+ </menu>+ </div>+</template>++<script>+export default {+ name: 'OatAutocomplete',+ inheritAttrs: false,+ props: {+ value: {+ type: String,+ default: '',+ },+ data: {+ type: Array,+ default: () => [],+ },+ field: {+ type: String,+ default: 'name',+ },+ placeholder: {+ type: String,+ default: '',+ },+ clearable: {+ type: Boolean,+ default: false,+ },+ disabled: {+ type: Boolean,+ default: false,+ },+ },+ data() {+ return {+ isOpen: false,+ };+ },+ methods: {+ onInput(e) {+ this.isOpen = true;+ this.$emit('input', e.target.value);+ this.$emit('typing', e.target.value);+ },+ select(item) {+ this.isOpen = false;+ this.$emit('select', item);+ this.$emit('input', item[this.field] || item);+ },+ clear() {+ this.$emit('input', '');+ this.$emit('select', null);+ },+ },+};+</script>++<style>+.oat-autocomplete {+ position: relative;+}++.oat-autocomplete menu {+ background: var(--background);+ border: 1px solid var(--border);+ border-radius: var(--radius);+ box-shadow: var(--shadow);+ left: 0;+ list-style: none;+ margin: var(--space-1) 0 0;+ max-height: 260px;+ overflow: auto;+ padding: var(--space-1);+ position: absolute;+ right: 0;+ z-index: 20;+}++.oat-autocomplete menu button {+ justify-content: start;+ width: 100%;+}+</style>diff --git a/frontend/src/components/OatBadge.vue b/frontend/src/components/OatBadge.vuenew file mode 100644index 00000000..151ad442--- /dev/null+++ b/frontend/src/components/OatBadge.vue@@ -0,0 +1,54 @@+<template>+ <span :class="badgeClass" :data-variant="variant || null">+ <slot />+ </span>+</template>++<script>+const variantMap = {+ active: 'success',+ api: 'secondary',+ blocklisted: 'danger',+ campaign: 'secondary',+ campaign_visual: 'secondary',+ disabled: 'danger',+ done: 'success',+ double: 'warning',+ draft: 'secondary',+ enabled: 'success',+ error: 'danger',+ failed: 'danger',+ optin: 'warning',+ paused: 'warning',+ primary: 'secondary',+ private: 'secondary',+ public: 'success',+ running: 'warning',+ scheduled: 'warning',+ single: 'secondary',+ status_unconfirmed: 'warning',+ status_unsubscribed: 'danger',+ status_confirmed: 'success',+};++export default {+ name: 'OatBadge',+ props: {+ type: {+ type: String,+ default: '',+ },+ variant: {+ type: String,+ default: '',+ },+ },+ computed: {+ badgeClass() {+ const typeClass = (this.type || '').trim();+ const key = typeClass.replace(/-/g, '_');+ return ['badge', typeClass, key !== typeClass ? key : null, this.variant || variantMap[key] || 'outline'];+ },+ },+};+</script>diff --git a/frontend/src/components/OatCheckbox.vue b/frontend/src/components/OatCheckbox.vuenew file mode 100644index 00000000..5b23c2a4--- /dev/null+++ b/frontend/src/components/OatCheckbox.vue@@ -0,0 +1,44 @@+<template>+ <label>+ <input type="checkbox" :checked="checked" :disabled="disabled" @change="onChange">+ <slot />+ </label>+</template>++<script>+export default {+ name: 'OatCheckcard',+ props: {+ value: {+ type: [Array, Boolean],+ default: false,+ },+ nativeValue: {+ type: [String, Number, Boolean],+ default: true,+ },+ disabled: {+ type: Boolean,+ default: false,+ },+ },+ computed: {+ checked() {+ return Array.isArray(this.value) ? this.value.includes(this.nativeValue) : !!this.value;+ },+ },+ methods: {+ onChange(e) {+ if (!Array.isArray(this.value)) {+ this.$emit('input', e.target.checked);+ return;+ }+ const next = this.value.filter((v) => v !== this.nativeValue);+ if (e.target.checked) {+ next.push(this.nativeValue);+ }+ this.$emit('input', next);+ },+ },+};+</script>diff --git a/frontend/src/components/OatDataTable.vue b/frontend/src/components/OatDataTable.vuenew file mode 100644index 00000000..27357b83--- /dev/null+++ b/frontend/src/components/OatDataTable.vue@@ -0,0 +1,269 @@+<script>+export default {+ name: 'OatDataTable',+ provide() {+ return {+ oatTable: this,+ };+ },+ props: {+ data: {+ type: Array,+ default: () => [],+ },+ loading: {+ type: Boolean,+ default: false,+ },+ checkable: {+ type: Boolean,+ default: false,+ },+ checkedRows: {+ type: Array,+ default: () => [],+ },+ paginated: {+ type: Boolean,+ default: false,+ },+ perPage: {+ type: Number,+ default: 20,+ },+ total: {+ type: Number,+ default: 0,+ },+ currentPage: {+ type: Number,+ default: 1,+ },+ backendPagination: {+ type: Boolean,+ default: false,+ },+ backendSorting: {+ type: Boolean,+ default: false,+ },+ defaultSort: {+ type: String,+ default: '',+ },+ defaultSortDirection: {+ type: String,+ default: 'asc',+ },+ detailed: {+ type: Boolean,+ default: false,+ },+ rowClass: {+ type: Function,+ default: null,+ },+ },+ data() {+ return {+ columns: [],+ sortField: this.defaultSort,+ sortDirection: this.defaultSortDirection,+ localPage: this.currentPage || 1,+ };+ },+ computed: {+ page() {+ return this.currentPage || this.localPage || 1;+ },+ totalRows() {+ return this.total || this.sortedRows.length;+ },+ sortedRows() {+ const rows = [...this.data];+ if (!this.sortField || this.backendSorting) {+ return rows;+ }+ const dir = this.sortDirection === 'desc' ? -1 : 1;+ return rows.sort((a, b) => {+ if (a[this.sortField] === b[this.sortField]) {+ return 0;+ }+ return a[this.sortField] > b[this.sortField] ? dir : -dir;+ });+ },+ visibleRows() {+ if (!this.paginated || this.backendPagination) {+ return this.sortedRows;+ }+ const start = (this.page - 1) * this.perPage;+ return this.sortedRows.slice(start, start + this.perPage);+ },+ allChecked() {+ return this.visibleRows.length > 0 && this.visibleRows.every((row) => this.checkedRows.includes(row));+ },+ },+ methods: {+ registerColumn(column) {+ if (!this.columns.includes(column)) {+ this.columns.push(column);+ this.$forceUpdate();+ }+ },+ unregisterColumn(column) {+ this.columns = this.columns.filter((c) => c !== column);+ },+ cellValue(row, col) {+ return col.field ? row[col.field] : '';+ },+ sort(col) {+ if (!col.sortable || !col.field) {+ return;+ }+ if (this.sortField === col.field) {+ this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';+ } else {+ this.sortField = col.field;+ this.sortDirection = 'asc';+ }+ this.$emit('sort', this.sortField, this.sortDirection);+ },+ setPage(page) {+ this.localPage = page;+ this.$emit('page-change', page);+ },+ emitChecked(rows, eventName) {+ this.$emit('update:checkedRows', rows);+ this.$emit(eventName, rows);+ },+ toggleRow(row) {+ const rows = this.checkedRows.includes(row)+ ? this.checkedRows.filter((r) => r !== row)+ : [...this.checkedRows, row];+ this.emitChecked(rows, 'check');+ },+ toggleAll(e) {+ const rows = e.target.checked+ ? [...new Set([...this.checkedRows, ...this.visibleRows])]+ : this.checkedRows.filter((row) => !this.visibleRows.includes(row));+ this.emitChecked(rows, 'check-all');+ },+ },+ render(h) {+ const hiddenColumns = h('div', { style: { display: 'none' } }, this.$slots.default);+ const headerCells = this.columns.map((col) => h('th', {+ class: col.headerClass,+ style: col.width ? { width: typeof col.width === 'number' ? `${col.width}px` : col.width } : {},+ }, [+ col.sortable+ ? h('button', { attrs: { type: 'button' }, class: 'ghost', on: { click: () => this.sort(col) } }, col.label)+ : col.label,+ ]));++ if (this.checkable) {+ headerCells.unshift(h('th', [+ h('input', {+ attrs: { type: 'checkbox', 'aria-label': 'Select all' },+ domProps: { checked: this.allChecked },+ on: { change: this.toggleAll },+ }),+ ]));+ }++ const bodyRows = [];+ this.visibleRows.forEach((row, index) => {+ const cells = this.columns.map((col) => {+ const slot = col.$scopedSlots.default;+ const content = slot ? slot({ row, index }) : this.cellValue(row, col);+ const attrs = col.tdAttrs ? col.tdAttrs(row) : {};+ return h('td', {+ class: [+ col.cellClass,+ { numeric: col.numeric, 'align-center': col.centered, 'align-right': col.align === 'right' },+ ],+ attrs,+ }, content);+ });++ if (this.checkable) {+ cells.unshift(h('td', [+ h('input', {+ attrs: { type: 'checkbox', 'aria-label': 'Select row' },+ domProps: { checked: this.checkedRows.includes(row) },+ on: { change: () => this.toggleRow(row) },+ }),+ ]));+ }++ bodyRows.push(h('tr', { class: this.rowClass ? this.rowClass(row, index) : '' }, cells));+ if (this.detailed && this.$scopedSlots.detail) {+ bodyRows.push(h('tr', { class: 'details' }, [+ h('td', { attrs: { colspan: this.columns.length + (this.checkable ? 1 : 0) } }, this.$scopedSlots.detail({ row, index })),+ ]));+ }+ });++ const topLeft = this.$slots['top-left'];+ const topRight = this.$slots['top-right'];+ const toolbar = (topLeft || topRight) ? h('div', { class: 'table-toolbar' }, [+ h('div', { class: 'table-toolbar-left' }, topLeft),+ h('div', { class: 'table-toolbar-right' }, topRight),+ ]) : null;++ return h('div', {+ class: 'oat-data-table',+ attrs: {+ 'aria-busy': this.loading ? 'true' : null,+ 'data-spinner': 'large overlay',+ },+ }, [+ hiddenColumns,+ toolbar,+ h('div', { class: 'table' }, [h('table', [+ h('thead', [h('tr', headerCells)]),+ h('tbody', bodyRows),+ ])]),+ this.paginated ? h('oat-pagination', {+ props: { total: this.totalRows, current: this.page, perPage: this.perPage },+ on: { change: this.setPage },+ }) : null,+ ]);+ },+};+</script>++<style>+.oat-data-table {+ overflow-x: auto;+ position: relative;+}++.table-toolbar {+ align-items: flex-start;+ display: flex;+ gap: var(--space-4);+ justify-content: space-between;+ margin-block-end: var(--space-4);+}++.table-toolbar-left {+ flex: 1 1 auto;+ min-width: 0;+}++.table-toolbar-right {+ flex: 0 0 auto;+}++.oat-data-table table {+ width: 100%;+}++.oat-data-table .actions {+ white-space: nowrap;+}++.oat-data-table tr.details td {+ background: var(--muted);+}+</style>diff --git a/frontend/src/components/OatDateInput.vue b/frontend/src/components/OatDateInput.vuenew file mode 100644index 00000000..ef2ec01a--- /dev/null+++ b/frontend/src/components/OatDateInput.vue@@ -0,0 +1,50 @@+<template>+ <input :type="datetime ? 'datetime-local' : 'date'" :name="name" :required="required" :aria-label="name || 'date'"+ :value="formatted" @input="onInput">+</template>++<script>+function pad(v) {+ return `${v}`.padStart(2, '0');+}++export default {+ name: 'OatDateInput',+ props: {+ value: {+ type: [Date, String],+ default: null,+ },+ datetime: {+ type: Boolean,+ default: false,+ },+ name: {+ type: String,+ default: '',+ },+ required: {+ type: Boolean,+ default: false,+ },+ },+ computed: {+ formatted() {+ if (!this.value) {+ return '';+ }+ const d = this.value instanceof Date ? this.value : new Date(this.value);+ const date = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;+ if (!this.datetime) {+ return date;+ }+ return `${date}T${pad(d.getHours())}:${pad(d.getMinutes())}`;+ },+ },+ methods: {+ onInput(e) {+ this.$emit('input', e.target.value ? new Date(e.target.value) : null);+ },+ },+};+</script>diff --git a/frontend/src/components/OatField.vue b/frontend/src/components/OatField.vuenew file mode 100644index 00000000..e15c5e4c--- /dev/null+++ b/frontend/src/components/OatField.vue@@ -0,0 +1,23 @@+<template>+ <div data-field>+ <span v-if="label">{{ label }}</span>+ <slot />+ <small v-if="message" data-hint>{{ message }}</small>+ </div>+</template>++<script>+export default {+ name: 'OatField',+ props: {+ label: {+ type: String,+ default: '',+ },+ message: {+ type: String,+ default: '',+ },+ },+};+</script>diff --git a/frontend/src/components/OatIcon.vue b/frontend/src/components/OatIcon.vuenew file mode 100644index 00000000..df01fd44--- /dev/null+++ b/frontend/src/components/OatIcon.vue@@ -0,0 +1,15 @@+<template>+ <span :class="`mdi-${icon}`" aria-hidden="true" />+</template>++<script>+export default {+ name: 'OatIcon',+ props: {+ icon: {+ type: String,+ required: true,+ },+ },+};+</script>diff --git a/frontend/src/components/OatLoading.vue b/frontend/src/components/OatLoading.vuenew file mode 100644index 00000000..ab4e99e1--- /dev/null+++ b/frontend/src/components/OatLoading.vue@@ -0,0 +1,36 @@+<template>+ <div v-if="active" class="oat-loading" :class="{ overlay }" aria-busy="true" data-spinner="large" />+</template>++<script>+export default {+ name: 'OatLoading',+ props: {+ active: {+ type: Boolean,+ default: true,+ },+ isFullPage: {+ type: Boolean,+ default: false,+ },+ },+ computed: {+ overlay() {+ return this.isFullPage;+ },+ },+};+</script>++<style>+.oat-loading.overlay {+ align-items: center;+ background: color-mix(in srgb, var(--background) 70%, transparent);+ display: flex;+ inset: 0;+ justify-content: center;+ position: fixed;+ z-index: 1000;+}+</style>diff --git a/frontend/src/components/OatModal.vue b/frontend/src/components/OatModal.vuenew file mode 100644index 00000000..523db2e4--- /dev/null+++ b/frontend/src/components/OatModal.vue@@ -0,0 +1,99 @@+<template>+ <dialog ref="dialog" class="oat-modal" :style="contentStyle" @close="onNativeClose" @cancel="onCancel">+ <slot />+ </dialog>+</template>++<script>+export default {+ name: 'OatModal',+ props: {+ active: {+ type: Boolean,+ default: false,+ },+ width: {+ type: [Number, String],+ default: '',+ },+ },+ computed: {+ contentStyle() {+ if (!this.width) {+ return {};+ }+ return { width: typeof this.width === 'number' ? `${this.width}px` : this.width };+ },+ },+ watch: {+ active: {+ immediate: true,+ handler(active) {+ this.$nextTick(() => {+ const { dialog } = this.$refs;+ if (!dialog) {+ return;+ }+ if (active && !dialog.open) {+ dialog.showModal();+ } else if (!active && dialog.open) {+ dialog.close();+ }+ });+ },+ },+ },+ methods: {+ close() {+ this.$emit('update:active', false);+ this.$emit('close');+ },+ onCancel(e) {+ e.preventDefault();+ this.close();+ },+ onNativeClose() {+ if (this.active) {+ this.close();+ }+ },+ },+};+</script>++<style>+.oat-modal {+ max-width: min(96vw, 1200px);+ width: min(100% - 2rem, 32rem);+}++.oat-modal>form>.dialog-card,+.oat-modal>.dialog-card {+ display: contents;+}++.oat-modal>form>.dialog-card>header,+.oat-modal>.dialog-card>header {+ display: flex;+ flex-direction: column;+ gap: var(--space-1);+ padding: var(--space-6);+ padding-block-end: 0;+}++.oat-modal>form>.dialog-card> :is(div, section),+.oat-modal>.dialog-card> :is(div, section) {+ max-height: 70vh;+ overflow-y: auto;+ padding: var(--space-6);+}++.oat-modal>form>.dialog-card>footer,+.oat-modal>.dialog-card>footer {+ display: flex;+ gap: var(--space-2);+ justify-content: flex-end;+ padding: var(--space-6);+ padding-block-start: 0;+}+</style>diff --git a/frontend/src/components/OatPagination.vue b/frontend/src/components/OatPagination.vuenew file mode 100644index 00000000..e32410d1--- /dev/null+++ b/frontend/src/components/OatPagination.vue@@ -0,0 +1,71 @@+<template>+ <nav v-if="numPages > 1" class="oat-pagination" :aria-label="$t ? $t('globals.terms.page') : 'Pagination'">+ <button type="button" :disabled="page <= 1" @click="setPage(page - 1)">+ <oat-icon icon="chevron-left" />+ </button>+ <button v-for="p in pages" :key="p" type="button" :class="{ outline: p !== page }"+ :aria-current="p === page ? 'page' : null" @click="setPage(p)">+ {{ p }}+ </button>+ <button type="button" :disabled="page >= numPages" @click="setPage(page + 1)">+ <oat-icon icon="chevron-right" />+ </button>+ </nav>+</template>++<script>+export default {+ name: 'OatPagination',+ props: {+ total: {+ type: Number,+ default: 0,+ },+ current: {+ type: Number,+ default: 1,+ },+ perPage: {+ type: Number,+ default: 20,+ },+ },+ computed: {+ page() {+ return this.current || 1;+ },+ numPages() {+ return Math.max(1, Math.ceil(this.total / this.perPage));+ },+ pages() {+ const out = [];+ const start = Math.max(1, this.page - 2);+ const end = Math.min(this.numPages, start + 4);+ for (let i = start; i <= end; i += 1) {+ out.push(i);+ }+ return out;+ },+ },+ methods: {+ setPage(page) {+ if (page < 1 || page > this.numPages || page === this.page) {+ return;+ }+ this.$emit('update:current', page);+ this.$emit('change', page);+ this.$emit('page-change', page);+ },+ },+};+</script>++<style>+.oat-pagination {+ display: flex;+ flex-wrap: wrap;+ gap: var(--space-2);+ justify-content: flex-end;+ margin-block: var(--space-4);+}+</style>diff --git a/frontend/src/components/OatRadio.vue b/frontend/src/components/OatRadio.vuenew file mode 100644index 00000000..6bee2a15--- /dev/null+++ b/frontend/src/components/OatRadio.vue@@ -0,0 +1,31 @@+<template>+ <label>+ <input type="radio" :name="name" :value="nativeValue" :checked="value === nativeValue" :disabled="disabled"+ @change="$emit('input', nativeValue)">+ <slot />+ </label>+</template>++<script>+export default {+ name: 'OatRadio',+ props: {+ value: {+ type: [String, Number, Boolean],+ default: null,+ },+ nativeValue: {+ type: [String, Number, Boolean],+ default: '',+ },+ name: {+ type: String,+ default: '',+ },+ disabled: {+ type: Boolean,+ default: false,+ },+ },+};+</script>diff --git a/frontend/src/components/OatSwitch.vue b/frontend/src/components/OatSwitch.vuenew file mode 100644index 00000000..405b94ab--- /dev/null+++ b/frontend/src/components/OatSwitch.vue@@ -0,0 +1,39 @@+<template>+ <label>+ <input v-bind="$attrs" type="checkbox" role="switch" :checked="isChecked"+ :aria-checked="isChecked ? 'true' : 'false'" :disabled="disabled" @change="onChange">+ <slot />+ </label>+</template>++<script>+export default {+ name: 'OatSwitch',+ inheritAttrs: false,+ props: {+ value: {+ type: [Boolean, String, Number],+ default: false,+ },+ nativeValue: {+ type: [Boolean, String, Number],+ default: true,+ },+ disabled: {+ type: Boolean,+ default: false,+ },+ },+ computed: {+ isChecked() {+ return this.value === this.nativeValue || this.value === true;+ },+ },+ methods: {+ onChange(e) {+ this.$emit('input', e.target.checked ? this.nativeValue : false);+ this.$emit('change', e.target.checked);+ },+ },+};+</script>diff --git a/frontend/src/components/OatTableColumn.vue b/frontend/src/components/OatTableColumn.vuenew file mode 100644index 00000000..9fbfb68c--- /dev/null+++ b/frontend/src/components/OatTableColumn.vue@@ -0,0 +1,57 @@+<script>+export default {+ name: 'OatTableColumn',+ inject: ['oatTable'],+ props: {+ field: {+ type: String,+ default: '',+ },+ label: {+ type: String,+ default: '',+ },+ sortable: {+ type: Boolean,+ default: false,+ },+ numeric: {+ type: Boolean,+ default: false,+ },+ centered: {+ type: Boolean,+ default: false,+ },+ align: {+ type: String,+ default: '',+ },+ cellClass: {+ type: String,+ default: '',+ },+ headerClass: {+ type: String,+ default: '',+ },+ width: {+ type: [String, Number],+ default: '',+ },+ tdAttrs: {+ type: Function,+ default: null,+ },+ },+ created() {+ this.oatTable.registerColumn(this);+ },+ beforeDestroy() {+ this.oatTable.unregisterColumn(this);+ },+ render() {+ return null;+ },+};+</script>diff --git a/frontend/src/components/OatTagInput.vue b/frontend/src/components/OatTagInput.vuenew file mode 100644index 00000000..81bf12ca--- /dev/null+++ b/frontend/src/components/OatTagInput.vue@@ -0,0 +1,73 @@+<template>+ <div data-field>+ <div class="oat-tag-input">+ <span v-for="(tag, i) in value" :key="`${tag}-${i}`" class="badge">+ {{ tag }}+ <button type="button" class="ghost small" :disabled="disabled" @click="remove(i)">x</button>+ </span>+ <input v-bind="$attrs" v-model="draft" type="text" :name="name" :aria-label="placeholder || name || 'Tags'"+ :placeholder="placeholder" :disabled="disabled" @keydown.enter.prevent="add" @keydown.tab="add"+ @keydown.backspace="onBackspace" @keyup="onKeyup">+ </div>+ </div>+</template>++<script>+export default {+ name: 'OatTagInput',+ inheritAttrs: false,+ props: {+ value: {+ type: Array,+ default: () => [],+ },+ name: {+ type: String,+ default: '',+ },+ placeholder: {+ type: String,+ default: '',+ },+ beforeAdding: {+ type: Function,+ default: null,+ },+ disabled: {+ type: Boolean,+ default: false,+ },+ },+ data() {+ return {+ draft: '',+ };+ },+ methods: {+ add() {+ const val = this.draft.replace(/,$/, '').trim();+ if (!val) {+ return;+ }+ if (this.beforeAdding && !this.beforeAdding(val)) {+ return;+ }+ this.$emit('input', [...this.value, val]);+ this.draft = '';+ },+ remove(i) {+ this.$emit('input', this.value.filter((_, n) => n !== i));+ },+ onBackspace() {+ if (!this.draft && this.value.length > 0) {+ this.remove(this.value.length - 1);+ }+ },+ onKeyup(e) {+ if (e.key === ',') {+ this.add();+ }+ },+ },+};+</script>diff --git a/frontend/src/components/OatUpload.vue b/frontend/src/components/OatUpload.vuenew file mode 100644index 00000000..5d981022--- /dev/null+++ b/frontend/src/components/OatUpload.vue@@ -0,0 +1,60 @@+<template>+ <label class="oat-upload" @dragover.prevent @drop.prevent="onDrop">+ <input type="file" :multiple="multiple" :accept="accept || xaccept" :aria-label="label" @change="onChange">+ <slot />+ </label>+</template>++<script>+export default {+ name: 'OatUpload',+ props: {+ value: {+ type: [Array, File],+ default: null,+ },+ multiple: {+ type: Boolean,+ default: false,+ },+ accept: {+ type: String,+ default: '',+ },+ xaccept: {+ type: String,+ default: '',+ },+ label: {+ type: String,+ default: 'Upload file',+ },+ },+ methods: {+ emitFiles(files) {+ const list = Array.from(files);+ this.$emit('input', this.multiple ? list : list[0]);+ },+ onChange(e) {+ this.emitFiles(e.target.files);+ },+ onDrop(e) {+ this.emitFiles(e.dataTransfer.files);+ },+ },+};+</script>++<style>+.oat-upload {+ border: 1px dashed var(--border);+ border-radius: var(--radius);+ cursor: pointer;+ display: block;+ padding: var(--space-4);+}++.oat-upload input {+ display: none;+}+</style>diff --git a/frontend/src/components/RichtextEditor.vue b/frontend/src/components/RichtextEditor.vueindex 07220ab2..3f669f91 100644--- a/frontend/src/components/RichtextEditor.vue+++ b/frontend/src/components/RichtextEditor.vue@@ -2,52 +2,52 @@<div class="richtext-editor" v-if="isRichtextReady"><tiny-mce v-model="computedValue" :disabled="disabled" :init="richtextConf" />- <b-modal scroll="keep" :width="1200" :aria-modal="true" :active.sync="isRichtextSourceVisible">+ <oat-modal :width="1200" :active.sync="isRichtextSourceVisible"><div>- <section expanded class="modal-card-body preview">+ <section class="dialog-body preview"><code-editor lang="html" v-model="richTextSourceBody" key="richtext-source" /></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="onFormatRichtextHTML">+ <footer class="dialog-foot align-right">+ <button type="button" @click="onFormatRichtextHTML">{{ $t('campaigns.formatHTML') }}- </b-button>- <b-button @click="() => { this.isRichtextSourceVisible = false; }">+ </button>+ <button type="button" @click="() => { this.isRichtextSourceVisible = false; }">{{ $t('globals.buttons.close') }}- </b-button>- <b-button @click="onSaveRichTextSource" class="is-primary">+ </button>+ <button type="button" @click="onSaveRichTextSource" data-variant="primary">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div>- </b-modal>+ </oat-modal>- <b-modal scroll="keep" :width="750" :aria-modal="true" :active.sync="isInsertHTMLVisible">+ <oat-modal :width="750" :active.sync="isInsertHTMLVisible"><div>- <section expanded class="modal-card-body preview">+ <section class="dialog-body preview"><code-editor lang="html" v-model="insertHTMLSnippet" key="richtext-snippet" /></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="onFormatRichtextHTMLSnippet">+ <footer class="dialog-foot align-right">+ <button type="button" @click="onFormatRichtextHTMLSnippet">{{ $t('campaigns.formatHTML') }}- </b-button>- <b-button @click="() => { this.isInsertHTMLVisible = false; }">+ </button>+ <button type="button" @click="() => { this.isInsertHTMLVisible = false; }">{{ $t('globals.buttons.close') }}- </b-button>- <b-button @click="onInsertHTML" class="is-primary">+ </button>+ <button type="button" @click="onInsertHTML" data-variant="primary">{{ $t('globals.buttons.insert') }}- </b-button>+ </button></footer></div>- </b-modal>+ </oat-modal><!-- image picker -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isMediaVisible" :width="900">- <div class="modal-card content" style="width: auto">- <section expanded class="modal-card-body">+ <oat-modal :active.sync="isMediaVisible" :width="900">+ <div class="dialog-card content" style="width: auto">+ <section class="dialog-body"><media is-modal @selected="onMediaSelect" /></section></div>- </b-modal>+ </oat-modal></div></template>diff --git a/frontend/src/components/SubscriberActivity.vue b/frontend/src/components/SubscriberActivity.vueindex 201920ae..96cb909b 100644--- a/frontend/src/components/SubscriberActivity.vue+++ b/frontend/src/components/SubscriberActivity.vue@@ -1,87 +1,83 @@<template>- <div class="subscriber-activity">- <div v-if="isLoading" class="has-text-centered">- <b-loading :active="true" :is-full-page="false" />- </div>-- <div v-else>+ <div class="subscriber-activity" :aria-busy="isLoading ? 'true' : null" data-spinner="large overlay">+ <div v-if="!isLoading"><!-- Summary Stats -->- <div class="columns">- <div class="column is-4">- <div class="box has-text-centered">+ <div class="row">+ <div class="col-4">+ <div class="card align-center"><p class="heading">{{ $t('globals.terms.campaigns') }}</p>- <p class="title">{{ activity.campaignViews ? activity.campaignViews.length : 0 }}</p>+ <p>{{ activity.campaignViews ? activity.campaignViews.length : 0 }}</p></div></div>- <div class="column is-4">- <div class="box has-text-centered">+ <div class="col-4">+ <div class="card align-center"><p class="heading">{{ $t('campaigns.views') }}</p>- <p class="title">{{ totalViews }}</p>+ <p>{{ totalViews }}</p></div></div>- <div class="column is-4">- <div class="box has-text-centered">+ <div class="col-4">+ <div class="card align-center"><p class="heading">{{ $t('campaigns.clicks') }}</p>- <p class="title">{{ totalClicks }}</p>+ <p>{{ totalClicks }}</p></div></div></div><!-- Campaign Views Section -->- <div class="section-header mb-4">- <h5 class="title is-5">+ <div class="stack-header mb-4">+ <h5>{{ $t('campaigns.views') }}</h5></div><div v-if="activity.campaignViews && activity.campaignViews.length > 0">- <b-table :data="activity.campaignViews" hoverable default-sort="lastViewedAt" default-sort-direction="desc"+ <oat-data-table :data="activity.campaignViews" default-sort="lastViewedAt" default-sort-direction="desc"paginated :per-page="10" :pagination-simple="false" class="campaign-views-table">- <b-table-column v-slot="props" field="subject" :label="$tc('globals.terms.campaign', 1)" sortable>+ <oat-table-column v-slot="props" field="subject" :label="$tc('globals.terms.campaign', 1)" sortable><div v-if="props.row.uuid"><router-link :to="{ name: 'campaign', params: { id: props.row.id } }">{{ props.row.name }}</router-link>- <p class="is-size-7 has-text-grey">{{ props.row.subject }}</p>+ <p class="text-light text-7">{{ props.row.subject }}</p></div><div v-else>- <em class="has-text-grey">{{ $t('subscribers.activity.campaignDeleted') }}</em>+ <em class="text-light">{{ $t('subscribers.activity.campaignDeleted') }}</em></div>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="viewCount" :label="$t('campaigns.views')" sortable numeric>- <span class="tag is-light">{{ props.row.viewCount }}</span>- </b-table-column>+ <oat-table-column v-slot="props" field="viewCount" :label="$t('campaigns.views')" sortable numeric>+ <span class="badge ">{{ props.row.viewCount }}</span>+ </oat-table-column>- <b-table-column v-slot="props" field="lastViewedAt" :label="$t('globals.fields.createdAt')" sortable>+ <oat-table-column v-slot="props" field="lastViewedAt" :label="$t('globals.fields.createdAt')" sortable><span v-if="props.row.lastViewedAt">{{ $utils.niceDate(props.row.lastViewedAt, true) }}</span>- </b-table-column>- </b-table>+ </oat-table-column>+ </oat-data-table></div>- <div v-else class="has-text-centered has-text-grey p-6">+ <div v-else class="align-center text-light p-6"><p class="mt-2">{{ $t('globals.messages.emptyState') }}</p></div><!-- Link Clicks Section -->- <div class="section-header mb-4 mt-6">- <h5 class="title is-5">+ <div class="stack-header mb-4 mt-6">+ <h5>{{ $t('campaigns.clicks') }}</h5></div><div v-if="activity.linkClicks && activity.linkClicks.length > 0">- <b-table :data="activity.linkClicks" hoverable default-sort="lastClickedAt" default-sort-direction="desc"- paginated :per-page="10" :pagination-simple="false" class="link-clicks-table">- <b-table-column v-slot="props" field="url" :label="$t('globals.terms.url')" cell-class="link-click-url"+ <oat-data-table :data="activity.linkClicks" default-sort="lastClickedAt" default-sort-direction="desc" paginated+ :per-page="10" :pagination-simple="false" class="link-clicks-table">+ <oat-table-column v-slot="props" field="url" :label="$t('globals.terms.url')" cell-class="link-click-url"sortable><a :href="props.row.url" target="_blank" rel="noopener noreferrer">{{ props.row.url }}</a>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="campaignName" :label="$tc('globals.terms.campaign', 1)" sortable>+ <oat-table-column v-slot="props" field="campaignName" :label="$tc('globals.terms.campaign', 1)" sortable><div v-if="props.row.campaignUuid"><router-link :to="{ name: 'campaign', params: { id: props.row.campaignId } }">{{ props.row.campaignSubject || props.row.campaignName }}@@ -90,20 +86,20 @@<div v-else>—</div>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="clickCount" :label="$t('campaigns.clicks')" sortable numeric>- <span class="tag is-light">{{ props.row.clickCount }}</span>- </b-table-column>+ <oat-table-column v-slot="props" field="clickCount" :label="$t('campaigns.clicks')" sortable numeric>+ <span class="badge ">{{ props.row.clickCount }}</span>+ </oat-table-column>- <b-table-column v-slot="props" field="lastClickedAt" :label="$t('globals.fields.createdAt')" sortable>+ <oat-table-column v-slot="props" field="lastClickedAt" :label="$t('globals.fields.createdAt')" sortable><span v-if="props.row.lastClickedAt">{{ $utils.niceDate(props.row.lastClickedAt, true) }}</span>- </b-table-column>- </b-table>+ </oat-table-column>+ </oat-data-table></div>- <div v-else class="has-text-centered has-text-grey p-6">+ <div v-else class="align-center text-light p-6"><p class="mt-2">{{ $t('globals.messages.emptyState') }}</p></div></div>@@ -160,3 +156,9 @@ export default Vue.extend({},});</script>++<style>+.subscriber-activity[aria-busy="true"] {+ min-height: 10rem;+}+</style>diff --git a/frontend/src/components/VisualEditor.vue b/frontend/src/components/VisualEditor.vueindex 5228e2d4..f3a5cf3d 100644--- a/frontend/src/components/VisualEditor.vue+++ b/frontend/src/components/VisualEditor.vue@@ -4,13 +4,13 @@title="Visual email editor" /><!-- image picker -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isMediaVisible" :width="900">- <div class="modal-card content" style="width: auto">- <section expanded class="modal-card-body">+ <oat-modal :active.sync="isMediaVisible" :width="900">+ <div class="dialog-card content" style="width: auto">+ <section class="dialog-body"><media is-modal @selected="onMediaSelect" /></section></div>- </b-modal>+ </oat-modal></div></template>diff --git a/frontend/src/main.js b/frontend/src/main.jsindex e36c137f..19e72a08 100644--- a/frontend/src/main.js+++ b/frontend/src/main.js@@ -1,8 +1,22 @@import Vue from 'vue';-import Buefy from 'buefy';import VueI18n from 'vue-i18n';import App from './App.vue';+import OatAutocomplete from './components/OatAutocomplete.vue';+import OatBadge from './components/OatBadge.vue';+import OatCheckbox from './components/OatCheckbox.vue';+import OatDataTable from './components/OatDataTable.vue';+import OatDateInput from './components/OatDateInput.vue';+import OatField from './components/OatField.vue';+import OatIcon from './components/OatIcon.vue';+import OatLoading from './components/OatLoading.vue';+import OatModal from './components/OatModal.vue';+import OatPagination from './components/OatPagination.vue';+import OatRadio from './components/OatRadio.vue';+import OatSwitch from './components/OatSwitch.vue';+import OatTableColumn from './components/OatTableColumn.vue';+import OatTagInput from './components/OatTagInput.vue';+import OatUpload from './components/OatUpload.vue';import router from './router';import store from './store';import * as api from './api';@@ -12,7 +26,22 @@ import Utils from './utils';Vue.use(VueI18n);const i18n = new VueI18n();-Vue.use(Buefy, {});+Vue.component('OatAutocomplete', OatAutocomplete);+Vue.component('OatBadge', OatBadge);+Vue.component('OatCheckbox', OatCheckbox);+Vue.component('OatDataTable', OatDataTable);+Vue.component('OatDateInput', OatDateInput);+Vue.component('OatField', OatField);+Vue.component('OatIcon', OatIcon);+Vue.component('OatLoading', OatLoading);+Vue.component('OatModal', OatModal);+Vue.component('OatPagination', OatPagination);+Vue.component('OatRadio', OatRadio);+Vue.component('OatSwitch', OatSwitch);+Vue.component('OatTableColumn', OatTableColumn);+Vue.component('OatTagInput', OatTagInput);+Vue.component('OatUpload', OatUpload);+Vue.config.ignoredElements = [/^ot-/];Vue.config.productionTip = false;// Setup the router.diff --git a/frontend/src/utils.js b/frontend/src/utils.jsindex b8b459dc..91bd4c61 100644--- a/frontend/src/utils.js+++ b/frontend/src/utils.js@@ -1,7 +1,3 @@-import {- DialogProgrammatic as Dialog,- ToastProgrammatic as Toast,-} from 'buefy';import dayjs from 'dayjs';import dayDuration from 'dayjs/plugin/duration';import relativeTime from 'dayjs/plugin/relativeTime';@@ -25,6 +21,22 @@ const htmlEntities = {'=': '=',};+function toastVariant(typ) {+ if (!typ) {+ return 'success';+ }++ return {+ 'is-success': 'success',+ success: 'success',+ 'is-danger': 'danger',+ danger: 'danger',+ error: 'danger',+ 'is-warning': 'warning',+ warning: 'warning',+ }[typ] || 'info';+}+export default class Utils {constructor(i18n) {this.i18n = i18n;@@ -146,48 +158,39 @@ export default class Utils {// UI shortcuts.confirm = (msg, onConfirm, onCancel) => {- Dialog.confirm({- scroll: 'keep',- message: !msg ? this.i18n.t('globals.messages.confirm') : this.escapeHTML(msg),- confirmText: this.i18n.t('globals.buttons.ok'),- cancelText: this.i18n.t('globals.buttons.cancel'),- onConfirm,- onCancel,- });+ // Native browser dialogs are intentionally used during the Oat migration.+ // eslint-disable-next-line no-alert+ if (window.confirm(!msg ? this.i18n.t('globals.messages.confirm') : msg)) {+ if (onConfirm) {+ onConfirm();+ }+ } else if (onCancel) {+ onCancel();+ }};- prompt = (msg, inputAttrs, onConfirm, onCancel, params) => {- const p = params || {};-- Dialog.prompt({- scroll: 'keep',- message: this.escapeHTML(msg),- confirmText: p.confirmText || this.i18n.t('globals.buttons.ok'),- cancelText: p.cancelText || this.i18n.t('globals.buttons.cancel'),- inputAttrs: {- type: 'string',- maxlength: 200,- ...inputAttrs,- },- trapFocus: true,- onConfirm,- onCancel,- });+ prompt = (msg, inputAttrs, onConfirm, onCancel) => {+ const initialValue = inputAttrs && inputAttrs.value ? inputAttrs.value : '';+ // eslint-disable-next-line no-alert+ const val = window.prompt(msg, initialValue);+ if (val !== null) {+ if (onConfirm) {+ onConfirm(val);+ }+ } else if (onCancel) {+ onCancel();+ }};- toast = (msg, typ, duration, queue) => {- Toast.open({- message: this.escapeHTML(msg),- type: !typ ? 'is-success' : typ,- queue,+ toast = (msg, typ, duration) => {+ window.ot.toast(msg, '', {duration: duration || 3000,- position: 'is-top',- pauseOnHover: true,+ placement: 'top-right',+ variant: toastVariant(typ),});};- // Takes a props.row from a Buefy b-column <td> template and- // returns a `data-id` attribute which Buefy then applies to the td.+ // Takes a table row and returns a `data-id` attribute for the cell.tdID = (row) => ({ 'data-id': row.id.toString() });camelString = (str) => {diff --git a/frontend/src/views/404.vue b/frontend/src/views/404.vueindex 4e92448b..a6d0e599 100644--- a/frontend/src/views/404.vue+++ b/frontend/src/views/404.vue@@ -1,8 +1,16 @@<template><section class="page-404">- <h1 class="title">- 404- </h1>+ <header class="row page-header">+ <div class="col-8">+ <h1>+ 404+ </h1>+ </div>+ </header>++ <div class="card page-content">+ Page not found.+ </div></section></template>diff --git a/frontend/src/views/About.vue b/frontend/src/views/About.vueindex 3fa28070..a3556b35 100644--- a/frontend/src/views/About.vue+++ b/frontend/src/views/About.vue@@ -1,5 +1,11 @@<template>- <div class="about">- <h1>This is an about page</h1>- </div>+ <section class="about">+ <header class="row page-header">+ <div class="col-8">+ <h1>This is an about page</h1>+ </div>+ </header>++ <div class="card page-content" />+ </section></template>diff --git a/frontend/src/views/Bounces.vue b/frontend/src/views/Bounces.vueindex bfc4cd0b..a35cf81d 100644--- a/frontend/src/views/Bounces.vue+++ b/frontend/src/views/Bounces.vue@@ -1,97 +1,100 @@<template><section class="bounces">- <header class="page-header columns">- <div class="column is-two-thirds">- <h1 class="title is-4">+ <header class="page-header row">+ <div class="col-8">+ <h1>{{ $t('globals.terms.bounces') }}<span v-if="bounces.total > 0">({{ bounces.total }})</span></h1></div></header>- <b-table :data="bounces.results" :hoverable="true" :loading="loading.bounces" default-sort="createdAt" checkable- @check-all="onTableCheck" @check="onTableCheck" :checked-rows.sync="bulk.checked" detailed show-detail-icon- paginated backend-pagination pagination-position="both" @page-change="onPageChange"- :current-page="queryParams.page" :per-page="bounces.perPage" :total="bounces.total" backend-sorting- @sort="onSort">- <template #top-left>- <div class="actions">- <template v-if="bulk.checked.length > 0">- <a class="a" href="#" @click.prevent="$utils.confirm(null, () => deleteBounces())" data-cy="btn-delete">- <b-icon icon="trash-can-outline" size="is-small" /> {{ $t('globals.buttons.delete') }}- </a>- <a class="a" href="#" @click.prevent="$utils.confirm(null, () => blocklistSubscribers())"- data-cy="btn-manage-blocklist">- <b-icon icon="account-off-outline" size="is-small" /> {{ $t('import.blocklist') }}- </a>- <span>- {{ $t('globals.messages.numSelected', { num: numSelectedBounces }) }}- <span v-if="!bulk.all && bounces.total > bounces.perPage">- —- <a href="#" @click.prevent="selectAllBounces">- {{ $t('subscribers.selectAll', { num: bounces.total }) }}- </a>+ <div class="card page-content">+ <oat-data-table :data="bounces.results" :hoverable="true" :loading="loading.bounces" default-sort="createdAt"+ checkable @check-all="onTableCheck" @check="onTableCheck" :checked-rows.sync="bulk.checked" detailed paginated+ backend-pagination @page-change="onPageChange" :current-page="queryParams.page" :per-page="bounces.perPage"+ :total="bounces.total" backend-sorting @sort="onSort">+ <template #top-left>+ <div class="actions">+ <template v-if="bulk.checked.length > 0">+ <a class="a" href="#" @click.prevent="$utils.confirm(null, () => deleteBounces())" data-cy="btn-delete">+ <oat-icon icon="trash-can-outline" /> {{ $t('globals.buttons.delete') }}+ </a>+ <a class="a" href="#" @click.prevent="$utils.confirm(null, () => blocklistSubscribers())"+ data-cy="btn-manage-blocklist">+ <oat-icon icon="account-off-outline" /> {{ $t('import.blocklist') }}+ </a>+ <span>+ {{ $t('globals.messages.numSelected', { num: numSelectedBounces }) }}+ <span v-if="!bulk.all && bounces.total > bounces.perPage">+ —+ <a href="#" @click.prevent="selectAllBounces">+ {{ $t('subscribers.selectAll', { num: bounces.total }) }}+ </a>+ </span></span>+ </template>+ </div>+ </template>+ <oat-table-column v-slot="props" field="email" :label="$t('subscribers.email')" :td-attrs="$utils.tdID"+ sortable>+ <router-link :to="{ name: 'subscriber', params: { id: props.row.subscriberId } }"+ :class="{ 'blocklisted': props.row.subscriberStatus === 'blocklisted' }">+ {{ props.row.email }}+ <oat-badge v-if="props.row.subscriberStatus !== 'enabled'" :type="props.row.subscriberStatus"+ data-cy="blocklisted">+ {{ $t(`subscribers.status.${props.row.subscriberStatus}`) }}+ </oat-badge>+ </router-link>+ </oat-table-column>++ <oat-table-column v-slot="props" field="campaign" :label="$tc('globals.terms.campaign')" sortable>+ <router-link v-if="props.row.campaign"+ :to="{ name: 'bounces', query: { campaign_id: props.row.campaign.id } }">+ {{ props.row.campaign.name }}+ </router-link>+ <span v-else>-</span>+ </oat-table-column>++ <oat-table-column v-slot="props" field="source" :label="$t('bounces.source')" sortable>+ <router-link :to="{ name: 'bounces', query: { source: props.row.source } }">+ {{ props.row.source }}+ </router-link>+ </oat-table-column>++ <oat-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" sortable>+ <router-link :to="{ name: 'bounces', query: { type: props.row.type } }">+ {{ $t(`bounces.${props.row.type}`) }}+ </router-link>+ </oat-table-column>++ <oat-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')" sortable>+ {{ $utils.niceDate(props.row.createdAt, true) }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions" align="right">+ <div>+ <a v-if="!props.row.isDefault" href="#" @click.prevent="$utils.confirm(null, () => deleteBounce(props.row))"+ data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />++ </a>+ <span v-else class="a text-lighter">+ <oat-icon icon="trash-can-outline" /></span>- </template>- </div>- </template>- <b-table-column v-slot="props" field="email" :label="$t('subscribers.email')" :td-attrs="$utils.tdID" sortable>- <router-link :to="{ name: 'subscriber', params: { id: props.row.subscriberId } }"- :class="{ 'blocklisted': props.row.subscriberStatus === 'blocklisted' }">- {{ props.row.email }}- <b-tag v-if="props.row.subscriberStatus !== 'enabled'" :class="props.row.subscriberStatus"- data-cy="blocklisted">- {{ $t(`subscribers.status.${props.row.subscriberStatus}`) }}- </b-tag>- </router-link>- </b-table-column>-- <b-table-column v-slot="props" field="campaign" :label="$tc('globals.terms.campaign')" sortable>- <router-link v-if="props.row.campaign" :to="{ name: 'bounces', query: { campaign_id: props.row.campaign.id } }">- {{ props.row.campaign.name }}- </router-link>- <span v-else>-</span>- </b-table-column>-- <b-table-column v-slot="props" field="source" :label="$t('bounces.source')" sortable>- <router-link :to="{ name: 'bounces', query: { source: props.row.source } }">- {{ props.row.source }}- </router-link>- </b-table-column>-- <b-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" sortable>- <router-link :to="{ name: 'bounces', query: { type: props.row.type } }">- {{ $t(`bounces.${props.row.type}`) }}- </router-link>- </b-table-column>-- <b-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')" sortable>- {{ $utils.niceDate(props.row.createdAt, true) }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" align="right">- <div>- <a v-if="!props.row.isDefault" href="#" @click.prevent="$utils.confirm(null, () => deleteBounce(props.row))"- data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>- </a>- <span v-else class="a has-text-grey-light">- <b-icon icon="trash-can-outline" size="is-small" />- </span>- </div>- </b-table-column>-- <template #detail="props">- <pre class="is-size-7">{{ props.row.meta }}</pre>- </template>-- <template #empty v-if="!loading.templates">- <empty-placeholder />- </template>- </b-table>+ </div>+ </oat-table-column>++ <template #detail="props">+ <pre class="text-7">{{ props.row.meta }}</pre>+ </template>++ <template #empty v-if="!loading.templates">+ <empty-placeholder />+ </template>+ </oat-data-table>+ </div></section></template>diff --git a/frontend/src/views/Campaign.vue b/frontend/src/views/Campaign.vueindex 93362b03..6c404181 100644--- a/frontend/src/views/Campaign.vue+++ b/frontend/src/views/Campaign.vue@@ -1,322 +1,334 @@<template><section class="campaign">- <header class="columns page-header">- <div class="column is-6">- <p v-if="isEditing && data.status" class="tags">- <b-tag v-if="isEditing" :class="data.status">+ <header class="row page-header">+ <div class="col-8">+ <p v-if="isEditing && data.status" class="hstack">+ <oat-badge v-if="isEditing" :type="data.status">{{ $t(`campaigns.status.${data.status}`) }}- </b-tag>- <b-tag v-if="data.type === 'optin'" :class="data.type">+ </oat-badge>+ <oat-badge v-if="data.type === 'optin'" :type="data.type">{{ $t('lists.optin') }}- </b-tag>- <span v-if="isEditing" class="has-text-grey-light is-size-7" :data-campaign-id="data.id">+ </oat-badge>+ <span v-if="isEditing" class="text-lighter text-7 " :data-campaign-id="data.id">{{ $t('globals.fields.id') }}: <copy-text :text="`${data.id}`" />{{ $t('globals.fields.uuid') }}: <copy-text :text="data.uuid" /></span></p>- <h4 v-if="isEditing" class="title is-4">+ <h4 v-if="isEditing">{{ data.name }}</h4>- <h4 v-else class="title is-4">+ <h4 v-else>{{ $t('campaigns.newCampaign') }}</h4></div>- <div class="column is-6">- <div v-if="canManage || canSend" class="buttons">- <b-field grouped v-if="isEditing && canEdit">- <b-field v-if="canManage" expanded>- <b-button expanded @click="() => onSubmit('update')" :loading="loading.campaigns" type="is-primary"- icon-left="content-save-outline" data-cy="btn-save" aria-keyshortcuts="ctrl+s">+ <div class="col-4 col-end align-right">+ <div v-if="canManage || canSend" class="hstack justify-end">+ <oat-field v-if="isEditing && canEdit">+ <oat-field v-if="canManage">+ <button type="button" @click="() => onSubmit('update')" :loading="loading.campaigns"+ data-variant="primary" data-cy="btn-save" aria-keyshortcuts="ctrl+s"><span class="has-kbd">{{ $t('globals.buttons.saveChanges') }} <span class="kbd">Ctrl+S</span></span>- </b-button>- </b-field>- <b-field expanded v-if="canSend && canStart">- <b-button expanded @click="startCampaign" :loading="loading.campaigns" type="is-primary"+ </button>+ </oat-field>+ <oat-field v-if="canSend && canStart">+ <button type="button" @click="startCampaign" :loading="loading.campaigns" data-variant="primary"icon-left="rocket-launch-outline" data-cy="btn-start">{{ $t('campaigns.start') }}- </b-button>- </b-field>- <b-field expanded v-if="canSend && canSchedule">- <b-button expanded @click="startCampaign" :loading="loading.campaigns" type="is-primary"+ </button>+ </oat-field>+ <oat-field v-if="canSend && canSchedule">+ <button type="button" @click="startCampaign" :loading="loading.campaigns" data-variant="primary"icon-left="clock-start" data-cy="btn-schedule">{{ $t('campaigns.schedule') }}- </b-button>- </b-field>- <b-field expanded v-if="canSend && canUnSchedule">- <b-button expanded @click="$utils.confirm(null, unscheduleCampaign)" :loading="loading.campaigns"- type="is-primary" icon-left="clock-start" data-cy="btn-unschedule">+ </button>+ </oat-field>+ <oat-field v-if="canSend && canUnSchedule">+ <button type="button" class="outline" @click="$utils.confirm(null, unscheduleCampaign)"+ :loading="loading.campaigns" icon-left="clock-start" data-cy="btn-unschedule">{{ $t('campaigns.unSchedule') }}- </b-button>- </b-field>- </b-field>+ </button>+ </oat-field>+ </oat-field></div></div></header>- <b-loading :active="loading.campaigns" />-- <b-tabs type="is-boxed" :animated="false" v-model="activeTab" @input="onTab">- <b-tab-item :label="$tc('globals.terms.campaign')" label-position="on-border" value="campaign"- icon="rocket-launch-outline">- <section class="wrap">- <div class="columns">- <div class="column is-7">- <form @submit.prevent="() => onSubmit(isNew ? 'create' : 'update')">- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" :ref="'focus'" v-model="form.name" name="name" :disabled="!canEdit"- :placeholder="$t('globals.fields.name')" required autofocus />- </b-field>-- <b-field :label="$t('campaigns.subject')" label-position="on-border">- <b-input :maxlength="5000" v-model="form.subject" name="subject" :disabled="!canEdit"- :placeholder="$t('campaigns.subject')" required />- </b-field>-- <b-field :label="$t('campaigns.fromAddress')" label-position="on-border">- <b-input :maxlength="200" v-model="form.fromEmail" name="from_email" :disabled="!canEdit"- :placeholder="$t('campaigns.fromAddressPlaceholder')" required />- </b-field>-- <list-selector v-model="form.lists" :selected="form.lists" :all="lists.results" :disabled="!canEdit"- :label="$t('globals.terms.lists')" :placeholder="$t('campaigns.sendToLists')" />-- <div class="columns">- <div class="column is-6">- <b-field :label="$tc('globals.terms.messenger')" label-position="on-border">- <b-select :placeholder="$tc('globals.terms.messenger')" v-model="form.messenger" name="messenger"- :disabled="!canEdit" required expanded>- <template v-if="emailMessengers.length > 1">- <optgroup label="email">- <option v-for="m in emailMessengers" :value="m" :key="m">- {{ m }}- </option>- </optgroup>- </template>- <template v-else>- <option value="email">email</option>- </template>- <option v-for="m in otherMessengers" :value="m" :key="m">{{ m }}</option>- </b-select>- </b-field>- </div>- <div class="column is-6">- <b-field :label="$t('campaigns.format')" label-position="on-border" class="mr-4 mb-0">- <b-select v-model="form.content.contentType" :disabled="!canEdit || isEditing" value="richtext"- expanded>- <option v-for="(name, f) in contentTypes" :key="f" name="format" :value="f"- :data-cy="`check-${f}`">- {{ name }}- </option>- </b-select>- </b-field>- </div>- </div>+ <div class="card page-content" :aria-busy="loading.campaigns ? 'true' : null" data-spinner="large overlay">+ <ot-tabs ref="campaignTabs" @ot-tab-change="onCampaignTabChange">+ <div role="tablist">+ <button type="button" role="tab" :aria-selected="activeTab === 'campaign' ? 'true' : 'false'">+ {{ $tc('globals.terms.campaign') }}+ </button>+ <button type="button" role="tab" :aria-selected="activeTab === 'content' ? 'true' : 'false'"+ :disabled="isNew">+ {{ $t('campaigns.content') }}+ </button>+ <button type="button" role="tab" :aria-selected="activeTab === 'attribs' ? 'true' : 'false'"+ :disabled="isNew">+ {{ $t('globals.terms.attribs') }}+ </button>+ <button type="button" role="tab" :aria-selected="activeTab === 'archive' ? 'true' : 'false'"+ :disabled="isNew">+ {{ $t('campaigns.archive') }}+ </button>+ </div>- <b-field :label="$t('globals.terms.tags')" label-position="on-border">- <b-taginput v-model="form.tags" name="tags" :disabled="!canEdit" ellipsis icon="tag-outline"- :placeholder="$t('globals.terms.tags')" />- </b-field>- <hr />-- <div class="columns">- <div class="column is-4">- <b-field :label="$t('campaigns.sendLater')" data-cy="btn-send-later">- <b-switch v-model="form.sendLater" :disabled="!canEdit" />- </b-field>+ <section role="tabpanel">+ <section class="wrap">+ <div class="row">+ <div class="col-7">+ <form @submit.prevent="() => onSubmit(isNew ? 'create' : 'update')">+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" :ref="'focus'" v-model="form.name" name="name"+ :disabled="!canEdit" :placeholder="$t('globals.fields.name')" required>+ </oat-field>++ <oat-field :label="$t('campaigns.subject')">+ <input aria-label="field" :maxlength="5000" v-model="form.subject" name="subject"+ :disabled="!canEdit" :placeholder="$t('campaigns.subject')" required>+ </oat-field>++ <oat-field :label="$t('campaigns.fromAddress')">+ <input aria-label="field" :maxlength="200" v-model="form.fromEmail" name="from_email"+ :disabled="!canEdit" :placeholder="$t('campaigns.fromAddressPlaceholder')" required>+ </oat-field>++ <list-selector v-model="form.lists" :selected="form.lists" :all="lists.results" :disabled="!canEdit"+ :label="$t('globals.terms.lists')" :placeholder="$t('campaigns.sendToLists')" />++ <div class="row">+ <div class="col-6">+ <oat-field :label="$tc('globals.terms.messenger')">+ <select aria-label="field" :placeholder="$tc('globals.terms.messenger')"+ v-model="form.messenger" name="messenger" :disabled="!canEdit" required>+ <template v-if="emailMessengers.length > 1">+ <optgroup label="email">+ <option v-for="m in emailMessengers" :value="m" :key="m">+ {{ m }}+ </option>+ </optgroup>+ </template>+ <template v-else>+ <option value="email">email</option>+ </template>+ <option v-for="m in otherMessengers" :value="m" :key="m">{{ m }}</option>+ </select>+ </oat-field>+ </div>+ <div class="col-6">+ <oat-field :label="$t('campaigns.format')" class="mr-4 mb-0">+ <select aria-label="field" v-model="form.content.contentType" :disabled="!canEdit || isEditing"+ value="richtext">+ <option v-for="(name, f) in contentTypes" :key="f" name="format" :value="f"+ :data-cy="`check-${f}`">+ {{ name }}+ </option>+ </select>+ </oat-field>+ </div></div>- <div class="column">- <br />- <b-field v-if="form.sendLater" data-cy="send_at"- :message="form.sendAtDate ? $utils.duration(Date(), form.sendAtDate) : ''">- <b-datetimepicker v-model="form.sendAtDate" :disabled="!canEdit" required editable mobile-native- position="is-top-right" :placeholder="$t('campaigns.dateAndTime')" icon="calendar-clock"- :timepicker="{ hourFormat: '24' }" :datetime-formatter="formatDateTime"- horizontal-time-picker />- </b-field>++ <oat-field :label="$t('globals.terms.tags')">+ <oat-tag-input v-model="form.tags" name="tags" :disabled="!canEdit"+ :placeholder="$t('globals.terms.tags')" />+ </oat-field>+ <hr />++ <div class="row">+ <div class="col-4">+ <oat-field :label="$t('campaigns.sendLater')" data-cy="btn-send-later">+ <oat-switch v-model="form.sendLater" :disabled="!canEdit" />+ </oat-field>+ </div>+ <div class="col-12">+ <br />+ <oat-field v-if="form.sendLater" data-cy="send_at"+ :message="form.sendAtDate ? $utils.duration(Date(), form.sendAtDate) : ''">+ <oat-date-input datetime v-model="form.sendAtDate" :disabled="!canEdit" required editable+ mobile-native :placeholder="$t('campaigns.dateAndTime')" horizontal-time-picker />+ </oat-field>+ </div></div>- </div>- <div>- <p class="has-text-right">- <a href="#" @click.prevent="onShowHeaders" data-cy="btn-headers">- <b-icon icon="plus" />{{ $t('settings.smtp.setCustomHeaders') }}- </a>- </p>- <b-field v-if="form.headersStr !== '[]' || isHeadersVisible" label-position="on-border"- :message="$t('campaigns.customHeadersHelp')">- <b-input v-model="form.headersStr" name="headers" type="textarea"- placeholder="[{"X-Custom": "value"}, {"X-Custom2": "value"}]"- :disabled="!canEdit" />- </b-field>+ <div>+ <p class="align-right">+ <a href="#" @click.prevent="onShowHeaders" data-cy="btn-headers">+ <oat-icon icon="plus" />{{ $t('settings.smtp.setCustomHeaders') }}+ </a>+ </p>+ <oat-field v-if="form.headersStr !== '[]' || isHeadersVisible"+ :message="$t('campaigns.customHeadersHelp')">+ <textarea aria-label="field" v-model="form.headersStr" name="headers"+ placeholder="[{"X-Custom": "value"}, {"X-Custom2": "value"}]"+ :disabled="!canEdit" />+ </oat-field>+ </div>+ <hr />++ <oat-field v-if="isNew">+ <button type="submit" data-variant="primary" :loading="loading.campaigns" data-cy="btn-continue">+ {{ $t('campaigns.continue') }}+ </button>+ </oat-field>+ </form>+ </div>+ <div v-if="canManage" class="col-4 offset-1">+ <br />+ <div class="card">+ <h3>+ {{ $t('campaigns.sendTest') }}+ </h3>+ <oat-field :message="$t('campaigns.sendTestHelp')">+ <oat-tag-input v-model="form.testEmails" :before-adding="$utils.validateEmail" :disabled="isNew"+ icon="email-outline" :placeholder="$t('campaigns.testEmails')" />+ </oat-field>+ <oat-field>+ <button type="button" @click="() => onSubmit('test')" :loading="loading.campaigns" :disabled="isNew"+ data-variant="primary" icon-left="email-outline">+ {{ $t('campaigns.send') }}+ </button>+ </oat-field></div>- <hr />-- <b-field v-if="isNew">- <b-button native-type="submit" type="is-primary" :loading="loading.campaigns" data-cy="btn-continue">- {{ $t('campaigns.continue') }}- </b-button>- </b-field>- </form>- </div>- <div v-if="canManage" class="column is-4 is-offset-1">- <br />- <div class="box">- <h3 class="title is-size-6">- {{ $t('campaigns.sendTest') }}- </h3>- <b-field :message="$t('campaigns.sendTestHelp')">- <b-taginput v-model="form.testEmails" :before-adding="$utils.validateEmail" :disabled="isNew" ellipsis- icon="email-outline" :placeholder="$t('campaigns.testEmails')" />- </b-field>- <b-field>- <b-button @click="() => onSubmit('test')" :loading="loading.campaigns" :disabled="isNew"- type="is-primary" icon-left="email-outline">- {{ $t('campaigns.send') }}- </b-button>- </b-field></div></div>- </div>- </section>- </b-tab-item><!-- campaign -->-- <b-tab-item :label="$t('campaigns.content')" icon="text" :disabled="isNew" value="content">- <editor v-if="data.id" v-model="form.content" :id="data.id" :title="data.name" :disabled="!canEdit"- :templates="templates" :content-types="contentTypes" />-- <div class="columns">- <div class="column is-6">- <p v-if="!isAttachFieldVisible" class="is-size-6 has-text-grey">- <a href="#" @click.prevent="onShowAttachField()" data-cy="btn-attach">- <b-icon icon="file-upload-outline" size="is-small" />- {{ $t('campaigns.addAttachments') }}- </a>- </p>-- <b-field v-if="isAttachFieldVisible" :label="$t('campaigns.attachments')" label-position="on-border"- expanded data-cy="media">- <b-taginput v-model="form.media" name="media" ellipsis icon="tag-outline" ref="media" field="filename"- @focus="onOpenAttach" :disabled="!canEdit" />- </b-field>- </div>- <div class="column has-text-right">- <a href="https://listmonk.app/docs/templating/#template-expressions" target="_blank"- rel="noopener noreferer">- <b-icon icon="code" /> {{ $t('campaigns.templatingRef') }}</a>- <span v-if="canEdit && form.content.contentType !== 'plain'" class="is-size-6 has-text-grey ml-6">- <a v-if="form.altbody === null" href="#" @click.prevent="onAddAltBody">- <b-icon icon="text" size="is-small" /> {{ $t('campaigns.addAltText') }}- </a>- <a v-else href="#" @click.prevent="$utils.confirm(null, onRemoveAltBody)">- <b-icon icon="trash-can-outline" size="is-small" />- {{ $t('campaigns.removeAltText') }}- </a>- </span>- </div>- </div>-- <div v-if="canEdit && form.content.contentType !== 'plain'" class="alt-body">- <b-input v-if="form.altbody !== null" v-model="form.altbody" type="textarea" :disabled="!canEdit" />- </div>- </b-tab-item><!-- content -->-- <b-tab-item :label="$t('globals.terms.attribs')" icon="code" value="attribs" :disabled="isNew">- <section class="wrap">- <b-field :label="$t('globals.terms.attribs')" :message="$t('campaigns.attribsHelp')"- label-position="on-border">- <b-input v-model="form.attribsStr" type="textarea" :disabled="!canEdit" rows="15" />- </b-field>- </section>- </b-tab-item><!-- attribs -->-- <b-tab-item :label="$t('campaigns.archive')" icon="newspaper-variant-outline" value="archive" :disabled="isNew">- <section class="wrap">- <div class="columns">- <div class="column is-4">- <b-field :label="$t('campaigns.archiveEnable')" data-cy="btn-archive"- :message="$t('campaigns.archiveHelp')">- <div class="columns">- <div class="column">- <b-switch data-cy="btn-archive" v-model="form.archive" :disabled="!canArchive" />- </div>- <div class="column is-12">- <a :href="`${serverConfig.root_url}/archive/${data.uuid}`" target="_blank" rel="noopener noreferer"- :class="{ 'has-text-grey-light': !form.archive }" aria-label="$t('campaigns.archive')">- <b-icon icon="link-variant" />- </a>- </div>- </div>- </b-field>+ </section>+ </section><!-- campaign -->++ <section role="tabpanel">+ <editor v-if="data.id" v-model="form.content" :id="data.id" :title="data.name" :disabled="!canEdit"+ :templates="templates" :content-types="contentTypes" />++ <div class="row">+ <div class="col-6">+ <p v-if="!isAttachFieldVisible" class="text-light text-7">+ <a href="#" @click.prevent="onShowAttachField()" data-cy="btn-attach">+ <oat-icon icon="file-upload-outline" />+ {{ $t('campaigns.addAttachments') }}+ </a>+ </p>++ <oat-field v-if="isAttachFieldVisible" :label="$t('campaigns.attachments')" data-cy="media">+ <oat-tag-input v-model="form.media" name="media" ref="media" field="filename" @focus="onOpenAttach"+ :disabled="!canEdit" />+ </oat-field></div>- <div class="column is-8">- <b-field grouped position="is-right">- <b-field v-if="!canEdit && canArchive">- <b-button @click="onUpdateCampaignArchive" :loading="loading.campaigns" type="is-primary"- icon-left="content-save-outline" data-cy="btn-save">- {{ $t('globals.buttons.saveChanges') }}- </b-button>- </b-field>- </b-field>+ <div class="col-12 align-right">+ <a href="https://listmonk.app/docs/templating/#template-expressions" target="_blank"+ rel="noopener noreferer">+ <oat-icon icon="code" /> {{ $t('campaigns.templatingRef') }}</a>+ <span v-if="canEdit && form.content.contentType !== 'plain'" class="text-light text-7 ml-6">+ <a v-if="form.altbody === null" href="#" @click.prevent="onAddAltBody">+ <oat-icon icon="text" /> {{ $t('campaigns.addAltText') }}+ </a>+ <a v-else href="#" @click.prevent="$utils.confirm(null, onRemoveAltBody)">+ <oat-icon icon="trash-can-outline" />+ {{ $t('campaigns.removeAltText') }}+ </a>+ </span></div></div>- <div class="columns">- <div class="column is-6">- <b-field :label="$tc('globals.terms.template')" label-position="on-border">- <b-select :placeholder="$tc('globals.terms.template')" v-model="form.archiveTemplateId" name="template"- :disabled="!canArchive || !form.archive || form.content.contentType === 'visual'" required>- <template v-for="t in templates">- <option v-if="t.type === 'campaign'" :value="t.id" :key="t.id">- {{ t.name }}- </option>- </template>- </b-select>- </b-field>+ <div v-if="canEdit && form.content.contentType !== 'plain'" class="alt-body">+ <textarea aria-label="field" v-if="form.altbody !== null" v-model="form.altbody" :disabled="!canEdit" />+ </div>+ </section><!-- content -->++ <section role="tabpanel">+ <section class="wrap">+ <oat-field :label="$t('globals.terms.attribs')" :message="$t('campaigns.attribsHelp')">+ <textarea aria-label="field" v-model="form.attribsStr" :disabled="!canEdit" rows="15" />+ </oat-field>+ </section>+ </section><!-- attribs -->++ <section role="tabpanel">+ <section class="wrap">+ <div class="row">+ <div class="col-4">+ <oat-field :label="$t('campaigns.archiveEnable')" data-cy="btn-archive"+ :message="$t('campaigns.archiveHelp')">+ <div class="row">+ <div class="col-12">+ <oat-switch data-cy="btn-archive" v-model="form.archive" :disabled="!canArchive" />+ </div>+ <div class="col-12">+ <a :href="`${serverConfig.root_url}/archive/${data.uuid}`" target="_blank"+ rel="noopener noreferer" :class="{ 'text-lighter': !form.archive }"+ aria-label="$t('campaigns.archive')">+ <oat-icon icon="link-variant" />+ </a>+ </div>+ </div>+ </oat-field>+ </div>+ <div class="col-8">+ <oat-field>+ <oat-field v-if="!canEdit && canArchive">+ <button type="button" @click="onUpdateCampaignArchive" :loading="loading.campaigns"+ data-variant="primary" data-cy="btn-save">+ {{ $t('globals.buttons.saveChanges') }}+ </button>+ </oat-field>+ </oat-field>+ </div></div>- <div class="column is-6">- <b-field grouped position="is-right">- <b-field v-if="form.archive && (!this.form.archiveMetaStr || this.form.archiveMetaStr === '{}')">- <a class="button is-primary" href="#" @click.prevent="onFillArchiveMeta" aria-label="{}"><b-icon- icon="code" /></a>- </b-field>- <b-field v-if="form.archive">- <b-button @click="onToggleArchivePreview" type="is-primary" icon-left="file-find-outline"- data-cy="btn-preview">- {{ $t('campaigns.preview') }}- </b-button>- </b-field>- </b-field>+ <div class="row">+ <div class="col-6">+ <oat-field :label="$tc('globals.terms.template')">+ <select aria-label="field" :placeholder="$tc('globals.terms.template')"+ v-model="form.archiveTemplateId" name="template"+ :disabled="!canArchive || !form.archive || form.content.contentType === 'visual'" required>+ <template v-for="t in templates">+ <option v-if="t.type === 'campaign'" :value="t.id" :key="t.id">+ {{ t.name }}+ </option>+ </template>+ </select>+ </oat-field>+ </div>++ <div class="col-6">+ <oat-field>+ <oat-field v-if="form.archive && (!this.form.archiveMetaStr || this.form.archiveMetaStr === '{}')">+ <a class="button " href="#" @click.prevent="onFillArchiveMeta" aria-label="{}"><oat-icon+ icon="code" /></a>+ </oat-field>+ <oat-field v-if="form.archive">+ <button type="button" @click="onToggleArchivePreview" data-variant="primary" data-cy="btn-preview">+ {{ $t('campaigns.preview') }}+ </button>+ </oat-field>+ </oat-field>+ </div></div>- </div>- <b-field>- <b-field :label="$t('campaigns.archiveSlug')" label-position="on-border"- :message="$t('campaigns.archiveSlugHelp')">- <b-input :maxlength="200" :ref="'focus'" v-model="form.archiveSlug" name="archive_slug"- data-cy="archive-slug" :disabled="!canArchive || !form.archive" />- </b-field>- </b-field>- <b-field :label="$t('campaigns.archiveMeta')" :message="$t('campaigns.archiveMetaHelp')"- label-position="on-border">- <b-input v-model="form.archiveMetaStr" name="archive_meta" type="textarea" data-cy="archive-meta"- :disabled="!canArchive || !form.archive" rows="20" />- </b-field>- </section>- </b-tab-item><!-- archive -->- </b-tabs>-- <b-modal scroll="keep" :aria-modal="true" :active.sync="isAttachModalOpen" :width="900">- <div class="modal-card content" style="width: auto">- <section expanded class="modal-card-body">- <media is-modal @selected="onAttachSelect" />- </section>- </div>- </b-modal>+ <oat-field>+ <oat-field :label="$t('campaigns.archiveSlug')" :message="$t('campaigns.archiveSlugHelp')">+ <input aria-label="field" :maxlength="200" :ref="'focus'" v-model="form.archiveSlug" name="archive_slug"+ data-cy="archive-slug" :disabled="!canArchive || !form.archive">+ </oat-field>+ </oat-field>+ <oat-field :label="$t('campaigns.archiveMeta')" :message="$t('campaigns.archiveMetaHelp')">+ <textarea aria-label="field" v-model="form.archiveMetaStr" name="archive_meta" data-cy="archive-meta"+ :disabled="!canArchive || !form.archive" rows="20" />+ </oat-field>+ </section>+ </section><!-- archive -->+ </ot-tabs>++ <oat-modal :active.sync="isAttachModalOpen" :width="900">+ <div class="dialog-card content" style="width: auto">+ <section class="dialog-body">+ <media is-modal @selected="onAttachSelect" />+ </section>+ </div>+ </oat-modal>- <campaign-preview v-if="isPreviewingArchive" @close="onToggleArchivePreview" type="campaign" :id="data.id"- :archive-meta="form.archiveMetaStr" :title="data.title" :content-type="data.contentType"- :template-id="form.archiveTemplateId" is-post is-archive />+ <campaign-preview v-if="isPreviewingArchive" @close="onToggleArchivePreview" type="campaign" :id="data.id"+ :archive-meta="form.archiveMetaStr" :title="data.title" :content-type="data.contentType"+ :template-id="form.archiveTemplateId" is-post is-archive />+ </div></section></template>@@ -442,7 +454,11 @@ export default Vue.extend({|| this.data.contentType !== this.form.content.contentType;},- onTab(tab) {+ onCampaignTabChange(e) {+ const tabs = ['campaign', 'content', 'attribs', 'archive'];+ const tab = tabs[e.detail.index] || 'campaign';+ this.activeTab = tab;+if (tab === 'content' && window.tinymce && window.tinymce.editors.length > 0) {this.$nextTick(() => {window.tinymce.editors[0].focus();@@ -453,6 +469,14 @@ export default Vue.extend({window.history.replaceState({}, '', `#${tab}`);},+ syncActiveTab() {+ const tabs = ['campaign', 'content', 'attribs', 'archive'];+ const index = tabs.indexOf(this.activeTab);+ if (index >= 0 && this.$refs.campaignTabs) {+ this.$refs.campaignTabs.activeIndex = index;+ }+ },+onFillArchiveMeta() {const archiveStr = `{"email": "[email protected]", "name": "${this.$t('globals.fields.name')}", "attribs": {}}`;this.form.archiveMetaStr = this.$utils.getPref('campaign.archiveMetaStr') || JSON.stringify(JSON.parse(archiveStr), null, 4);@@ -464,7 +488,7 @@ export default Vue.extend({try {this.form.headers = JSON.parse(this.form.headersStr);} catch (e) {- this.$utils.toast(e.toString(), 'is-danger');+ this.$utils.toast(e.toString(), '');return;}} else {@@ -476,7 +500,7 @@ export default Vue.extend({try {this.form.archiveMeta = JSON.parse(this.form.archiveMetaStr);} catch (e) {- this.$utils.toast(e.toString(), 'is-danger');+ this.$utils.toast(e.toString(), '');return;}}@@ -489,7 +513,7 @@ export default Vue.extend({} catch (e) {this.$utils.toast(`${this.$t('subscribers.invalidJSON')}: ${e.toString()}`,- 'is-danger',+ '',3000,);@@ -808,6 +832,7 @@ export default Vue.extend({this.getCampaign(id).then(() => {if (this.$route.hash !== '') {this.activeTab = this.$route.hash.replace('#', '');+ this.$nextTick(this.syncActiveTab);}});} else {diff --git a/frontend/src/views/CampaignAnalytics.vue b/frontend/src/views/CampaignAnalytics.vueindex 295f5df9..6262c908 100644--- a/frontend/src/views/CampaignAnalytics.vue+++ b/frontend/src/views/CampaignAnalytics.vue@@ -1,71 +1,76 @@<template>- <section class="analytics content relative">- <h1 class="title is-4">- {{ $t('analytics.title') }}- </h1>- <div v-if="serverConfig.privacy.disable_tracking || !serverConfig.privacy.individual_tracking"- class="notification is-info">- <template v-if="serverConfig.privacy.disable_tracking">- {{ $t('analytics.trackingDisabled') }}- </template>- <template v-else-if="!serverConfig.privacy.individual_tracking">- {{ $t('analytics.nonIndividualTracking') }}- </template>- </div>- <hr />-- <form @submit.prevent="onSubmit">- <div class="columns">- <div class="column is-6">- <b-field :label="$t('globals.terms.campaigns')" label-position="on-border">- <b-taginput v-model="form.campaigns" :data="queriedCampaigns" name="campaigns" ellipsis icon="tag-outline"- :placeholder="$t('globals.terms.campaigns')" autocomplete :allow-new="false" :open-on-focus="true"- :before-adding="isCampaignSelected" @typing="queryCampaigns" @focus="queryCampaigns" field="name"- :loading="isSearchLoading" />- </b-field>- </div>+ <section class="analytics relative">+ <header class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('analytics.title') }}+ </h1>+ </div>+ </header>++ <div class="card page-content">+ <div v-if="serverConfig.privacy.disable_tracking || !serverConfig.privacy.individual_tracking" class="card ">+ <template v-if="serverConfig.privacy.disable_tracking">+ {{ $t('analytics.trackingDisabled') }}+ </template>+ <template v-else-if="!serverConfig.privacy.individual_tracking">+ {{ $t('analytics.nonIndividualTracking') }}+ </template>+ </div>+ <hr />++ <form @submit.prevent="onSubmit">+ <div class="row">+ <div class="col-6">+ <oat-field :label="$t('globals.terms.campaigns')">+ <oat-tag-input v-model="form.campaigns" :data="queriedCampaigns" name="campaigns"+ :placeholder="$t('globals.terms.campaigns')" autocomplete :allow-new="false" :open-on-focus="true"+ :before-adding="isCampaignSelected" @typing="queryCampaigns" @focus="queryCampaigns" field="name"+ :loading="isSearchLoading" />+ </oat-field>+ </div>- <div class="column is-5">- <div class="columns">- <div class="column is-6">- <b-field data-cy="from" :label="$t('analytics.fromDate')" label-position="on-border">- <b-datetimepicker v-model="form.from" icon="calendar-clock" :timepicker="{ hourFormat: '24' }"- :datetime-formatter="formatDateTime" @input="onFromDateChange" />- </b-field>+ <div class="col-5">+ <div class="row">+ <div class="col-6">+ <oat-field data-cy="from" :label="$t('analytics.fromDate')">+ <oat-date-input datetime v-model="form.from" @input="onFromDateChange" />+ </oat-field>+ </div>+ <div class="col-6">+ <oat-field data-cy="to" :label="$t('analytics.toDate')">+ <oat-date-input datetime v-model="form.to" @input="onToDateChange" />+ </oat-field>+ </div>+ </div><!-- row -->+ </div><!-- row -->++ <div class="col-1">+ <button type="submit" data-variant="primary" :disabled="form.campaigns.length === 0" data-cy="btn-search"+ aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </div>+ </div><!-- row -->+ </form>++ <section class="charts mt-5">+ <div class="chart" v-for="(v, k) in charts" :key="k">+ <div class="row">+ <div class="col-9" :aria-busy="v.loading ? 'true' : null" data-spinner="large overlay">+ <h4>+ {{ v.name }}+ <span v-if="v.type !== 'bar'" class="text-lighter text-7">({{ $utils.niceNumber(counts[k]) }})</span>+ </h4>+ <chart :type="v.type" v-if="!v.loading" :data="v.data" :on-click="v.onClick" /></div>- <div class="column is-6">- <b-field data-cy="to" :label="$t('analytics.toDate')" label-position="on-border">- <b-datetimepicker v-model="form.to" icon="calendar-clock" :timepicker="{ hourFormat: '24' }"- :datetime-formatter="formatDateTime" @input="onToDateChange" />- </b-field>+ <div class="col-2 donut-container">+ <chart type="donut" v-if="!v.loading" :data="v.donutData" /></div>- </div><!-- columns -->- </div><!-- columns -->-- <div class="column is-1">- <b-button native-type="submit" type="is-primary" icon-left="magnify" :disabled="form.campaigns.length === 0"- data-cy="btn-search" />- </div>- </div><!-- columns -->- </form>-- <section class="charts mt-5">- <div class="chart" v-for="(v, k) in charts" :key="k">- <div class="columns">- <div class="column is-9">- <b-loading v-if="v.loading" :active="v.loading" :is-full-page="false" />- <h4>- {{ v.name }}- <span v-if="v.type !== 'bar'" class="has-text-grey-light">({{ $utils.niceNumber(counts[k]) }})</span>- </h4>- <chart :type="v.type" v-if="!v.loading" :data="v.data" :on-click="v.onClick" />- </div>- <div class="column is-2 donut-container">- <chart type="donut" v-if="!v.loading" :data="v.donutData" /></div></div>- </div>- </section>+ </section>+ </div></section></template>diff --git a/frontend/src/views/Campaigns.vue b/frontend/src/views/Campaigns.vueindex 1b411a83..ab124bb3 100644--- a/frontend/src/views/Campaigns.vue+++ b/frontend/src/views/Campaigns.vue@@ -1,277 +1,274 @@<template><section class="campaigns">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t('globals.terms.campaigns') }}<span v-if="!isNaN(campaigns.total)">({{ campaigns.total }})</span></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('campaigns:manage')" expanded>- <b-button expanded :to="{ name: 'campaign', params: { id: 'new' } }" tag="router-link" class="btn-new"- type="is-primary" icon-left="plus" data-cy="btn-new">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('campaigns:manage')">+ <button type="button" :to="{ name: 'campaign', params: { id: 'new' } }" tag="router-link" class="btn-new"+ data-variant="primary" data-cy="btn-new">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <b-table :data="campaigns.results" :loading="loading.campaigns" :row-class="highlightedRow"- @check-all="onTableCheck" @check="onTableCheck" :checked-rows.sync="bulk.checked" paginated backend-pagination- pagination-position="both" @page-change="onPageChange" :current-page="queryParams.page"- :per-page="campaigns.perPage" :total="campaigns.total" hoverable checkable backend-sorting @sort="onSort">- <template #top-left>- <div class="columns">- <div class="column is-6">- <form @submit.prevent="getCampaigns">- <div>- <b-field>- <b-input v-model="queryParams.query" name="query" expanded- :placeholder="$t('campaigns.queryPlaceholder')" icon="magnify" ref="query" />- <p class="controls">- <b-button native-type="submit" type="is-primary" icon-left="magnify" />- </p>- </b-field>- </div>- </form>+ <div class="card page-content">+ <oat-data-table :data="campaigns.results" :loading="loading.campaigns" :row-class="highlightedRow"+ @check-all="onTableCheck" @check="onTableCheck" :checked-rows.sync="bulk.checked" paginated backend-pagination+ @page-change="onPageChange" :current-page="queryParams.page" :per-page="campaigns.perPage"+ :total="campaigns.total" checkable backend-sorting @sort="onSort">+ <template #top-left>+ <div class="row">+ <div class="col-6">+ <form @submit.prevent="getCampaigns">+ <fieldset class="group">+ <input aria-label="Search" v-model="queryParams.query" name="query"+ :placeholder="$t('campaigns.queryPlaceholder')" ref="query">+ <button type="submit" data-variant="primary" aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </fieldset>+ </form>+ </div></div>- </div>-- <div class="actions" v-if="bulk.checked.length > 0">- <a class="a" href="#" @click.prevent="deleteCampaigns" data-cy="btn-delete-campaigns">- <b-icon icon="trash-can-outline" size="is-small" /> Delete- </a>- <span class="a">- {{ $tc('globals.messages.numSelected', numSelectedCampaigns, { num: numSelectedCampaigns }) }}- <span v-if="!bulk.all && campaigns.total > campaigns.perPage">- —- <a href="#" @click.prevent="onSelectAll" data-cy="select-all-campaigns">- {{ $tc('globals.messages.selectAll', campaigns.total, { num: campaigns.total }) }}- </a>++ <div class="actions" v-if="bulk.checked.length > 0">+ <a class="a" href="#" @click.prevent="deleteCampaigns" data-cy="btn-delete-campaigns">+ <oat-icon icon="trash-can-outline" /> Delete+ </a>+ <span class="a">+ {{ $tc('globals.messages.numSelected', numSelectedCampaigns, { num: numSelectedCampaigns }) }}+ <span v-if="!bulk.all && campaigns.total > campaigns.perPage">+ —+ <a href="#" @click.prevent="onSelectAll" data-cy="select-all-campaigns">+ {{ $tc('globals.messages.selectAll', campaigns.total, { num: campaigns.total }) }}+ </a>+ </span></span>- </span>- </div>- </template>-- <b-table-column v-slot="props" cell-class="status" field="status" :label="$t('globals.fields.status')" width="10%"- sortable :td-attrs="$utils.tdID" header-class="cy-status">- <div>- <p>- <router-link :to="{ name: 'campaign', params: { id: props.row.id } }">- <b-tag :class="props.row.status">- {{ $t(`campaigns.status.${props.row.status}`) }}- </b-tag>- <span class="spinner is-tiny" v-if="isRunning(props.row.id)">- <b-loading :is-full-page="false" active />+ </div>+ </template>++ <oat-table-column v-slot="props" cell-class="status" field="status" :label="$t('globals.fields.status')"+ width="10%" sortable :td-attrs="$utils.tdID" header-class="cy-status">+ <div>+ <p>+ <router-link :to="{ name: 'campaign', params: { id: props.row.id } }">+ <oat-badge :type="props.row.status">+ {{ $t(`campaigns.status.${props.row.status}`) }}+ </oat-badge>+ <span class="spinner" v-if="isRunning(props.row.id)">+ <oat-loading :is-full-page="false" active />+ </span>+ </router-link>+ </p>+ <p v-if="isSheduled(props.row)">+ <span class="text-light text-7 scheduled">+ <oat-icon icon="alarm" />+ <span v-if="!isDone(props.row) && !isRunning(props.row)">+ {{ $utils.duration(new Date(), props.row.sendAt, true) }}+ <br />+ </span>+ {{ $utils.niceDate(props.row.sendAt, true) }}</span>- </router-link>- </p>- <p v-if="isSheduled(props.row)">- <span class="is-size-7 has-text-grey scheduled">- <b-icon icon="alarm" size="is-small" />- <span v-if="!isDone(props.row) && !isRunning(props.row)">- {{ $utils.duration(new Date(), props.row.sendAt, true) }}- <br />+ </p>+ </div>+ </oat-table-column>+ <oat-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" width="25%" sortable+ header-class="cy-name">+ <div>+ <p>+ <oat-badge v-if="props.row.type === 'optin'" type="optin">+ {{ $t('lists.optin') }}+ </oat-badge>+ <router-link :to="{ name: 'campaign', params: { id: props.row.id } }">+ {{ props.row.name }}+ <copy-text :text="props.row.name" hide-text />+ </router-link>+ </p>+ <p class="text-light text-7">+ <copy-text :text="props.row.subject" />+ </p>+ <span class="badge-list hstack gap-1">+ <span class="badge secondary" v-for="t in props.row.tags" :key="t">+ {{ t }}</span>- {{ $utils.niceDate(props.row.sendAt, true) }}</span>- </p>- </div>- </b-table-column>- <b-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" width="25%" sortable- header-class="cy-name">- <div>- <p>- <b-tag v-if="props.row.type === 'optin'" class="is-small">- {{ $t('lists.optin') }}- </b-tag>- <router-link :to="{ name: 'campaign', params: { id: props.row.id } }">- {{ props.row.name }}- <copy-text :text="props.row.name" hide-text />- </router-link>- </p>- <p class="is-size-7 has-text-grey">- <copy-text :text="props.row.subject" />- </p>- <b-taglist>- <b-tag class="is-small" v-for="t in props.row.tags" :key="t">- {{ t }}- </b-tag>- </b-taglist>- </div>- </b-table-column>- <b-table-column v-slot="props" cell-class="lists" field="lists" :label="$t('globals.terms.lists')" width="15%">- <ul>- <li v-for="l in props.row.lists" :key="l.id">- <router-link :to="{ name: 'subscribers_list', params: { listID: l.id } }">- {{ l.name }}- </router-link>- </li>- </ul>- </b-table-column>- <b-table-column v-slot="props" field="created_at" :label="$t('campaigns.timestamps')" width="19%" sortable- header-class="cy-timestamp">- <div class="fields timestamps" :set="stats = getCampaignStats(props.row)">- <p>- <label for="#">{{ $t('globals.fields.createdAt') }}</label>- <span>{{ $utils.niceDate(props.row.createdAt, true) }}</span>- </p>- <p v-if="stats.startedAt">- <label for="#">{{ $t('campaigns.startedAt') }}</label>- <span>{{ $utils.niceDate(stats.startedAt, true) }}</span>- </p>- <p v-if="isDone(props.row)">- <label for="#">{{ $t('campaigns.ended') }}</label>- <span>{{ $utils.niceDate(stats.updatedAt, true) }}</span>- </p>- <p v-if="stats.startedAt && stats.updatedAt" class="is-capitalized">- <label for="#"><b-icon icon="alarm" size="is-small" /></label>- <span>{{ $utils.duration(stats.startedAt, stats.updatedAt) }}</span>- </p>- </div>- </b-table-column>-- <b-table-column v-slot="props" field="stats" :label="$t('campaigns.stats')" width="15%">- <div class="fields stats" :set="stats = getCampaignStats(props.row)">- <p>- <label for="#">{{ $t('campaigns.views') }}</label>- <span>{{ $utils.formatNumber(props.row.views) }}</span>- </p>- <p>- <label for="#">{{ $t('campaigns.clicks') }}</label>- <span>{{ $utils.formatNumber(props.row.clicks) }}</span>- </p>- <p>- <label for="#">{{ $t('campaigns.sent') }}</label>- <span>- {{ $utils.formatNumber(stats.sent) }} /- {{ $utils.formatNumber(stats.toSend) }}- </span>- </p>- <p>- <label for="#">{{ $t('globals.terms.bounces') }}</label>- <span>- <router-link :to="{ name: 'bounces', query: { campaign_id: props.row.id } }">- {{ $utils.formatNumber(props.row.bounces) }}+ </div>+ </oat-table-column>+ <oat-table-column v-slot="props" cell-class="lists" field="lists" :label="$t('globals.terms.lists')"+ width="15%">+ <ul>+ <li v-for="l in props.row.lists" :key="l.id">+ <router-link :to="{ name: 'subscribers_list', params: { listID: l.id } }">+ {{ l.name }}</router-link>- </span>- </p>- <p v-if="stats.rate">- <label for="#"><b-icon icon="speedometer" size="is-small" /></label>- <span class="send-rate">- <b-tooltip- :label="`${stats.netRate} / ${$t('campaigns.rateMinuteShort')} @ ${$utils.duration(stats.startedAt, stats.updatedAt)}`"- type="is-dark">+ </li>+ </ul>+ </oat-table-column>+ <oat-table-column v-slot="props" field="created_at" :label="$t('campaigns.timestamps')" width="19%" sortable+ header-class="cy-timestamp">+ <div class="field-list timestamps" :set="stats = getCampaignStats(props.row)">+ <p>+ <label for="#">{{ $t('globals.fields.createdAt') }}</label>+ <span>{{ $utils.niceDate(props.row.createdAt, true) }}</span>+ </p>+ <p v-if="stats.startedAt">+ <label for="#">{{ $t('campaigns.startedAt') }}</label>+ <span>{{ $utils.niceDate(stats.startedAt, true) }}</span>+ </p>+ <p v-if="isDone(props.row)">+ <label for="#">{{ $t('campaigns.ended') }}</label>+ <span>{{ $utils.niceDate(stats.updatedAt, true) }}</span>+ </p>+ <p v-if="stats.startedAt && stats.updatedAt" class="capitalize">+ <label for="#"><oat-icon icon="alarm" /></label>+ <span>{{ $utils.duration(stats.startedAt, stats.updatedAt) }}</span>+ </p>+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="stats" :label="$t('campaigns.stats')" width="15%">+ <div class="field-list stats" :set="stats = getCampaignStats(props.row)">+ <p>+ <label for="#">{{ $t('campaigns.views') }}</label>+ <span>{{ $utils.formatNumber(props.row.views) }}</span>+ </p>+ <p>+ <label for="#">{{ $t('campaigns.clicks') }}</label>+ <span>{{ $utils.formatNumber(props.row.clicks) }}</span>+ </p>+ <p>+ <label for="#">{{ $t('campaigns.sent') }}</label>+ <span>+ {{ $utils.formatNumber(stats.sent) }} /+ {{ $utils.formatNumber(stats.toSend) }}+ </span>+ </p>+ <p>+ <label for="#">{{ $t('globals.terms.bounces') }}</label>+ <span>+ <router-link :to="{ name: 'bounces', query: { campaign_id: props.row.id } }">+ {{ $utils.formatNumber(props.row.bounces) }}+ </router-link>+ </span>+ </p>+ <p v-if="stats.rate">+ <label for="#"><oat-icon icon="speedometer" /></label>+ <span class="send-rate">+{{ stats.rate.toFixed(0) }} / {{ $t('campaigns.rateMinuteShort') }}- </b-tooltip>- </span>- </p>- <p v-if="isRunning(props.row.id)">- <label for="#">- {{ $t('campaigns.progress') }}- <span class="spinner is-tiny">- <b-loading :is-full-page="false" active />+</span>- </label>- <span>- <b-progress :value="stats.sent / stats.toSend * 100" size="is-small" />- </span>- </p>- </div>- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" width="15%" align="right">- <div>- <!-- start / pause / resume / scheduled -->- <template v-if="$can('campaigns:send')">- <a v-if="canStart(props.row)" href="#"- @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'running'))"- data-cy="btn-start" :aria-label="$t('campaigns.start')">- <b-tooltip :label="$t('campaigns.start')" type="is-dark">- <b-icon icon="rocket-launch-outline" size="is-small" />- </b-tooltip>- </a>+ </p>+ <p v-if="isRunning(props.row.id)">+ <label for="#">+ {{ $t('campaigns.progress') }}+ <span class="spinner">+ <oat-loading :is-full-page="false" active />+ </span>+ </label>+ <span>+ <progress :value="stats.sent / stats.toSend * 100" />+ </span>+ </p>+ </div>+ </oat-table-column>- <a v-if="canPause(props.row)" href="#"- @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'paused'))" data-cy="btn-pause"- :aria-label="$t('campaigns.pause')">- <b-tooltip :label="$t('campaigns.pause')" type="is-dark">- <b-icon icon="pause-circle-outline" size="is-small" />- </b-tooltip>- </a>+ <oat-table-column v-slot="props" cell-class="actions" width="15%" align="right">+ <div>+ <!-- start / pause / resume / scheduled -->+ <template v-if="$can('campaigns:send')">+ <a v-if="canStart(props.row)" href="#"+ @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'running'))"+ data-cy="btn-start" :aria-label="$t('campaigns.start')">- <a v-if="canResume(props.row)" href="#"- @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'running'))"- data-cy="btn-resume" :aria-label="$t('campaigns.send')">- <b-tooltip :label="$t('campaigns.send')" type="is-dark">- <b-icon icon="rocket-launch-outline" size="is-small" />- </b-tooltip>- </a>+ <oat-icon icon="rocket-launch-outline" />- <a v-if="canSchedule(props.row)" href="#"- @click.prevent="$utils.confirm($t('campaigns.confirmSchedule'), () => changeCampaignStatus(props.row, 'scheduled'))"- data-cy="btn-schedule" :aria-label="$t('campaigns.schedule')">- <b-tooltip :label="$t('campaigns.schedule')" type="is-dark">- <b-icon icon="clock-start" size="is-small" />- </b-tooltip>- </a>+ </a>++ <a v-if="canPause(props.row)" href="#"+ @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'paused'))"+ data-cy="btn-pause" :aria-label="$t('campaigns.pause')">++ <oat-icon icon="pause-circle-outline" />++ </a>++ <a v-if="canResume(props.row)" href="#"+ @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'running'))"+ data-cy="btn-resume" :aria-label="$t('campaigns.send')">++ <oat-icon icon="rocket-launch-outline" />++ </a>++ <a v-if="canSchedule(props.row)" href="#"+ @click.prevent="$utils.confirm($t('campaigns.confirmSchedule'), () => changeCampaignStatus(props.row, 'scheduled'))"+ data-cy="btn-schedule" :aria-label="$t('campaigns.schedule')">++ <oat-icon icon="clock-start" />++ </a>++ <!-- placeholder for finished campaigns -->+ <a v-if="!canCancel(props.row) && !canSchedule(props.row) && !canStart(props.row)" href="#" data-disabled+ aria-label=" ">+ <oat-icon icon="rocket-launch-outline" />+ </a>++ <a v-if="canCancel(props.row)" href="#"+ @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'cancelled'))"+ data-cy="btn-cancel" :aria-label="$t('globals.buttons.cancel')">++ <oat-icon icon="cancel" />++ </a>+ <a v-else href="#" data-disabled aria-label=" ">+ <oat-icon icon="cancel" />+ </a>+ </template>++ <a href="#" @click.prevent="previewCampaign(props.row)" data-cy="btn-preview"+ :aria-label="$t('campaigns.preview')">++ <oat-icon icon="file-find-outline" />- <!-- placeholder for finished campaigns -->- <a v-if="!canCancel(props.row) && !canSchedule(props.row) && !canStart(props.row)" href="#" data-disabled- aria-label=" ">- <b-icon icon="rocket-launch-outline" size="is-small" /></a>+ <a v-if="$can('campaigns:manage')" href="#" @click.prevent="$utils.prompt($t('globals.buttons.clone'),+ {+ placeholder: $t('globals.fields.name'),+ value: $t('campaigns.copyOf', { name: props.row.name }),+ },+ (name) => cloneCampaign(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">++ <oat-icon icon="file-multiple-outline" />- <a v-if="canCancel(props.row)" href="#"- @click.prevent="$utils.confirm(null, () => changeCampaignStatus(props.row, 'cancelled'))"- data-cy="btn-cancel" :aria-label="$t('globals.buttons.cancel')">- <b-tooltip :label="$t('globals.buttons.cancel')" type="is-dark">- <b-icon icon="cancel" size="is-small" />- </b-tooltip></a>- <a v-else href="#" data-disabled aria-label=" ">- <b-icon icon="cancel" size="is-small" />+ <router-link v-if="$can('campaigns:get_analytics')"+ :to="{ name: 'campaignAnalytics', query: { id: props.row.id } }">+ <oat-icon icon="chart-bar" />+ </router-link>+ <a v-if="$can('campaigns:manage')" href="#"+ @click.prevent="$utils.confirm($t('campaigns.confirmDelete', { name: props.row.name }), () => deleteCampaign(props.row))"+ data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">+ <oat-icon icon="trash-can-outline" /></a>- </template>-- <a href="#" @click.prevent="previewCampaign(props.row)" data-cy="btn-preview"- :aria-label="$t('campaigns.preview')">- <b-tooltip :label="$t('campaigns.preview')" type="is-dark">- <b-icon icon="file-find-outline" size="is-small" />- </b-tooltip>- </a>- <a v-if="$can('campaigns:manage')" href="#" @click.prevent="$utils.prompt($t('globals.buttons.clone'),- {- placeholder: $t('globals.fields.name'),- value: $t('campaigns.copyOf', { name: props.row.name }),- },- (name) => cloneCampaign(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">- <b-tooltip :label="$t('globals.buttons.clone')" type="is-dark">- <b-icon icon="file-multiple-outline" size="is-small" />- </b-tooltip>- </a>- <router-link v-if="$can('campaigns:get_analytics')"- :to="{ name: 'campaignAnalytics', query: { id: props.row.id } }">- <b-tooltip :label="$t('globals.terms.analytics')" type="is-dark">- <b-icon icon="chart-bar" size="is-small" />- </b-tooltip>- </router-link>- <a v-if="$can('campaigns:manage')" href="#"- @click.prevent="$utils.confirm($t('campaigns.confirmDelete', { name: props.row.name }), () => deleteCampaign(props.row))"- data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">- <b-icon icon="trash-can-outline" size="is-small" />- </a>- </div>- </b-table-column>-- <template #empty v-if="!loading.campaigns">- <empty-placeholder />- </template>- </b-table>-- <campaign-preview v-if="previewItem" type="campaign" :id="previewItem.id" :title="previewItem.name"- @close="closePreview" />+ </div>+ </oat-table-column>++ <template #empty v-if="!loading.campaigns">+ <empty-placeholder />+ </template>+ </oat-data-table>++ <campaign-preview v-if="previewItem" type="campaign" :id="previewItem.id" :title="previewItem.name"+ @close="closePreview" />+ </div></section></template>diff --git a/frontend/src/views/Dashboard.vue b/frontend/src/views/Dashboard.vueindex 6ad26829..fd87aa30 100644--- a/frontend/src/views/Dashboard.vue+++ b/frontend/src/views/Dashboard.vue@@ -1,150 +1,191 @@<template>- <section class="dashboard content">- <header class="columns">- <div class="column is-two-thirds">- <h1 class="title is-5">- {{ $utils.niceDate(new Date()) }}- </h1>+ <section class="dashboard">+ <header class="row page-header">+ <div class="col-8">+ <h1> {{ $utils.niceDate(new Date()) }} </h1>+ </div>+ <div class="col-4 col-end align-right">+ <button type="button" class="outline small" @click="fetchData">+ <oat-icon icon="refresh" />+ {{ $t('globals.buttons.refresh') }}+ </button></div></header>- <section class="counts wrap">- <div class="tile is-ancestor">- <div class="tile is-vertical is-12">- <div class="tile">- <div class="tile is-parent is-vertical relative">- <b-loading v-if="isCountsLoading" active :is-full-page="false" />- <article class="tile is-child notification" data-cy="lists">- <div class="columns is-mobile">- <div class="column is-6">- <p class="title">- <b-icon icon="format-list-bulleted-square" />- {{ $utils.niceNumber(counts.lists.total) }}- </p>- <p class="is-size-6 has-text-grey">- {{ $tc('globals.terms.list', counts.lists.total) }}- </p>- </div>- <div class="column is-6">- <ul class="no has-text-grey">- <li>- <label for="#">{{ $utils.niceNumber(counts.lists.public) }}</label>- {{ $t('lists.types.public') }}- </li>- <li>- <label for="#">{{ $utils.niceNumber(counts.lists.private) }}</label>- {{ $t('lists.types.private') }}- </li>- <li>- <label for="#">{{ $utils.niceNumber(counts.lists.optinSingle) }}</label>- {{ $t('lists.optins.single') }}- </li>- <li>- <label for="#">{{ $utils.niceNumber(counts.lists.optinDouble) }}</label>- {{ $t('lists.optins.double') }}- </li>- </ul>- </div>- </div>- </article><!-- lists -->-- <article class="tile is-child notification" data-cy="campaigns">- <div class="columns is-mobile">- <div class="column is-6">- <p class="title">- <b-icon icon="rocket-launch-outline" />- {{ $utils.niceNumber(counts.campaigns.total) }}- </p>- <p class="is-size-6 has-text-grey">- {{ $tc('globals.terms.campaign', counts.campaigns.total) }}- </p>- </div>- <div class="column is-6">- <ul class="no has-text-grey">- <li v-for="(num, status) in counts.campaigns.byStatus" :key="status">- <label for="#" :data-cy="`campaigns-${status}`">{{ num }}</label>+ <div class="page-content">+ <section class="row">+ <div class="col-3">+ <article class="card stat-card" :aria-busy="isCountsLoading ? 'true' : null" data-spinner="large overlay"+ data-cy="lists">+ <header>+ <small class="text-light">{{ $tc('globals.terms.list', 2) }}</small>+ <div class="stat-value">+ <oat-icon icon="format-list-bulleted-square" />+ {{ nice(counts.lists.total) }}+ </div>+ <small class="text-light hstack gap-2">+ <span class="badge public">{{ nice(counts.lists.public) }} {{ $t('lists.types.public') }}</span>+ <span class="badge private">{{ nice(counts.lists.private) }} {{ $t('lists.types.private') }}</span>+ </small>+ </header>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" :aria-busy="isCountsLoading ? 'true' : null" data-spinner="large overlay"+ data-cy="subscribers">+ <header>+ <small class="text-light">{{ $tc('globals.terms.subscriber', 2) }}</small>+ <div class="stat-value">+ <oat-icon icon="account-multiple" />+ {{ nice(counts.subscribers.total) }}+ </div>+ <small class="text-light hstack gap-2">+ <span class="badge blocklisted">{{ nice(counts.subscribers.blocklisted) }} {{+ $t('subscribers.status.blocklisted') }}</span>+ <span class="badge outline">{{ nice(counts.subscribers.orphans) }} {{ $t('dashboard.orphanSubs')+ }}</span>+ </small>+ </header>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" :aria-busy="isCountsLoading ? 'true' : null" data-spinner="large overlay"+ data-cy="campaigns">+ <header>+ <small class="text-light">{{ $tc('globals.terms.campaign', 2) }}</small>+ <div class="stat-value">+ <oat-icon icon="rocket-launch-outline" />+ {{ nice(counts.campaigns.total) }}+ </div>+ <small class="text-light hstack gap-2">+ <span v-for="status in primaryCampaignStatuses" :key="status" :class="['badge', status]">+ {{ statusCount(status) }} {{ $t(`campaigns.status.${status}`) }}+ </span>+ </small>+ </header>+ </article>+ </div>++ <div class="col-3">+ <article class="card stat-card" :aria-busy="isCountsLoading ? 'true' : null" data-spinner="large overlay"+ data-cy="messages">+ <header>+ <small class="text-light">{{ $t('dashboard.messagesSent') }}</small>+ <div class="stat-value">+ <oat-icon icon="email-outline" />+ {{ nice(counts.messages) }}+ </div>+ <small class="text-light">+ <span class="badge">{{ nice(messagesPerSubscriber) }} / {{ $tc('globals.terms.subscriber', 1) }}</span>+ </small>+ </header>+ </article>+ </div>+ </section>++ <section class="row mt-6">+ <div class="col-6">+ <article class="card chart-card" :aria-busy="isChartsLoading ? 'true' : null" data-spinner="large overlay">+ <header class="hstack justify-between">+ <div>+ <h3>{{ $t('dashboard.campaignViews') }}</h3>+ <small class="text-light">{{ nice(chartTotal(campaignViews)) }} total</small>+ </div>+ <span class="badge success">{{ $t('globals.terms.analytics') }}</span>+ </header>+ <chart type="line" v-if="campaignViews" :data="campaignViews" />+ </article>+ </div>++ <div class="col-6">+ <article class="card chart-card" :aria-busy="isChartsLoading ? 'true' : null" data-spinner="large overlay">+ <header class="hstack justify-between">+ <div>+ <h3>{{ $t('dashboard.linkClicks') }}</h3>+ <small class="text-light">{{ nice(chartTotal(campaignClicks)) }} total</small>+ </div>+ <span class="badge warning">{{ $t('analytics.links') }}</span>+ </header>+ <chart type="line" v-if="campaignClicks" :data="campaignClicks" />+ </article>+ </div>+ </section>++ <section class="row mt-6">+ <div class="col-6">+ <article class="card">+ <header>+ <h3>{{ $tc('globals.terms.campaign', 2) }}</h3>+ <p class="text-light text-7">{{ $t('globals.fields.status') }}</p>+ </header>+ <div class="table">+ <table>+ <thead>+ <tr>+ <th>{{ $t('globals.fields.status') }}</th>+ <th class="align-right">{{ $t('analytics.count') }}</th>+ </tr>+ </thead>+ <tbody>+ <tr v-for="(num, status) in campaignStatuses" :key="status">+ <td>+ <span :class="['badge', status]">{{ $t(`campaigns.status.${status}`) }}- <span v-if="status === 'running'" class="spinner is-tiny">- <b-loading :is-full-page="false" active />- </span>- </li>- </ul>- </div>+ </span>+ </td>+ <td class="align-right">{{ nice(num) }}</td>+ </tr>+ </tbody>+ </table>+ </div>+ </article>+ </div>++ <div class="col-6">+ <article class="card">+ <header>+ <h3>{{ $tc('globals.terms.list', 2) }}</h3>+ <p class="text-light text-7">{{ $t('globals.fields.type') }} / {{ $t('lists.optin') }}</p>+ </header>+ <div class="dashboard-mix">+ <div>+ <div class="hstack justify-between">+ <strong>{{ $t('lists.types.public') }}</strong>+ <span class="badge public">{{ nice(counts.lists.public) }}</span></div>- </article><!-- campaigns -->- </div><!-- block -->-- <div class="tile is-parent relative">- <b-loading v-if="isCountsLoading" active :is-full-page="false" />- <article class="tile is-child notification" data-cy="subscribers">- <div class="columns is-mobile">- <div class="column is-6">- <p class="title">- <b-icon icon="account-multiple" />- {{ $utils.niceNumber(counts.subscribers.total) }}- </p>- <p class="is-size-6 has-text-grey">- {{ $tc('globals.terms.subscriber', counts.subscribers.total) }}- </p>- </div>-- <div class="column is-6">- <ul class="no has-text-grey">- <li>- <label for="#">{{ $utils.niceNumber(counts.subscribers.blocklisted) }}</label>- {{ $t('subscribers.status.blocklisted') }}- </li>- <li>- <label for="#">{{ $utils.niceNumber(counts.subscribers.orphans) }}</label>- {{ $t('dashboard.orphanSubs') }}- </li>- </ul>- </div><!-- subscriber breakdown -->- </div><!-- subscriber columns -->- <hr />- <div class="columns" data-cy="messages">- <div class="column is-12">- <p class="title">- <b-icon icon="email-outline" />- {{ $utils.niceNumber(counts.messages) }}- </p>- <p class="is-size-6 has-text-grey">- {{ $t('dashboard.messagesSent') }}- </p>- </div>+ </div>+ <div>+ <div class="hstack justify-between">+ <strong>{{ $t('lists.types.private') }}</strong>+ <span class="badge private">{{ nice(counts.lists.private) }}</span></div>- </article><!-- subscribers -->- </div>- </div>- <div class="tile is-parent relative">- <b-loading v-if="isChartsLoading" active :is-full-page="false" />- <article class="tile is-child notification charts">- <div class="columns">- <div class="column is-6">- <h3 class="title is-size-6">- {{ $t('dashboard.campaignViews') }}- </h3><br />- <chart type="line" v-if="campaignViews" :data="campaignViews" />+ </div>+ <div>+ <div class="hstack justify-between">+ <strong>{{ $t('lists.optins.single') }}</strong>+ <span class="badge single">{{ nice(counts.lists.optinSingle) }}</span></div>- <div class="column is-6">- <h3 class="title is-size-6 has-text-right">- {{ $t('dashboard.linkClicks') }}- </h3><br />- <chart type="line" v-if="campaignClicks" :data="campaignClicks" />+ </div>+ <div>+ <div class="hstack justify-between">+ <strong>{{ $t('lists.optins.double') }}</strong>+ <span class="badge double">{{ nice(counts.lists.optinDouble) }}</span></div></div>- </article>- </div>+ </div>+ </article></div>- </div><!-- tile block -->- <p v-if="settings['app.cache_slow_queries']" class="has-text-grey">+ </section>++ <div v-if="settings['app.cache_slow_queries']" role="alert" class="mt-6">*{{ $t('globals.messages.slowQueriesCached') }}- <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferer"- class="has-text-grey">- <b-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}+ <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferer">+ <oat-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}</a>- </p>- </section>+ </div>+ </div></section></template>@@ -169,7 +210,9 @@ export default Vue.extend({counts: {lists: {},subscribers: {},- campaigns: {},+ campaigns: {+ byStatus: {},+ },messages: 0,},};@@ -181,7 +224,13 @@ export default Vue.extend({this.isChartsLoading = true;this.$api.getDashboardCounts().then((data) => {- this.counts = data;+ this.counts = {+ ...data,+ campaigns: {+ ...data.campaigns,+ byStatus: data.campaigns.byStatus || {},+ },+ };this.isCountsLoading = false;});@@ -194,27 +243,54 @@ export default Vue.extend({makeChart(data) {if (data.length === 0) {- return {};+ return { labels: [], datasets: [{ data: [] }] };}return {labels: data.map((d) => dayjs(d.date).format('DD MMM')),datasets: [{- data: [...data.map((d) => d.count)],+ data: data.map((d) => d.count),borderColor: colors.primary,+ backgroundColor: `${colors.primary}22`,borderWidth: 2,+ fill: true,+ tension: 0.35,pointHoverBorderWidth: 5,pointBorderWidth: 0.5,},],};},++ nice(n) {+ return this.$utils.niceNumber(n || 0);+ },++ statusCount(status) {+ return this.nice(this.counts.campaigns.byStatus?.[status]);+ },++ chartTotal(chart) {+ return chart?.datasets?.[0]?.data?.reduce((sum, n) => sum + n, 0) || 0;+ },},computed: {...mapState(['settings']),- dayjs() {- return dayjs;++ messagesPerSubscriber() {+ if (!this.counts.subscribers.total) {+ return 0;+ }+ return Math.round((this.counts.messages || 0) / this.counts.subscribers.total);+ },++ campaignStatuses() {+ return this.counts.campaigns.byStatus || {};+ },++ primaryCampaignStatuses() {+ return Object.keys(this.campaignStatuses).slice(0, 3);},},@@ -231,3 +307,36 @@ export default Vue.extend({},});</script>++<style>+.dashboard>header h1 {+ margin: 0;+}++.stat-card header {+ display: grid;+ gap: var(--space-2);+}++.stat-value {+ align-items: center;+ display: flex;+ gap: var(--space-2);+ font-size: var(--text-2);+ font-weight: var(--font-semibold);+ line-height: 1.1;+}++.chart-card {+ min-height: 24rem;+}++.chart-card .chart {+ height: 18rem;+}++.dashboard-mix {+ display: grid;+ gap: var(--space-4);+}+</style>diff --git a/frontend/src/views/Forms.vue b/frontend/src/views/Forms.vueindex 6814bd6f..61d84c69 100644--- a/frontend/src/views/Forms.vue+++ b/frontend/src/views/Forms.vue@@ -1,66 +1,69 @@<template>- <section class="forms content relative">- <h1 class="title is-4">- {{ $t('forms.title') }}- </h1>- <hr />-- <b-loading v-if="loading.lists" :active="loading.lists" :is-full-page="false" />- <p v-else-if="publicLists.length === 0">- {{ $t('forms.noPublicLists') }}- </p>- <div class="columns" v-else-if="publicLists.length > 0">- <div class="column is-4">- <h4>{{ $t('forms.publicLists') }}</h4>- <p>{{ $t('forms.selectHelp') }}</p>-- <b-loading :active="loading.lists" :is-full-page="false" />- <ul class="no" data-cy="lists">- <li v-for="(l, i) in publicLists" :key="l.id">- <b-checkbox v-model="checked" :native-value="i">- {{ l.name }}- </b-checkbox>- </li>- </ul>-- <template v-if="serverConfig.public_subscription.enabled">+ <section class="forms relative">+ <header class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('forms.title') }}+ </h1>+ </div>+ </header>++ <div class="card page-content" :aria-busy="loading.lists ? 'true' : null" data-spinner="large overlay">+ <p v-if="!loading.lists && publicLists.length === 0">+ {{ $t('forms.noPublicLists') }}+ </p>+ <div class="row" v-else-if="publicLists.length > 0">+ <div class="col-4">+ <h4>{{ $t('forms.publicLists') }}</h4>+ <p>{{ $t('forms.selectHelp') }}</p>++ <ul class="no" data-cy="lists">+ <li v-for="(l, i) in publicLists" :key="l.id">+ <oat-checkbox v-model="checked" :native-value="i">+ {{ l.name }}+ </oat-checkbox>+ </li>+ </ul>++ <template v-if="serverConfig.public_subscription.enabled">+ <hr />+ <h4>{{ $t('forms.publicSubPage') }}</h4>+ <p>+ <a :href="`${serverConfig.root_url}/subscription/form`" target="_blank" rel="noopener noreferer"+ data-cy="url">+ {{ serverConfig.root_url }}/subscription/form+ </a>+ </p>+ </template>+<hr />- <h4>{{ $t('forms.publicSubPage') }}</h4>+ <h4>{{ $t('forms.redirectURL') }}</h4>+ <p class="text-light text-7">+ {{ $t('forms.redirectURLHelp') }}+ </p>+ <ul v-if="redirectURLs.length > 0" class="no" data-cy="redirect-urls">+ <li>+ <oat-radio v-model="selectedRedirectURL" native-value="">+ {{ $t('globals.terms.none') }}+ </oat-radio>+ </li>+ <li v-for="url in redirectURLs" :key="url">+ <oat-radio v-model="selectedRedirectURL" :native-value="url">+ {{ url }}+ </oat-radio>+ </li>+ </ul>+ </div>+ <div class="col-12" data-cy="form">+ <h4>{{ $t('forms.formHTML') }}</h4><p>- <a :href="`${serverConfig.root_url}/subscription/form`" target="_blank" rel="noopener noreferer"- data-cy="url">- {{ serverConfig.root_url }}/subscription/form- </a>+ {{ $t('forms.formHTMLHelp') }}</p>- </template>-- <hr />- <h4>{{ $t('forms.redirectURL') }}</h4>- <p class="is-size-7 has-text-grey">- {{ $t('forms.redirectURLHelp') }}- </p>- <ul v-if="redirectURLs.length > 0" class="no" data-cy="redirect-urls">- <li>- <b-radio v-model="selectedRedirectURL" native-value="">- {{ $t('globals.terms.none') }}- </b-radio>- </li>- <li v-for="url in redirectURLs" :key="url">- <b-radio v-model="selectedRedirectURL" :native-value="url">- {{ url }}- </b-radio>- </li>- </ul>- </div>- <div class="column" data-cy="form">- <h4>{{ $t('forms.formHTML') }}</h4>- <p>- {{ $t('forms.formHTMLHelp') }}- </p>- <code-editor lang="html" v-if="checked.length > 0" v-model="html" disabled />- </div>- </div><!-- columns -->+ <code-editor lang="html" v-if="checked.length > 0" v-model="html" disabled />+ </div>+ </div><!-- row -->+ </div></section></template>diff --git a/frontend/src/views/Import.vue b/frontend/src/views/Import.vueindex d21f9ea1..127ab5ca 100644--- a/frontend/src/views/Import.vue+++ b/frontend/src/views/Import.vue@@ -1,146 +1,154 @@<template><section class="import">- <h1 class="title is-4">- {{ $t('import.title') }}- </h1>- <b-loading :active="isLoading" />-- <section v-if="isFree()" class="wrap">- <form @submit.prevent="onUpload" class="box">- <div>- <div class="columns">- <div class="column">- <b-field :label="$t('import.mode')" :addons="false">- <div>- <b-radio v-model="form.mode" name="mode" native-value="subscribe" data-cy="check-subscribe">- {{ $t('import.subscribe') }}- </b-radio>- <br />- <b-radio v-model="form.mode" name="mode" native-value="blocklist" data-cy="check-blocklist">- {{ $t('import.blocklist') }}- </b-radio>- </div>- </b-field>- </div>- <div class="column">- <b-field :label="$t('globals.fields.status')" :addons="false">- <template v-if="form.mode === 'subscribe'">- <b-radio v-model="form.subStatus" name="subStatus" native-value="unconfirmed"- data-cy="check-unconfirmed">- {{ $t('subscribers.status.unconfirmed') }}- </b-radio>- <b-radio v-model="form.subStatus" name="subStatus" native-value="confirmed" data-cy="check-confirmed">- {{ $t('subscribers.status.confirmed') }}- </b-radio>- </template>-- <b-radio v-else v-model="form.subStatus" name="subStatus" native-value="unsubscribed"- data-cy="check-unsubscribed">- {{ $t('subscribers.status.unsubscribed') }}- </b-radio>- </b-field>- </div>+ <header class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('import.title') }}+ </h1>+ </div>+ </header>++ <div class="card page-content" :aria-busy="isLoading ? 'true' : null" data-spinner="large overlay">+ <section v-if="isFree()">+ <form @submit.prevent="onUpload" class="card">+ <div>+ <div class="row">+ <div class="col-12">+ <oat-field :label="$t('import.mode')" :addons="false">+ <div>+ <oat-radio v-model="form.mode" name="mode" native-value="subscribe" data-cy="check-subscribe">+ {{ $t('import.subscribe') }}+ </oat-radio>+ <br />+ <oat-radio v-model="form.mode" name="mode" native-value="blocklist" data-cy="check-blocklist">+ {{ $t('import.blocklist') }}+ </oat-radio>+ </div>+ </oat-field>+ </div>+ <div class="col-12">+ <oat-field :label="$t('globals.fields.status')" :addons="false">+ <template v-if="form.mode === 'subscribe'">+ <oat-radio v-model="form.subStatus" name="subStatus" native-value="unconfirmed"+ data-cy="check-unconfirmed">+ {{ $t('subscribers.status.unconfirmed') }}+ </oat-radio>+ <oat-radio v-model="form.subStatus" name="subStatus" native-value="confirmed"+ data-cy="check-confirmed">+ {{ $t('subscribers.status.confirmed') }}+ </oat-radio>+ </template>++ <oat-radio v-else v-model="form.subStatus" name="subStatus" native-value="unsubscribed"+ data-cy="check-unsubscribed">+ {{ $t('subscribers.status.unsubscribed') }}+ </oat-radio>+ </oat-field>+ </div>- <div class="column">- <b-field :label="$t('import.csvDelim')" :message="$t('import.csvDelimHelp')" class="delimiter">- <b-input v-model="form.delim" name="delim" placeholder="," maxlength="1" required />- </b-field>+ <div class="col-12">+ <oat-field :label="$t('import.csvDelim')" :message="$t('import.csvDelimHelp')" class="delimiter">+ <input aria-label="field" v-model="form.delim" name="delim" placeholder="," maxlength="1" required>+ </oat-field>+ </div></div>- </div>- <div class="columns">- <div class="column is-4">- <b-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteUserInfo')"- :message="$t('import.overwriteUserInfoHelp')">- <div>- <b-switch v-model="form.overwriteUserInfo" name="overwriteUserInfo" data-cy="overwrite-user-info" />- </div>- </b-field>+ <div class="row">+ <div class="col-4">+ <oat-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteUserInfo')"+ :message="$t('import.overwriteUserInfoHelp')">+ <div>+ <oat-switch v-model="form.overwriteUserInfo" name="overwriteUserInfo"+ data-cy="overwrite-user-info" />+ </div>+ </oat-field>+ </div>++ <div class="col-12">+ <oat-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteSubStatus')"+ :message="$t('import.overwriteSubStatusHelp')">+ <div>+ <oat-switch v-model="form.overwriteSubStatus" name="overwriteSubStatus"+ data-cy="overwrite-sub-status" />+ </div>+ </oat-field>+ </div></div>- <div class="column">- <b-field v-if="form.mode === 'subscribe'" :label="$t('import.overwriteSubStatus')"- :message="$t('import.overwriteSubStatusHelp')">- <div>- <b-switch v-model="form.overwriteSubStatus" name="overwriteSubStatus"- data-cy="overwrite-sub-status" />+ <list-selector v-if="form.mode === 'subscribe'" :label="$t('globals.terms.lists')"+ :placeholder="$t('import.listSubHelp')" :message="$t('import.listSubHelp')" v-model="form.lists"+ :selected="form.lists" :all="lists.results" />+ <hr />++ <oat-field :label="$t('import.csvFile')">+ <oat-upload v-model="form.file">+ <div class="align-center app-section">+ <p>+ <oat-icon icon="file-upload-outline" />+ </p>+ <p>{{ $t('import.csvFileHelp') }}</p></div>- </b-field>+ </oat-upload>+ </oat-field>+ <div class="hstack" v-if="form.file">+ <span closable @close="clearFile">+ {{ form.file.name }}+ </span>+ </div>+ <div class="hstack">+ <button type="submit" data-variant="primary"+ :disabled="!form.file || (form.mode === 'subscribe' && form.lists.length === 0)"+ :loading="isProcessing">+ {{ $t('import.upload') }}+ </button></div></div>+ </form>+ <br /><br />++ <div class="import-help">+ <h5>+ {{ $t('import.instructions') }}+ </h5>+ <p>{{ $t('import.instructionsHelp') }}</p>+ <br />+ <blockquote class="csv-example">+ <code class="csv-headers"> <span>email,</span> <span>name,</span> <span>attributes</span></code>+ </blockquote>- <list-selector v-if="form.mode === 'subscribe'" :label="$t('globals.terms.lists')"- :placeholder="$t('import.listSubHelp')" :message="$t('import.listSubHelp')" v-model="form.lists"- :selected="form.lists" :all="lists.results" /><hr />- <b-field :label="$t('import.csvFile')" label-position="on-border">- <b-upload v-model="form.file" drag-drop expanded>- <div class="has-text-centered section">- <p>- <b-icon icon="file-upload-outline" size="is-large" />- </p>- <p>{{ $t('import.csvFileHelp') }}</p>- </div>- </b-upload>- </b-field>- <div class="tags" v-if="form.file">- <b-tag size="is-medium" closable @close="clearFile">- {{ form.file.name }}- </b-tag>- </div>- <div class="buttons">- <b-button native-type="submit" type="is-primary"- :disabled="!form.file || (form.mode === 'subscribe' && form.lists.length === 0)" :loading="isProcessing">- {{ $t('import.upload') }}- </b-button>- </div>+ <h5>+ {{ $t('import.csvExample') }}+ </h5>++ <pre class="csv-example" v-text="example" /></div>- </form>- <br /><br />-- <div class="import-help">- <h5 class="title is-size-6">- {{ $t('import.instructions') }}- </h5>- <p>{{ $t('import.instructionsHelp') }}</p>+ </section><!-- upload //-->++ <section v-if="isRunning() || isDone()" class="wrap status card align-center">+ <progress :value="progress" data-variant="primary" /><br />- <blockquote class="csv-example">- <code class="csv-headers"> <span>email,</span> <span>name,</span> <span>attributes</span></code>- </blockquote>+ <p+ :class="['text-5', 'capitalize', { 'text-success': status.status === 'finished' }, { 'text-danger': (status.status === 'failed' || status.status === 'stopped') }]">+ {{ status.status }}+ </p>- <hr />+ <p>{{ $t('import.recordsCount', { num: status.imported, total: status.total }) }}</p>+ <br />- <h5 class="title is-size-6">- {{ $t('import.csvExample') }}- </h5>+ <p>+ <button type="button" @click="stopImport" :loading="isProcessing" data-variant="primary">+ {{ isDone() ? $t('import.importDone') : $t('import.stopImport') }}+ </button>+ </p>+ <br />- <pre class="csv-example" v-text="example" />- </div>- </section><!-- upload //-->-- <section v-if="isRunning() || isDone()" class="wrap status box has-text-centered">- <b-progress :value="progress" show-value type="is-success" />- <br />- <p- :class="['is-size-5', 'is-capitalized', { 'has-text-success': status.status === 'finished' }, { 'has-text-danger': (status.status === 'failed' || status.status === 'stopped') }]">- {{ status.status }}- </p>-- <p>{{ $t('import.recordsCount', { num: status.imported, total: status.total }) }}</p>- <br />-- <p>- <b-button @click="stopImport" :loading="isProcessing" icon-left="file-upload-outline" type="is-primary">- {{ isDone() ? $t('import.importDone') : $t('import.stopImport') }}- </b-button>- </p>- <br />-- <div class="import-logs">- <log-view :lines="logs" :loading="false" />- </div>- </section>+ <div class="import-logs">+ <log-view :lines="logs" :loading="false" />+ </div>+ </section>+ </div></section></template>@@ -175,7 +183,7 @@ export default Vue.extend({},// Initial page load still has to wait for the status API to return- // to either show the form or the status box.+ // to either show the form or the status card.isLoading: true,isProcessing: false,diff --git a/frontend/src/views/ListForm.vue b/frontend/src/views/ListForm.vueindex 3b960406..493d291f 100644--- a/frontend/src/views/ListForm.vue+++ b/frontend/src/views/ListForm.vue@@ -1,14 +1,14 @@<template><form @submit.prevent="onSubmit">- <div class="modal-card content" style="width: auto">- <header class="modal-card-head">- <p v-if="isEditing" class="has-text-grey-light is-size-7">+ <div class="dialog-card content" style="width: auto">+ <header class="dialog-head">+ <p v-if="isEditing" class="text-lighter text-7 ">{{ $t('globals.fields.id') }}: <copy-text :text="`${data.id}`" />{{ $t('globals.fields.uuid') }}: <copy-text :text="data.uuid" /></p>- <b-tag v-if="isEditing" :class="[data.type, 'is-pulled-right']">+ <oat-badge v-if="isEditing" :type="data.type" class="align-right">{{ $t(`lists.types.${data.type}`) }}- </b-tag>+ </oat-badge><h4 v-if="isEditing">{{ data.name }}</h4>@@ -16,56 +16,55 @@{{ $t('lists.newList') }}</h4></header>- <section expanded class="modal-card-body">- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" :ref="'focus'" v-model="form.name" name="name"- :placeholder="$t('globals.fields.name')" required />- </b-field>-- <b-field :label="$t('lists.type')" label-position="on-border" :message="$t('lists.typeHelp')">- <b-select v-model="form.type" name="type" :placeholder="$t('lists.typeHelp')" required expanded>+ <section class="dialog-body">+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" :ref="'focus'" v-model="form.name" name="name"+ :placeholder="$t('globals.fields.name')" required>+ </oat-field>++ <oat-field :label="$t('lists.type')" :message="$t('lists.typeHelp')">+ <select aria-label="field" v-model="form.type" name="type" :placeholder="$t('lists.typeHelp')" required><option value="private">{{ $t('lists.types.private') }}</option><option value="public">{{ $t('lists.types.public') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field>- <b-field :label="$t('lists.optin')" label-position="on-border" :message="$t('lists.optinHelp')">- <b-select v-model="form.optin" name="optin" placeholder="Opt-in type" required expanded>+ <oat-field :label="$t('lists.optin')" :message="$t('lists.optinHelp')">+ <select aria-label="field" v-model="form.optin" name="optin" placeholder="Opt-in type" required><option value="single">{{ $t('lists.optins.single') }}</option><option value="double">{{ $t('lists.optins.double') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field>- <b-field :label="$t('globals.terms.tags')" label-position="on-border">- <b-taginput v-model="form.tags" name="tags" ellipsis icon="tag-outline"- :placeholder="$t('globals.terms.tags')" />- </b-field>+ <oat-field :label="$t('globals.terms.tags')">+ <oat-tag-input v-model="form.tags" name="tags" :placeholder="$t('globals.terms.tags')" />+ </oat-field>- <b-field :label="$t('globals.fields.description')" label-position="on-border">- <b-input :maxlength="2000" v-model="form.description" name="description" type="textarea"+ <oat-field :label="$t('globals.fields.description')">+ <textarea aria-label="field" :maxlength="2000" v-model="form.description" name="description":placeholder="$t('globals.fields.description')" />- </b-field>+ </oat-field>- <b-field :message="$t('lists.archivedHelp')" :label="$t('lists.archived')">- <b-switch v-model="isArchived" name="status" />- </b-field>+ <oat-field :message="$t('lists.archivedHelp')" :label="$t('lists.archived')">+ <oat-switch v-model="isArchived" name="status" />+ </oat-field></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button v-if="$can('lists:manage_all') || $canList(data.id, 'list:manage')" native-type="submit"- type="is-primary" :loading="loading.lists" data-cy="btn-save">+ </button>+ <button v-if="$can('lists:manage_all') || $canList(data.id, 'list:manage')" type="submit" data-variant="primary"+ :loading="loading.lists" data-cy="btn-save">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>diff --git a/frontend/src/views/Lists.vue b/frontend/src/views/Lists.vueindex 76cffa80..953c00d9 100644--- a/frontend/src/views/Lists.vue+++ b/frontend/src/views/Lists.vue@@ -1,14 +1,14 @@<template><section class="lists">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4 mb-2">+ <header class="row page-header">+ <div class="col-8">+ <h1 class="mb-2">{{ $t('globals.terms.lists') }}- <span v-if="queryParams.status === 'archived'" class="has-text-grey-light">/ {{ queryParams.status }} </span>+ <span v-if="queryParams.status === 'archived'" class="text-lighter text-7">/ {{ queryParams.status }} </span><span v-if="!isNaN(lists.total)">({{ lists.total }})</span></h1>- <div class="is-size-7">+ <div class="text-7"><router-link v-if="queryParams.status !== 'archived'" :to="{ name: 'lists', query: { status: 'archived' } }">{{ $t('globals.buttons.view') }} {{ $t('lists.archived').toLowerCase() }} →</router-link>@@ -17,170 +17,167 @@</router-link></div></div>- <div class="column has-text-right">- <b-field v-if="$can('lists:manage_all')" expanded>- <b-button expanded type="is-primary" icon-left="plus" class="btn-new" @click="showNewForm" data-cy="btn-new">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('lists:manage_all')">+ <button type="button" data-variant="primary" class="btn-new" @click="showNewForm" data-cy="btn-new">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <b-table :data="lists.results" :loading="loading.listsFull" @check-all="onTableCheck" @check="onTableCheck"- :checked-rows.sync="bulk.checked" hoverable default-sort="createdAt" paginated backend-pagination- pagination-position="both" @page-change="onPageChange" :current-page="queryParams.page" :per-page="lists.perPage"- :total="lists.total" checkable backend-sorting @sort="onSort">- <template #top-left>- <div class="columns">- <div class="column is-6">- <form @submit.prevent="getLists">- <b-field>- <b-input v-model="queryParams.query" name="query" expanded icon="magnify" ref="query" data-cy="query" />- <p class="controls">- <b-button native-type="submit" type="is-primary" icon-left="magnify" data-cy="btn-query" />- </p>- </b-field>- </form>+ <div class="card page-content">+ <oat-data-table :data="lists.results" :loading="loading.listsFull" @check-all="onTableCheck" @check="onTableCheck"+ :checked-rows.sync="bulk.checked" default-sort="createdAt" paginated backend-pagination+ @page-change="onPageChange" :current-page="queryParams.page" :per-page="lists.perPage" :total="lists.total"+ checkable backend-sorting @sort="onSort">+ <template #top-left>+ <div class="row">+ <div class="col-6">+ <form @submit.prevent="getLists">+ <fieldset class="group">+ <input aria-label="Search" v-model="queryParams.query" name="query" ref="query" data-cy="query"+ placeholder="Search">+ <button type="submit" data-variant="primary" data-cy="btn-query" aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </fieldset>+ </form>+ </div></div>- </div>- <div class="actions" v-if="bulk.checked.length > 0">- <a class="a" href="#" @click.prevent="deleteLists" data-cy="btn-delete-lists">- <b-icon icon="trash-can-outline" size="is-small" /> {{ $t('globals.buttons.delete') }}- </a>- <span class="a">- {{ $tc('globals.messages.numSelected', numSelectedLists, { num: numSelectedLists }) }}- <span v-if="!bulk.all && lists.total > lists.perPage">- —- <a href="#" @click.prevent="onSelectAll" data-cy="select-all-lists">- {{ $tc('globals.messages.selectAll', lists.total, { num: lists.total }) }}- </a>+ <div class="actions" v-if="bulk.checked.length > 0">+ <a class="a" href="#" @click.prevent="deleteLists" data-cy="btn-delete-lists">+ <oat-icon icon="trash-can-outline" /> {{ $t('globals.buttons.delete') }}+ </a>+ <span class="a">+ {{ $tc('globals.messages.numSelected', numSelectedLists, { num: numSelectedLists }) }}+ <span v-if="!bulk.all && lists.total > lists.perPage">+ —+ <a href="#" @click.prevent="onSelectAll" data-cy="select-all-lists">+ {{ $tc('globals.messages.selectAll', lists.total, { num: lists.total }) }}+ </a>+ </span></span>- </span>- </div>- </template>-- <b-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" header-class="cy-name" sortable- width="25%" paginated backend-pagination pagination-position="both" :td-attrs="$utils.tdID"- @page-change="onPageChange">- <div>- <a :href="`/lists/${props.row.id}`" @click.prevent="showEditForm(props.row)">- {{ props.row.name }}- </a>- <b-taglist>- <b-tag class="is-small" v-for="t in props.row.tags" :key="t">- {{ t }}- </b-tag>- </b-taglist>- </div>- </b-table-column>-- <b-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" header-class="cy-type" sortable- width="15%">- <div class="tags">- <b-tag :class="props.row.type" :data-cy="`type-${props.row.type}`">- {{ $t(`lists.types.${props.row.type}`) }}- </b-tag>- {{ ' ' }}-- <b-tag :class="props.row.optin" :data-cy="`optin-${props.row.optin}`">- <b-icon :icon="props.row.optin === 'double' ? 'account-check-outline' : 'account-off-outline'"- size="is-small" />+ </div>+ </template>++ <oat-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" header-class="cy-name" sortable+ width="25%" paginated backend-pagination :td-attrs="$utils.tdID" @page-change="onPageChange">+ <div>+ <a :href="`/lists/${props.row.id}`" @click.prevent="showEditForm(props.row)">+ {{ props.row.name }}+ </a>+ <span class="badge-list hstack gap-1">+ <span class="badge secondary" v-for="t in props.row.tags" :key="t">+ {{ t }}+ </span>+ </span>+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" header-class="cy-type" sortable+ width="15%">+ <div class="hstack">+ <oat-badge :type="props.row.type" :data-cy="`type-${props.row.type}`">+ {{ $t(`lists.types.${props.row.type}`) }}+ </oat-badge>{{ ' ' }}- {{ $t(`lists.optins.${props.row.optin}`) }}- </b-tag>{{ ' ' }}- <a v-if="props.row.optin === 'double'" class="is-size-7 send-optin" href="#"- @click="$utils.confirm(null, () => createOptinCampaign(props.row))" data-cy="btn-send-optin-campaign">- <b-tooltip :label="$t('lists.sendOptinCampaign')" type="is-dark">- <b-icon icon="rocket-launch-outline" size="is-small" />+ <oat-badge :type="props.row.optin" :data-cy="`optin-${props.row.optin}`">+ <oat-icon :icon="props.row.optin === 'double' ? 'account-check-outline' : 'account-off-outline'" />+ {{ ' ' }}+ {{ $t(`lists.optins.${props.row.optin}`) }}+ </oat-badge>{{ ' ' }}++ <a v-if="props.row.optin === 'double'" class="text-7 send-optin" href="#"+ @click="$utils.confirm(null, () => createOptinCampaign(props.row))" data-cy="btn-send-optin-campaign">++ <oat-icon icon="rocket-launch-outline" />{{ $t('lists.sendOptinCampaign') }}- </b-tooltip>- </a>- </div>- </b-table-column>- <b-table-column v-slot="props" field="subscriber_count" :label="$t('globals.terms.subscribers')"- header-class="cy-subscribers" numeric sortable centered>- <template v-if="$can('subscribers:get_all', 'subscribers:get')">- <router-link :to="`/subscribers/lists/${props.row.id}`">+ </a>+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="subscriber_count" :label="$t('globals.terms.subscribers')"+ header-class="cy-subscribers" numeric sortable centered>+ <template v-if="$can('subscribers:get_all', 'subscribers:get')">+ <router-link :to="`/subscribers/lists/${props.row.id}`">+ {{ $utils.formatNumber(props.row.subscriberCount) }}+ <span class="text-7 view">{{ $t('globals.buttons.view') }}</span>+ </router-link>+ </template>+ <template v-else>{{ $utils.formatNumber(props.row.subscriberCount) }}- <span class="is-size-7 view">{{ $t('globals.buttons.view') }}</span>- </router-link>- </template>- <template v-else>- {{ $utils.formatNumber(props.row.subscriberCount) }}- </template>- </b-table-column>-- <b-table-column v-slot="props" field="subscriber_counts" header-class="cy-subscribers" width="10%">- <div class="fields stats">- <p v-for="(count, status) in filterStatuses(props.row)" :key="status">- <label for="#">{{ $tc(`subscribers.status.${status}`, count) }}</label>- <router-link :to="`/subscribers/lists/${props.row.id}?subscription_status=${status}`" :class="status">- {{ $utils.formatNumber(count) }}+ </template>+ </oat-table-column>++ <oat-table-column v-slot="props" field="subscriber_counts" header-class="cy-subscribers" width="10%">+ <div class="field-list stats">+ <p v-for="(count, status) in filterStatuses(props.row)" :key="status">+ <label for="#">{{ $tc(`subscribers.status.${status}`, count) }}</label>+ <router-link :to="`/subscribers/lists/${props.row.id}?subscription_status=${status}`" :class="status">+ {{ $utils.formatNumber(count) }}+ </router-link>+ </p>+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"+ header-class="cy-created_at" sortable>+ {{ $utils.niceDate(props.row.createdAt) }}+ </oat-table-column>+ <oat-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"+ header-class="cy-updated_at" sortable>+ {{ $utils.niceDate(props.row.updatedAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions" align="right">+ <div>+ <router-link v-if="$can('campaigns:manage')" :to="`/campaigns/new?list_id=${props.row.id}`"+ data-cy="btn-campaign">+ <oat-icon icon="rocket-launch-outline" /></router-link>- </p>- </div>- </b-table-column>-- <b-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"- header-class="cy-created_at" sortable>- {{ $utils.niceDate(props.row.createdAt) }}- </b-table-column>- <b-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"- header-class="cy-updated_at" sortable>- {{ $utils.niceDate(props.row.updatedAt) }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" align="right">- <div>- <router-link v-if="$can('campaigns:manage')" :to="`/campaigns/new?list_id=${props.row.id}`"- data-cy="btn-campaign">- <b-tooltip :label="$t('lists.sendCampaign')" type="is-dark">- <b-icon icon="rocket-launch-outline" size="is-small" />- </b-tooltip>- </router-link>- <a v-if="$can('lists:manage') || $canList(props.row.id, 'list:manage')" href="#"- @click.prevent="showEditForm(props.row)" data-cy="btn-edit" :aria-label="$t('globals.buttons.edit')">- <b-tooltip :label="$t('globals.buttons.edit')" type="is-dark">- <b-icon icon="pencil-outline" size="is-small" />- </b-tooltip>- </a>-- <router-link v-if="$can('subscribers:import')" :to="{ name: 'import', query: { list_id: props.row.id } }"- data-cy="btn-import">- <b-tooltip :label="$t('import.title')" type="is-dark">- <b-icon icon="file-upload-outline" size="is-small" />- </b-tooltip>- </router-link>+ <a v-if="$can('lists:manage') || $canList(props.row.id, 'list:manage')" href="#"+ @click.prevent="showEditForm(props.row)" data-cy="btn-edit" :aria-label="$t('globals.buttons.edit')">- <a v-if="$can('lists:manage') || $canList(props.row.id, 'list:manage')" href="#"- @click.prevent="deleteList(props.row)" data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>- </a>- </div>- </b-table-column>-- <template #empty v-if="!loading.listsFull">- <empty-placeholder />- </template>- </b-table>-- <!-- Add / edit form modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="600" @close="onFormClose">- <list-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />- </b-modal>-- <p v-if="settings['app.cache_slow_queries']" class="has-text-grey">- *{{ $t('globals.messages.slowQueriesCached') }}- <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferer"- class="has-text-grey">- <b-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}- </a>- </p>+ <oat-icon icon="pencil-outline" />++ </a>++ <router-link v-if="$can('subscribers:import')" :to="{ name: 'import', query: { list_id: props.row.id } }"+ data-cy="btn-import">+ <oat-icon icon="file-upload-outline" />+ </router-link>++ <a v-if="$can('lists:manage') || $canList(props.row.id, 'list:manage')" href="#"+ @click.prevent="deleteList(props.row)" data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />++ </a>+ </div>+ </oat-table-column>++ <template #empty v-if="!loading.listsFull">+ <empty-placeholder />+ </template>+ </oat-data-table>++ <!-- Add / edit form modal -->+ <oat-modal :active.sync="isFormVisible" :width="600" @close="onFormClose">+ <list-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />+ </oat-modal>++ <p v-if="settings['app.cache_slow_queries']" class="text-light text-7">+ *{{ $t('globals.messages.slowQueriesCached') }}+ <a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferer"+ class="text-light text-7">+ <oat-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}+ </a>+ </p>+ </div></section></template>diff --git a/frontend/src/views/Logs.vue b/frontend/src/views/Logs.vueindex 2d8eb685..25cf3b56 100644--- a/frontend/src/views/Logs.vue+++ b/frontend/src/views/Logs.vue@@ -1,10 +1,16 @@<template>- <section class="logs content relative">- <h1 class="title is-4">- {{ $t('logs.title') }}- </h1>- <hr />- <log-view :loading="loading.logs" :lines="lines" />+ <section class="logs relative">+ <header class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('logs.title') }}+ </h1>+ </div>+ </header>++ <div class="card page-content">+ <log-view :loading="loading.logs" :lines="lines" />+ </div></section></template>diff --git a/frontend/src/views/Maintenance.vue b/frontend/src/views/Maintenance.vueindex 9ce8375f..7074a596 100644--- a/frontend/src/views/Maintenance.vue+++ b/frontend/src/views/Maintenance.vue@@ -1,181 +1,179 @@<template>- <section class="maintenance wrap">- <h1 class="title is-4">- {{ $t('maintenance.title') }}- </h1>- <hr />- <p class="has-text-grey">- {{ $t('maintenance.help') }}- </p>- <br />-- <div class="box">- <h4 class="is-size-4">- {{ $t('globals.terms.subscribers') }}- </h4><br />- <div class="columns">- <div class="column is-4">- <b-field label="Data" :message="$t('maintenance.orphanHelp')">- <b-select v-model="subscriberType" expanded>- <option value="orphan">- {{ $t('dashboard.orphanSubs') }}- </option>- <option value="blocklisted">- {{ $t('subscribers.status.blocklisted') }}- </option>- </b-select>- </b-field>- </div>- <div class="column is-5" />- <div class="column">- <br />- <b-field>- <b-button class="is-primary" :loading="loading.maintenance" @click="deleteSubscribers" expanded>- {{ $t('globals.buttons.delete') }}- </b-button>- </b-field>- </div>+ <section class="maintenance">+ <header class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('maintenance.title') }}+ </h1>+ <p class="text-light text-7">+ {{ $t('maintenance.help') }}+ </p></div>- </div><!-- subscribers -->+ </header>- <div class="box mt-6">- <h4 class="is-size-4">- {{ $tc('globals.terms.subscriptions', 2) }}- </h4><br />- <div class="columns">- <div class="column is-4">- <b-field label="Data">- <b-select v-model="subscriptionType" expanded>- <option value="optin">- {{ $t('maintenance.maintenance.unconfirmedOptins') }}- </option>- </b-select>- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('maintenance.olderThan')">- <b-datepicker v-model="subscriptionDate" required expanded icon="calendar-clock"- :date-formatter="formatDateTime" />- </b-field>+ <div class="card page-content" :aria-busy="isLoading ? 'true' : null" data-spinner="large overlay">+ <div class="card">+ <h4 class="text-4">+ {{ $t('globals.terms.subscribers') }}+ </h4><br />+ <div class="row">+ <div class="col-4">+ <oat-field label="Data" :message="$t('maintenance.orphanHelp')">+ <select aria-label="field" v-model="subscriberType">+ <option value="orphan">+ {{ $t('dashboard.orphanSubs') }}+ </option>+ <option value="blocklisted">+ {{ $t('subscribers.status.blocklisted') }}+ </option>+ </select>+ </oat-field>+ </div>+ <div class="col-5" />+ <div class="col-12">+ <br />+ <oat-field>+ <button type="button" data-variant="danger" :loading="loading.maintenance" @click="deleteSubscribers">+ {{ $t('globals.buttons.delete') }}+ </button>+ </oat-field>+ </div></div>- <div class="column is-1" />- <div class="column">- <br />- <b-field>- <b-button class="is-primary" :loading="loading.maintenance" @click="deleteSubscriptions" expanded>- {{ $t('globals.buttons.delete') }}- </b-button>- </b-field>- </div>- </div>- </div><!-- subscriptions -->+ </div><!-- subscribers -->- <div class="box mt-6">- <h4 class="is-size-4">- {{ $t('globals.terms.analytics') }}- </h4><br />- <div class="columns">- <div class="column is-4">- <b-field label="Data">- <b-select v-model="analyticsType" expanded>- <option selected value="all">- {{ $t('globals.terms.all') }}- </option>- <option value="views">- {{ $t('dashboard.campaignViews') }}- </option>- <option value="clicks">- {{ $t('dashboard.linkClicks') }}- </option>- </b-select>- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('maintenance.olderThan')">- <b-datepicker v-model="analyticsDate" required expanded icon="calendar-clock"- :date-formatter="formatDateTime" />- </b-field>- </div>- <div class="column is-1" />- <div class="column">- <br />- <b-field>- <b-button expanded class="is-primary" :loading="loading.maintenance" @click="deleteAnalytics">- {{ $t('globals.buttons.delete') }}- </b-button>- </b-field>+ <div class="card mt-6">+ <h4 class="text-4">+ {{ $tc('globals.terms.subscriptions', 2) }}+ </h4><br />+ <div class="row">+ <div class="col-4">+ <oat-field label="Data">+ <select aria-label="field" v-model="subscriptionType">+ <option value="optin">+ {{ $t('maintenance.maintenance.unconfirmedOptins') }}+ </option>+ </select>+ </oat-field>+ </div>+ <div class="col-4">+ <oat-field :label="$t('maintenance.olderThan')">+ <oat-date-input v-model="subscriptionDate" required />+ </oat-field>+ </div>+ <div class="col-1" />+ <div class="col-12">+ <br />+ <oat-field>+ <button type="button" data-variant="danger" :loading="loading.maintenance" @click="deleteSubscriptions">+ {{ $t('globals.buttons.delete') }}+ </button>+ </oat-field>+ </div></div>- </div>+ </div><!-- subscriptions -->- <hr />- <h5 class="is-size-5">- {{ $t('subscribers.export') }}- </h5>- <br />- <div class="columns">- <div class="column is-4">- <b-field label="Data">- <b-select v-model="exportType" expanded>- <option value="views">- {{ $t('dashboard.campaignViews') }}- </option>- <option value="clicks">- {{ $t('dashboard.linkClicks') }}- </option>- </b-select>- </b-field>- </div>- <div class="column is-4">- <b-field :label="$t('analytics.fromDate')">- <b-datepicker v-model="exportDate" required expanded icon="calendar-clock"- :date-formatter="formatDateTime" />- </b-field>+ <div class="card mt-6">+ <h4 class="text-4">+ {{ $t('globals.terms.analytics') }}+ </h4><br />+ <div class="row">+ <div class="col-4">+ <oat-field label="Data">+ <select aria-label="field" v-model="analyticsType">+ <option selected value="all">+ {{ $t('globals.terms.all') }}+ </option>+ <option value="views">+ {{ $t('dashboard.campaignViews') }}+ </option>+ <option value="clicks">+ {{ $t('dashboard.linkClicks') }}+ </option>+ </select>+ </oat-field>+ </div>+ <div class="col-4">+ <oat-field :label="$t('maintenance.olderThan')">+ <oat-date-input v-model="analyticsDate" required />+ </oat-field>+ </div>+ <div class="col-1" />+ <div class="col-12">+ <br />+ <oat-field>+ <button type="button" data-variant="danger" :loading="loading.maintenance" @click="deleteAnalytics">+ {{ $t('globals.buttons.delete') }}+ </button>+ </oat-field>+ </div></div>- <div class="column is-1" />- <div class="column">- <br />- <b-field>- <b-button expanded class="is-primary" tag="a" icon-left="download"- :href="exportURL">- {{ $t('subscribers.export') }}- </b-button>- </b-field>- </div>- </div>- </div><!-- analytics -->- <form @submit.prevent="onUpdateDBSettings" class="box mt-6">- <h4 class="is-size-4">- {{ $t('maintenance.database.title') }}- </h4><br />- <h5 class="is-size-5">Vacuum</h5>- <p class="has-text-grey is-size-7">- {{ $t('maintenance.database.vacuumHelp') }}- </p>- <br />- <div class="columns">- <div class="column is-2">- <b-field :label="$t('globals.buttons.enabled')">- <b-switch v-model="dbSettings.vacuum" />- </b-field>+ <hr />+ <h5 class="text-5">+ {{ $t('subscribers.export') }}+ </h5>+ <br />+ <div class="row">+ <div class="col-4">+ <oat-field label="Data">+ <select aria-label="field" v-model="exportType">+ <option value="views">+ {{ $t('dashboard.campaignViews') }}+ </option>+ <option value="clicks">+ {{ $t('dashboard.linkClicks') }}+ </option>+ </select>+ </oat-field>+ </div>+ <div class="col-4">+ <oat-field :label="$t('analytics.fromDate')">+ <oat-date-input v-model="exportDate" required />+ </oat-field>+ </div>+ <div class="col-1" />+ <div class="col-12">+ <br />+ <oat-field>+ <button type="button" data-variant="primary" tag="a" :href="exportURL">+ {{ $t('subscribers.export') }}+ </button>+ </oat-field>+ </div></div>- <div class="column is-4" :class="{ disabled: !dbSettings.vacuum }">- <b-field :label="$t('settings.maintenance.cron')">- <b-input v-model="dbSettings.vacuum_cron_interval" placeholder="0 2 * * *" :disabled="!dbSettings.vacuum"- pattern="((\*|[0-9,\-\/]+)\s+){4}(\*|[0-9,\-\/]+)" />- </b-field>- </div>- <div class="column is-3" />- <div class="column is-3">- <br />- <b-button type="is-primary" native-type="submit" :loading="loading.settings" expanded>- {{ $t('globals.buttons.save') }}- </b-button>- </div>- </div>- </form><!-- database -->+ </div><!-- analytics -->- <b-loading :is-full-page="true" v-if="isLoading" active />+ <form @submit.prevent="onUpdateDBSettings" class="card mt-6">+ <h4 class="text-4">+ {{ $t('maintenance.database.title') }}+ </h4><br />+ <h5 class="text-5">Vacuum</h5>+ <p class="text-light text-7 ">+ {{ $t('maintenance.database.vacuumHelp') }}+ </p>+ <br />+ <div class="row">+ <div class="col-2">+ <oat-field :label="$t('globals.buttons.enabled')">+ <oat-switch v-model="dbSettings.vacuum" />+ </oat-field>+ </div>+ <div class="col-4" :class="{ disabled: !dbSettings.vacuum }">+ <oat-field :label="$t('settings.maintenance.cron')">+ <input aria-label="field" v-model="dbSettings.vacuum_cron_interval" placeholder="0 2 * * *"+ :disabled="!dbSettings.vacuum" pattern="((\*|[0-9,\-\/]+)\s+){4}(\*|[0-9,\-\/]+)">+ </oat-field>+ </div>+ <div class="col-3" />+ <div class="col-3">+ <br />+ <button data-variant="primary" type="submit" :loading="loading.settings">+ {{ $t('globals.buttons.save') }}+ </button>+ </div>+ </div>+ </form><!-- database -->+ </div></section></template>diff --git a/frontend/src/views/Media.vue b/frontend/src/views/Media.vueindex 8543a261..e7c6ab36 100644--- a/frontend/src/views/Media.vue+++ b/frontend/src/views/Media.vue@@ -1,110 +1,111 @@<template><section class="media-files">- <h1 class="title is-4">- {{ $t('media.title') }}- <span v-if="media.results && media.results.length > 0">({{ media.results.length }})</span>- <span class="has-text-grey-light"> / {{ serverConfig.media_provider }}</span>- </h1>-- <b-loading :active="isProcessing || loading.media" />-- <section class="wrap gallery mt-6">- <div class="columns mb-4">- <div class="column">- <form @submit.prevent="onQueryMedia" class="search">+ <header v-if="!isModal" class="row page-header">+ <div class="col-8">+ <h1>+ {{ $t('media.title') }}+ <span v-if="media.results && media.results.length > 0">({{ media.results.length }})</span>+ <span class="text-lighter text-7"> / {{ serverConfig.media_provider }}</span>+ </h1>+ </div>+ </header>++ <div :class="isModal ? 'media-content' : 'card page-content'"+ :aria-busy="(isProcessing || loading.media) ? 'true' : null" data-spinner="large overlay">+ <section class="gallery">+ <div class="row mb-4">+ <div class="col-12">+ <form @submit.prevent="onQueryMedia" class="search">+ <fieldset class="group">+ <input aria-label="Search" v-model="queryParams.query" name="query" ref="query" data-cy="query"+ placeholder="Search">+ <button type="submit" data-variant="primary" data-cy="btn-query" aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </fieldset>+ </form>+ </div>+ <div v-if="$can('media:manage')" class="col-2">+ <button type="button" @click="onToggleForm" data-cy="btn-toggle-upload">+ {{ $t('media.upload') }}+ </button>+ </div>+ </div>++ <div>+ <form @submit.prevent="onSubmit" class="mb-6" data-cy="upload"><div>- <b-field>- <b-input v-model="queryParams.query" name="query" expanded icon="magnify" ref="query" data-cy="query" />- <p class="controls">- <b-button native-type="submit" type="is-primary" icon-left="magnify" data-cy="btn-query" />- </p>- </b-field>+ <oat-field :label="$t('media.upload')">+ <oat-upload v-model="form.files" multiple xaccept=".png,.jpg,.jpeg,.gif,.svg">+ <div class="align-center app-section">+ <p>+ <oat-icon icon="file-upload-outline" />+ </p>+ <p>{{ $t('media.uploadHelp') }}</p>+ </div>+ </oat-upload>+ </oat-field>+ <div class="hstack" v-if="form.files.length > 0">+ <span v-for="(f, i) in form.files" :key="i" closable @close="removeUploadFile(i)">+ {{ f.name }}+ </span>+ </div>+ <div class="hstack">+ <button type="submit" data-variant="primary" :disabled="form.files.length === 0"+ :loading="isProcessing">+ {{ $tc('media.upload') }}+ </button>+ </div></div></form></div>- <div v-if="$can('media:manage')" class="column is-narrow">- <b-button @click="onToggleForm" icon-left="file-upload-outline" data-cy="btn-toggle-upload">- {{ $t('media.upload') }}- </b-button>- </div>- </div>-- <b-collapse v-if="$can('media:manage')" v-model="showUploadForm" animation="">- <form @submit.prevent="onSubmit" class="mb-6" data-cy="upload">- <div>- <b-field :label="$t('media.upload')">- <b-upload v-model="form.files" drag-drop multiple xaccept=".png,.jpg,.jpeg,.gif,.svg" expanded>- <div class="has-text-centered section">- <p>- <b-icon icon="file-upload-outline" size="is-large" />- </p>- <p>{{ $t('media.uploadHelp') }}</p>- </div>- </b-upload>- </b-field>- <div class="tags" v-if="form.files.length > 0">- <b-tag v-for="(f, i) in form.files" :key="i" size="is-medium" closable @close="removeUploadFile(i)">- {{ f.name }}- </b-tag>- </div>- <div class="buttons">- <b-button native-type="submit" type="is-primary" icon-left="file-upload-outline"- :disabled="form.files.length === 0" :loading="isProcessing">- {{ $tc('media.upload') }}- </b-button>- </div>- </div>- </form>- </b-collapse>- <!-- Pagination -->- <div v-if="media.total > media.perPage" class="pagination-wrapper mt-5">- <b-pagination :total="media.total" :current.sync="media.page" :per-page="media.perPage"- @change="onPageChange" />- </div>+ <!-- Pagination -->+ <div v-if="media.total > media.perPage" class="pagination-wrapper mt-5">+ <oat-pagination :total="media.total" :current.sync="media.page" :per-page="media.perPage"+ @change="onPageChange" />+ </div>- <div v-if="loading.media" class="has-text-centered py-6">- <b-loading :active="loading.media" />- </div>- <div v-else-if="media.results && media.results.length > 0" class="grid">- <div v-for="item in media.results" :key="item.id" class="item">- <div class="thumb">- <a @click="(e) => onMediaSelect(item, e)" :href="item.url" target="_blank" rel="noopener noreferer"- class="thumb-link">- <div class="thumb-container">- <img v-if="item.thumbUrl" :src="item.thumbUrl" :title="item.filename" :alt="item.filename" />- <div v-else class="thumb-placeholder">- <span class="file-ext">- {{ item.filename.split(".").pop().toUpperCase() }}- </span>+ <div v-if="media.results && media.results.length > 0" class="grid">+ <div v-for="item in media.results" :key="item.id" class="item">+ <div class="thumb">+ <a @click="(e) => onMediaSelect(item, e)" :href="item.url" target="_blank" rel="noopener noreferer"+ class="thumb-link">+ <div class="thumb-container">+ <img v-if="item.thumbUrl" :src="item.thumbUrl" :title="item.filename" :alt="item.filename" />+ <div v-else class="thumb-placeholder">+ <span class="file-ext">+ {{ item.filename.split(".").pop().toUpperCase() }}+ </span>+ </div></div>- </div>- </a>- <div class="actions">- <a href="#" @click.prevent="$utils.confirm(null, () => onDeleteMedia(item.id))" data-cy="btn-delete"- :aria-label="$t('globals.buttons.delete')" class="delete-btn">- <b-icon icon="trash-can-outline" size="is-small" /></a>+ <div class="actions">+ <a href="#" @click.prevent="$utils.confirm(null, () => onDeleteMedia(item.id))" data-cy="btn-delete"+ :aria-label="$t('globals.buttons.delete')" class="delete-btn">+ <oat-icon icon="trash-can-outline" />+ </a>+ </div>+ </div>+ <div class="info">+ <p class="filename" :title="item.filename">{{ item.filename }}</p>+ <p class="date">{{ $utils.niceDate(item.createdAt, false) }}</p></div>- </div>- <div class="info">- <p class="filename" :title="item.filename">{{ item.filename }}</p>- <p class="date">{{ $utils.niceDate(item.createdAt, false) }}</p></div></div>- </div>- <!-- Empty State -->- <div v-else-if="!loading.media">- <empty-placeholder />- </div>+ <!-- Empty State -->+ <div v-else-if="!loading.media">+ <empty-placeholder />+ </div>- <!-- Pagination -->- <div v-if="media.total > media.perPage" class="pagination-wrapper mt-5">- <b-pagination :total="media.total" :current.sync="media.page" :per-page="media.perPage"- @change="onPageChange" />- </div>- </section>+ <!-- Pagination -->+ <div v-if="media.total > media.perPage" class="pagination-wrapper mt-5">+ <oat-pagination :total="media.total" :current.sync="media.page" :per-page="media.perPage"+ @change="onPageChange" />+ </div>+ </section>+ </div></section></template>diff --git a/frontend/src/views/RoleForm.vue b/frontend/src/views/RoleForm.vueindex da6997f6..0432ef82 100644--- a/frontend/src/views/RoleForm.vue+++ b/frontend/src/views/RoleForm.vue@@ -1,8 +1,8 @@<template><form @submit.prevent="onSubmit">- <div class="modal-card content" style="width: auto">- <header class="modal-card-head">- <p v-if="isEditing" class="has-text-grey-light is-size-7">+ <div class="dialog-card content" style="width: auto">+ <header class="dialog-head">+ <p v-if="isEditing" class="text-lighter text-7 ">{{ $t('globals.fields.id') }}: <copy-text :text="`${data.id}`" /></p><h4 v-if="isEditing">@@ -13,110 +13,110 @@</h4></header>- <section expanded class="modal-card-body">- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input autofocus :disabled="disabled" :maxlength="200" v-model="form.name" name="name" ref="focus"- required />- </b-field>+ <section class="dialog-body">+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :disabled="disabled" :maxlength="200" v-model="form.name" name="name" ref="focus"+ required>+ </oat-field>- <div v-if="type === 'list'" class="box">+ <div v-if="type === 'list'" class="card"><h5>{{ $t('users.listPerms') }}</h5><div class="mb-5">- <div class="columns">- <div class="column is-9">- <b-select :placeholder="$tc('globals.terms.list')" v-model="form.curList" name="list"- :disabled="disabled || filteredLists.length < 1" expanded class="mb-3">+ <div class="row">+ <div class="col-9">+ <select aria-label="field" :placeholder="$tc('globals.terms.list')" v-model="form.curList" name="list"+ :disabled="disabled || filteredLists.length < 1" class="mb-3"><template v-for="l in filteredLists"><option :value="l.id" :key="l.id">{{ l.name }}</option></template>- </b-select>+ </select></div>- <div class="column">- <b-button @click="onAddListPerm" :disabled="!form.curList" class="is-primary" expanded>+ <div class="col-12">+ <button type="button" @click="onAddListPerm" :disabled="!form.curList" data-variant="primary">{{ $t('globals.buttons.add') }}- </b-button>+ </button></div></div><spanv-if="form.lists.length > 0 && (form.permissions['lists:get_all'] || form.permissions['lists:manage_all'])"- class="is-size-6 has-text-danger">- <b-icon icon="warning-empty" />+ class="text-danger text-6">+ <oat-icon icon="warning-empty" />{{ $t('users.listPermsWarning') }}</span></div>- <b-table :data="form.lists">- <b-table-column v-slot="props" field="name" :label="$tc('globals.terms.list')">+ <oat-data-table :data="form.lists">+ <oat-table-column v-slot="props" field="name" :label="$tc('globals.terms.list')"><router-link :to="`/lists/${props.row.id}`" target="_blank">{{ props.row.name }}</router-link>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="permissions" :label="$t('users.perms')" width="40%">- <b-checkbox v-model="props.row.permissions" native-value="list:get">+ <oat-table-column v-slot="props" field="permissions" :label="$t('users.perms')" width="40%">+ <oat-checkbox v-model="props.row.permissions" native-value="list:get">{{ $t('globals.buttons.view') }}- </b-checkbox>- <b-checkbox v-model="props.row.permissions" native-value="list:manage">+ </oat-checkbox>+ <oat-checkbox v-model="props.row.permissions" native-value="list:manage">{{ $t('globals.buttons.manage') }}- </b-checkbox>- </b-table-column>+ </oat-checkbox>+ </oat-table-column>- <b-table-column v-slot="props" width="10%">+ <oat-table-column v-slot="props" width="10%"><a href="#" @click.prevent="onDeleteListPerm(props.row.id)" data-cy="btn-delete":aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>++ <oat-icon icon="trash-can-outline" />+</a>- </b-table-column>- </b-table>+ </oat-table-column>+ </oat-data-table></div><template v-if="type === 'user'">- <div class="columns">- <div class="column is-7">+ <div class="row">+ <div class="col-7"><h5 class="mb-0">{{ $t('users.perms') }}</h5></div>- <div class="column has-text-right" v-if="!disabled">+ <div class="col-12 align-right" v-if="!disabled"><a href="#" @click.prevent="onToggleSelect">{{ $t('globals.buttons.toggleSelect') }}</a></div></div>- <b-table :data="serverConfig.permissions">- <b-table-column v-slot="props" field="group" :label="$t('users.roleGroup')">+ <oat-data-table :data="serverConfig.permissions">+ <oat-table-column v-slot="props" field="group" :label="$t('users.roleGroup')">{{ $tc(`globals.terms.${props.row.group}`) }}- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="permissions" label="Permissions">+ <oat-table-column v-slot="props" field="permissions" label="Permissions"><div v-for="p in props.row.permissions" :key="p">- <b-checkbox v-model="form.permissions" :native-value="p" :disabled="disabled">+ <oat-checkbox v-model="form.permissions" :native-value="p" :disabled="disabled">{{ p }}<a v-if="p === 'subscribers:sql_query'"href="https://listmonk.app/docs/roles-and-permissions/#subscriberssql_query" target="_blank"rel="noopener noreferrer" aria-label="Warning: high risk permission">- <b-icon icon="warning-empty" type="is-danger" size="is-small" />+ <oat-icon icon="warning-empty" data-variant="danger" /></a>- </b-checkbox>+ </oat-checkbox></div>- </b-table-column>- </b-table>+ </oat-table-column>+ </oat-data-table></template><a href="https://listmonk.app/docs/roles-and-permissions" target="_blank" rel="noopener noreferrer">- <b-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}+ <oat-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}</a></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button v-if="!disabled" native-type="submit" type="is-primary" :loading="loading.roles" data-cy="btn-save">+ </button>+ <button v-if="!disabled" type="submit" data-variant="primary" :loading="loading.roles" data-cy="btn-save">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>diff --git a/frontend/src/views/Roles.vue b/frontend/src/views/Roles.vueindex f51f0202..ca028b36 100644--- a/frontend/src/views/Roles.vue+++ b/frontend/src/views/Roles.vue@@ -1,81 +1,82 @@<template><section class="roles">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t(isUser ? 'users.userRoles' : 'users.listRoles') }}<span v-if="!isNaN(roles.length)">({{ roles.length }})</span></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('users:manage')" expanded>- <b-button expanded type="is-primary" icon-left="plus" class="btn-new" @click="showNewForm('user')"- data-cy="btn-new">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('users:manage')">+ <button type="button" data-variant="primary" class="btn-new" @click="showNewForm('user')" data-cy="btn-new">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <b-table :data="roles" :loading="isLoading()" hoverable>- <b-table-column v-slot="props" field="role" :label="$tc('users.role')" sortable>- <a href="#" @click.prevent="showEditForm(props.row, 'user')">- <b-tag v-if="props.row.id === 1" class="enabled">- {{ props.row.name }}- </b-tag>- <template v-else>{{ props.row.name }}</template>- </a>- </b-table-column>-- <b-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"- header-class="cy-created_at" sortable>- {{ $utils.niceDate(props.row.createdAt) }}- </b-table-column>-- <b-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"- header-class="cy-updated_at" sortable>- {{ $utils.niceDate(props.row.updatedAt) }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions has-text-right">- <template v-if="$can('roles:manage')">- <a href="#" @click.prevent="$utils.prompt($t('globals.buttons.clone'),- {- placeholder: $t('globals.fields.name'),- value: $t('campaigns.copyOf', { name: props.row.name }),- },- (name) => onCloneRole(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">- <b-tooltip :label="$t('globals.buttons.clone')" type="is-dark">- <b-icon icon="file-multiple-outline" size="is-small" />- </b-tooltip>+ <div class="card page-content">+ <oat-data-table :data="roles" :loading="isLoading()">+ <oat-table-column v-slot="props" field="role" :label="$tc('users.role')" sortable>+ <a href="#" @click.prevent="showEditForm(props.row, 'user')">+ <oat-badge v-if="props.row.id === 1" type="enabled">+ {{ props.row.name }}+ </oat-badge>+ <template v-else>{{ props.row.name }}</template></a>+ </oat-table-column>- <template v-if="props.row.id !== 1">- <a href="#" @click.prevent="showEditForm(props.row, 'user')" data-cy="btn-edit"- :aria-label="$t('globals.buttons.edit')">- <b-tooltip :label="$t('globals.buttons.edit')" type="is-dark">- <b-icon icon="pencil-outline" size="is-small" />- </b-tooltip>- </a>+ <oat-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"+ header-class="cy-created_at" sortable>+ {{ $utils.niceDate(props.row.createdAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"+ header-class="cy-updated_at" sortable>+ {{ $utils.niceDate(props.row.updatedAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions align-right">+ <template v-if="$can('roles:manage')">+ <a href="#" @click.prevent="$utils.prompt($t('globals.buttons.clone'),+ {+ placeholder: $t('globals.fields.name'),+ value: $t('campaigns.copyOf', { name: props.row.name }),+ },+ (name) => onCloneRole(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">++ <oat-icon icon="file-multiple-outline" />- <a href="#" @click.prevent="onDeleteRole(props.row)" data-cy="btn-delete"- :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip></a>++ <template v-if="props.row.id !== 1">+ <a href="#" @click.prevent="showEditForm(props.row, 'user')" data-cy="btn-edit"+ :aria-label="$t('globals.buttons.edit')">++ <oat-icon icon="pencil-outline" />++ </a>++ <a href="#" @click.prevent="onDeleteRole(props.row)" data-cy="btn-delete"+ :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />++ </a>+ </template></template>- </template>- </b-table-column>+ </oat-table-column>- <template #empty v-if="!isLoading()">- <empty-placeholder />- </template>- </b-table>+ <template #empty v-if="!isLoading()">+ <empty-placeholder />+ </template>+ </oat-data-table>- <!-- Add / edit form modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="700" @close="onFormClose">- <role-form :data="curItem" :type="curType" :is-editing="isEditing" @finished="formFinished" />- </b-modal>+ <!-- Add / edit form modal -->+ <oat-modal :active.sync="isFormVisible" :width="700" @close="onFormClose">+ <role-form :data="curItem" :type="curType" :is-editing="isEditing" @finished="formFinished" />+ </oat-modal>+ </div></section></template>diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vueindex 34e19432..66c0f8fd 100644--- a/frontend/src/views/Settings.vue+++ b/frontend/src/views/Settings.vue@@ -1,64 +1,73 @@<template><form @submit.prevent="onSubmit"><section class="settings">- <b-loading :is-full-page="true" v-if="loading.settings || isLoading" active />- <header class="columns page-header">- <div class="column is-half">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t('settings.title') }}- <span class="has-text-grey-light">({{ serverConfig.version }})</span>+ <small>({{ serverConfig.version }})</small></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('settings:manage')" expanded>- <b-button expanded :disabled="!hasFormChanged" type="is-primary" icon-left="content-save-outline"- native-type="submit" class="isSaveEnabled" data-cy="btn-save">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('settings:manage')">+ <button :disabled="!hasFormChanged" data-variant="primary" type="submit" class="isSaveEnabled"+ data-cy="btn-save">+ <oat-icon icon="content-save-outline" />{{ $t('globals.buttons.save') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <hr />-- <section class="wrap settings-wrap" v-if="form">- <b-tabs class="settings-tabs" vertical :animated="false" v-model="tab">- <b-tab-item :label="$t('settings.general.name')">- <general-settings :form="form" :key="key" />- </b-tab-item><!-- general -->-- <b-tab-item :label="$t('settings.performance.name')">- <performance-settings :form="form" :key="key" />- </b-tab-item><!-- performance -->-- <b-tab-item :label="$t('settings.privacy.name')">- <privacy-settings :form="form" :key="key" />- </b-tab-item><!-- privacy -->-- <b-tab-item :label="$t('settings.security.name')">- <security-settings :form="form" :key="key" />- </b-tab-item><!-- security -->-- <b-tab-item :label="$t('settings.media.title')">- <media-settings :form="form" :key="key" />- </b-tab-item><!-- media -->-- <b-tab-item :label="$t('settings.smtp.name')">- <smtp-settings :form="form" :key="key" />- </b-tab-item><!-- mail servers -->-- <b-tab-item :label="$t('settings.bounces.name')">- <bounce-settings :form="form" :key="key" />- </b-tab-item><!-- bounces -->-- <b-tab-item :label="$t('settings.messengers.name')">- <messenger-settings :form="form" :key="key" />- </b-tab-item><!-- messengers -->-- <b-tab-item :label="$t('settings.appearance.name')">- <appearance-settings :form="form" :key="key" />- </b-tab-item><!-- appearance -->- </b-tabs>- </section>++ <div class="card page-content" :aria-busy="(loading.settings || isLoading) ? 'true' : null"+ data-spinner="large overlay">+ <section class="settings-wrap" v-if="form">+ <ot-tabs class="settings-tabs" @ot-tab-change="tab = $event.detail.index">+ <div role="tablist" aria-orientation="vertical">+ <button v-for="(item, i) in tabs" :key="item.key" type="button" role="tab"+ :aria-selected="tab === i ? 'true' : 'false'">+ {{ item.label }}+ </button>+ </div>++ <div role="tabpanel">+ <general-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <performance-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <privacy-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <security-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <media-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <smtp-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <bounce-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <messenger-settings :form="form" :key="key" />+ </div>++ <div role="tabpanel">+ <appearance-settings :form="form" :key="key" />+ </div>+ </ot-tabs>+ </section>+ </div></section></form></template>@@ -109,7 +118,7 @@ export default Vue.extend({async onSubmit() {const form = JSON.parse(JSON.stringify(this.form));- // SMTP boxes.+ // SMTP cardes.let hasDummy = '';for (let i = 0; i < form.smtp.length; i += 1) {// trim the host before saving@@ -129,15 +138,15 @@ export default Vue.extend({}}- // Bounces boxes.- for (let i = 0; i < form['bounce.mailboxes'].length; i += 1) {+ // Bounces cardes.+ for (let i = 0; i < form['bounce.mailcardes'].length; i += 1) {// trim the host before saving- form['bounce.mailboxes'][i].host = form['bounce.mailboxes'][i].host?.trim();+ form['bounce.mailcardes'][i].host = form['bounce.mailcardes'][i].host?.trim();// If it's the dummy UI password placeholder, ignore it.- if (this.isDummy(form['bounce.mailboxes'][i].password)) {- form['bounce.mailboxes'][i].password = '';- } else if (this.hasDummy(form['bounce.mailboxes'][i].password)) {+ if (this.isDummy(form['bounce.mailcardes'][i].password)) {+ form['bounce.mailcardes'][i].password = '';+ } else if (this.hasDummy(form['bounce.mailcardes'][i].password)) {hasDummy = `bounce #${i + 1}`;}}@@ -200,7 +209,7 @@ export default Vue.extend({}if (hasDummy) {- this.$utils.toast(this.$t('globals.messages.passwordChangeFull', { name: hasDummy }), 'is-danger');+ this.$utils.toast(this.$t('globals.messages.passwordChangeFull', { name: hasDummy }), '');return false;}@@ -262,6 +271,20 @@ export default Vue.extend({computed: {...mapState(['serverConfig', 'loading']),+ tabs() {+ return [+ { key: 'general', label: this.$t('settings.general.name') },+ { key: 'performance', label: this.$t('settings.performance.name') },+ { key: 'privacy', label: this.$t('settings.privacy.name') },+ { key: 'security', label: this.$t('settings.security.name') },+ { key: 'media', label: this.$t('settings.media.title') },+ { key: 'smtp', label: this.$t('settings.smtp.name') },+ { key: 'bounces', label: this.$t('settings.bounces.name') },+ { key: 'messengers', label: this.$t('settings.messengers.name') },+ { key: 'appearance', label: this.$t('settings.appearance.name') },+ ];+ },+hasFormChanged() {if (!this.formCopy) {return false;diff --git a/frontend/src/views/SubscriberBulkList.vue b/frontend/src/views/SubscriberBulkList.vueindex 38d4863e..b6069954 100644--- a/frontend/src/views/SubscriberBulkList.vue+++ b/frontend/src/views/SubscriberBulkList.vue@@ -1,44 +1,44 @@<template><form @submit.prevent="onSubmit">- <div class="modal-card" style="width: auto">- <header class="modal-card-head">- <h4 class="title is-size-5">+ <div class="dialog-card" style="width: auto">+ <header class="dialog-head">+ <h4>{{ $t('subscribers.manageLists') }}</h4></header>- <section expanded class="modal-card-body">- <b-field label="Action">+ <section class="dialog-body">+ <oat-field label="Action"><div>- <b-radio v-model="form.action" name="action" native-value="add" data-cy="check-list-add">+ <oat-radio v-model="form.action" name="action" native-value="add" data-cy="check-list-add">{{ $t('globals.buttons.add') }}- </b-radio>- <b-radio v-model="form.action" name="action" native-value="remove" data-cy="check-list-remove">+ </oat-radio>+ <oat-radio v-model="form.action" name="action" native-value="remove" data-cy="check-list-remove">{{ $t('globals.buttons.remove') }}- </b-radio>- <b-radio v-model="form.action" name="action" native-value="unsubscribe" data-cy="check-list-unsubscribe">+ </oat-radio>+ <oat-radio v-model="form.action" name="action" native-value="unsubscribe" data-cy="check-list-unsubscribe">{{ $t('subscribers.markUnsubscribed') }}- </b-radio>+ </oat-radio></div>- </b-field>+ </oat-field><list-selector label="Target lists" placeholder="Lists to apply to" v-model="form.lists" :selected="form.lists":all="lists.results" />- <b-field :message="$t('subscribers.preconfirmHelp')">- <b-checkbox v-model="form.preconfirm" data-cy="preconfirm" :native-value="true" :disabled="!hasOptinList">+ <oat-field :message="$t('subscribers.preconfirmHelp')">+ <oat-checkbox v-model="form.preconfirm" data-cy="preconfirm" :native-value="true" :disabled="!hasOptinList">{{ $t('subscribers.preconfirm') }}- </b-checkbox>- </b-field>+ </oat-checkbox>+ </oat-field></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button native-type="submit" type="is-primary" :disabled="form.lists.length === 0">+ </button>+ <button type="submit" data-variant="primary" :disabled="form.lists.length === 0">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>diff --git a/frontend/src/views/SubscriberForm.vue b/frontend/src/views/SubscriberForm.vueindex e9a08738..8b83ebcc 100644--- a/frontend/src/views/SubscriberForm.vue+++ b/frontend/src/views/SubscriberForm.vue@@ -1,10 +1,10 @@<template><form @submit.prevent="onSubmit">- <div class="modal-card content" style="width: auto">- <header class="modal-card-head">- <b-tag v-if="isEditing" :class="[data.status, 'is-pulled-right']">+ <div class="dialog-card content" style="width: auto">+ <header class="dialog-head">+ <oat-badge v-if="isEditing" :type="data.status" class="align-right">{{ $t(`subscribers.status.${data.status}`) }}- </b-tag>+ </oat-badge><h4 v-if="isEditing">{{ data.name }}</h4>@@ -12,157 +12,165 @@{{ $t('subscribers.newSubscriber') }}</h4>- <p v-if="isEditing" class="has-text-grey is-size-7">+ <p v-if="isEditing" class="text-light text-7 ">{{ $t('globals.fields.id') }}: <span data-cy="id"><copy-text :text="`${data.id}`" /></span>{{ $t('globals.fields.uuid') }}: <copy-text :text="data.uuid" /></p></header>- <section expanded class="modal-card-body">- <b-field :label="$t('subscribers.email')" label-position="on-border">- <b-input :maxlength="200" v-model="form.email" name="email" :ref="'focus'"- :placeholder="$t('subscribers.email')" required />- </b-field>-- <div class="columns">- <div class="column is-8">- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" v-model="form.name" name="name" :placeholder="$t('globals.fields.name')" />- </b-field>+ <section class="dialog-body">+ <oat-field :label="$t('subscribers.email')">+ <input aria-label="field" :maxlength="200" v-model="form.email" name="email" :ref="'focus'"+ :placeholder="$t('subscribers.email')" required>+ </oat-field>++ <div class="row">+ <div class="col-8">+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" v-model="form.name" name="name"+ :placeholder="$t('globals.fields.name')">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('globals.fields.status')" label-position="on-border"- :message="$t('subscribers.blocklistedHelp')">- <b-select v-model="form.status" name="status" :placeholder="$t('globals.fields.status')" required- expanded>+ <div class="col-4">+ <oat-field :label="$t('globals.fields.status')" :message="$t('subscribers.blocklistedHelp')">+ <select aria-label="field" v-model="form.status" name="status" :placeholder="$t('globals.fields.status')"+ required><option value="enabled">{{ $t('subscribers.status.enabled') }}</option><option value="blocklisted">{{ $t('subscribers.status.blocklisted') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div></div>- <b-tabs type="is-boxed" :animated="false">- <b-tab-item :label="$t('globals.terms.lists')" label-position="on-border">+ <ot-tabs>+ <div role="tablist">+ <button type="button" role="tab">{{ $t('globals.terms.lists') }}</button>+ <button type="button" role="tab" :disabled="!data.lists || data.lists.length === 0">+ {{ `${$tc('globals.terms.subscriptions', 2)} (${data.lists ? data.lists.length : 0})` }}+ </button>+ <button type="button" role="tab" :disabled="bounces.length === 0">+ {{ `${$t('globals.terms.bounces')} (${bounces.length})` }}+ </button>+ <button type="button" role="tab" :disabled="!isEditing">{{ $t('subscribers.activity') }}</button>+ </div>++ <section role="tabpanel"><list-selector :label="$t('subscribers.lists')" :placeholder="$t('subscribers.listsPlaceholder')":message="$t('subscribers.listsHelp')" v-model="form.lists" :selected="form.lists" :all="lists.results" />- <div class="columns">- <div class="column is-7">- <b-field :message="$t('subscribers.preconfirmHelp')">- <b-checkbox v-model="form.preconfirm" :native-value="true" :disabled="!hasOptinList">+ <div class="row">+ <div class="col-7">+ <oat-field :message="$t('subscribers.preconfirmHelp')">+ <oat-checkbox v-model="form.preconfirm" :native-value="true" :disabled="!hasOptinList">{{ $t('subscribers.preconfirm') }}- </b-checkbox>- </b-field>+ </oat-checkbox>+ </oat-field></div>- <div v-if="$can('subscribers:manage') && isEditing" class="column is-5 has-text-right">- <a href="#" @click.prevent="sendOptinConfirmation" :class="{ 'is-disabled': !hasOptinList }">- <b-icon icon="email-outline" size="is-small" />+ <div v-if="$can('subscribers:manage') && isEditing" class="col-5 align-right">+ <a href="#" @click.prevent="sendOptinConfirmation" :class="{ 'disabled': !hasOptinList }">+ <oat-icon icon="email-outline" />{{ $t('subscribers.sendOptinConfirm') }}</a></div></div>- </b-tab-item><!-- lists -->+ </section><!-- lists -->- <b-tab-item :label="`${$tc('globals.terms.subscriptions', 2)} (${data.lists ? data.lists.length : 0})`"- label-position="on-border" :disabled="!data.lists || data.lists.length === 0">+ <section role="tabpanel"><template v-if="data.lists">- <b-table :data="data.lists" hoverable default-sort="createdAt" class="subscriptions">- <b-table-column v-slot="props" field="name" :label="$tc('globals.terms.list', 1)">+ <oat-data-table :data="data.lists" default-sort="createdAt" class="subscriptions">+ <oat-table-column v-slot="props" field="name" :label="$tc('globals.terms.list', 1)"><div><router-link v-if="!props.row.restricted" :to="`/lists/${props.row.id}`">{{ props.row.name }}</router-link>- <span v-else class="has-text-grey-light is-italic">{{ props.row.name }}</span>+ <span v-else class="text-lighter text-7 ">{{ props.row.name }}</span><br />- <b-tag :class="props.row.optin" :data-cy="`optin-${props.row.optin}`">- <b-icon :icon="props.row.optin === 'double' ? 'account-check-outline' : 'account-off-outline'"- size="is-small" />+ <oat-badge :type="props.row.optin" :data-cy="`optin-${props.row.optin}`">+ <oat-icon+ :icon="props.row.optin === 'double' ? 'account-check-outline' : 'account-off-outline'" />{{ ' ' }}{{ $t(`lists.optins.${props.row.optin}`) }}- </b-tag>{{ ' ' }}+ </oat-badge>{{ ' ' }}</div>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="status" cell-class="status" :label="$t('globals.fields.status')">- <b-tag :class="`status-${props.row.subscriptionStatus}`">+ <oat-table-column v-slot="props" field="status" cell-class="status"+ :label="$t('globals.fields.status')">+ <oat-badge :type="`status-${props.row.subscriptionStatus}`">{{ $t(`subscribers.status.${props.row.subscriptionStatus}`) }}- </b-tag>+ </oat-badge><template v-if="props.row.optin === 'double' && props.row.subscriptionMeta.optinIp">- <br /><span class="is-size-7">{{ props.row.subscriptionMeta.optinIp }}</span>+ <br /><span class="text-7">{{ props.row.subscriptionMeta.optinIp }}</span></template>- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="createdAt" :label="$t('globals.fields.createdAt')">+ <oat-table-column v-slot="props" field="createdAt" :label="$t('globals.fields.createdAt')">{{ $utils.niceDate(props.row.subscriptionCreatedAt, true) }}- </b-table-column>+ </oat-table-column>- <b-table-column v-slot="props" field="updatedAt" :label="$t('globals.fields.updatedAt')">+ <oat-table-column v-slot="props" field="updatedAt" :label="$t('globals.fields.updatedAt')">{{ $utils.niceDate(props.row.subscriptionCreatedAt, true) }}- </b-table-column>- </b-table>+ </oat-table-column>+ </oat-data-table></template>- </b-tab-item><!-- subscriptions -->+ </section><!-- subscriptions -->- <b-tab-item :label="`${$t('globals.terms.bounces')} (${bounces.length})`" class="bounces"- :disabled="bounces.length === 0">- <a href="#" class="is-size-6 is-pulled-right" disabed="true" @click.prevent="deleteBounces"- v-if="isBounceVisible">- <b-icon icon="trash-can-outline" />+ <section role="tabpanel" class="bounces">+ <a href="#" class="text-6 align-right" disabed="true" @click.prevent="deleteBounces" v-if="isBounceVisible">+ <oat-icon icon="trash-can-outline" />{{ $t('globals.buttons.delete') }}</a>- <b-table :data="bounces" hoverable default-sort="createdAt" class="bounces">- <b-table-column field="campaign" :label="$tc('globals.terms.campaign', 1)" v-slot="props">+ <oat-data-table :data="bounces" default-sort="createdAt" class="bounces">+ <oat-table-column field="campaign" :label="$tc('globals.terms.campaign', 1)" v-slot="props"><div v-if="props.row.campaign"><router-link :to="{ name: 'bounces', query: { campaign_id: props.row.campaign.id } }">{{ props.row.campaign.name }}</router-link></div>- </b-table-column>+ </oat-table-column>- <b-table-column field="createdAt" :label="$t('globals.fields.createdAt')" v-slot="props">+ <oat-table-column field="createdAt" :label="$t('globals.fields.createdAt')" v-slot="props">{{ $utils.niceDate(props.row.createdAt, true) }}- </b-table-column>+ </oat-table-column>- <b-table-column field="action" :label="$t('globals.fields.type')" v-slot="props">- <span class="is-pulled-right">+ <oat-table-column field="action" :label="$t('globals.fields.type')" v-slot="props">+ <span class="align-right"><a href="#" @click.prevent="toggleMeta(props.row.id)">{{ props.row.source }}- <b-icon :icon="visibleMeta[props.row.id] ? 'arrow-up' : 'arrow-down'" />+ <oat-icon :icon="visibleMeta[props.row.id] ? 'arrow-up' : 'arrow-down'" /></a></span>- <span class="is-clearfix" />+ <span class="clearfix" /><pre v-if="visibleMeta[props.row.id]">{{ props.row.meta }}</pre>- </b-table-column>- </b-table>- </b-tab-item><!-- bounces -->+ </oat-table-column>+ </oat-data-table>+ </section><!-- bounces -->- <b-tab-item :label="$t('subscribers.activity')" class="activity" :disabled="!isEditing">+ <section role="tabpanel" class="activity"><subscriber-activity v-if="isEditing && data.id" :subscriber-id="data.id" />- </b-tab-item><!-- activity -->- </b-tabs>+ </section><!-- activity -->+ </ot-tabs>- <b-field :message="$t('subscribers.attribsHelp') + ' ' + egAttribs" class="mt-6">+ <oat-field :message="$t('subscribers.attribsHelp') + ' ' + egAttribs" class="mt-6"><div><h5>{{ $t('globals.terms.attribs') }}</h5>- <b-input v-model="form.strAttribs" name="attribs" type="textarea" />- <a href="https://listmonk.app/docs/concepts" target="_blank" rel="noopener noreferrer" class="is-size-7">- {{ $t('globals.buttons.learnMore') }} <b-icon icon="link-variant" size="is-small" />+ <textarea aria-label="field" v-model="form.strAttribs" name="attribs" />+ <a href="https://listmonk.app/docs/concepts" target="_blank" rel="noopener noreferrer" class="text-7">+ {{ $t('globals.buttons.learnMore') }} <oat-icon icon="link-variant" /></a></div>- </b-field>+ </oat-field></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button v-if="$can('subscribers:manage')" native-type="submit" type="is-primary"- :loading="loading.subscribers">+ </button>+ <button v-if="$can('subscribers:manage')" type="submit" data-variant="primary" :loading="loading.subscribers">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>@@ -317,14 +325,14 @@ export default Vue.extend({} catch (e) {this.$utils.toast(`${this.$t('subscribers.invalidJSON')}: ${e.toString()}`,- 'is-danger',+ '',3000,);return null;}if (attribs instanceof Array) {- this.$utils.toast('Attributes should be a map {} and not an array []', 'is-danger', 3000);+ this.$utils.toast('Attributes should be a map {} and not an array []', '', 3000);return null;}diff --git a/frontend/src/views/Subscribers.vue b/frontend/src/views/Subscribers.vueindex ab37780a..3534dd2c 100644--- a/frontend/src/views/Subscribers.vue+++ b/frontend/src/views/Subscribers.vue@@ -1,193 +1,198 @@<template><section class="subscribers">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t('globals.terms.subscribers') }}<span v-if="!isNaN(subscribers.total)">(<span data-cy="count">{{ subscribers.total }}</span>)</span><span v-if="currentList">» {{ currentList.name }}- <span v-if="queryParams.subStatus" class="has-text-grey has-text-weight-normal is-capitalized">({{+ <span v-if="queryParams.subStatus" class="text-light text-7 ">({{queryParams.subStatus }})</span></span></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('subscribers:manage')" expanded>- <b-button expanded type="is-primary" icon-left="plus" @click="showNewForm" data-cy="btn-new" class="btn-new">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('subscribers:manage')">+ <button type="button" data-variant="primary" @click="showNewForm" data-cy="btn-new" class="btn-new">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <section class="subscribers-controls">- <div class="columns">- <div class="column is-8">- <form @submit.prevent="onSubmit">- <div>- <b-field addons>- <b-input @input="onSimpleQueryInput" v-model="queryInput" expanded- :placeholder="$t('subscribers.queryPlaceholder')" icon="magnify" ref="query"- :disabled="isSearchAdvanced" data-cy="search" />- <p class="controls">- <b-button native-type="submit" type="is-primary" icon-left="magnify" :disabled="isSearchAdvanced"- data-cy="btn-search" />- </p>- </b-field>-- <div v-if="isSearchAdvanced">- <b-input v-model="queryParams.queryExp" @keydown.native.enter="onAdvancedQueryEnter" type="textarea"- ref="queryExp" placeholder="subscribers.name LIKE '%user%' or subscribers.status='blocklisted'"- data-cy="query" />- <span class="is-size-6 has-text-grey">- {{ $t('subscribers.advancedQueryHelp') }}.{{ ' ' }}- <a href="https://listmonk.app/docs/querying-and-segmentation" target="_blank"- rel="noopener noreferrer">- {{ $t('globals.buttons.learnMore') }}.- </a>- </span>- <div class="buttons">- <b-button native-type="submit" type="is-primary" icon-left="magnify" data-cy="btn-query">- {{- $t('subscribers.query') }}- </b-button>- <b-button @click.prevent="toggleAdvancedSearch" icon-left="cancel" data-cy="btn-query-reset">- {{ $t('subscribers.reset') }}- </b-button>- </div>- </div><!-- advanced query -->+ <div class="card page-content">+ <section class="subscribers-controls">+ <div class="row">+ <div class="col-8">+ <form @submit.prevent="onSubmit">+ <div>+ <fieldset v-if="!isSearchAdvanced" class="group">+ <input aria-label="field" @input="onSimpleQueryInput" v-model="queryInput"+ :placeholder="$t('subscribers.queryPlaceholder')" ref="query" :disabled="isSearchAdvanced"+ data-cy="search">+ <button type="submit" data-variant="primary" :disabled="isSearchAdvanced" data-cy="btn-search"+ aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </fieldset>++ <div v-if="isSearchAdvanced">+ <textarea aria-label="field" v-model="queryParams.queryExp"+ @keydown.native.enter="onAdvancedQueryEnter" ref="queryExp"+ placeholder="subscribers.name LIKE '%user%' or subscribers.status='blocklisted'" data-cy="query" />+ <span class="text-light text-7">+ {{ $t('subscribers.advancedQueryHelp') }}.{{ ' ' }}+ <a href="https://listmonk.app/docs/querying-and-segmentation" target="_blank"+ rel="noopener noreferrer">+ {{ $t('globals.buttons.learnMore') }}.+ </a>+ </span>+ <div class="hstack">+ <button type="submit" data-variant="primary" data-cy="btn-query">+ {{+ $t('subscribers.query') }}+ </button>+ <button type="button" @click.prevent="toggleAdvancedSearch" icon-left="cancel"+ data-cy="btn-query-reset">+ {{ $t('subscribers.reset') }}+ </button>+ </div>+ </div><!-- advanced query -->+ </div>+ </form>+ <div v-if="!isSearchAdvanced" class="toggle-advanced">+ <a href="#" @click.prevent="toggleAdvancedSearch" data-cy="btn-advanced-search">+ <oat-icon icon="cog-outline" />+ {{ $t('subscribers.advancedQuery') }}+ </a></div>- </form>- <div v-if="!isSearchAdvanced" class="toggle-advanced">- <a href="#" @click.prevent="toggleAdvancedSearch" data-cy="btn-advanced-search">- <b-icon icon="cog-outline" size="is-small" />- {{ $t('subscribers.advancedQuery') }}+ </div><!-- search -->+ </div>+ </section><!-- control -->++ <br />+ <oat-data-table :data="subscribers.results ?? []" :loading="loading.subscribers" @check-all="onTableCheck"+ @check="onTableCheck" :checked-rows.sync="bulk.checked" paginated backend-pagination @page-change="onPageChange"+ :current-page="queryParams.page" :per-page="subscribers.perPage" :total="subscribers.total" checkable+ backend-sorting @sort="onSort">+ <template #top-left>+ <div class="actions">+ <a class="a" href="#" @click.prevent="exportSubscribers" data-cy="btn-export-subscribers">+ <oat-icon icon="cloud-download-outline" />+ {{ $t('subscribers.export') }}</a>+ <template v-if="bulk.checked.length > 0">+ <a class="a" href="#" @click.prevent="showBulkListForm" data-cy="btn-manage-lists">+ <oat-icon icon="format-list-bulleted-square" /> Manage lists+ </a>+ <a class="a" href="#" @click.prevent="deleteSubscribers" data-cy="btn-delete-subscribers">+ <oat-icon icon="trash-can-outline" /> Delete+ </a>+ <a class="a" href="#" @click.prevent="blocklistSubscribers" data-cy="btn-manage-blocklist">+ <oat-icon icon="account-off-outline" /> Blocklist+ </a>+ <span class="a">+ {{ $t('globals.messages.numSelected', { num: numSelectedSubscribers }) }}+ <span v-if="!bulk.all && subscribers.total > subscribers.perPage">+ —+ <a href="#" @click.prevent="selectAllSubscribers">+ {{ $t('globals.messages.selectAll', { num: subscribers.total }) }}+ </a>+ </span>+ </span>+ </template></div>- </div><!-- search -->- </div>- </section><!-- control -->-- <br />- <b-table :data="subscribers.results ?? []" :loading="loading.subscribers" @check-all="onTableCheck"- @check="onTableCheck" :checked-rows.sync="bulk.checked" paginated backend-pagination pagination-position="both"- @page-change="onPageChange" :current-page="queryParams.page" :per-page="subscribers.perPage"- :total="subscribers.total" hoverable checkable backend-sorting @sort="onSort">- <template #top-left>- <div class="actions">- <a class="a" href="#" @click.prevent="exportSubscribers" data-cy="btn-export-subscribers">- <b-icon icon="cloud-download-outline" size="is-small" />- {{ $t('subscribers.export') }}+ </template>++ <oat-table-column v-slot="props" field="email" :label="$t('subscribers.email')" header-class="cy-email" sortable+ :td-attrs="$utils.tdID">+ <a :href="`/subscribers/${props.row.id}`" @click.prevent="showEditForm(props.row)"+ :class="{ 'blocklisted': props.row.status === 'blocklisted' }">+ {{ props.row.email }}+ <copy-text :text="`${props.row.email}`" hide-text /></a>- <template v-if="bulk.checked.length > 0">- <a class="a" href="#" @click.prevent="showBulkListForm" data-cy="btn-manage-lists">- <b-icon icon="format-list-bulleted-square" size="is-small" /> Manage lists+ <oat-badge v-if="props.row.status !== 'enabled'" :type="props.row.status" data-cy="blocklisted">+ {{ $t(`subscribers.status.${props.row.status}`) }}+ </oat-badge>+ <span class="badge-list hstack gap-1">+ <template v-for="l in (props.row.lists || [])">+ <router-link :to="`/subscribers/lists/${l.id}`" :key="l.id" style="padding-right:0.5em;">+ <oat-badge :type="l.subscriptionStatus" :key="l.id">+ {{ l.name }}+ <sup v-if="l.optin === 'double' || l.subscriptionStatus == 'unsubscribed'">+ {{ $t(`subscribers.status.${l.subscriptionStatus}`) }}+ </sup>+ </oat-badge>+ </router-link>+ </template>+ </span>+ </oat-table-column>++ <oat-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" header-class="cy-name"+ sortable>+ <a :href="`/subscribers/${props.row.id}`" @click.prevent="showEditForm(props.row)"+ :class="{ 'blocklisted': props.row.status === 'blocklisted' }">+ {{ props.row.name }}+ <copy-text :text="`${props.row.name}`" hide-text />+ </a>+ </oat-table-column>++ <oat-table-column v-slot="props" field="lists" :label="$t('globals.terms.lists')" header-class="cy-lists"+ centered>+ {{ listCount(props.row.lists || []) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"+ header-class="cy-created_at" sortable>+ {{ $utils.niceDate(props.row.createdAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"+ header-class="cy-updated_at" sortable>+ {{ $utils.niceDate(props.row.updatedAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions" align="right">+ <div>+ <a :href="`/api/subscribers/${props.row.id}/export`" data-cy="btn-download"+ :aria-label="$t('subscribers.downloadData')">++ <oat-icon icon="cloud-download-outline" />+</a>- <a class="a" href="#" @click.prevent="deleteSubscribers" data-cy="btn-delete-subscribers">- <b-icon icon="trash-can-outline" size="is-small" /> Delete+ <a v-if="$can('subscribers:manage')" :href="`/subscribers/${props.row.id}`"+ @click.prevent="showEditForm(props.row)" data-cy="btn-edit" :aria-label="$t('globals.buttons.edit')">++ <oat-icon icon="pencil-outline" />+</a>- <a class="a" href="#" @click.prevent="blocklistSubscribers" data-cy="btn-manage-blocklist">- <b-icon icon="account-off-outline" size="is-small" /> Blocklist+ <a v-if="$can('subscribers:manage')" href="#" @click.prevent="deleteSubscriber(props.row)"+ data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />+</a>- <span class="a">- {{ $t('globals.messages.numSelected', { num: numSelectedSubscribers }) }}- <span v-if="!bulk.all && subscribers.total > subscribers.perPage">- —- <a href="#" @click.prevent="selectAllSubscribers">- {{ $t('globals.messages.selectAll', { num: subscribers.total }) }}- </a>- </span>- </span>- </template>- </div>- </template>-- <b-table-column v-slot="props" field="email" :label="$t('subscribers.email')" header-class="cy-email" sortable- :td-attrs="$utils.tdID">- <a :href="`/subscribers/${props.row.id}`" @click.prevent="showEditForm(props.row)"- :class="{ 'blocklisted': props.row.status === 'blocklisted' }">- {{ props.row.email }}- <copy-text :text="`${props.row.email}`" hide-text />- </a>- <b-tag v-if="props.row.status !== 'enabled'" :class="props.row.status" data-cy="blocklisted">- {{ $t(`subscribers.status.${props.row.status}`) }}- </b-tag>- <b-taglist>- <template v-for="l in props.row.lists">- <router-link :to="`/subscribers/lists/${l.id}`" :key="l.id" style="padding-right:0.5em;">- <b-tag :class="l.subscriptionStatus" size="is-small" :key="l.id">- {{ l.name }}- <sup v-if="l.optin === 'double' || l.subscriptionStatus == 'unsubscribed'">- {{ $t(`subscribers.status.${l.subscriptionStatus}`) }}- </sup>- </b-tag>- </router-link>- </template>- </b-taglist>- </b-table-column>-- <b-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" header-class="cy-name" sortable>- <a :href="`/subscribers/${props.row.id}`" @click.prevent="showEditForm(props.row)"- :class="{ 'blocklisted': props.row.status === 'blocklisted' }">- {{ props.row.name }}- <copy-text :text="`${props.row.name}`" hide-text />- </a>- </b-table-column>-- <b-table-column v-slot="props" field="lists" :label="$t('globals.terms.lists')" header-class="cy-lists" centered>- {{ listCount(props.row.lists) }}- </b-table-column>-- <b-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"- header-class="cy-created_at" sortable>- {{ $utils.niceDate(props.row.createdAt) }}- </b-table-column>-- <b-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"- header-class="cy-updated_at" sortable>- {{ $utils.niceDate(props.row.updatedAt) }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" align="right">- <div>- <a :href="`/api/subscribers/${props.row.id}/export`" data-cy="btn-download"- :aria-label="$t('subscribers.downloadData')">- <b-tooltip :label="$t('subscribers.downloadData')" type="is-dark">- <b-icon icon="cloud-download-outline" size="is-small" />- </b-tooltip>- </a>- <a v-if="$can('subscribers:manage')" :href="`/subscribers/${props.row.id}`"- @click.prevent="showEditForm(props.row)" data-cy="btn-edit" :aria-label="$t('globals.buttons.edit')">- <b-tooltip :label="$t('globals.buttons.edit')" type="is-dark">- <b-icon icon="pencil-outline" size="is-small" />- </b-tooltip>- </a>- <a v-if="$can('subscribers:manage')" href="#" @click.prevent="deleteSubscriber(props.row)"- data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>- </a>- </div>- </b-table-column>-- <template #empty v-if="!loading.subscribers">- <empty-placeholder />- </template>- </b-table>-- <!-- Manage list modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isBulkListFormVisible" :width="500" class="has-overflow">- <subscriber-bulk-list :num-subscribers="this.numSelectedSubscribers" @finished="bulkChangeLists" />- </b-modal>-- <!-- Add / edit form modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="850" @close="onFormClose">- <subscriber-form :data="curItem" :is-editing="isEditing" @finished="querySubscribers" />- </b-modal>+ </div>+ </oat-table-column>++ <template #empty v-if="!loading.subscribers">+ <empty-placeholder />+ </template>+ </oat-data-table>++ <!-- Manage list modal -->+ <oat-modal :active.sync="isBulkListFormVisible" :width="500" class="has-overflow">+ <subscriber-bulk-list :num-subscribers="this.numSelectedSubscribers" @finished="bulkChangeLists" />+ </oat-modal>++ <!-- Add / edit form modal -->+ <oat-modal :active.sync="isFormVisible" :width="850" @close="onFormClose">+ <subscriber-form :data="curItem" :is-editing="isEditing" @finished="querySubscribers" />+ </oat-modal>+ </div></section></template>@@ -257,7 +262,9 @@ export default Vue.extend({this.queryParams.queryExp = '';this.queryParams.page = 1;this.querySubscribers();- this.$refs.query.focus();+ if (this.$refs.query) {+ this.$refs.query.focus();+ }return;}@@ -273,7 +280,9 @@ export default Vue.extend({// Toggling to advanced search.this.$nextTick(() => {- this.$refs.queryExp.focus();+ if (this.$refs.queryExp) {+ this.$refs.queryExp.focus();+ }});},diff --git a/frontend/src/views/TemplateForm.vue b/frontend/src/views/TemplateForm.vueindex a10f9433..3b96ad7f 100644--- a/frontend/src/views/TemplateForm.vue+++ b/frontend/src/views/TemplateForm.vue@@ -1,15 +1,15 @@<template><section><form @submit.prevent="onSubmit">- <div class="modal-card content template-modal-content" style="width: auto">- <header class="modal-card-head">- <b-button @click="onTogglePreview" class="is-pulled-right" type="is-primary" icon-left="file-find-outline">+ <div class="dialog-card content template-modal-content" style="width: auto">+ <header class="dialog-head">+ <button type="button" @click="onTogglePreview" class="align-right" data-variant="primary">{{ $t('templates.preview') }} (F9)- </b-button>+ </button><template v-if="isEditing"><h4>{{ data.name }}</h4>- <p class="has-text-grey is-size-7">+ <p class="text-light text-7 ">{{ $t('globals.fields.id') }}: <span data-cy="id"><copy-text :text="`${data.id}`" /></span></p></template>@@ -17,17 +17,17 @@{{ $t('templates.newTemplate') }}</h4></header>- <section expanded class="modal-card-body mb-0 pb-0">- <div class="columns">- <div class="column is-9">- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" :ref="'focus'" v-model="form.name" name="name"- :placeholder="$t('globals.fields.name')" required />- </b-field>+ <section class="dialog-body mb-0 pb-0">+ <div class="row">+ <div class="col-9">+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" :ref="'focus'" v-model="form.name" name="name"+ :placeholder="$t('globals.fields.name')" required>+ </oat-field></div>- <div class="column is-3">- <b-field :label="$t('globals.fields.type')" label-position="on-border">- <b-select v-model="form.type" :disabled="isEditing" expanded>+ <div class="col-3">+ <oat-field :label="$t('globals.fields.type')">+ <select aria-label="field" v-model="form.type" :disabled="isEditing"><option value="campaign">{{ $tc('templates.typeCampaignHTML') }}</option>@@ -37,31 +37,31 @@<option value="tx">{{ $tc('templates.typeTransactional') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div></div>- <div class="columns" v-if="form.type === 'tx'">- <div class="column is-12">- <b-field :label="$t('templates.subject')" label-position="on-border">- <b-input :maxlength="200" :ref="'focus'" v-model="form.subject" name="name"- :placeholder="$t('templates.subject')" required />- </b-field>+ <div class="row" v-if="form.type === 'tx'">+ <div class="col-12">+ <oat-field :label="$t('templates.subject')">+ <input aria-label="field" :maxlength="200" :ref="'focus'" v-model="form.subject" name="name"+ :placeholder="$t('templates.subject')" required>+ </oat-field></div></div><template v-if="form.body !== null">- <b-field v-if="form.type === 'campaign_visual'" label-position="on-border" class="mb-1">+ <oat-field v-if="form.type === 'campaign_visual'" class="mb-1"><visual-editor v-if="form.type === 'campaign_visual'" name="body" :source="form.bodySource"@change="onChangeVisualEditor" height="70vh" />- </b-field>+ </oat-field>- <b-field v-else :label="$t('templates.rawHTML')" label-position="on-border">+ <oat-field v-else :label="$t('templates.rawHTML')"><code-editor lang="html" v-model="form.body" name="body" />- </b-field>+ </oat-field></template>- <p class="is-size-7">+ <p class="text-7"><template v-if="form.type === 'campaign'">{{ $t('templates.placeholderHelp', { placeholder: egPlaceholder }) }}</template>@@ -70,13 +70,13 @@</a></p></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button v-if="$can('templates:manage')" native-type="submit" type="is-primary" :loading="loading.templates">+ </button>+ <button v-if="$can('templates:manage')" type="submit" data-variant="primary" :loading="loading.templates">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>diff --git a/frontend/src/views/Templates.vue b/frontend/src/views/Templates.vueindex 50c6a3d8..30f5532c 100644--- a/frontend/src/views/Templates.vue+++ b/frontend/src/views/Templates.vue@@ -1,117 +1,120 @@<template><section class="templates">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t('globals.terms.templates') }}<span v-if="templates.length > 0">({{ templates.length }})</span></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('templates:manage')" expanded>- <b-button expanded type="is-primary" icon-left="plus" class="btn-new" @click="showNewForm">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('templates:manage')">+ <button type="button" data-variant="primary" class="btn-new" @click="showNewForm">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <b-table :data="templates" :hoverable="true" :loading="loading.templates" default-sort="createdAt">- <b-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" :td-attrs="$utils.tdID" sortable>- <a href="#" @click.prevent="showEditForm(props.row)">- {{ props.row.name }}- </a>- <b-tag v-if="props.row.isDefault">- {{ $t('templates.default') }}- </b-tag>-- <p class="is-size-7 has-text-grey" v-if="props.row.type === 'tx'">- {{ props.row.subject }}- </p>- </b-table-column>-- <b-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" sortable>- <b-tag v-if="props.row.type === 'campaign'" :class="props.row.type" :data-cy="`type-${props.row.type}`">- {{ $tc('templates.typeCampaignHTML') }}- </b-tag>- <b-tag v-else-if="props.row.type === 'campaign_visual'" :class="props.row.type"- :data-cy="`type-${props.row.type}`">- {{ $tc('templates.typeCampaignVisual') }}- </b-tag>- <b-tag v-else :class="props.row.type" :data-cy="`type-${props.row.type}`">- {{ $tc('templates.typeTransactional') }}- </b-tag>- </b-table-column>-- <b-table-column v-slot="props" field="id" :label="$t('globals.fields.id')" sortable>- {{ props.row.id }}- </b-table-column>-- <b-table-column v-slot="props" field="createdAt" :label="$t('globals.fields.createdAt')" sortable>- {{ $utils.niceDate(props.row.createdAt) }}- </b-table-column>-- <b-table-column v-slot="props" field="updatedAt" :label="$t('globals.fields.updatedAt')" sortable>- {{ $utils.niceDate(props.row.updatedAt) }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" align="right">- <div>- <a href="#" @click.prevent="previewTemplate(props.row)" data-cy="btn-preview"- :aria-label="$t('templates.preview')">- <b-tooltip :label="$t('templates.preview')" type="is-dark">- <b-icon icon="file-find-outline" size="is-small" />- </b-tooltip>+ <div class="card page-content">+ <oat-data-table :data="templates" :hoverable="true" :loading="loading.templates" default-sort="createdAt">+ <oat-table-column v-slot="props" field="name" :label="$t('globals.fields.name')" :td-attrs="$utils.tdID"+ sortable>+ <a href="#" @click.prevent="showEditForm(props.row)">+ {{ props.row.name }}</a>- <a href="#" @click.prevent="showEditForm(props.row)" data-cy="btn-edit"- :aria-label="$t('globals.buttons.edit')">- <b-tooltip :label="$t('globals.buttons.edit')" type="is-dark">- <b-icon icon="pencil-outline" size="is-small" />- </b-tooltip>- </a>- <a href="#" @click.prevent="$utils.prompt(`Clone template`,- { placeholder: 'Name', value: `Copy of ${props.row.name}` },- (name) => cloneTemplate(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">- <b-tooltip :label="$t('globals.buttons.clone')" type="is-dark">- <b-icon icon="file-multiple-outline" size="is-small" />- </b-tooltip>- </a>- <a v-if="!props.row.isDefault && props.row.type === 'campaign'" href="#"- @click.prevent="$utils.confirm(null, () => makeTemplateDefault(props.row))" data-cy="btn-set-default"- :aria-label="$t('templates.makeDefault')">- <b-tooltip :label="$t('templates.makeDefault')" type="is-dark">- <b-icon icon="check-circle-outline" size="is-small" />- </b-tooltip>- </a>- <span v-else class="a has-text-grey-light">- <b-icon icon="check-circle-outline" size="is-small" />+ <span v-if="props.row.isDefault" class="badge secondary">+ {{ $t('templates.default') }}</span>- <a v-if="!props.row.isDefault" href="#" @click.prevent="$utils.confirm(null, () => deleteTemplate(props.row))"- data-cy="btn-delete" :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>- </a>- <span v-else class="a has-text-grey-light">- <b-icon icon="trash-can-outline" size="is-small" />- </span>- </div>- </b-table-column>-- <template #empty v-if="!loading.templates">- <empty-placeholder />- </template>- </b-table>-- <!-- Add / edit form modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="1200" :can-cancel="false"- class="template-modal">- <template-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />- </b-modal>-- <campaign-preview v-if="previewItem" type="template" :id="previewItem.id" :template-type="previewItem.type"- :title="previewItem.name" @close="closePreview" />+ <p class="text-light text-7" v-if="props.row.type === 'tx'">+ {{ props.row.subject }}+ </p>+ </oat-table-column>++ <oat-table-column v-slot="props" field="type" :label="$t('globals.fields.type')" sortable>+ <oat-badge v-if="props.row.type === 'campaign'" :type="props.row.type" :data-cy="`type-${props.row.type}`">+ {{ $tc('templates.typeCampaignHTML') }}+ </oat-badge>+ <oat-badge v-else-if="props.row.type === 'campaign_visual'" :type="props.row.type"+ :data-cy="`type-${props.row.type}`">+ {{ $tc('templates.typeCampaignVisual') }}+ </oat-badge>+ <oat-badge v-else :type="props.row.type" :data-cy="`type-${props.row.type}`">+ {{ $tc('templates.typeTransactional') }}+ </oat-badge>+ </oat-table-column>++ <oat-table-column v-slot="props" field="id" :label="$t('globals.fields.id')" sortable>+ {{ props.row.id }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="createdAt" :label="$t('globals.fields.createdAt')" sortable>+ {{ $utils.niceDate(props.row.createdAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="updatedAt" :label="$t('globals.fields.updatedAt')" sortable>+ {{ $utils.niceDate(props.row.updatedAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions" align="right">+ <div>+ <a href="#" @click.prevent="previewTemplate(props.row)" data-cy="btn-preview"+ :aria-label="$t('templates.preview')">++ <oat-icon icon="file-find-outline" />++ </a>+ <a href="#" @click.prevent="showEditForm(props.row)" data-cy="btn-edit"+ :aria-label="$t('globals.buttons.edit')">++ <oat-icon icon="pencil-outline" />++ </a>+ <a href="#" @click.prevent="$utils.prompt(`Clone template`,+ { placeholder: 'Name', value: `Copy of ${props.row.name}` },+ (name) => cloneTemplate(name, props.row))" data-cy="btn-clone" :aria-label="$t('globals.buttons.clone')">++ <oat-icon icon="file-multiple-outline" />++ </a>+ <a v-if="!props.row.isDefault && props.row.type === 'campaign'" href="#"+ @click.prevent="$utils.confirm(null, () => makeTemplateDefault(props.row))" data-cy="btn-set-default"+ :aria-label="$t('templates.makeDefault')">++ <oat-icon icon="check-circle-outline" />++ </a>+ <span v-else class="a text-lighter">+ <oat-icon icon="check-circle-outline" />+ </span>++ <a v-if="!props.row.isDefault" href="#"+ @click.prevent="$utils.confirm(null, () => deleteTemplate(props.row))" data-cy="btn-delete"+ :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />++ </a>+ <span v-else class="a text-lighter">+ <oat-icon icon="trash-can-outline" />+ </span>+ </div>+ </oat-table-column>++ <template #empty v-if="!loading.templates">+ <empty-placeholder />+ </template>+ </oat-data-table>++ <!-- Add / edit form modal -->+ <oat-modal :active.sync="isFormVisible" :width="1200" :can-cancel="false" class="template-modal">+ <template-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />+ </oat-modal>++ <campaign-preview v-if="previewItem" type="template" :id="previewItem.id" :template-type="previewItem.type"+ :title="previewItem.name" @close="closePreview" />+ </div></section></template>diff --git a/frontend/src/views/UserForm.vue b/frontend/src/views/UserForm.vueindex e134dabf..87623ab3 100644--- a/frontend/src/views/UserForm.vue+++ b/frontend/src/views/UserForm.vue@@ -1,8 +1,8 @@<template><form @submit.prevent="onSubmit">- <div class="modal-card content" style="width: auto">- <header class="modal-card-head">- <p v-if="isEditing" class="has-text-grey-light is-size-7">+ <div class="dialog-card content" style="width: auto">+ <header class="dialog-head">+ <p v-if="isEditing" class="text-lighter text-7 ">{{ $t('globals.fields.id') }}: <copy-text :text="`${data.id}`" /></p><h4 v-if="isEditing">@@ -12,98 +12,99 @@{{ $t('users.newUser') }}</h4></header>- <section expanded class="modal-card-body">- <div class="columns">- <div class="column is-6">- <b-field label-position="on-border" class="mb-6">- <b-radio-button v-model="form.type" name="type" native-value="user" :disabled="isEditing" expanded- type="is-light is-outlined">- <b-icon icon="account-outline" />+ <section class="dialog-body">+ <div class="row">+ <div class="col-6">+ <oat-field class="mb-6">+ <oat-radio v-model="form.type" name="type" native-value="user" :disabled="isEditing">+ <oat-icon icon="account-outline" />{{ $t('users.type.user') }}- </b-radio-button>- <b-radio-button v-model="form.type" name="type" native-value="api" :disabled="isEditing" expanded- type="is-light is-outlined">- <b-icon icon="code" />+ </oat-radio>+ <oat-radio v-model="form.type" name="type" native-value="api" :disabled="isEditing">+ <oat-icon icon="code" />{{ $t('users.type.api') }}- </b-radio-button>- </b-field>+ </oat-radio>+ </oat-field></div>- <div class="column is-6">- <b-field :label="$t('globals.fields.status')" label-position="on-border">- <b-select v-model="form.status" name="status" required expanded>+ <div class="col-6">+ <oat-field :label="$t('globals.fields.status')">+ <select aria-label="field" v-model="form.status" name="status" required><option value="enabled">{{ $t('users.status.enabled') }}</option><option value="disabled">{{ $t('users.status.disabled') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div></div>- <b-field :label="$t('users.username')" label-position="on-border">- <b-input :maxlength="200" v-model="form.username" name="username" ref="focus" autofocus+ <oat-field :label="$t('users.username')">+ <input aria-label="field" :maxlength="200" v-model="form.username" name="username" ref="focus":placeholder="$t('users.username')" required :message="$t('users.usernameHelp')" autocomplete="off"- pattern="[a-zA-Z0-9_\-\.@]+$" />- </b-field>+ pattern="[a-zA-Z0-9_\-\.@]+$">+ </oat-field>- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" v-model="form.name" name="name" :placeholder="$t('globals.fields.name')" />- </b-field>+ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" v-model="form.name" name="name"+ :placeholder="$t('globals.fields.name')">+ </oat-field>- <b-field v-if="form.type !== 'api'" :label="$t('subscribers.email')" label-position="on-border">- <b-input :maxlength="200" v-model="form.email" name="email" :placeholder="$t('subscribers.email')" required />- </b-field>+ <oat-field v-if="form.type !== 'api'" :label="$t('subscribers.email')">+ <input aria-label="field" :maxlength="200" v-model="form.email" name="email"+ :placeholder="$t('subscribers.email')" required>+ </oat-field><template v-if="form.type !== 'api'">- <div class="box">- <b-field>- <b-checkbox v-model="form.passwordLogin" :native-value="true" name="password_login">+ <div class="card">+ <oat-field>+ <oat-checkbox v-model="form.passwordLogin" :native-value="true" name="password_login">{{ $t('users.passwordEnable') }}- </b-checkbox>- </b-field>-- <div class="columns">- <div class="column is-6">- <b-field :label="$t('users.password')" label-position="on-border">- <b-input :disabled="!form.passwordLogin" minlength="8" :maxlength="200" v-model="form.password"- type="password" name="password" :placeholder="$t('users.password')"- :required="form.passwordLogin && !isEditing" />- </b-field>+ </oat-checkbox>+ </oat-field>++ <div class="row">+ <div class="col-6">+ <oat-field :label="$t('users.password')">+ <input aria-label="field" :disabled="!form.passwordLogin" minlength="8" :maxlength="200"+ v-model="form.password" type="password" name="password" :placeholder="$t('users.password')"+ :required="form.passwordLogin && !isEditing">+ </oat-field></div>- <div class="column is-6">- <b-field :label="$t('users.passwordRepeat')" label-position="on-border">- <b-input :disabled="!form.passwordLogin" minlength="8" :maxlength="200" v-model="form.password2"- type="password" name="password2" :required="form.passwordLogin && !isEditing && form.password" />- </b-field>+ <div class="col-6">+ <oat-field :label="$t('users.passwordRepeat')">+ <input aria-label="field" :disabled="!form.passwordLogin" minlength="8" :maxlength="200"+ v-model="form.password2" type="password" name="password2"+ :required="form.passwordLogin && !isEditing && form.password">+ </oat-field></div></div></div></template><h5>{{ $tc('users.roles') }}</h5>- <div class="box">- <div class="columns">- <div class="column is-6">- <b-field :label="$tc('users.userRole')" label-position="on-border">- <b-select v-model="form.userRoleId" name="user_role" required expanded>+ <div class="card">+ <div class="row">+ <div class="col-6">+ <oat-field :label="$tc('users.userRole')">+ <select aria-label="field" v-model="form.userRoleId" name="user_role" required><option v-for="r in userRoles" :value="r.id" :key="r.id">{{ r.name }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div>- <div class="column is-6">- <b-field :label="$tc('users.listRole', 0)" label-position="on-border">- <b-select v-model="form.listRoleId" name="list_role" expanded>+ <div class="col-6">+ <oat-field :label="$tc('users.listRole', 0)">+ <select aria-label="field" v-model="form.listRoleId" name="list_role"><option value="">— {{ $t("globals.terms.none") }} —</option><option v-for="r in listRoles" :value="r.id" :key="r.id">{{ r.name }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div></div></div>@@ -113,14 +114,14 @@<copy-text :text="apiToken" /></div></section>- <footer class="modal-card-foot has-text-right">- <b-button @click="$parent.close()">+ <footer class="dialog-foot align-right">+ <button type="button" class="outline" @click="$parent.close()">{{ $t('globals.buttons.close') }}- </b-button>- <b-button v-if="$can('users:manage') && !apiToken" native-type="submit" type="is-primary"- :loading="loading.lists" data-cy="btn-save">+ </button>+ <button v-if="$can('users:manage') && !apiToken" type="submit" data-variant="primary" :loading="loading.lists"+ data-cy="btn-save">{{ $t('globals.buttons.save') }}- </b-button>+ </button></footer></div></form>@@ -168,7 +169,7 @@ export default Vue.extend({if (this.isEditing) {if (this.form.type !== 'api' && this.form.passwordLogin && this.form.password && this.form.password !== this.form.password2) {- this.$utils.toast(this.$t('users.passwordMismatch'), 'is-danger');+ this.$utils.toast(this.$t('users.passwordMismatch'), '');return;}@@ -177,7 +178,7 @@ export default Vue.extend({}if (this.form.type !== 'api' && this.form.passwordLogin && this.form.password !== this.form.password2) {- this.$utils.toast(this.$t('users.passwordMismatch'), 'is-danger');+ this.$utils.toast(this.$t('users.passwordMismatch'), '');return;}diff --git a/frontend/src/views/UserProfile.vue b/frontend/src/views/UserProfile.vueindex e0b5c71d..c3aabd8f 100644--- a/frontend/src/views/UserProfile.vue+++ b/frontend/src/views/UserProfile.vue@@ -1,125 +1,131 @@<template>- <section class="user-profile section-mini">- <b-loading v-if="loading.users" :active="loading.users" :is-full-page="false" />-- <h1 class="title">- @{{ data.username }}- </h1>- <b-tag v-if="data.userRole">{{ data.userRole.name }}</b-tag>-- <br /><br /><br />- <form @submit.prevent="onSubmit">- <b-field v-if="data.type !== 'api'" :label="$t('subscribers.email')" label-position="on-border">- <b-input :maxlength="200" v-model="form.email" name="email" :placeholder="$t('subscribers.email')"- :disabled="!data.passwordLogin" required autofocus />- </b-field>-- <b-field :label="$t('globals.fields.name')" label-position="on-border">- <b-input :maxlength="200" v-model="form.name" name="name" :placeholder="$t('globals.fields.name')" />- </b-field>-- <div v-if="data.passwordLogin" class="columns">- <div class="column is-6">- <b-field :label="$t('users.password')" label-position="on-border">- <b-input minlength="8" :maxlength="200" v-model="form.password" type="password" name="password"- :placeholder="$t('users.password')" />- </b-field>- </div>- <div class="column is-6">- <b-field :label="$t('users.passwordRepeat')" label-position="on-border">- <b-input minlength="8" :maxlength="200" v-model="form.password2" type="password" name="password2" />- </b-field>- </div>+ <section class="user-profile">+ <header class="row page-header">+ <div class="col-8">+ <h1>+ @{{ data.username }}+ </h1>+ <span v-if="data.userRole" class="badge">{{ data.userRole.name }}</span></div>-- <b-field expanded>- <b-button type="is-primary" icon-left="content-save-outline" native-type="submit" data-cy="btn-save">- {{ $t('globals.buttons.save') }}- </b-button>- </b-field>- </form>-- <br /><br />-- <!-- 2FA -->- <section v-if="this.data.passwordLogin" class="twofa-section">- <!-- TOTP disabled -->- <div v-if="data.twofaType === 'none'" class="box">- <div class="columns is-vcentered mb-4">- <div class="column">- <h3 class="title is-size-5 mb-0">{{ $t('users.twoFA') }}</h3>+ </header>++ <div class="card page-content" :aria-busy="loading.users ? 'true' : null" data-spinner="large overlay">+ <form @submit.prevent="onSubmit">+ <oat-field v-if="data.type !== 'api'" :label="$t('subscribers.email')">+ <input aria-label="field" :maxlength="200" v-model="form.email" name="email"+ :placeholder="$t('subscribers.email')" :disabled="!data.passwordLogin" required>+ </oat-field>++ <oat-field :label="$t('globals.fields.name')">+ <input aria-label="field" :maxlength="200" v-model="form.name" name="name"+ :placeholder="$t('globals.fields.name')">+ </oat-field>++ <div v-if="data.passwordLogin" class="row">+ <div class="col-6">+ <oat-field :label="$t('users.password')">+ <input aria-label="field" minlength="8" :maxlength="200" v-model="form.password" type="password"+ name="password" :placeholder="$t('users.password')">+ </oat-field></div>- <div class="column is-narrow">- <b-switch v-if="!isTotpVisible" v-model="twofaEnabled" @input="onToggleEnableTotp" />+ <div class="col-6">+ <oat-field :label="$t('users.passwordRepeat')">+ <input aria-label="field" minlength="8" :maxlength="200" v-model="form.password2" type="password"+ name="password2">+ </oat-field></div></div>- <p>{{ $t('users.twoFANotEnabled') }}</p>- <br />-- <!-- TOTP setup -->- <div v-if="isTotpVisible" class="totp-setup">- <div v-if="totpQR" class="qr-section">- <p class="has-text-grey">{{ $t('users.totpScanQR') }}</p><br />-- <img :src="'data:image/png;base64,' + totpQR" alt="QR Code" />-- <br /><br />- <p>- <strong>{{ $t('users.totpSecret') }}</strong><br />- <code><copy-text :text="`${totpSecret}`" /></code>- </p>-- <br /><br />- <form @submit.prevent="confirmTOTP">- <b-field :label="$t('users.totpCode')" label-position="on-border">- <b-input ref="totpCodeInput" v-model="totpCode" maxlength="6" pattern="[0-9]{6}" placeholder="000000"- required />- </b-field>- <div class="buttons">- <b-button type="is-primary" native-type="submit">- {{ $t('globals.buttons.enable') }}- </b-button>- <b-button type="button" @click="onCancelTOTPSetup">- {{ $t('globals.buttons.cancel') }}- </b-button>- </div>- </form>+ <oat-field>+ <button data-variant="primary" type="submit" data-cy="btn-save">+ {{ $t('globals.buttons.save') }}+ </button>+ </oat-field>+ </form>++ <br /><br />++ <!-- 2FA -->+ <section v-if="this.data.passwordLogin" class="twofa-app-section">+ <!-- TOTP disabled -->+ <div v-if="data.twofaType === 'none'" class="card">+ <div class="row mb-4">+ <div class="col-12">+ <h3 class="mb-0">{{ $t('users.twoFA') }}</h3>+ </div>+ <div class="col-2">+ <oat-switch v-if="!isTotpVisible" v-model="twofaEnabled" @input="onToggleEnableTotp" />+ </div></div>- </div>- </div>- <!-- TOTP Enabled -->- <div v-if="data.twofaType === 'totp'" class="box">- <div class="columns is-vcentered">- <div class="column">- <h3 class="title is-size-5">- <b-icon icon="check-circle-outline" type="is-success" /> {{ $t('users.twoFAEnabled') }}- </h3>- </div>- <div class="column is-narrow">- <b-switch v-if="!showDisableTOTP" v-model="twofaEnabled" @input="toggleDisableTOTP" />+ <p>{{ $t('users.twoFANotEnabled') }}</p>+ <br />++ <!-- TOTP setup -->+ <div v-if="isTotpVisible" class="totp-setup">+ <div v-if="totpQR" class="qr-app-section">+ <p class="text-light text-7">{{ $t('users.totpScanQR') }}</p><br />++ <img :src="'data:image/png;base64,' + totpQR" alt="QR Code" />++ <br /><br />+ <p>+ <strong>{{ $t('users.totpSecret') }}</strong><br />+ <code><copy-text :text="`${totpSecret}`" /></code>+ </p>++ <br /><br />+ <form @submit.prevent="confirmTOTP">+ <oat-field :label="$t('users.totpCode')">+ <input aria-label="field" ref="totpCodeInput" v-model="totpCode" maxlength="6" pattern="[0-9]{6}"+ placeholder="000000" required>+ </oat-field>+ <div class="hstack">+ <button data-variant="primary" type="submit">+ {{ $t('globals.buttons.enable') }}+ </button>+ <button type="button" @click="onCancelTOTPSetup">+ {{ $t('globals.buttons.cancel') }}+ </button>+ </div>+ </form>+ </div></div></div>- <p>{{ $t('users.twoFAEnabledDesc', { type: data.twofaType.toUpperCase() }) }}</p>-- <!-- Disable TOTP Flow -->- <form v-if="showDisableTOTP" class="disable-totp mt-5" @submit.prevent="confirmDisableTOTP">- <b-field :label="$t('users.password')" label-position="on-border">- <b-input ref="disablePasswordInput" v-model="disableTOTPPassword" type="password" minlength="8" required />- </b-field>- <div class="buttons">- <b-button type="is-danger" native-type="submit">- {{ $t('globals.buttons.disable') }}- </b-button>- <b-button type="button" @click="onCancelTOTPSetup">- {{ $t('globals.buttons.cancel') }}- </b-button>+ <!-- TOTP Enabled -->+ <div v-if="data.twofaType === 'totp'" class="card">+ <div class="row">+ <div class="col-12">+ <h3>+ <oat-icon icon="check-circle-outline" data-variant="primary" /> {{ $t('users.twoFAEnabled') }}+ </h3>+ </div>+ <div class="col-2">+ <oat-switch v-if="!showDisableTOTP" v-model="twofaEnabled" @input="toggleDisableTOTP" />+ </div></div>- </form>- </div>- </section>++ <p>{{ $t('users.twoFAEnabledDesc', { type: data.twofaType.toUpperCase() }) }}</p>++ <!-- Disable TOTP Flow -->+ <form v-if="showDisableTOTP" class="disable-totp mt-5" @submit.prevent="confirmDisableTOTP">+ <oat-field :label="$t('users.password')">+ <input aria-label="field" ref="disablePasswordInput" v-model="disableTOTPPassword" type="password"+ minlength="8" required>+ </oat-field>+ <div class="hstack">+ <button data-variant="danger" type="submit">+ {{ $t('globals.buttons.disable') }}+ </button>+ <button type="button" @click="onCancelTOTPSetup">+ {{ $t('globals.buttons.cancel') }}+ </button>+ </div>+ </form>+ </div>+ </section>+ </div></section></template>@@ -158,7 +164,7 @@ export default Vue.extend({if (this.data.passwordLogin && this.form.password) {if (this.form.password !== this.form.password2) {- this.$utils.toast(this.$t('users.passwordMismatch'), 'is-danger');+ this.$utils.toast(this.$t('users.passwordMismatch'), '');return;}@@ -185,7 +191,7 @@ export default Vue.extend({}});}).catch(() => {- this.$utils.toast(this.$t('globals.messages.errorFetching'), 'is-danger');+ this.$utils.toast(this.$t('globals.messages.errorFetching'), '');});},@@ -201,7 +207,7 @@ export default Vue.extend({confirmTOTP() {if (!this.totpCode || this.totpCode.length !== 6) {- this.$utils.toast(this.$t('globals.messages.invalidValue'), 'is-danger');+ this.$utils.toast(this.$t('globals.messages.invalidValue'), '');return;}@@ -219,7 +225,7 @@ export default Vue.extend({this.twofaEnabled = data.twofaType === 'totp';});}).catch(() => {- this.$utils.toast(this.$t('globals.messages.invalidValue'), 'is-danger');+ this.$utils.toast(this.$t('globals.messages.invalidValue'), '');});},@@ -240,7 +246,7 @@ export default Vue.extend({confirmDisableTOTP() {if (!this.disableTOTPPassword) {- this.$utils.toast(this.$t('globals.messages.invalidFields'), 'is-danger');+ this.$utils.toast(this.$t('globals.messages.invalidFields'), '');return;}@@ -257,7 +263,7 @@ export default Vue.extend({this.twofaEnabled = data.twofaType === 'totp';});}).catch(() => {- this.$utils.toast(this.$t('users.invalidPassword'), 'is-danger');+ this.$utils.toast(this.$t('users.invalidPassword'), '');});},},diff --git a/frontend/src/views/Users.vue b/frontend/src/views/Users.vueindex a250e779..4f2620fd 100644--- a/frontend/src/views/Users.vue+++ b/frontend/src/views/Users.vue@@ -1,130 +1,130 @@<template><section class="users">- <header class="columns page-header">- <div class="column is-10">- <h1 class="title is-4">+ <header class="row page-header">+ <div class="col-8">+ <h1>{{ $t('globals.terms.users') }}<span v-if="!isNaN(users.length)">({{ users.length }})</span></h1></div>- <div class="column has-text-right">- <b-field v-if="$can('users:manage')" expanded>- <b-button expanded type="is-primary" icon-left="plus" class="btn-new" @click="showNewForm" data-cy="btn-new">+ <div class="col-4 col-end align-right">+ <oat-field v-if="$can('users:manage')">+ <button type="button" data-variant="primary" class="btn-new" @click="showNewForm" data-cy="btn-new">{{ $t('globals.buttons.new') }}- </b-button>- </b-field>+ </button>+ </oat-field></div></header>- <b-table :data="users" :loading="loading.users" hoverable checkable :checked-rows.sync="checked"- default-sort="createdAt" backend-sorting @sort="onSort" @check-all="onTableCheck" @check="onTableCheck">- <template #top-left>- <div class="columns">- <div class="column is-6">- <form @submit.prevent="getUsers">- <div>- <b-field>- <b-input v-model="queryParams.query" name="query" expanded icon="magnify" ref="query"- data-cy="query" />- <p class="controls">- <b-button native-type="submit" type="is-primary" icon-left="magnify" data-cy="btn-query" />- </p>- </b-field>- </div>- </form>+ <div class="card page-content">+ <oat-data-table :data="users" :loading="loading.users" checkable :checked-rows.sync="checked"+ default-sort="createdAt" backend-sorting @sort="onSort" @check-all="onTableCheck" @check="onTableCheck">+ <template #top-left>+ <div class="row">+ <div class="col-6">+ <form @submit.prevent="getUsers">+ <fieldset class="group">+ <input aria-label="Search" v-model="queryParams.query" name="query" ref="query" data-cy="query"+ placeholder="Search">+ <button type="submit" data-variant="primary" data-cy="btn-query" aria-label="Search">+ <oat-icon icon="magnify" />+ </button>+ </fieldset>+ </form>+ </div></div>- </div>- </template>-- <b-table-column v-slot="props" field="username" :label="$t('users.username')" header-class="cy-username" sortable- :td-attrs="$utils.tdID">- <a :href="`/users/${props.row.id}`" @click.prevent="showEditForm(props.row)"- :class="{ 'has-text-grey': props.row.status === 'disabled' }">- {{ props.row.username }}- </a>- <b-tag v-if="props.row.status === 'disabled'">- {{ $t(`users.status.${props.row.status}`) }}- </b-tag>- <b-tag v-if="props.row.type === 'api'" class="api">- <b-icon icon="code" />- {{ $t(`users.type.${props.row.type}`) }}- </b-tag>- <div class="has-text-grey is-size-7 mt-2">- {{ props.row.name }}- </div>- </b-table-column>-- <b-table-column v-slot="props" field="status" :label="$tc('users.role')" header-class="cy-status" sortable- :td-attrs="$utils.tdID">- <router-link :to="{ name: 'userRoles' }">- <b-tag :class="props.row.userRole.id === 1 ? 'enabled' : 'primary'">- <b-icon icon="account-outline" />- {{ props.row.userRole.name }}- </b-tag>- </router-link>- <router-link :to="{ name: 'listRoles' }">- <b-tag v-if="props.row.listRole">- <b-icon icon="newspaper-variant-outline" />- {{ props.row.listRole.name }}- </b-tag>- </router-link>- </b-table-column>-- <b-table-column v-slot="props" field="name" :label="$t('subscribers.email')" header-class="cy-name" sortable- :td-attrs="$utils.tdID">- <div>- <a v-if="props.row.email" :href="`/users/${props.row.id}`" @click.prevent="showEditForm(props.row)"- :class="{ 'has-text-grey': props.row.status === 'disabled' }">- {{ props.row.email }}- </a>- <template v-else>- —- </template>- </div>- </b-table-column>-- <b-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"- header-class="cy-created_at" sortable>- {{ $utils.niceDate(props.row.createdAt) }}- </b-table-column>-- <b-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"- header-class="cy-updated_at" sortable>- {{ $utils.niceDate(props.row.updatedAt) }}- </b-table-column>-- <b-table-column v-slot="props" field="last_login" :label="$t('users.lastLogin')" header-class="cy-updated_at"- sortable>- {{ props.row.loggedinAt ? $utils.niceDate(props.row.loggedinAt, true) : '—' }}- </b-table-column>-- <b-table-column v-slot="props" cell-class="actions" align="right">- <div>- <a v-if="$can('users:manage')" href="#" @click.prevent="showEditForm(props.row)" data-cy="btn-edit"- :aria-label="$t('globals.buttons.edit')">- <b-tooltip :label="$t('globals.buttons.edit')" type="is-dark">- <b-icon icon="pencil-outline" size="is-small" />- </b-tooltip>- </a>+ </template>- <a v-if="$can('users:manage')" href="#" @click.prevent="deleteUser(props.row)" data-cy="btn-delete"- :aria-label="$t('globals.buttons.delete')">- <b-tooltip :label="$t('globals.buttons.delete')" type="is-dark">- <b-icon icon="trash-can-outline" size="is-small" />- </b-tooltip>+ <oat-table-column v-slot="props" field="username" :label="$t('users.username')" header-class="cy-username"+ sortable :td-attrs="$utils.tdID">+ <a :href="`/users/${props.row.id}`" @click.prevent="showEditForm(props.row)"+ :class="{ 'text-light': props.row.status === 'disabled' }">+ {{ props.row.username }}</a>- </div>- </b-table-column>-- <template #empty v-if="!loading.users">- <empty-placeholder />- </template>- </b-table>-- <!-- Add / edit form modal -->- <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="600" @close="onFormClose">- <user-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />- </b-modal>+ <oat-badge v-if="props.row.status === 'disabled'" type="disabled">+ {{ $t(`users.status.${props.row.status}`) }}+ </oat-badge>+ <oat-badge v-if="props.row.type === 'api'" type="api">+ <oat-icon icon="code" />+ {{ $t(`users.type.${props.row.type}`) }}+ </oat-badge>+ <div class="text-light text-7 mt-2">+ {{ props.row.name }}+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="status" :label="$tc('users.role')" header-class="cy-status" sortable+ :td-attrs="$utils.tdID">+ <router-link :to="{ name: 'userRoles' }">+ <oat-badge v-if="props.row.userRole" :type="props.row.userRole.id === 1 ? 'enabled' : 'primary'">+ <oat-icon icon="account-outline" />+ {{ props.row.userRole.name }}+ </oat-badge>+ </router-link>+ <router-link :to="{ name: 'listRoles' }">+ <span v-if="props.row.listRole" class="badge secondary">+ <oat-icon icon="newspaper-variant-outline" />+ {{ props.row.listRole.name }}+ </span>+ </router-link>+ </oat-table-column>++ <oat-table-column v-slot="props" field="name" :label="$t('subscribers.email')" header-class="cy-name" sortable+ :td-attrs="$utils.tdID">+ <div>+ <a v-if="props.row.email" :href="`/users/${props.row.id}`" @click.prevent="showEditForm(props.row)"+ :class="{ 'text-light': props.row.status === 'disabled' }">+ {{ props.row.email }}+ </a>+ <template v-else>+ —+ </template>+ </div>+ </oat-table-column>++ <oat-table-column v-slot="props" field="created_at" :label="$t('globals.fields.createdAt')"+ header-class="cy-created_at" sortable>+ {{ $utils.niceDate(props.row.createdAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="updated_at" :label="$t('globals.fields.updatedAt')"+ header-class="cy-updated_at" sortable>+ {{ $utils.niceDate(props.row.updatedAt) }}+ </oat-table-column>++ <oat-table-column v-slot="props" field="last_login" :label="$t('users.lastLogin')" header-class="cy-updated_at"+ sortable>+ {{ props.row.loggedinAt ? $utils.niceDate(props.row.loggedinAt, true) : '—' }}+ </oat-table-column>++ <oat-table-column v-slot="props" cell-class="actions" align="right">+ <div>+ <a v-if="$can('users:manage')" href="#" @click.prevent="showEditForm(props.row)" data-cy="btn-edit"+ :aria-label="$t('globals.buttons.edit')">++ <oat-icon icon="pencil-outline" />++ </a>++ <a v-if="$can('users:manage')" href="#" @click.prevent="deleteUser(props.row)" data-cy="btn-delete"+ :aria-label="$t('globals.buttons.delete')">++ <oat-icon icon="trash-can-outline" />++ </a>+ </div>+ </oat-table-column>++ <template #empty v-if="!loading.users">+ <empty-placeholder />+ </template>+ </oat-data-table>++ <!-- Add / edit form modal -->+ <oat-modal :active.sync="isFormVisible" :width="600" @close="onFormClose">+ <user-form :data="curItem" :is-editing="isEditing" @finished="formFinished" />+ </oat-modal>+ </div></section></template>@@ -166,8 +166,8 @@ export default Vue.extend({onTableCheck() {// Disable bulk.all selection if there are no rows checked in the table.- if (this.bulk.checked.length !== this.subscribers.total) {- this.bulk.all = false;+ if (this.checked.length === 0) {+ this.checked = [];}},diff --git a/frontend/src/views/settings/appearance.vue b/frontend/src/views/settings/appearance.vueindex d48629d6..b54cfac0 100644--- a/frontend/src/views/settings/appearance.vue+++ b/frontend/src/views/settings/appearance.vue@@ -1,36 +1,45 @@<template><div class="items">- <b-tabs :animated="false" v-model="tab">- <b-tab-item :label="$t('settings.appearance.adminName')" label-position="on-border">- <div class="block">+ <ot-tabs ref="appearanceTabs" class="settings-subtabs" @ot-tab-change="tab = $event.detail.index">+ <div role="tablist">+ <button type="button" role="tab" :aria-selected="tab === 0 ? 'true' : 'false'">+ {{ $t('settings.appearance.adminName') }}+ </button>+ <button type="button" role="tab" :aria-selected="tab === 1 ? 'true' : 'false'">+ {{ $t('settings.appearance.publicName') }}+ </button>+ </div>++ <div role="tabpanel">+ <div>{{ $t('settings.appearance.adminHelp') }}</div>- <b-field :label="$t('settings.appearance.customCSS')" label-position="on-border">+ <oat-field :label="$t('settings.appearance.customCSS')"><code-editor lang="css" v-model="data['appearance.admin.custom_css']" name="body" key="editor-admin-css" />- </b-field>+ </oat-field>- <b-field :label="$t('settings.appearance.customJS')" label-position="on-border">+ <oat-field :label="$t('settings.appearance.customJS')"><code-editor lang="javascript" v-model="data['appearance.admin.custom_js']" name="body"key="editor-admin-js" />- </b-field>- </b-tab-item><!-- admin -->+ </oat-field>+ </div>- <b-tab-item :label="$t('settings.appearance.publicName')" label-position="on-border">- <div class="block">+ <div role="tabpanel">+ <div>{{ $t('settings.appearance.publicHelp') }}</div>- <b-field :label="$t('settings.appearance.customCSS')" label-position="on-border">+ <oat-field :label="$t('settings.appearance.customCSS')"><code-editor lang="css" v-model="data['appearance.public.custom_css']" name="body" key="editor-public-css" />- </b-field>+ </oat-field>- <b-field :label="$t('settings.appearance.customJS')" label-position="on-border">+ <oat-field :label="$t('settings.appearance.customJS')"><code-editor lang="javascript" v-model="data['appearance.public.custom_js']" name="body"key="editor-public-js" />- </b-field>- </b-tab-item><!-- public -->- </b-tabs>+ </oat-field>+ </div>+ </ot-tabs></div></template>@@ -59,6 +68,11 @@ export default Vue.extend({mounted() {this.tab = this.$utils.getPref('settings.apperanceTab') || 0;+ this.$nextTick(() => {+ if (this.$refs.appearanceTabs) {+ this.$refs.appearanceTabs.activeIndex = Number(this.tab);+ }+ });},watch: {diff --git a/frontend/src/views/settings/bounces.vue b/frontend/src/views/settings/bounces.vueindex a68d9061..bdd1a145 100644--- a/frontend/src/views/settings/bounces.vue+++ b/frontend/src/views/settings/bounces.vue@@ -1,29 +1,28 @@<template><div>- <div class="columns mb-6">- <div class="column is-4">- <b-field data-cy="btn-enable-bounce">- <b-switch v-model="data['bounce.enabled']" name="bounce.enabled">+ <div class="row mb-6">+ <div class="col-4">+ <oat-field data-cy="btn-enable-bounce">+ <oat-switch v-model="data['bounce.enabled']" name="bounce.enabled">{{ $t('settings.bounces.enable') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <div v-for="typ in bounceTypes" :key="typ" class="columns">- <div class="column is-2" :class="{ disabled: !data['bounce.enabled'] }" :label="$t('settings.bounces.count')"- label-position="on-border">+ <div class="col-8">+ <div v-for="typ in bounceTypes" :key="typ" class="row">+ <div class="col-2" :class="{ disabled: !data['bounce.enabled'] }" :label="$t('settings.bounces.count')">{{ $t(`bounces.${typ}`) }}</div>- <div class="column is-4" :class="{ disabled: !data['bounce.enabled'] }">- <b-field :label="$t('settings.bounces.count')" label-position="on-border"- :message="$t('settings.bounces.countHelp')" data-cy="btn-bounce-count">- <b-numberinput v-model="data['bounce.actions'][typ]['count']" name="bounce.count" type="is-light"- controls-position="compact" placeholder="3" min="1" max="1000" />- </b-field>+ <div class="col-4" :class="{ disabled: !data['bounce.enabled'] }">+ <oat-field :label="$t('settings.bounces.count')" :message="$t('settings.bounces.countHelp')"+ data-cy="btn-bounce-count">+ <input aria-label="field" type="number" v-model.number="data['bounce.actions'][typ]['count']"+ name="bounce.count" placeholder="3" min="1" max="1000">+ </oat-field></div>- <div class="column is-4" :class="{ disabled: !data['bounce.enabled'] }">- <b-field :label="$t('settings.bounces.action')" label-position="on-border">- <b-select name="bounce.action" v-model="data['bounce.actions'][typ]['action']" expanded>+ <div class="col-4" :class="{ disabled: !data['bounce.enabled'] }">+ <oat-field :label="$t('settings.bounces.action')">+ <select aria-label="field" name="bounce.action" v-model="data['bounce.actions'][typ]['action']"><option value="none">{{ $t('globals.terms.none') }}</option>@@ -36,178 +35,180 @@<option value="delete">{{ $t('globals.buttons.delete') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field></div></div></div>- </div><!-- columns -->+ </div><!-- row --><div class="mb-6">- <b-field data-cy="btn-enable-bounce-webhook">- <b-switch v-model="data['bounce.webhooks_enabled']" :disabled="!data['bounce.enabled']" name="webhooks_enabled"- :native-value="true" data-cy="btn-enable-bounce-webhook">+ <oat-field data-cy="btn-enable-bounce-webhook">+ <oat-switch v-model="data['bounce.webhooks_enabled']" :disabled="!data['bounce.enabled']"+ name="webhooks_enabled" :native-value="true" data-cy="btn-enable-bounce-webhook">{{ $t('settings.bounces.enableWebhooks') }}- </b-switch>- <p class="has-text-grey">+ </oat-switch>+ <p class="text-light text-7"><a href="https://listmonk.app/docs/bounces" target="_blank" rel="noopener noreferer">{{$t('globals.buttons.learnMore') }} →</a></p>- </b-field>- <div class="box" v-if="data['bounce.webhooks_enabled']">- <div class="columns">- <div class="column">- <b-field>- <b-switch v-model="data['bounce.ses_enabled']" name="ses_enabled" :native-value="true"+ </oat-field>+ <div class="card" v-if="data['bounce.webhooks_enabled']">+ <div class="row">+ <div class="col-12">+ <oat-field>+ <oat-switch v-model="data['bounce.ses_enabled']" name="ses_enabled" :native-value="true"data-cy="btn-enable-bounce-ses">{{ $t('settings.bounces.enableSES') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div></div>- <div class="columns">- <div class="column is-3">- <b-field>- <b-switch v-model="data['bounce.azure'].enabled" name="azure_enabled" :native-value="true"+ <div class="row">+ <div class="col-3">+ <oat-field>+ <oat-switch v-model="data['bounce.azure'].enabled" name="azure_enabled" :native-value="true"data-cy="btn-enable-bounce-azure">{{ $t('settings.bounces.enableAzure') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.azureSharedSecret')" :message="$t('settings.bounces.azureSharedSecretHelp')">- <b-input v-model="data['bounce.azure'].shared_secret" type="password"+ <div class="col-4">+ <oat-field :label="$t('settings.bounces.azureSharedSecret')"+ :message="$t('settings.bounces.azureSharedSecretHelp')">+ <input aria-label="field" v-model="data['bounce.azure'].shared_secret" type="password":disabled="!data['bounce.azure'].enabled" name="azure_shared_secret"- data-cy="bounce-azure-shared-secret" />- </b-field>+ data-cy="bounce-azure-shared-secret">+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.azureSharedSecretHeader')" :message="$t('settings.bounces.azureSharedSecretHeaderHelp')">- <b-input v-model="data['bounce.azure'].shared_secret_header" type="text"+ <div class="col-5">+ <oat-field :label="$t('settings.bounces.azureSharedSecretHeader')"+ :message="$t('settings.bounces.azureSharedSecretHeaderHelp')">+ <input aria-label="field" v-model="data['bounce.azure'].shared_secret_header" type="text":disabled="!data['bounce.azure'].enabled" name="azure_shared_secret_header"- data-cy="bounce-azure-shared-secret-header" />- </b-field>+ data-cy="bounce-azure-shared-secret-header">+ </oat-field></div></div>- <div class="columns">- <div class="column is-3">- <b-field>- <b-switch v-model="data['bounce.sendgrid_enabled']" name="sendgrid_enabled" :native-value="true"+ <div class="row">+ <div class="col-3">+ <oat-field>+ <oat-switch v-model="data['bounce.sendgrid_enabled']" name="sendgrid_enabled" :native-value="true"data-cy="btn-enable-bounce-sendgrid">{{ $t('settings.bounces.enableSendgrid') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.sendgridKey')" :message="$t('globals.messages.passwordChange')">- <b-input v-model="data['bounce.sendgrid_key']" type="password"+ <div class="col-9">+ <oat-field :label="$t('settings.bounces.sendgridKey')" :message="$t('globals.messages.passwordChange')">+ <input aria-label="field" v-model="data['bounce.sendgrid_key']" type="password":disabled="!data['bounce.sendgrid_enabled']" name="sendgrid_enabled" :native-value="true"- data-cy="btn-enable-bounce-sendgrid" />- </b-field>+ data-cy="btn-enable-bounce-sendgrid">+ </oat-field></div></div>- <div class="columns">- <div class="column is-3">- <b-field>- <b-switch v-model="data['bounce.postmark'].enabled" name="postmark_enabled" :native-value="true"+ <div class="row">+ <div class="col-3">+ <oat-field>+ <oat-switch v-model="data['bounce.postmark'].enabled" name="postmark_enabled" :native-value="true"data-cy="btn-enable-bounce-postmark">{{ $t('settings.bounces.enablePostmark') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.postmarkUsername')"+ <div class="col-4">+ <oat-field :label="$t('settings.bounces.postmarkUsername')":message="$t('settings.bounces.postmarkUsernameHelp')">- <b-input v-model="data['bounce.postmark'].username" type="text"+ <input aria-label="field" v-model="data['bounce.postmark'].username" type="text":disabled="!data['bounce.postmark'].enabled" name="postmark_username"- data-cy="btn-enable-bounce-postmark" />- </b-field>+ data-cy="btn-enable-bounce-postmark">+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.postmarkPassword')" :message="$t('globals.messages.passwordChange')">- <b-input v-model="data['bounce.postmark'].password" type="password"+ <div class="col-5">+ <oat-field :label="$t('settings.bounces.postmarkPassword')"+ :message="$t('globals.messages.passwordChange')">+ <input aria-label="field" v-model="data['bounce.postmark'].password" type="password":disabled="!data['bounce.postmark'].enabled" name="postmark_password"- data-cy="btn-enable-bounce-postmark" />- </b-field>+ data-cy="btn-enable-bounce-postmark">+ </oat-field></div></div>- <div class="columns">- <div class="column is-3">- <b-field>- <b-switch v-model="data['bounce.forwardemail'].enabled" name="forwardemail_enabled" :native-value="true"+ <div class="row">+ <div class="col-3">+ <oat-field>+ <oat-switch v-model="data['bounce.forwardemail'].enabled" name="forwardemail_enabled" :native-value="true"data-cy="btn-enable-bounce-forwardemail">{{ $t('settings.bounces.enableForwardemail') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.forwardemailKey')" :message="$t('globals.messages.passwordChange')">- <b-input v-model="data['bounce.forwardemail'].key" type="password"+ <div class="col-9">+ <oat-field :label="$t('settings.bounces.forwardemailKey')" :message="$t('globals.messages.passwordChange')">+ <input aria-label="field" v-model="data['bounce.forwardemail'].key" type="password":disabled="!data['bounce.forwardemail'].enabled" name="forwardemail_enabled" :native-value="true"- data-cy="btn-enable-bounce-forwardemail" />- </b-field>+ data-cy="btn-enable-bounce-forwardemail">+ </oat-field></div></div>- <div class="columns">- <div class="column is-3">- <b-field>- <b-switch v-model="data['bounce.lettermint'].enabled" name="lettermint_enabled" :native-value="true"+ <div class="row">+ <div class="col-3">+ <oat-field>+ <oat-switch v-model="data['bounce.lettermint'].enabled" name="lettermint_enabled" :native-value="true"data-cy="btn-enable-bounce-lettermint">{{ $t('settings.bounces.enableLettermint') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.bounces.lettermintKey')" :message="$t('globals.messages.passwordChange')">- <b-input v-model="data['bounce.lettermint'].key" type="password"- :disabled="!data['bounce.lettermint'].enabled" name="lettermint_key" data-cy="bounce-lettermint-key" />- </b-field>+ <div class="col-9">+ <oat-field :label="$t('settings.bounces.lettermintKey')" :message="$t('globals.messages.passwordChange')">+ <input aria-label="field" v-model="data['bounce.lettermint'].key" type="password"+ :disabled="!data['bounce.lettermint'].enabled" name="lettermint_key" data-cy="bounce-lettermint-key">+ </oat-field></div></div></div></div>- <!-- bounce mailbox -->- <b-field>- <b-switch v-if="data['bounce.mailboxes']" v-model="data['bounce.mailboxes'][0].enabled"- :disabled="!data['bounce.enabled']" name="enabled" :native-value="true" data-cy="btn-enable-bounce-mailbox">- {{ $t('settings.bounces.enableMailbox') }}- </b-switch>- </b-field>+ <!-- bounce mailcard -->+ <oat-field>+ <oat-switch v-if="data['bounce.mailcardes']" v-model="data['bounce.mailcardes'][0].enabled"+ :disabled="!data['bounce.enabled']" name="enabled" :native-value="true" data-cy="btn-enable-bounce-mailcard">+ {{ $t('settings.bounces.enableMailcard') }}+ </oat-switch>+ </oat-field>- <template v-if="data['bounce.enabled'] && data['bounce.mailboxes'][0].enabled">- <div class="block box" v-for="(item, n) in data['bounce.mailboxes']" :key="n">- <div class="columns">- <div class="column" :class="{ disabled: !item.enabled }">- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.bounces.type')" label-position="on-border">- <b-select v-model="item.type" name="type" expanded>+ <template v-if="data['bounce.enabled'] && data['bounce.mailcardes'][0].enabled">+ <div class="card" v-for="(item, n) in data['bounce.mailcardes']" :key="n">+ <div class="row">+ <div class="col-12" :class="{ disabled: !item.enabled }">+ <div class="row">+ <div class="col-3">+ <oat-field :label="$t('settings.bounces.type')">+ <select aria-label="field" v-model="item.type" name="type"><option value="pop">POP</option>- </b-select>- </b-field>+ </select>+ </oat-field></div>- <div class="column is-6">- <b-field :label="$t('settings.mailserver.host')" label-position="on-border"- :message="$t('settings.mailserver.hostHelp')">- <b-input v-model="item.host" name="host" placeholder="bounce.yourmailserver.net" :maxlength="200" />- </b-field>+ <div class="col-6">+ <oat-field :label="$t('settings.mailserver.host')" :message="$t('settings.mailserver.hostHelp')">+ <input aria-label="field" v-model="item.host" name="host" placeholder="bounce.yourmailserver.net"+ :maxlength="200">+ </oat-field></div>- <div class="column is-3">- <b-field :label="$t('settings.mailserver.port')" label-position="on-border"- :message="$t('settings.mailserver.portHelp')">- <b-numberinput v-model="item.port" name="port" type="is-light" controls-position="compact"- placeholder="25" min="1" max="65535" />- </b-field>+ <div class="col-3">+ <oat-field :label="$t('settings.mailserver.port')" :message="$t('settings.mailserver.portHelp')">+ <input aria-label="field" type="number" v-model.number="item.port" name="port" placeholder="25"+ min="1" max="65535">+ </oat-field></div></div><!-- host -->- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.mailserver.authProtocol')" label-position="on-border">- <b-select v-model="item.auth_protocol" name="auth_protocol" expanded>+ <div class="row">+ <div class="col-3">+ <oat-field :label="$t('settings.mailserver.authProtocol')">+ <select aria-label="field" v-model="item.auth_protocol" name="auth_protocol"><option value="none">none</option>@@ -225,50 +226,52 @@login</option></template>- </b-select>- </b-field>+ </select>+ </oat-field></div>- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.mailserver.username')" label-position="on-border" expanded>- <b-input v-model="item.username" :disabled="item.auth_protocol === 'none'" name="username"- placeholder="mysmtp" :maxlength="200" />- </b-field>- <b-field :label="$t('settings.mailserver.password')" label-position="on-border" expanded+ <div class="col-9">+ <oat-field>+ <oat-field :label="$t('settings.mailserver.username')">+ <input aria-label="field" v-model="item.username" :disabled="item.auth_protocol === 'none'"+ name="username" placeholder="mysmtp" :maxlength="200">+ </oat-field>+ <oat-field :label="$t('settings.mailserver.password')":message="$t('settings.mailserver.passwordHelp')">- <b-input v-model="item.password" :disabled="item.auth_protocol === 'none'" name="password"- type="password" :placeholder="$t('settings.mailserver.passwordHelp')" :maxlength="200" />- </b-field>- </b-field>+ <input aria-label="field" v-model="item.password" :disabled="item.auth_protocol === 'none'"+ name="password" type="password" :placeholder="$t('settings.mailserver.passwordHelp')"+ :maxlength="200">+ </oat-field>+ </oat-field></div></div><!-- auth -->- <div class="columns">- <div class="column is-6">- <b-field grouped>- <b-field expanded :message="$t('settings.mailserver.tlsHelp')">- <b-switch v-model="item.tls_enabled" name="item.tls_enabled">+ <div class="row">+ <div class="col-6">+ <oat-field>+ <oat-field :message="$t('settings.mailserver.tlsHelp')">+ <oat-switch v-model="item.tls_enabled" name="item.tls_enabled">{{ $t('settings.mailserver.tls') }}- </b-switch>- </b-field>- <b-field expanded :message="$t('settings.mailserver.skipTLSHelp')">- <b-switch v-model="item.tls_skip_verify" :disabled="!item.tls_enabled" name="item.tls_skip_verify">+ </oat-switch>+ </oat-field>+ <oat-field :message="$t('settings.mailserver.skipTLSHelp')">+ <oat-switch v-model="item.tls_skip_verify" :disabled="!item.tls_enabled"+ name="item.tls_skip_verify">{{ $t('settings.mailserver.skipTLS') }}- </b-switch>- </b-field>- </b-field>+ </oat-switch>+ </oat-field>+ </oat-field></div>- <div class="column" />- <div class="column is-4">- <b-field :label="$t('settings.bounces.scanInterval')" expanded label-position="on-border"+ <div class="col-2" />+ <div class="col-4">+ <oat-field :label="$t('settings.bounces.scanInterval')":message="$t('settings.bounces.scanIntervalHelp')">- <b-input v-model="item.scan_interval" name="scan_interval" placeholder="15m" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <input aria-label="field" v-model="item.scan_interval" name="scan_interval" placeholder="15m"+ :pattern="regDuration" :maxlength="10">+ </oat-field></div></div><!-- TLS --></div>- </div><!-- second container column -->+ </div><!-- second container col-12 --></div><!-- block --></template></div>@@ -295,7 +298,7 @@ export default Vue.extend({methods: {removeBounceBox(i) {- this.data['bounce.mailboxes'].splice(i, 1);+ this.data['bounce.mailcardes'].splice(i, 1);},},});diff --git a/frontend/src/views/settings/general.vue b/frontend/src/views/settings/general.vueindex 70df9447..46413334 100644--- a/frontend/src/views/settings/general.vue+++ b/frontend/src/views/settings/general.vue@@ -1,98 +1,94 @@<template><div class="items">- <b-field :label="$t('settings.general.siteName')" label-position="on-border">- <b-input v-model="data['app.site_name']" name="app.site_name" :label="$t('settings.general.siteName')"- :maxlength="300" required />- </b-field>+ <oat-field :label="$t('settings.general.siteName')">+ <input aria-label="field" v-model="data['app.site_name']" name="app.site_name"+ :label="$t('settings.general.siteName')" :maxlength="300" required>+ </oat-field>- <b-field :label="$t('settings.general.rootURL')" label-position="on-border"- :message="$t('settings.general.rootURLHelp')">- <b-input v-model="data['app.root_url']" name="app.root_url" placeholder="https://listmonk.yoursite.com"- :maxlength="300" required type="url" pattern="https?://.*" />- </b-field>+ <oat-field :label="$t('settings.general.rootURL')" :message="$t('settings.general.rootURLHelp')">+ <input aria-label="field" v-model="data['app.root_url']" name="app.root_url"+ placeholder="https://listmonk.yoursite.com" :maxlength="300" required type="url" pattern="https?://.*">+ </oat-field>- <b-field :label="$t('settings.general.logoURL')" label-position="on-border"- :message="$t('settings.general.logoURLHelp')">- <b-input v-model="data['app.logo_url']" name="app.logo_url" placeholder="https://listmonk.yoursite.com/logo.png"- :maxlength="300" type="url" pattern="https?://.*" />- </b-field>- <b-field :label="$t('settings.general.faviconURL')" label-position="on-border"- :message="$t('settings.general.faviconURLHelp')">- <b-input v-model="data['app.favicon_url']" name="app.favicon_url"- placeholder="https://listmonk.yoursite.com/favicon.png" :maxlength="300" type="url" pattern="https?://.*" />- </b-field>+ <oat-field :label="$t('settings.general.logoURL')" :message="$t('settings.general.logoURLHelp')">+ <input aria-label="field" v-model="data['app.logo_url']" name="app.logo_url"+ placeholder="https://listmonk.yoursite.com/logo.png" :maxlength="300" type="url" pattern="https?://.*">+ </oat-field>+ <oat-field :label="$t('settings.general.faviconURL')" :message="$t('settings.general.faviconURLHelp')">+ <input aria-label="field" v-model="data['app.favicon_url']" name="app.favicon_url"+ placeholder="https://listmonk.yoursite.com/favicon.png" :maxlength="300" type="url" pattern="https?://.*">+ </oat-field><hr />- <b-field :label="$t('settings.general.fromEmail')" label-position="on-border"- :message="$t('settings.general.fromEmailHelp')">- <b-input v-model="data['app.from_email']" name="app.from_email"+ <oat-field :label="$t('settings.general.fromEmail')" :message="$t('settings.general.fromEmailHelp')">+ <input aria-label="field" v-model="data['app.from_email']" name="app.from_email"placeholder="Listmonk <[email protected]>" pattern="((.+?)\s)?<(.+?)@(.+?)>" :maxlength="300" />- </b-field>- <b-field :label="$t('settings.general.adminNotifEmails')" label-position="on-border"- :message="$t('settings.general.adminNotifEmailsHelp')">- <b-taginput v-model="data['app.notify_emails']" name="app.notify_emails"+ </oat-field>+ <oat-field :label="$t('settings.general.adminNotifEmails')" :message="$t('settings.general.adminNotifEmailsHelp')">+ <oat-tag-input v-model="data['app.notify_emails']" name="app.notify_emails":before-adding="(v) => v.match(/(.+?)@(.+?)/)" placeholder="[email protected]" />- </b-field>+ </oat-field><hr /><div>- <h2 class="is-size-4 mb-5">+ <h2 class="text-4 mb-5">{{ $tc('globals.terms.subscriptions', 2) }}</h2>- <b-field :message="$t('settings.general.enablePublicSubPageHelp')">- <b-switch v-model="data['app.enable_public_subscription_page']" name="app.enable_public_subscription_page">+ <oat-field :message="$t('settings.general.enablePublicSubPageHelp')">+ <oat-switch v-model="data['app.enable_public_subscription_page']" name="app.enable_public_subscription_page">{{ $t('settings.general.enablePublicSubPage') }}- </b-switch>- </b-field>- <b-field :message="$t('settings.general.sendOptinConfirmHelp')">- <b-switch v-model="data['app.send_optin_confirmation']" name="app.send_optin_confirmation">+ </oat-switch>+ </oat-field>+ <oat-field :message="$t('settings.general.sendOptinConfirmHelp')">+ <oat-switch v-model="data['app.send_optin_confirmation']" name="app.send_optin_confirmation">{{ $t('settings.general.sendOptinConfirm') }}- </b-switch>- </b-field>- <b-field :message="$t('settings.general.showOptinPageHelp')">- <b-switch v-model="data['app.show_optin_page']" name="app.show_optin_page">+ </oat-switch>+ </oat-field>+ <oat-field :message="$t('settings.general.showOptinPageHelp')">+ <oat-switch v-model="data['app.show_optin_page']" name="app.show_optin_page">{{ $t('settings.general.showOptinPage') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div><hr /><div>- <h2 class="is-size-4 mb-5">+ <h2 class="text-4 mb-5">{{ $t('campaigns.archive') }}</h2>- <b-field :message="$t('settings.general.enablePublicArchiveHelp')">- <b-switch v-model="data['app.enable_public_archive']" name="app.enable_public_archive">+ <oat-field :message="$t('settings.general.enablePublicArchiveHelp')">+ <oat-switch v-model="data['app.enable_public_archive']" name="app.enable_public_archive">{{ $t('settings.general.enablePublicArchive') }}- </b-switch>- </b-field>- <b-field :message="$t('settings.general.enablePublicArchiveRSSContentHelp')">- <b-switch v-model="data['app.enable_public_archive_rss_content']" name="app.enable_public_archive_rss_content">+ </oat-switch>+ </oat-field>+ <oat-field :message="$t('settings.general.enablePublicArchiveRSSContentHelp')">+ <oat-switch v-model="data['app.enable_public_archive_rss_content']"+ name="app.enable_public_archive_rss_content">{{ $t('settings.general.enablePublicArchiveRSSContent') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div><hr />- <b-field :message="$t('settings.general.checkUpdatesHelp')">- <b-switch v-model="data['app.check_updates']" name="app.check_updates">+ <oat-field :message="$t('settings.general.checkUpdatesHelp')">+ <oat-switch v-model="data['app.check_updates']" name="app.check_updates">{{ $t('settings.general.checkUpdates') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field><hr />- <b-field :label="$t('settings.general.language')" label-position="on-border" :addons="false">- <b-select v-model="data['app.lang']" name="app.lang">+ <oat-field :label="$t('settings.general.language')">+ <select aria-label="field" v-model="data['app.lang']" name="app.lang"><option v-for="l in serverConfig.langs" :key="l.code" :value="l.code">{{ l.name }}</option>- </b-select>+ </select><p class="mt-2"><a href="https://listmonk.app/docs/i18n/#additional-language-packs" target="_blank" rel="noopener noreferer">{{$t('globals.buttons.more') }} →</a></p>- </b-field>+ </oat-field></div></template>diff --git a/frontend/src/views/settings/media.vue b/frontend/src/views/settings/media.vueindex 5089b004..8114f7ac 100644--- a/frontend/src/views/settings/media.vue+++ b/frontend/src/views/settings/media.vue@@ -1,96 +1,89 @@<template><div class="items">- <div class="columns">- <div class="column">- <b-field :label="$t('settings.media.provider')" label-position="on-border">- <b-select v-model="data['upload.provider']" name="upload.provider">+ <div class="row">+ <div class="col-2">+ <oat-field :label="$t('settings.media.provider')">+ <select aria-label="field" v-model="data['upload.provider']" name="upload.provider"><option value="filesystem">filesystem</option><option value="s3">s3</option>- </b-select>- </b-field>+ </select>+ </oat-field></div>- <div class="column is-10">- <b-field :label="$t('settings.media.upload.extensions')" label-position="on-border" expanded>- <b-taginput v-model="data['upload.extensions']" name="tags" ellipsis icon="tag-outline"- placeholder="jpg, png, gif .." />- </b-field>+ <div class="col-10">+ <oat-field :label="$t('settings.media.upload.extensions')">+ <oat-tag-input v-model="data['upload.extensions']" name="tags" placeholder="jpg, png, gif .." />+ </oat-field></div></div><hr />- <div class="block" v-if="data['upload.provider'] === 'filesystem'">- <b-field :label="$t('settings.media.upload.path')" label-position="on-border"- :message="$t('settings.media.upload.pathHelp')">- <b-input v-model="data['upload.filesystem.upload_path']" name="app.upload_path"- placeholder="/home/listmonk/uploads" :maxlength="200" required />- </b-field>+ <div v-if="data['upload.provider'] === 'filesystem'">+ <oat-field :label="$t('settings.media.upload.path')" :message="$t('settings.media.upload.pathHelp')">+ <input aria-label="field" v-model="data['upload.filesystem.upload_path']" name="app.upload_path"+ placeholder="/home/listmonk/uploads" :maxlength="200" required>+ </oat-field>- <b-field :label="$t('settings.media.upload.uri')" label-position="on-border"- :message="$t('settings.media.upload.uriHelp')">- <b-input v-model="data['upload.filesystem.upload_uri']" name="app.upload_uri" placeholder="/uploads"- :maxlength="200" required pattern="^\/(.+?)" />- </b-field>+ <oat-field :label="$t('settings.media.upload.uri')" :message="$t('settings.media.upload.uriHelp')">+ <input aria-label="field" v-model="data['upload.filesystem.upload_uri']" name="app.upload_uri"+ placeholder="/uploads" :maxlength="200" required pattern="^\/(.+?)">+ </oat-field></div><!-- filesystem -->- <div class="block" v-if="data['upload.provider'] === 's3'">- <b-field :label="$t('settings.media.s3.region')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.aws_default_region']" @input="onS3URLChange"- name="upload.s3.aws_default_region" :maxlength="200" placeholder="ap-south-1" />- </b-field>+ <div v-if="data['upload.provider'] === 's3'">+ <oat-field :label="$t('settings.media.s3.region')">+ <input aria-label="field" v-model="data['upload.s3.aws_default_region']" @input="onS3URLChange"+ name="upload.s3.aws_default_region" :maxlength="200" placeholder="ap-south-1">+ </oat-field>- <b-field :label="$t('settings.media.s3.key')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.aws_access_key_id']" name="upload.s3.aws_access_key_id" :maxlength="200" />- </b-field>+ <oat-field :label="$t('settings.media.s3.key')">+ <input aria-label="field" v-model="data['upload.s3.aws_access_key_id']" name="upload.s3.aws_access_key_id"+ :maxlength="200">+ </oat-field>- <b-field :label="$t('settings.media.s3.secret')" label-position="on-border" expanded- message="Enter a value to change.">- <b-input v-model="data['upload.s3.aws_secret_access_key']" name="upload.s3.aws_secret_access_key"- type="password" :maxlength="200" />- </b-field>+ <oat-field :label="$t('settings.media.s3.secret')" message="Enter a value to change.">+ <input aria-label="field" v-model="data['upload.s3.aws_secret_access_key']"+ name="upload.s3.aws_secret_access_key" type="password" :maxlength="200">+ </oat-field>- <b-field :label="$t('settings.media.s3.bucketType')" label-position="on-border">- <b-select v-model="data['upload.s3.bucket_type']" name="upload.s3.bucket_type" expanded>+ <oat-field :label="$t('settings.media.s3.bucketType')">+ <select aria-label="field" v-model="data['upload.s3.bucket_type']" name="upload.s3.bucket_type"><option value="private">{{ $t('settings.media.s3.bucketTypePrivate') }}</option><option value="public">{{ $t('settings.media.s3.bucketTypePublic') }}</option>- </b-select>- </b-field>+ </select>+ </oat-field>- <b-field :label="$t('settings.media.s3.bucket')" label-position="on-border" expanded>- <b-input v-model="data['upload.s3.bucket']" @input="onS3URLChange" name="upload.s3.bucket" :maxlength="200"- placeholder="" />- </b-field>+ <oat-field :label="$t('settings.media.s3.bucket')">+ <input aria-label="field" v-model="data['upload.s3.bucket']" @input="onS3URLChange" name="upload.s3.bucket"+ :maxlength="200" placeholder="">+ </oat-field>- <b-field :label="$t('settings.media.s3.bucketPath')" label-position="on-border"- :message="$t('settings.media.s3.bucketPathHelp')" expanded>- <b-input v-model="data['upload.s3.bucket_path']" name="upload.s3.bucket_path" :maxlength="200"- placeholder="/" />- </b-field>+ <oat-field :label="$t('settings.media.s3.bucketPath')" :message="$t('settings.media.s3.bucketPathHelp')">+ <input aria-label="field" v-model="data['upload.s3.bucket_path']" name="upload.s3.bucket_path" :maxlength="200"+ placeholder="/">+ </oat-field>- <b-field :label="$t('settings.media.s3.uploadExpiry')" label-position="on-border"- :message="$t('settings.media.s3.uploadExpiryHelp')" expanded>- <b-input v-model="data['upload.s3.expiry']" name="upload.s3.expiry" placeholder="14d" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <oat-field :label="$t('settings.media.s3.uploadExpiry')" :message="$t('settings.media.s3.uploadExpiryHelp')">+ <input aria-label="field" v-model="data['upload.s3.expiry']" name="upload.s3.expiry" placeholder="14d"+ :pattern="regDuration" :maxlength="10">+ </oat-field>- <b-field :label="$t('settings.media.s3.url')" label-position="on-border"- :message="$t('settings.media.s3.urlHelp')">- <b-input v-model="data['upload.s3.url']" name="upload.s3.url" required- placeholder="https://s3.$region.amazonaws.com" :maxlength="200" expanded type="url" pattern="https?://.*" />- </b-field>+ <oat-field :label="$t('settings.media.s3.url')" :message="$t('settings.media.s3.urlHelp')">+ <input aria-label="field" v-model="data['upload.s3.url']" name="upload.s3.url" required+ placeholder="https://s3.$region.amazonaws.com" :maxlength="200" type="url" pattern="https?://.*">+ </oat-field>- <b-field :label="$t('settings.media.s3.publicURL')" label-position="on-border"- :message="$t('settings.media.s3.publicURLHelp')" expanded>- <b-input v-model="data['upload.s3.public_url']" name="upload.s3.public_url"- placeholder="https://files.yourdomain.com" :maxlength="200" type="string" pattern="(https?://.*|/.+)" />- </b-field>+ <oat-field :label="$t('settings.media.s3.publicURL')" :message="$t('settings.media.s3.publicURLHelp')">+ <input aria-label="field" v-model="data['upload.s3.public_url']" name="upload.s3.public_url"+ placeholder="https://files.yourdomain.com" :maxlength="200" type="string" pattern="(https?://.*|/.+)">+ </oat-field></div><!-- s3 --></div></template>diff --git a/frontend/src/views/settings/messengers.vue b/frontend/src/views/settings/messengers.vueindex f8879ded..d65afa8a 100644--- a/frontend/src/views/settings/messengers.vue+++ b/frontend/src/views/settings/messengers.vue@@ -1,71 +1,65 @@<template><div><div class="items messengers">- <div class="block box" v-for="(item, n) in data.messengers" :key="n">- <b-field>- <b-switch v-model="item.enabled" name="enabled" :native-value="true">+ <div class="card" v-for="(item, n) in data.messengers" :key="n">+ <oat-field>+ <oat-switch v-model="item.enabled" name="enabled" :native-value="true">{{ $t('globals.buttons.enabled') }}- </b-switch>- </b-field>- <b-field>- <a @click.prevent="$utils.confirm(null, () => removeMessenger(n))" href="#" class="is-size-7">- <b-icon icon="trash-can-outline" size="is-small" />+ </oat-switch>+ </oat-field>+ <oat-field>+ <a @click.prevent="$utils.confirm(null, () => removeMessenger(n))" href="#">+ <oat-icon icon="trash-can-outline" />{{ $t('globals.buttons.delete') }}</a>- </b-field>+ </oat-field><div :class="{ disabled: !item.enabled }">- <b-field :label="$t('globals.fields.name')" label-position="on-border"- :message="$t('settings.messengers.nameHelp')">- <b-input v-model="item.name" name="name" placeholder="mymessenger" :maxlength="200" />- </b-field>+ <oat-field :label="$t('globals.fields.name')" :message="$t('settings.messengers.nameHelp')">+ <input aria-label="field" v-model="item.name" name="name" placeholder="mymessenger" :maxlength="200">+ </oat-field>- <b-field :label="$t('settings.messengers.url')" label-position="on-border"- :message="$t('settings.messengers.urlHelp')">- <b-input v-model="item.root_url" name="root_url" placeholder="https://postback.messenger.net/path"- :maxlength="200" expanded type="url" pattern="https?://.*" />- </b-field>+ <oat-field :label="$t('settings.messengers.url')" :message="$t('settings.messengers.urlHelp')">+ <input aria-label="field" v-model="item.root_url" name="root_url"+ placeholder="https://postback.messenger.net/path" :maxlength="200" type="url" pattern="https?://.*">+ </oat-field>- <b-field :label="$t('settings.messengers.username')" label-position="on-border" expanded>- <b-input v-model="item.username" name="username" :maxlength="200" />- </b-field>+ <oat-field :label="$t('settings.messengers.username')">+ <input aria-label="field" v-model="item.username" name="username" :maxlength="200">+ </oat-field>- <b-field :label="$t('settings.messengers.password')" label-position="on-border" expanded- :message="$t('globals.messages.passwordChange')">- <b-input v-model="item.password" name="password" type="password"- :placeholder="$t('globals.messages.passwordChange')" :maxlength="200" />- </b-field>+ <oat-field :label="$t('settings.messengers.password')" :message="$t('globals.messages.passwordChange')">+ <input aria-label="field" v-model="item.password" name="password" type="password"+ :placeholder="$t('globals.messages.passwordChange')" :maxlength="200">+ </oat-field>- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.messengers.maxConns')" label-position="on-border"- :message="$t('settings.messengers.maxConnsHelp')">- <b-numberinput v-model="item.max_conns" name="max_conns" type="is-light" controls-position="compact"- placeholder="25" min="1" max="65535" />- </b-field>+ <div class="row">+ <div class="col-4">+ <oat-field :label="$t('settings.messengers.maxConns')" :message="$t('settings.messengers.maxConnsHelp')">+ <input aria-label="field" type="number" v-model.number="item.max_conns" name="max_conns"+ placeholder="25" min="1" max="65535">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('settings.messengers.retries')" label-position="on-border"- :message="$t('settings.messengers.retriesHelp')">- <b-numberinput v-model="item.max_msg_retries" name="max_msg_retries" type="is-light"- controls-position="compact" placeholder="2" min="1" max="1000" />- </b-field>+ <div class="col-4">+ <oat-field :label="$t('settings.messengers.retries')" :message="$t('settings.messengers.retriesHelp')">+ <input aria-label="field" type="number" v-model.number="item.max_msg_retries" name="max_msg_retries"+ placeholder="2" min="1" max="1000">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('settings.messengers.timeout')" label-position="on-border"- :message="$t('settings.messengers.timeoutHelp')">- <b-input v-model="item.timeout" name="timeout" placeholder="5s" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <div class="col-4">+ <oat-field :label="$t('settings.messengers.timeout')" :message="$t('settings.messengers.timeoutHelp')">+ <input aria-label="field" v-model="item.timeout" name="timeout" placeholder="5s" :pattern="regDuration"+ :maxlength="10">+ </oat-field></div></div></div></div><!-- block --></div><!-- mail-servers -->- <b-button @click="addMessenger" icon-left="plus" type="is-primary">+ <button type="button" @click="addMessenger" data-variant="primary">{{ $t('globals.buttons.addNew') }}- </b-button>+ </button></div></template>diff --git a/frontend/src/views/settings/performance.vue b/frontend/src/views/settings/performance.vueindex 6d368230..fb59d4ff 100644--- a/frontend/src/views/settings/performance.vue+++ b/frontend/src/views/settings/performance.vue@@ -1,78 +1,76 @@<template><div class="items">- <b-field :label="$t('settings.performance.concurrency')" label-position="on-border"- :message="$t('settings.performance.concurrencyHelp')">- <b-numberinput v-model="data['app.concurrency']" name="app.concurrency" type="is-light" placeholder="5" min="1"- max="10000" />- </b-field>+ <oat-field :label="$t('settings.performance.concurrency')" :message="$t('settings.performance.concurrencyHelp')">+ <input aria-label="field" type="number" v-model.number="data['app.concurrency']" name="app.concurrency"+ placeholder="5" min="1" max="10000">+ </oat-field>- <b-field :label="$t('settings.performance.messageRate')" label-position="on-border"- :message="$t('settings.performance.messageRateHelp')">- <b-numberinput v-model="data['app.message_rate']" name="app.message_rate" type="is-light" placeholder="5" min="1"- max="100000" />- </b-field>+ <oat-field :label="$t('settings.performance.messageRate')" :message="$t('settings.performance.messageRateHelp')">+ <input aria-label="field" type="number" v-model.number="data['app.message_rate']" name="app.message_rate"+ placeholder="5" min="1" max="100000">+ </oat-field>- <b-field :label="$t('settings.performance.batchSize')" label-position="on-border"- :message="$t('settings.performance.batchSizeHelp')">- <b-numberinput v-model="data['app.batch_size']" name="app.batch_size" type="is-light" placeholder="1000" min="1"- max="100000" />- </b-field>+ <oat-field :label="$t('settings.performance.batchSize')" :message="$t('settings.performance.batchSizeHelp')">+ <input aria-label="field" type="number" v-model.number="data['app.batch_size']" name="app.batch_size"+ placeholder="1000" min="1" max="100000">+ </oat-field>- <b-field :label="$t('settings.performance.maxErrThreshold')" label-position="on-border"+ <oat-field :label="$t('settings.performance.maxErrThreshold')":message="$t('settings.performance.maxErrThresholdHelp')">- <b-numberinput v-model="data['app.max_send_errors']" name="app.max_send_errors" type="is-light" placeholder="1999"- min="0" max="100000" />- </b-field>+ <input aria-label="field" type="number" v-model.number="data['app.max_send_errors']" name="app.max_send_errors"+ placeholder="1999" min="0" max="100000">+ </oat-field><div>- <div class="columns">- <div class="column is-6">- <b-field :message="$t('settings.performance.slidingWindowHelp')">- <b-switch v-model="data['app.message_sliding_window']" name="app.message_sliding_window">+ <div class="row">+ <div class="col-6">+ <oat-field :message="$t('settings.performance.slidingWindowHelp')">+ <oat-switch v-model="data['app.message_sliding_window']" name="app.message_sliding_window">{{ $t('settings.performance.slidingWindow') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column is-3" :class="{ disabled: !data['app.message_sliding_window'] }">- <b-field :label="$t('settings.performance.slidingWindowRate')" label-position="on-border"+ <div class="col-3" :class="{ disabled: !data['app.message_sliding_window'] }">+ <oat-field :label="$t('settings.performance.slidingWindowRate')":message="$t('settings.performance.slidingWindowRateHelp')">- <b-numberinput v-model="data['app.message_sliding_window_rate']" name="sliding_window_rate" type="is-light"- controls-position="compact" :disabled="!data['app.message_sliding_window']" placeholder="25" min="1"- max="10000000" />- </b-field>+ <input aria-label="field" type="number" v-model.number="data['app.message_sliding_window_rate']"+ name="sliding_window_rate" :disabled="!data['app.message_sliding_window']" placeholder="25" min="1"+ max="10000000">+ </oat-field></div>- <div class="column is-3" :class="{ disabled: !data['app.message_sliding_window'] }">- <b-field :label="$t('settings.performance.slidingWindowDuration')" label-position="on-border"+ <div class="col-3" :class="{ disabled: !data['app.message_sliding_window'] }">+ <oat-field :label="$t('settings.performance.slidingWindowDuration')":message="$t('settings.performance.slidingWindowDurationHelp')">- <b-input v-model="data['app.message_sliding_window_duration']" name="sliding_window_duration"- :disabled="!data['app.message_sliding_window']" placeholder="1h" :pattern="regDuration" :maxlength="10" />- </b-field>+ <input aria-label="field" v-model="data['app.message_sliding_window_duration']"+ name="sliding_window_duration" :disabled="!data['app.message_sliding_window']" placeholder="1h"+ :pattern="regDuration" :maxlength="10">+ </oat-field></div></div></div><!-- sliding window --><div><hr />- <div class="columns">- <div class="column is-4">- <b-field :message="$t('settings.performance.cacheSlowQueriesHelp')">- <b-switch v-model="data['app.cache_slow_queries']" name="app.cache_slow_queries">+ <div class="row">+ <div class="col-4">+ <oat-field :message="$t('settings.performance.cacheSlowQueriesHelp')">+ <oat-switch v-model="data['app.cache_slow_queries']" name="app.cache_slow_queries">{{ $t('settings.performance.cacheSlowQueries') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column is-4" :class="{ disabled: !data['app.cache_slow_queries'] }">- <b-field :label="$t('settings.maintenance.cron')">- <b-input v-model="data['app.cache_slow_queries_interval']" :disabled="!data['app.cache_slow_queries']"- placeholder="0 3 * * *" />- </b-field>+ <div class="col-4" :class="{ disabled: !data['app.cache_slow_queries'] }">+ <oat-field :label="$t('settings.maintenance.cron')">+ <input aria-label="field" v-model="data['app.cache_slow_queries_interval']"+ :disabled="!data['app.cache_slow_queries']" placeholder="0 3 * * *">+ </oat-field></div>- <div class="column">+ <div class="col-4"><br /><br /><a href="https://listmonk.app/docs/maintenance/performance/" target="_blank" rel="noopener noreferer">- <b-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}+ <oat-icon icon="link-variant" /> {{ $t('globals.buttons.learnMore') }}</a></div></div>diff --git a/frontend/src/views/settings/privacy.vue b/frontend/src/views/settings/privacy.vueindex 6df1af64..ee69360b 100644--- a/frontend/src/views/settings/privacy.vue+++ b/frontend/src/views/settings/privacy.vue@@ -1,73 +1,82 @@<template><div class="items">- <div class="columns">- <div class="column is-6">- <b-field :message="$t('settings.privacy.disableTrackingHelp')">- <b-switch v-model="data['privacy.disable_tracking']" name="privacy.disable_tracking">+ <div class="row">+ <div class="col-6">+ <oat-field :message="$t('settings.privacy.disableTrackingHelp')">+ <oat-switch v-model="data['privacy.disable_tracking']" name="privacy.disable_tracking">{{ $t('settings.privacy.disableTracking') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column is-6" :class="{ 'is-disabled': data['privacy.disable_tracking'] }">- <b-field :message="$t('settings.privacy.individualSubTrackingHelp')">- <b-switch v-model="data['privacy.individual_tracking']" :disabled="data['privacy.disable_tracking']"+ <div class="col-6" :class="{ disabled: data['privacy.disable_tracking'] }">+ <oat-field :message="$t('settings.privacy.individualSubTrackingHelp')">+ <oat-switch v-model="data['privacy.individual_tracking']" :disabled="data['privacy.disable_tracking']"name="privacy.individual_tracking">{{ $t('settings.privacy.individualSubTracking') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div></div>- <b-field :message="$t('settings.privacy.listUnsubHeaderHelp')">- <b-switch v-model="data['privacy.unsubscribe_header']" name="privacy.unsubscribe_header">+ <oat-field :message="$t('settings.privacy.listUnsubHeaderHelp')">+ <oat-switch v-model="data['privacy.unsubscribe_header']" name="privacy.unsubscribe_header">{{ $t('settings.privacy.listUnsubHeader') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :message="$t('settings.privacy.allowBlocklistHelp')">- <b-switch v-model="data['privacy.allow_blocklist']" name="privacy.allow_blocklist">+ <oat-field :message="$t('settings.privacy.allowBlocklistHelp')">+ <oat-switch v-model="data['privacy.allow_blocklist']" name="privacy.allow_blocklist">{{ $t('settings.privacy.allowBlocklist') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :message="$t('settings.privacy.allowPrefsHelp')">- <b-switch v-model="data['privacy.allow_preferences']" name="privacy.allow_blocklist">+ <oat-field :message="$t('settings.privacy.allowPrefsHelp')">+ <oat-switch v-model="data['privacy.allow_preferences']" name="privacy.allow_blocklist">{{ $t('settings.privacy.allowPrefs') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :message="$t('settings.privacy.allowExportHelp')">- <b-switch v-model="data['privacy.allow_export']" name="privacy.allow_export">+ <oat-field :message="$t('settings.privacy.allowExportHelp')">+ <oat-switch v-model="data['privacy.allow_export']" name="privacy.allow_export">{{ $t('settings.privacy.allowExport') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :message="$t('settings.privacy.allowWipeHelp')">- <b-switch v-model="data['privacy.allow_wipe']" name="privacy.allow_wipe">+ <oat-field :message="$t('settings.privacy.allowWipeHelp')">+ <oat-switch v-model="data['privacy.allow_wipe']" name="privacy.allow_wipe">{{ $t('settings.privacy.allowWipe') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :message="$t('settings.privacy.recordOptinIPHelp')">- <b-switch v-model="data['privacy.record_optin_ip']" name="privacy.record_optin_ip">+ <oat-field :message="$t('settings.privacy.recordOptinIPHelp')">+ <oat-switch v-model="data['privacy.record_optin_ip']" name="privacy.record_optin_ip">{{ $t('settings.privacy.recordOptinIP') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field><hr />- <b-tabs v-model="tab" type="is-boxed" :animated="false">- <b-tab-item :label="`${$t('settings.privacy.domainBlocklist')} (${numBlocked})`">- <b-field :message="$t('settings.privacy.domainBlocklistHelp')">- <b-input type="textarea" v-model="data['privacy.domain_blocklist']" name="privacy.domain_blocklist" />- </b-field>- </b-tab-item>- <b-tab-item :label="`${$t('settings.privacy.domainAllowlist')} (${numAllowed})`">- <b-field :message="$t('settings.privacy.domainAllowlistHelp')">- <b-input type="textarea" v-model="data['privacy.domain_allowlist']" name="privacy.domain_allowlist" />- </b-field>- </b-tab-item>- </b-tabs>+ <ot-tabs ref="privacyDomainTabs" class="settings-subtabs" @ot-tab-change="tab = $event.detail.index">+ <div role="tablist">+ <button type="button" role="tab" :aria-selected="tab === 0 ? 'true' : 'false'">+ {{ `${$t('settings.privacy.domainBlocklist')} (${numBlocked})` }}+ </button>+ <button type="button" role="tab" :aria-selected="tab === 1 ? 'true' : 'false'">+ {{ `${$t('settings.privacy.domainAllowlist')} (${numAllowed})` }}+ </button>+ </div>++ <div role="tabpanel">+ <oat-field :message="$t('settings.privacy.domainBlocklistHelp')">+ <textarea aria-label="field" v-model="data['privacy.domain_blocklist']" name="privacy.domain_blocklist" />+ </oat-field>+ </div>+ <div role="tabpanel">+ <oat-field :message="$t('settings.privacy.domainAllowlistHelp')">+ <textarea aria-label="field" v-model="data['privacy.domain_allowlist']" name="privacy.domain_allowlist" />+ </oat-field>+ </div>+ </ot-tabs></div></template>@@ -96,6 +105,11 @@ export default Vue.extend({mounted() {this.tab = this.$utils.getPref('settings.privacyDomainTab') || 0;+ this.$nextTick(() => {+ if (this.$refs.privacyDomainTabs) {+ this.$refs.privacyDomainTabs.activeIndex = Number(this.tab);+ }+ });},computed: {diff --git a/frontend/src/views/settings/security.vue b/frontend/src/views/settings/security.vueindex 92395ce7..64334caa 100644--- a/frontend/src/views/settings/security.vue+++ b/frontend/src/views/settings/security.vue@@ -1,124 +1,126 @@<template><div class="items">- <div class="columns">- <div class="column is-3">- <b-field :message="$t('settings.security.OIDCHelp')">- <b-switch v-model="data['security.oidc']['enabled']" name="security.oidc">+ <div class="row">+ <div class="col-3">+ <oat-field :message="$t('settings.security.OIDCHelp')">+ <oat-switch v-model="data['security.oidc']['enabled']" name="security.oidc">{{ $t('settings.security.enableOIDC') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column is-9">- <b-field :label="$t('settings.security.OIDCURL')" label-position="on-border">+ <div class="col-9">+ <oat-field :label="$t('settings.security.OIDCURL')"><div>- <b-input v-model="data['security.oidc']['provider_url']" name="oidc.provider_url"+ <input aria-label="field" v-model="data['security.oidc']['provider_url']" name="oidc.provider_url"placeholder="https://login.yoursite.com" :disabled="!data['security.oidc']['enabled']" :maxlength="300"- required type="url" pattern="https?://.*" />+ required type="url" pattern="https?://.*">- <div class="spaced-links is-size-7 mt-2" :class="{ 'disabled': !data['security.oidc']['enabled'] }">+ <div class="spaced-links text-7 mt-2" :class="{ disabled: !data['security.oidc']['enabled'] }"><a href="#" @click.prevent="() => setProvider('google')">Google</a><a href="#" @click.prevent="() => setProvider('microsoft')">Microsoft</a><a href="#" @click.prevent="() => setProvider('apple')">Apple</a></div></div>- </b-field>+ </oat-field>- <b-field :label="$t('settings.security.OIDCName')" label-position="on-border">- <b-input v-model="data['security.oidc']['provider_name']" name="oidc.provider_name" ref="provider_name"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" />- </b-field>+ <oat-field :label="$t('settings.security.OIDCName')">+ <input aria-label="field" v-model="data['security.oidc']['provider_name']" name="oidc.provider_name"+ ref="provider_name" :disabled="!data['security.oidc']['enabled']" :maxlength="200">+ </oat-field>- <b-field :label="$t('settings.security.OIDCClientID')" label-position="on-border">- <b-input v-model="data['security.oidc']['client_id']" name="oidc.client_id" ref="client_id"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />- </b-field>+ <oat-field :label="$t('settings.security.OIDCClientID')">+ <input aria-label="field" v-model="data['security.oidc']['client_id']" name="oidc.client_id" ref="client_id"+ :disabled="!data['security.oidc']['enabled']" :maxlength="200" required>+ </oat-field>- <b-field :label="$t('settings.security.OIDCClientSecret')" label-position="on-border">- <b-input v-model="data['security.oidc']['client_secret']" name="oidc.client_secret" type="password"- :disabled="!data['security.oidc']['enabled']" :maxlength="200" required />- </b-field>+ <oat-field :label="$t('settings.security.OIDCClientSecret')">+ <input aria-label="field" v-model="data['security.oidc']['client_secret']" name="oidc.client_secret"+ type="password" :disabled="!data['security.oidc']['enabled']" :maxlength="200" required>+ </oat-field><hr />- <b-field :message="$t('settings.security.OIDCAutoCreateUsersHelp')">- <b-switch v-model="data['security.oidc']['auto_create_users']" :disabled="!data['security.oidc']['enabled']"+ <oat-field :message="$t('settings.security.OIDCAutoCreateUsersHelp')">+ <oat-switch v-model="data['security.oidc']['auto_create_users']" :disabled="!data['security.oidc']['enabled']"name="oidc.auto_create_users">{{ $t('settings.security.OIDCAutoCreateUsers') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field>- <b-field :label="$t('settings.security.OIDCDefaultUserRole')" label-position="on-border"+ <oat-field :label="$t('settings.security.OIDCDefaultUserRole')":message="$t('settings.security.OIDCDefaultRoleHelp')">- <b-select v-model="data['security.oidc']['default_user_role_id']"+ <select aria-label="field" v-model="data['security.oidc']['default_user_role_id']":disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"- name="oidc.default_user_role_id" expanded>+ name="oidc.default_user_role_id"><option v-for="role in userRoles" :key="role.id" :value="role.id">{{ role.name }}</option>- </b-select>- </b-field>+ </select>+ </oat-field>- <b-field :label="$t('settings.security.OIDCDefaultListRole')" label-position="on-border"+ <oat-field :label="$t('settings.security.OIDCDefaultListRole')":message="$t('settings.security.OIDCDefaultRoleHelp')">- <b-select v-model="data['security.oidc']['default_list_role_id']"+ <select aria-label="field" v-model="data['security.oidc']['default_list_role_id']":disabled="!data['security.oidc']['enabled'] || !data['security.oidc']['auto_create_users']"- name="oidc.default_list_role_id" expanded>+ name="oidc.default_list_role_id"><option :value="null">— {{ $t("globals.terms.none") }} —</option><option v-for="role in listRoles" :key="role.id" :value="role.id">{{ role.name }}</option>- </b-select>- </b-field>+ </select>+ </oat-field><hr />- <b-field :label="$t('settings.security.OIDCRedirectURL')">+ <oat-field :label="$t('settings.security.OIDCRedirectURL')"><code><copy-text :text="`${serverConfig.root_url}/auth/oidc`" /></code>- </b-field>- <p v-if="data['security.oidc']['enabled'] && !isURLOk" class="has-text-danger">- <b-icon icon="warning-empty" />+ </oat-field>+ <p v-if="data['security.oidc']['enabled'] && !isURLOk" class="text-danger">+ <oat-icon icon="warning-empty" />{{ $t('settings.security.OIDCRedirectWarning') }}</p></div></div><hr />- <div class="columns">- <div class="column is-3">- <b-field :message="$t('settings.security.enableCaptchaHelp')">- <b-switch v-model="captchaEnabled" name="security.captcha">+ <div class="row">+ <div class="col-3">+ <oat-field :message="$t('settings.security.enableCaptchaHelp')">+ <oat-switch v-model="captchaEnabled" name="security.captcha">{{ $t('settings.security.enableCaptcha') }}- </b-switch>- </b-field>+ </oat-switch>+ </oat-field></div>- <div class="column is-9" v-if="captchaEnabled">- <b-field>- <b-radio v-model="selectedProvider" native-value="altcha" name="captcha_provider">+ <div class="col-9" v-if="captchaEnabled">+ <fieldset>+ <legend>{{ $t('settings.security.enableCaptcha') }}</legend>+ <label>+ <input aria-label="field" v-model="selectedProvider" type="radio" value="altcha" name="captcha_provider">ALTCHA- </b-radio>- <b-radio v-model="selectedProvider" native-value="hcaptcha" name="captcha_provider">+ </label>+ <label>+ <input aria-label="field" v-model="selectedProvider" type="radio" value="hcaptcha" name="captcha_provider">hCaptcha (deprecated)- </b-radio>- </b-field>+ </label>+ </fieldset><!-- captcha settings --><div v-if="selectedProvider === 'altcha'">- <b-field :label="$t('settings.security.altchaComplexity')" label-position="on-border"+ <oat-field :label="$t('settings.security.altchaComplexity')":message="$t('settings.security.altchaComplexityHelp')">- <b-input v-model.number="data['security.captcha']['altcha']['complexity']" name="altcha_complexity"- type="number" min="1000" max="1000000" required />- </b-field>+ <input aria-label="field" v-model.number="data['security.captcha']['altcha']['complexity']"+ name="altcha_complexity" type="number" min="1000" max="1000000" required>+ </oat-field></div><div v-if="selectedProvider === 'hcaptcha'">- <b-field :label="$t('settings.security.captchaKey')" label-position="on-border"- :message="$t('settings.security.captchaKeyHelp')">- <b-input v-model="data['security.captcha']['hcaptcha']['key']" name="hcaptcha_key" :maxlength="200"- required />- </b-field>- <b-field :label="$t('settings.security.captchaSecret')" label-position="on-border">- <b-input v-model="data['security.captcha']['hcaptcha']['secret']" name="hcaptcha_secret" type="password"- :maxlength="200" required />- </b-field>+ <oat-field :label="$t('settings.security.captchaKey')" :message="$t('settings.security.captchaKeyHelp')">+ <input aria-label="field" v-model="data['security.captcha']['hcaptcha']['key']" name="hcaptcha_key"+ :maxlength="200" required>+ </oat-field>+ <oat-field :label="$t('settings.security.captchaSecret')">+ <input aria-label="field" v-model="data['security.captcha']['hcaptcha']['secret']" name="hcaptcha_secret"+ type="password" :maxlength="200" required>+ </oat-field></div></div></div><!-- captcha -->@@ -126,13 +128,13 @@<hr /><!-- CORS -->- <div class="columns">- <div class="column is-12">- <h3 class="is-size-6"><strong>{{ $t('settings.security.trustedURLs') }} / CORS</strong></h3><br />- <b-field label-position="on-border" :message="$t('settings.security.trustedURLsHelp')">- <b-input v-model="trustedURLs" name="trusted_urls" type="textarea" rows="5"+ <div class="row">+ <div class="col-12">+ <h3><strong>{{ $t('settings.security.trustedURLs') }} / CORS</strong></h3><br />+ <oat-field :message="$t('settings.security.trustedURLsHelp')">+ <textarea aria-label="field" v-model="trustedURLs" name="trusted_urls" rows="5"placeholder="https://example.com" />- </b-field>+ </oat-field></div></div><!-- cors --></div>diff --git a/frontend/src/views/settings/smtp.vue b/frontend/src/views/settings/smtp.vueindex c5d279ff..89ae28bb 100644--- a/frontend/src/views/settings/smtp.vue+++ b/frontend/src/views/settings/smtp.vue@@ -1,43 +1,42 @@<template><div><div class="items mail-servers">- <div class="block box" v-for="(item, n) in form.smtp" :key="n">- <div class="columns">- <div class="column is-2">- <b-field>- <b-switch v-model="item.enabled" name="enabled" :native-value="true" data-cy="btn-enable-smtp">+ <div class="card" v-for="(item, n) in form.smtp" :key="n">+ <div class="row">+ <div class="col-2">+ <oat-field>+ <oat-switch v-model="item.enabled" name="enabled" :native-value="true" data-cy="btn-enable-smtp">{{ $t('globals.buttons.enabled') }}- </b-switch>- </b-field>- <b-field v-if="form.smtp.length > 1">+ </oat-switch>+ </oat-field>+ <oat-field v-if="form.smtp.length > 1"><a @click.prevent="$utils.confirm(null, () => removeSMTP(n))" href="#" data-cy="btn-delete-smtp">- <b-icon icon="trash-can-outline" />+ <oat-icon icon="trash-can-outline" />{{ $t('globals.buttons.delete') }}</a>- </b-field>- </div><!-- first column -->+ </oat-field>+ </div><!-- first col-12 -->- <div class="column" :class="{ disabled: !item.enabled }">- <div class="columns">- <div class="column is-9">- <b-field :label="$t('settings.mailserver.host')" label-position="on-border"- :message="$t('settings.mailserver.hostHelp')">- <b-input v-model="item.host" name="host" placeholder="smtp.yourmailserver.net" :maxlength="200" />- </b-field>+ <div class="col-10" :class="{ disabled: !item.enabled }">+ <div class="row">+ <div class="col-9">+ <oat-field :label="$t('settings.mailserver.host')" :message="$t('settings.mailserver.hostHelp')">+ <input aria-label="field" v-model="item.host" name="host" placeholder="smtp.yourmailserver.net"+ :maxlength="200">+ </oat-field></div>- <div class="column">- <b-field :label="$t('settings.mailserver.port')" label-position="on-border"- :message="$t('settings.mailserver.portHelp')">- <b-numberinput v-model="item.port" name="port" type="is-light" controls-position="compact"- placeholder="25" min="1" max="65535" />- </b-field>+ <div class="col-3">+ <oat-field :label="$t('settings.mailserver.port')" :message="$t('settings.mailserver.portHelp')">+ <input aria-label="field" type="number" v-model.number="item.port" name="port" placeholder="25"+ min="1" max="65535">+ </oat-field></div></div><!-- host -->- <div class="columns">- <div class="column is-3">- <b-field :label="$t('settings.mailserver.authProtocol')" label-position="on-border">- <b-select v-model="item.auth_protocol" name="auth_protocol" expanded>+ <div class="row">+ <div class="col-3">+ <oat-field :label="$t('settings.mailserver.authProtocol')">+ <select aria-label="field" v-model="item.auth_protocol" name="auth_protocol"><option value="login">LOGIN</option>@@ -50,25 +49,25 @@<option value="none">None</option>- </b-select>- </b-field>+ </select>+ </oat-field></div>- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.mailserver.username')" label-position="on-border" expanded>- <b-input v-model="item.username" :custom-class="`smtp-username-${n}`"- :disabled="item.auth_protocol === 'none'" name="username" placeholder="mysmtp" :maxlength="200" />- </b-field>- <b-field :label="$t('settings.mailserver.password')" label-position="on-border" expanded+ <div class="col-9">+ <oat-field>+ <oat-field :label="$t('settings.mailserver.username')">+ <input aria-label="field" v-model="item.username" :disabled="item.auth_protocol === 'none'"+ name="username" placeholder="mysmtp" :maxlength="200">+ </oat-field>+ <oat-field :label="$t('settings.mailserver.password')":message="$t('settings.mailserver.passwordHelp')">- <b-input v-model="item.password" :disabled="item.auth_protocol === 'none'" name="password"- type="password" :custom-class="`password-${n}`"- :placeholder="$t('settings.mailserver.passwordHelp')" :maxlength="200" />- </b-field>- </b-field>+ <input aria-label="field" v-model="item.password" :disabled="item.auth_protocol === 'none'"+ name="password" type="password" :placeholder="$t('settings.mailserver.passwordHelp')"+ :maxlength="200">+ </oat-field>+ </oat-field></div></div><!-- auth -->- <div class="spaced-links is-size-7">+ <div class="spaced-links text-7"><a href="#" @click.prevent="() => fillSettings(n, 'gmail')">Gmail</a><a href="#" @click.prevent="() => fillSettings(n, 'ses')">Amazon SES</a><a href="#" @click.prevent="() => fillSettings(n, 'azure')">Azure ACS</a>@@ -81,18 +80,17 @@</div><hr />- <div class="columns">- <div class="column is-6">- <b-field :label="$t('settings.smtp.heloHost')" label-position="on-border"- :message="$t('settings.smtp.heloHostHelp')">- <b-input v-model="item.hello_hostname" name="hello_hostname" placeholder="" :maxlength="200" />- </b-field>+ <div class="row">+ <div class="col-6">+ <oat-field :label="$t('settings.smtp.heloHost')" :message="$t('settings.smtp.heloHostHelp')">+ <input aria-label="field" v-model="item.hello_hostname" name="hello_hostname" placeholder=""+ :maxlength="200">+ </oat-field></div>- <div class="column">- <b-field grouped>- <b-field :label="$t('settings.mailserver.tls')" expanded :message="$t('settings.mailserver.tlsHelp')"- label-position="on-border">- <b-select v-model="item.tls_type" name="items.tls_type">+ <div class="col-6">+ <oat-field>+ <oat-field :label="$t('settings.mailserver.tls')" :message="$t('settings.mailserver.tlsHelp')">+ <select aria-label="field" v-model="item.tls_type" name="items.tls_type"><option value="none">{{ $t('globals.states.off') }}</option>@@ -102,133 +100,131 @@<option value="TLS">SSL/TLS</option>- </b-select>- </b-field>- <b-field expanded :message="$t('settings.mailserver.skipTLSHelp')">- <b-switch v-model="item.tls_skip_verify" :disabled="item.tls_type === 'none'"+ </select>+ </oat-field>+ <oat-field :message="$t('settings.mailserver.skipTLSHelp')">+ <oat-switch v-model="item.tls_skip_verify" :disabled="item.tls_type === 'none'"name="item.tls_skip_verify">{{ $t('settings.mailserver.skipTLS') }}- </b-switch>- </b-field>- </b-field>+ </oat-switch>+ </oat-field>+ </oat-field></div></div><!-- TLS --><hr />- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.mailserver.maxConns')" label-position="on-border"+ <div class="row">+ <div class="col-4">+ <oat-field :label="$t('settings.mailserver.maxConns')":message="$t('settings.mailserver.maxConnsHelp')">- <b-numberinput v-model="item.max_conns" name="max_conns" type="is-light" controls-position="compact"- placeholder="25" min="1" max="65535" />- </b-field>+ <input aria-label="field" type="number" v-model.number="item.max_conns" name="max_conns"+ placeholder="25" min="1" max="65535">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('settings.mailserver.idleTimeout')" label-position="on-border"+ <div class="col-4">+ <oat-field :label="$t('settings.mailserver.idleTimeout')":message="$t('settings.mailserver.idleTimeoutHelp')">- <b-input v-model="item.idle_timeout" name="idle_timeout" placeholder="15s" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <input aria-label="field" v-model="item.idle_timeout" name="idle_timeout" placeholder="15s"+ :pattern="regDuration" :maxlength="10">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('settings.mailserver.waitTimeout')" label-position="on-border"+ <div class="col-4">+ <oat-field :label="$t('settings.mailserver.waitTimeout')":message="$t('settings.mailserver.waitTimeoutHelp')">- <b-input v-model="item.wait_timeout" name="wait_timeout" placeholder="5s" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <input aria-label="field" v-model="item.wait_timeout" name="wait_timeout" placeholder="5s"+ :pattern="regDuration" :maxlength="10">+ </oat-field></div></div>- <div class="columns">- <div class="column is-4">- <b-field :label="$t('settings.smtp.retries')" label-position="on-border"- :message="$t('settings.smtp.retriesHelp')">- <b-numberinput v-model="item.max_msg_retries" name="max_msg_retries" type="is-light"- controls-position="compact" placeholder="2" min="1" max="1000" />- </b-field>+ <div class="row">+ <div class="col-4">+ <oat-field :label="$t('settings.smtp.retries')" :message="$t('settings.smtp.retriesHelp')">+ <input aria-label="field" type="number" v-model.number="item.max_msg_retries" name="max_msg_retries"+ placeholder="2" min="1" max="1000">+ </oat-field></div>- <div class="column is-4">- <b-field :label="$t('settings.smtp.retryDelay')" label-position="on-border"- :message="$t('settings.smtp.retryDelayHelp')">- <b-input v-model="item.msg_retry_delay" name="msg_retry_delay" placeholder="0s" :pattern="regDuration"- :maxlength="10" />- </b-field>+ <div class="col-4">+ <oat-field :label="$t('settings.smtp.retryDelay')" :message="$t('settings.smtp.retryDelayHelp')">+ <input aria-label="field" v-model="item.msg_retry_delay" name="msg_retry_delay" placeholder="0s"+ :pattern="regDuration" :maxlength="10">+ </oat-field></div></div><hr />- <div class="columns">- <div class="column is-6">- <b-field :label="$t('globals.fields.name')" label-position="on-border"- :message="$t('settings.mailserver.nameHelp')">- <b-input v-model="item.name" name="name" placeholder="email-primary" :maxlength="100" />- </b-field>+ <div class="row">+ <div class="col-6">+ <oat-field :label="$t('globals.fields.name')" :message="$t('settings.mailserver.nameHelp')">+ <input aria-label="field" v-model="item.name" name="name" placeholder="email-primary"+ :maxlength="100">+ </oat-field></div>- <div class="column is-6">- <b-field :label="$t('settings.smtp.fromAddresses')" label-position="on-border"- :message="$t('settings.smtp.fromAddressesHelp')">- <b-taginput v-model="item.from_addresses" name="from_addresses" ellipsis icon="tag-outline"+ <div class="col-6">+ <oat-field :label="$t('settings.smtp.fromAddresses')" :message="$t('settings.smtp.fromAddressesHelp')">+ <oat-tag-input v-model="item.from_addresses" name="from_addresses":before-adding="validateFromAddress" placeholder="[email protected], anothersite.com" />- </b-field>+ </oat-field></div></div>- <div class="columns">- <div class="column">+ <div class="row">+ <div class="col-12"><p v-if="item.email_headers.length === 0 && !item.showHeaders"><a href="#" @click.prevent="() => showSMTPHeaders(n)">- <b-icon icon="plus" />{{ $t('settings.smtp.setCustomHeaders') }}</a>+ <oat-icon icon="plus" />{{ $t('settings.smtp.setCustomHeaders') }}</a></p>- <b-field v-if="item.email_headers.length > 0 || item.showHeaders" label-position="on-border"+ <oat-field v-if="item.email_headers.length > 0 || item.showHeaders":message="$t('settings.smtp.customHeadersHelp')">- <b-input v-model="item.strEmailHeaders" name="email_headers" type="textarea"+ <textarea aria-label="field" v-model="item.strEmailHeaders" name="email_headers"placeholder="[{"X-Custom": "value"}, {"X-Custom2": "value"}]" />- </b-field>+ </oat-field></div></div><hr /><form @submit.prevent="() => doSMTPTest(item, n)">- <div class="columns">+ <div class="row"><template v-if="smtpTestItem === n">- <div class="column is-5">+ <div class="col-5"><strong>{{ $t('settings.general.fromEmail') }}</strong><br />{{ settings['app.from_email'] }}</div>- <div class="column is-4">- <b-field :label="$t('settings.smtp.toEmail')" label-position="on-border">- <b-input type="email" required v-model="testEmail" :ref="'testEmailTo'"- placeholder="[email protected]" :custom-class="`test-email-${n}`" />- </b-field>+ <div class="col-4">+ <oat-field :label="$t('settings.smtp.toEmail')">+ <input aria-label="field" type="email" required v-model="testEmail" :ref="'testEmailTo'"+ placeholder="[email protected]">+ </oat-field></div></template>- <div class="column has-text-right">- <b-button v-if="smtpTestItem === n" class="is-primary" @click.prevent="() => doSMTPTest(item, n)">+ <div class="col-3 align-right">+ <button type="button" v-if="smtpTestItem === n" data-variant="primary"+ @click.prevent="() => doSMTPTest(item, n)">{{ $t('settings.smtp.sendTest') }}- </b-button>- <a href="#" v-else class="is-primary" @click.prevent="showTestForm(n)">- <b-icon icon="rocket-launch-outline" /> {{ $t('settings.smtp.testConnection') }}+ </button>+ <a href="#" v-else data-variant="primary" @click.prevent="showTestForm(n)">+ <oat-icon icon="rocket-launch-outline" /> {{ $t('settings.smtp.testConnection') }}</a></div>- <div class="columns">- <div class="column" />+ <div class="row">+ <div class="col-12" /></div></div><div v-if="errMsg && smtpTestItem === n">- <b-field class="mt-4" type="is-danger">- <b-input v-model="errMsg" type="textarea" custom-class="has-text-danger is-size-6" readonly />- </b-field>+ <oat-field class="mt-4">+ <textarea aria-label="field" v-model="errMsg" readonly />+ </oat-field></div></form><!-- smtp test --></div>- </div><!-- second container column -->+ </div><!-- second container col-12 --></div><!-- block --></div><!-- mail-servers -->- <b-button @click="addSMTP" icon-left="plus" type="is-primary">+ <button type="button" @click="addSMTP" data-variant="primary">{{ $t('globals.buttons.addNew') }}- </b-button>+ </button></div></template>@@ -333,7 +329,7 @@ export default Vue.extend({doSMTPTest(item, n) {if (!this.isTestEnabled(item)) {- this.$utils.toast(this.$t('settings.smtp.testEnterEmail'), 'is-danger');+ this.$utils.toast(this.$t('settings.smtp.testEnterEmail'), '');this.$nextTick(() => {const i = document.querySelector(`.password-${n}`);this.data.smtp[n].password = '';diff --git a/frontend/vite.config.js b/frontend/vite.config.jsindex 4a45f7e5..bb992506 100644--- a/frontend/vite.config.js+++ b/frontend/vite.config.js@@ -13,7 +13,6 @@ export default defineConfig(({ _, mode }) => {resolve: {alias: {'@': path.resolve(__dirname, './src'),- bulma: require.resolve('bulma/bulma.sass'),},},build: {diff --git a/frontend/yarn.lock b/frontend/yarn.lockindex fc795c2e..27e74544 100644--- a/frontend/yarn.lock+++ b/frontend/yarn.lock@@ -4,38 +4,38 @@"@altcha/crypto@^0.0.1":version "0.0.1"- resolved "https://registry.yarnpkg.com/@altcha/crypto/-/crypto-0.0.1.tgz#0e2f254559fb350c80ff56d29b8e3ab2e6bbea95"+ resolved "https://registry.npmjs.org/@altcha/crypto/-/crypto-0.0.1.tgz"integrity sha512-qZMdnoD3lAyvfSUMNtC2adRi666Pxdcw9zqfMU5qBOaJWqpN9K+eqQGWqeiKDMqL0SF+EytNG4kR/Pr/99GJ6g=="@babel/helper-string-parser@^7.25.9":version "7.25.9"- resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"+ resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz"integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA=="@babel/helper-validator-identifier@^7.25.9":version "7.25.9"- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"+ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz"integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ=="@babel/parser@^7.23.5":version "7.26.3"- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"+ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz"integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==dependencies:"@babel/types" "^7.26.3""@babel/types@^7.26.3":version "7.26.3"- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"+ resolved "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz"integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==dependencies:"@babel/helper-string-parser" "^7.25.9""@babel/helper-validator-identifier" "^7.25.9""@codemirror/autocomplete@^6.0.0", "@codemirror/autocomplete@^6.3.2", "@codemirror/autocomplete@^6.7.1":- version "6.18.6"- resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz#de26e864a1ec8192a1b241eb86addbb612964ddb"- integrity sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==+ version "6.20.2"+ resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.2.tgz"+ integrity sha512-G5FPkgIiLjOgZMjqVjvuKQ1rGPtHogLldJr33eFJdVLtmwY+giGrlv/ewljLz6b9BSQLkjxuwBc6g6omDM+YxQ==dependencies:"@codemirror/language" "^6.0.0""@codemirror/state" "^6.0.0"@@ -43,19 +43,19 @@"@lezer/common" "^1.0.0""@codemirror/commands@^6.0.0", "@codemirror/commands@^6.8.1":- version "6.8.1"- resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.8.1.tgz#639f5559d2f33f2582a2429c58cb0c1b925c7a30"- integrity sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==+ version "6.10.3"+ resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz"+ integrity sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==dependencies:"@codemirror/language" "^6.0.0"- "@codemirror/state" "^6.4.0"+ "@codemirror/state" "^6.6.0""@codemirror/view" "^6.27.0""@lezer/common" "^1.1.0""@codemirror/lang-angular@^0.1.0":- version "0.1.3"- resolved "https://registry.yarnpkg.com/@codemirror/lang-angular/-/lang-angular-0.1.3.tgz#83035e7e9e1f0e2ba466e83d778407b519089a28"- integrity sha512-xgeWGJQQl1LyStvndWtruUvb4SnBZDAu/gvFH/ZU+c0W25tQR8e5hq7WTwiIY2dNxnf+49mRiGI/9yxIwB6f5w==+ version "0.1.4"+ resolved "https://registry.npmjs.org/@codemirror/lang-angular/-/lang-angular-0.1.4.tgz"+ integrity sha512-oap+gsltb/fzdlTQWD6BFF4bSLKcDnlxDsLdePiJpCVNKWXSTAbiiQeYI3UmES+BLAdkmIC1WjyztC1pi/bX4g==dependencies:"@codemirror/lang-html" "^6.0.0""@codemirror/lang-javascript" "^6.1.2"@@ -65,16 +65,16 @@"@lezer/lr" "^1.3.3""@codemirror/lang-cpp@^6.0.0":- version "6.0.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-cpp/-/lang-cpp-6.0.2.tgz#076c98340c3beabde016d7d83e08eebe17254ef9"- integrity sha512-6oYEYUKHvrnacXxWxYa6t4puTlbN3dgV662BDfSH8+MfjQjVmP697/KYTDOqpxgerkvoNm7q5wlFMBeX8ZMocg==+ version "6.0.3"+ resolved "https://registry.npmjs.org/@codemirror/lang-cpp/-/lang-cpp-6.0.3.tgz"+ integrity sha512-URM26M3vunFFn9/sm6rzqrBzDgfWuDixp85uTY49wKudToc2jTHUrKIGGKs+QWND+YLofNNZpxcNGRynFJfvgA==dependencies:"@codemirror/language" "^6.0.0""@lezer/cpp" "^1.0.0""@codemirror/lang-css@^6.0.0", "@codemirror/lang-css@^6.2.0", "@codemirror/lang-css@^6.3.1":version "6.3.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-css/-/lang-css-6.3.1.tgz#763ca41aee81bb2431be55e3cfcc7cc8e91421a3"+ resolved "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz"integrity sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==dependencies:"@codemirror/autocomplete" "^6.0.0"@@ -85,7 +85,7 @@"@codemirror/lang-go@^6.0.0":version "6.0.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-go/-/lang-go-6.0.1.tgz#598222c90f56eae28d11069c612ca64d0306b057"+ resolved "https://registry.npmjs.org/@codemirror/lang-go/-/lang-go-6.0.1.tgz"integrity sha512-7fNvbyNylvqCphW9HD6WFnRpcDjr+KXX/FgqXy5H5ZS0eC5edDljukm/yNgYkwTsgp2busdod50AOTIy6Jikfg==dependencies:"@codemirror/autocomplete" "^6.0.0"@@ -95,9 +95,9 @@"@lezer/go" "^1.0.0""@codemirror/lang-html@^6.0.0", "@codemirror/lang-html@^6.4.9":- version "6.4.9"- resolved "https://registry.yarnpkg.com/@codemirror/lang-html/-/lang-html-6.4.9.tgz#d586f2cc9c341391ae07d1d7c545990dfa069727"- integrity sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==+ version "6.4.11"+ resolved "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz"+ integrity sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/lang-css" "^6.0.0"@@ -107,20 +107,20 @@"@codemirror/view" "^6.17.0""@lezer/common" "^1.0.0""@lezer/css" "^1.1.0"- "@lezer/html" "^1.3.0"+ "@lezer/html" "^1.3.12""@codemirror/lang-java@^6.0.0":- version "6.0.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-java/-/lang-java-6.0.1.tgz#03bd06334da7c8feb9dff6db01ac6d85bd2e48bb"- integrity sha512-OOnmhH67h97jHzCuFaIEspbmsT98fNdhVhmA3zCxW0cn7l8rChDhZtwiwJ/JOKXgfm4J+ELxQihxaI7bj7mJRg==+ version "6.0.2"+ resolved "https://registry.npmjs.org/@codemirror/lang-java/-/lang-java-6.0.2.tgz"+ integrity sha512-m5Nt1mQ/cznJY7tMfQTJchmrjdjQ71IDs+55d1GAa8DGaB8JXWsVCkVT284C3RTASaY43YknrK2X3hPO/J3MOQ==dependencies:"@codemirror/language" "^6.0.0""@lezer/java" "^1.0.0""@codemirror/lang-javascript@^6.0.0", "@codemirror/lang-javascript@^6.1.2", "@codemirror/lang-javascript@^6.2.3":- version "6.2.3"- resolved "https://registry.yarnpkg.com/@codemirror/lang-javascript/-/lang-javascript-6.2.3.tgz#d705c359dc816afcd3bcdf120a559f83d31d4cda"- integrity sha512-8PR3vIWg7pSu7ur8A07pGiYHgy3hHj+mRYRCSG8q+mPIrl0F02rgpGv+DsQTHRTc30rydOsf5PZ7yjKFg2Ackw==+ version "6.2.5"+ resolved "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.5.tgz"+ integrity sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/language" "^6.6.0"@@ -130,17 +130,31 @@"@lezer/common" "^1.0.0""@lezer/javascript" "^1.0.0"-"@codemirror/lang-json@^6.0.0":+"@codemirror/lang-jinja@^6.0.0":version "6.0.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-json/-/lang-json-6.0.1.tgz#0a0be701a5619c4b0f8991f9b5e95fe33f462330"- integrity sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==+ resolved "https://registry.npmjs.org/@codemirror/lang-jinja/-/lang-jinja-6.0.1.tgz"+ integrity sha512-P5kyHLObzjtbGj16h+hyvZTxJhSjBEeSx4wMjbnAf3b0uwTy2+F0zGjMZL4PQOm/mh2eGZ5xUDVZXgwP783Nsw==+ dependencies:+ "@codemirror/autocomplete" "^6.0.0"+ "@codemirror/lang-html" "^6.0.0"+ "@codemirror/language" "^6.0.0"+ "@codemirror/state" "^6.0.0"+ "@codemirror/view" "^6.0.0"+ "@lezer/common" "^1.2.0"+ "@lezer/highlight" "^1.2.0"+ "@lezer/lr" "^1.4.0"++"@codemirror/lang-json@^6.0.0":+ version "6.0.2"+ resolved "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.2.tgz"+ integrity sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==dependencies:"@codemirror/language" "^6.0.0""@lezer/json" "^1.0.0""@codemirror/lang-less@^6.0.0":version "6.0.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-less/-/lang-less-6.0.2.tgz#2e3d82a3ddb8710e6409689cd4a28c66558d0cb8"+ resolved "https://registry.npmjs.org/@codemirror/lang-less/-/lang-less-6.0.2.tgz"integrity sha512-EYdQTG22V+KUUk8Qq582g7FMnCZeEHsyuOJisHRft/mQ+ZSZ2w51NupvDUHiqtsOy7It5cHLPGfHQLpMh9bqpQ==dependencies:"@codemirror/lang-css" "^6.2.0"@@ -150,9 +164,9 @@"@lezer/lr" "^1.0.0""@codemirror/lang-liquid@^6.0.0":- version "6.2.3"- resolved "https://registry.yarnpkg.com/@codemirror/lang-liquid/-/lang-liquid-6.2.3.tgz#cbdb38cbf2c59bc334292420401f88aa6c4b4b27"- integrity sha512-yeN+nMSrf/lNii3FJxVVEGQwFG0/2eDyH6gNOj+TGCa0hlNO4bhQnoO5ISnd7JOG+7zTEcI/GOoyraisFVY7jQ==+ version "6.3.2"+ resolved "https://registry.npmjs.org/@codemirror/lang-liquid/-/lang-liquid-6.3.2.tgz"+ integrity sha512-6PDVU3ZnfeYyz1at1E/ttorErZvZFXXt1OPhtfe1EZJ2V2iDFa0CwPqPgG5F7NXN0yONGoBogKmFAafKTqlwIw==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/lang-html" "^6.0.0"@@ -164,9 +178,9 @@"@lezer/lr" "^1.3.1""@codemirror/lang-markdown@^6.0.0", "@codemirror/lang-markdown@^6.3.2":- version "6.3.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-markdown/-/lang-markdown-6.3.2.tgz#841a922c9305c035678600de5187c1b7a80f6c21"- integrity sha512-c/5MYinGbFxYl4itE9q/rgN/sMTjOr8XL5OWnC+EaRMLfCbVUmmubTJfdgpfcSS2SCaT7b+Q+xi3l6CgoE+BsA==+ version "6.5.0"+ resolved "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz"+ integrity sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==dependencies:"@codemirror/autocomplete" "^6.7.1""@codemirror/lang-html" "^6.0.0"@@ -177,9 +191,9 @@"@lezer/markdown" "^1.0.0""@codemirror/lang-php@^6.0.0":- version "6.0.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-php/-/lang-php-6.0.1.tgz#fa34cc75562178325861a5731f79bd621f57ffaa"- integrity sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==+ version "6.0.2"+ resolved "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.2.tgz"+ integrity sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==dependencies:"@codemirror/lang-html" "^6.0.0""@codemirror/language" "^6.0.0"@@ -188,9 +202,9 @@"@lezer/php" "^1.0.0""@codemirror/lang-python@^6.0.0":- version "6.1.7"- resolved "https://registry.yarnpkg.com/@codemirror/lang-python/-/lang-python-6.1.7.tgz#1906234d453517d760a57c69672f0023a8649e14"- integrity sha512-mZnFTsL4lW5p9ch8uKNKeRU3xGGxr1QpESLilfON2E3fQzOa/OygEMkaDvERvXDJWJA9U9oN/D4w0ZuUzNO4+g==+ version "6.2.1"+ resolved "https://registry.npmjs.org/@codemirror/lang-python/-/lang-python-6.2.1.tgz"+ integrity sha512-IRjC8RUBhn9mGR9ywecNhB51yePWCGgvHfY1lWN/Mrp3cKuHr0isDKia+9HnvhiWNnMpbGhWrkhuWOc09exRyw==dependencies:"@codemirror/autocomplete" "^6.3.2""@codemirror/language" "^6.8.0"@@ -199,16 +213,16 @@"@lezer/python" "^1.1.4""@codemirror/lang-rust@^6.0.0":- version "6.0.1"- resolved "https://registry.yarnpkg.com/@codemirror/lang-rust/-/lang-rust-6.0.1.tgz#d6829fc7baa39a15bcd174a41a9e0a1bf7cf6ba8"- integrity sha512-344EMWFBzWArHWdZn/NcgkwMvZIWUR1GEBdwG8FEp++6o6vT6KL9V7vGs2ONsKxxFUPXKI0SPcWhyYyl2zPYxQ==+ version "6.0.2"+ resolved "https://registry.npmjs.org/@codemirror/lang-rust/-/lang-rust-6.0.2.tgz"+ integrity sha512-EZaGjCUegtiU7kSMvOfEZpaCReowEf3yNidYu7+vfuGTm9ow4mthAparY5hisJqOHmJowVH3Upu+eJlUji6qqA==dependencies:"@codemirror/language" "^6.0.0""@lezer/rust" "^1.0.0""@codemirror/lang-sass@^6.0.0":version "6.0.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-sass/-/lang-sass-6.0.2.tgz#38c1b0a1326cc9f5cb2741d2cd51cfbcd7abc0b2"+ resolved "https://registry.npmjs.org/@codemirror/lang-sass/-/lang-sass-6.0.2.tgz"integrity sha512-l/bdzIABvnTo1nzdY6U+kPAC51czYQcOErfzQ9zSm9D8GmNPD0WTW8st/CJwBTPLO8jlrbyvlSEcN20dc4iL0Q==dependencies:"@codemirror/lang-css" "^6.2.0"@@ -218,9 +232,9 @@"@lezer/sass" "^1.0.0""@codemirror/lang-sql@^6.0.0":- version "6.8.0"- resolved "https://registry.yarnpkg.com/@codemirror/lang-sql/-/lang-sql-6.8.0.tgz#1ae68ad49f378605ff88a4cc428ba667ce056068"- integrity sha512-aGLmY4OwGqN3TdSx3h6QeA1NrvaYtF7kkoWR/+W7/JzB0gQtJ+VJxewlnE3+VImhA4WVlhmkJr109PefOOhjLg==+ version "6.10.0"+ resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.10.0.tgz"+ integrity sha512-6ayPkEd/yRw0XKBx5uAiToSgGECo/GY2NoJIHXIIQh1EVwLuKoU8BP/qK0qH5NLXAbtJRLuT73hx7P9X34iO4w==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/language" "^6.0.0"@@ -231,7 +245,7 @@"@codemirror/lang-vue@^0.1.1":version "0.1.3"- resolved "https://registry.yarnpkg.com/@codemirror/lang-vue/-/lang-vue-0.1.3.tgz#bf79b9152cc18b4903d64c1f67e186ae045c8a97"+ resolved "https://registry.npmjs.org/@codemirror/lang-vue/-/lang-vue-0.1.3.tgz"integrity sha512-QSKdtYTDRhEHCfo5zOShzxCmqKJvgGrZwDQSdbvCRJ5pRLWBS7pD/8e/tH44aVQT6FKm0t6RVNoSUWHOI5vNug==dependencies:"@codemirror/lang-html" "^6.0.0"@@ -243,7 +257,7 @@"@codemirror/lang-wast@^6.0.0":version "6.0.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-wast/-/lang-wast-6.0.2.tgz#d2b14175e5e80d7878cbbb29e20ec90dc12d3a2b"+ resolved "https://registry.npmjs.org/@codemirror/lang-wast/-/lang-wast-6.0.2.tgz"integrity sha512-Imi2KTpVGm7TKuUkqyJ5NRmeFWF7aMpNiwHnLQe0x9kmrxElndyH0K6H/gXtWwY6UshMRAhpENsgfpSwsgmC6Q==dependencies:"@codemirror/language" "^6.0.0"@@ -253,7 +267,7 @@"@codemirror/lang-xml@^6.0.0":version "6.1.0"- resolved "https://registry.yarnpkg.com/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz#e3e786e1a89fdc9520efe75c1d6d3de1c40eb91c"+ resolved "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz"integrity sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==dependencies:"@codemirror/autocomplete" "^6.0.0"@@ -264,9 +278,9 @@"@lezer/xml" "^1.0.0""@codemirror/lang-yaml@^6.0.0":- version "6.1.2"- resolved "https://registry.yarnpkg.com/@codemirror/lang-yaml/-/lang-yaml-6.1.2.tgz#c84280c68fa7af456a355d91183b5e537e9b7038"- integrity sha512-dxrfG8w5Ce/QbT7YID7mWZFKhdhsaTNOYjOkSIMt1qmC4VQnXSDSYVHHHn8k6kJUfIhtLo8t1JJgltlxWdsITw==+ version "6.1.3"+ resolved "https://registry.npmjs.org/@codemirror/lang-yaml/-/lang-yaml-6.1.3.tgz"+ integrity sha512-AZ8DJBuXGVHybpBQhmZtgew5//4hv3tdkXnr3vDmOUMJRuB6vn/uuwtmTOTlqEaQFg3hQSVeA90NmvIQyUV6FQ==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/language" "^6.0.0"@@ -277,9 +291,9 @@"@lezer/yaml" "^1.0.0""@codemirror/language-data@^6.5.1":- version "6.5.1"- resolved "https://registry.yarnpkg.com/@codemirror/language-data/-/language-data-6.5.1.tgz#5cb9413d5225ef27a577c23781bbc0b36c58bb67"- integrity sha512-0sWxeUSNlBr6OmkqybUTImADFUP0M3P0IiSde4nc24bz/6jIYzqYSgkOSLS+CBIoW1vU8Q9KUWXscBXeoMVC9w==+ version "6.5.2"+ resolved "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.5.2.tgz"+ integrity sha512-CPkWBKrNS8stYbEU5kwBwTf3JB1kghlbh4FSAwzGW2TEscdeHHH4FGysREW86Mqnj3Qn09s0/6Ea/TutmoTobg==dependencies:"@codemirror/lang-angular" "^0.1.0""@codemirror/lang-cpp" "^6.0.0"@@ -288,6 +302,7 @@"@codemirror/lang-html" "^6.0.0""@codemirror/lang-java" "^6.0.0""@codemirror/lang-javascript" "^6.0.0"+ "@codemirror/lang-jinja" "^6.0.0""@codemirror/lang-json" "^6.0.0""@codemirror/lang-less" "^6.0.0""@codemirror/lang-liquid" "^6.0.0"@@ -305,62 +320,63 @@"@codemirror/legacy-modes" "^6.4.0""@codemirror/language@^6.0.0", "@codemirror/language@^6.11.0", "@codemirror/language@^6.3.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0", "@codemirror/language@^6.8.0":- version "6.11.0"- resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.11.0.tgz#5ae90972601497f4575f30811519d720bf7232c9"- integrity sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==+ version "6.12.3"+ resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz"+ integrity sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==dependencies:"@codemirror/state" "^6.0.0""@codemirror/view" "^6.23.0"- "@lezer/common" "^1.1.0"+ "@lezer/common" "^1.5.0""@lezer/highlight" "^1.0.0""@lezer/lr" "^1.0.0"style-mod "^4.0.0""@codemirror/legacy-modes@^6.4.0":- version "6.5.0"- resolved "https://registry.yarnpkg.com/@codemirror/legacy-modes/-/legacy-modes-6.5.0.tgz#21c8cf818f9ea4d6eba9f22afdfef010d1d9f754"- integrity sha512-dNw5pwTqtR1giYjaJyEajunLqxGavZqV0XRtVZyMJnNOD2HmK9DMUmuCAr6RMFGRJ4l8OeQDjpI/us+R09mQsw==+ version "6.5.3"+ resolved "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-6.5.3.tgz"+ integrity sha512-xCsmIzH78MyWkib9jlPaaun57XNkfbMIhagfaZVd0iLTqlpw3jXaIcbZm72MTmmn64eTZpBVNjbyYh+QXnxRsg==dependencies:"@codemirror/language" "^6.0.0""@codemirror/lint@^6.0.0":- version "6.8.5"- resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.8.5.tgz#9edaa808e764e28e07665b015951934c8ec3a418"- integrity sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==+ version "6.9.6"+ resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.6.tgz"+ integrity sha512-6Kp7r6XfCi/D/5sdXieMfg9pJU1bUEx96WITuLU6ESaKizCz0QHFMjY/TaFSbigDdEAIgi93itLBIUETP4oK+A==dependencies:"@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.35.0"+ "@codemirror/view" "^6.42.0"crelt "^1.0.5""@codemirror/search@^6.0.0", "@codemirror/search@^6.5.10":- version "6.5.10"- resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.5.10.tgz#7367bfc88094d078b91c752bc74140fb565b55ee"- integrity sha512-RMdPdmsrUf53pb2VwflKGHEe1XVM07hI7vV2ntgw1dmqhimpatSJKva4VA9h4TLUDOD4EIF02201oZurpnEFsg==+ version "6.7.0"+ resolved "https://registry.npmjs.org/@codemirror/search/-/search-6.7.0.tgz"+ integrity sha512-ZvGm99wc/s2cITtMT15LFdn8aH/aS+V+DqyGq/N5ZlV5vWtH+nILvC2nw0zX7ByNoHHDZ2IxxdW38O0tc5nVHg==dependencies:"@codemirror/state" "^6.0.0"- "@codemirror/view" "^6.0.0"+ "@codemirror/view" "^6.37.0"crelt "^1.0.5"-"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.0", "@codemirror/state@^6.5.0", "@codemirror/state@^6.5.2":- version "6.5.2"- resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.2.tgz#8eca3a64212a83367dc85475b7d78d5c9b7076c6"- integrity sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==+"@codemirror/state@^6.0.0", "@codemirror/state@^6.5.2", "@codemirror/state@^6.6.0":+ version "6.6.0"+ resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz"+ integrity sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==dependencies:"@marijn/find-cluster-break" "^1.0.0"-"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.35.0", "@codemirror/view@^6.36.5":- version "6.36.5"- resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.36.5.tgz#bb99b971322b9a3f8c7013f0ef6c4a511c0d750a"- integrity sha512-cd+FZEUlu3GQCYnguYm3EkhJ8KJVisqqUsCOKedBoAt/d9c76JUUap6U0UrpElln5k6VyrEOYliMuDAKIeDQLg==+"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0", "@codemirror/view@^6.36.5", "@codemirror/view@^6.37.0", "@codemirror/view@^6.42.0":+ version "6.43.0"+ resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.43.0.tgz"+ integrity sha512-V7ZCLQO3Jus9hzh2jVCCPW3mO4IBMr43O37PqSUYautJSnnJF41YlgLw21x0fLJTYvJ+Vkm6Gp+qKGH9pltgXA==dependencies:- "@codemirror/state" "^6.5.0"+ "@codemirror/state" "^6.6.0"+ crelt "^1.0.6"style-mod "^4.1.0"w3c-keyname "^2.2.4""@cypress/request@^3.0.9":- version "3.0.9"- resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.9.tgz#8ed6e08fea0c62998b5552301023af7268f11625"- integrity sha512-I3l7FdGRXluAS44/0NguwWlO83J18p0vlr2FYHrJkWdNYhgVoiYo61IXPqaOsL+vNxU1ZqMACzItGK3/KKDsdw==+ version "3.0.10"+ resolved "https://registry.npmjs.org/@cypress/request/-/request-3.0.10.tgz"+ integrity sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==dependencies:aws-sign2 "~0.7.0"aws4 "^1.8.0"@@ -375,7 +391,7 @@json-stringify-safe "~5.0.1"mime-types "~2.1.19"performance-now "^2.1.0"- qs "6.14.0"+ qs "~6.14.1"safe-buffer "^5.1.2"tough-cookie "^5.0.0"tunnel-agent "^0.6.0"@@ -383,7 +399,7 @@"@cypress/xvfb@^1.2.4":version "1.2.4"- resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"+ resolved "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz"integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==dependencies:debug "^3.1.0"@@ -471,7 +487,7 @@"@esbuild/[email protected]":version "0.21.5"- resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"+ resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz"integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ=="@esbuild/[email protected]":@@ -506,19 +522,19 @@"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":version "4.4.1"- resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"+ resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz"integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==dependencies:eslint-visitor-keys "^3.4.3""@eslint-community/regexpp@^4.6.1":version "4.12.1"- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"+ resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz"integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ=="@eslint/eslintrc@^2.1.4":version "2.1.4"- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"+ resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz"integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==dependencies:ajv "^6.12.4"@@ -533,12 +549,12 @@"@eslint/[email protected]":version "8.57.1"- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"+ resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz"integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q=="@humanwhocodes/config-array@^0.13.0":version "0.13.0"- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"+ resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz"integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==dependencies:"@humanwhocodes/object-schema" "^2.0.3"@@ -547,62 +563,62 @@"@humanwhocodes/module-importer@^1.0.1":version "1.0.1"- resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"+ resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="@humanwhocodes/object-schema@^2.0.3":version "2.0.3"- resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"+ resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz"integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA=="@kurkle/color@^0.3.0":version "0.3.4"- resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.4.tgz#4d4ff677e1609214fc71c580125ddddd86abcabf"+ resolved "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz"integrity sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==-"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0", "@lezer/common@^1.2.1":- version "1.2.3"- resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.3.tgz#138fcddab157d83da557554851017c6c1e5667fd"- integrity sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==+"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0", "@lezer/common@^1.2.1", "@lezer/common@^1.3.0", "@lezer/common@^1.5.0":+ version "1.5.2"+ resolved "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz"+ integrity sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ=="@lezer/cpp@^1.0.0":- version "1.1.3"- resolved "https://registry.yarnpkg.com/@lezer/cpp/-/cpp-1.1.3.tgz#3029a542f4624fba0ed28f96511b34b8e7906352"- integrity sha512-ykYvuFQKGsRi6IcE+/hCSGUhb/I4WPjd3ELhEblm2wS2cOznDFzO+ubK2c+ioysOnlZ3EduV+MVQFCPzAIoY3w==+ version "1.1.6"+ resolved "https://registry.npmjs.org/@lezer/cpp/-/cpp-1.1.6.tgz"+ integrity sha512-vh9gWWJOXFVY8HBHK3Twzq8MgwG2iN4GSyzBP9sCGTe37P15x2R14VaBQk0VA0ezTRN1KHYBBsHhvpGZ2Xy/pA==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0""@lezer/lr" "^1.0.0""@lezer/css@^1.1.0", "@lezer/css@^1.1.7":- version "1.1.11"- resolved "https://registry.yarnpkg.com/@lezer/css/-/css-1.1.11.tgz#f73ac747e44f89d729cc421f829681a85b994766"- integrity sha512-FuAnusbLBl1SEAtfN8NdShxYJiESKw9LAFysfea1T96jD3ydBn12oYjaSG1a04BQRIUd93/0D8e5CV1cUMkmQg==+ version "1.3.3"+ resolved "https://registry.npmjs.org/@lezer/css/-/css-1.3.3.tgz"+ integrity sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"- "@lezer/lr" "^1.0.0"+ "@lezer/lr" "^1.3.0""@lezer/go@^1.0.0":- version "1.0.0"- resolved "https://registry.yarnpkg.com/@lezer/go/-/go-1.0.0.tgz#26cd2463f8583e630f52e714dca6d7420c5f7d7e"- integrity sha512-co9JfT3QqX1YkrMmourYw2Z8meGC50Ko4d54QEcQbEYpvdUvN4yb0NBZdn/9ertgvjsySxHsKzH3lbm3vqJ4Jw==+ version "1.0.1"+ resolved "https://registry.npmjs.org/@lezer/go/-/go-1.0.1.tgz"+ integrity sha512-xToRsYxwsgJNHTgNdStpcvmbVuKxTapV0dM0wey1geMMRc9aggoVyKgzYp41D2/vVOx+Ii4hmE206kvxIXBVXQ==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"- "@lezer/lr" "^1.0.0"+ "@lezer/lr" "^1.3.0""@lezer/highlight@^1.0.0", "@lezer/highlight@^1.1.3", "@lezer/highlight@^1.2.0", "@lezer/highlight@^1.2.1":- version "1.2.1"- resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.2.1.tgz#596fa8f9aeb58a608be0a563e960c373cbf23f8b"- integrity sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==+ version "1.2.3"+ resolved "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz"+ integrity sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==dependencies:- "@lezer/common" "^1.0.0"+ "@lezer/common" "^1.3.0"-"@lezer/html@^1.3.0":- version "1.3.10"- resolved "https://registry.yarnpkg.com/@lezer/html/-/html-1.3.10.tgz#1be9a029a6fe835c823b20a98a449a630416b2af"- integrity sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==+"@lezer/html@^1.3.12":+ version "1.3.13"+ resolved "https://registry.npmjs.org/@lezer/html/-/html-1.3.13.tgz"+ integrity sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"@@ -610,7 +626,7 @@"@lezer/java@^1.0.0":version "1.1.3"- resolved "https://registry.yarnpkg.com/@lezer/java/-/java-1.1.3.tgz#9efd6a29b4142d07f211076a6fb5e8061c85e147"+ resolved "https://registry.npmjs.org/@lezer/java/-/java-1.1.3.tgz"integrity sha512-yHquUfujwg6Yu4Fd1GNHCvidIvJwi/1Xu2DaKl/pfWIA2c1oXkVvawH3NyXhCaFx4OdlYBVX5wvz2f7Aoa/4Xw==dependencies:"@lezer/common" "^1.2.0"@@ -618,9 +634,9 @@"@lezer/lr" "^1.0.0""@lezer/javascript@^1.0.0":- version "1.5.1"- resolved "https://registry.yarnpkg.com/@lezer/javascript/-/javascript-1.5.1.tgz#2a424a6ec29f1d4ef3c34cbccc5447e373618ad8"- integrity sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==+ version "1.5.4"+ resolved "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.4.tgz"+ integrity sha512-vvYx3MhWqeZtGPwDStM2dwgljd5smolYD2lR2UyFcHfxbBQebqx8yjmFmxtJ/E6nN6u1D9srOiVWm3Rb4tmcUA==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.1.3"@@ -628,7 +644,7 @@"@lezer/json@^1.0.0":version "1.0.3"- resolved "https://registry.yarnpkg.com/@lezer/json/-/json-1.0.3.tgz#e773a012ad0088fbf07ce49cfba875cc9e5bc05f"+ resolved "https://registry.npmjs.org/@lezer/json/-/json-1.0.3.tgz"integrity sha512-BP9KzdF9Y35PDpv04r0VeSTKDeox5vVr3efE7eBbx3r4s3oNLfunchejZhjArmeieBH+nVOpgIiBJpEAv8ilqQ==dependencies:"@lezer/common" "^1.2.0"@@ -636,33 +652,33 @@"@lezer/lr" "^1.0.0""@lezer/lr@^1.0.0", "@lezer/lr@^1.1.0", "@lezer/lr@^1.3.0", "@lezer/lr@^1.3.1", "@lezer/lr@^1.3.3", "@lezer/lr@^1.4.0":- version "1.4.2"- resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.2.tgz#931ea3dea8e9de84e90781001dae30dea9ff1727"- integrity sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==+ version "1.4.10"+ resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz"+ integrity sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==dependencies:"@lezer/common" "^1.0.0""@lezer/markdown@^1.0.0":- version "1.4.2"- resolved "https://registry.yarnpkg.com/@lezer/markdown/-/markdown-1.4.2.tgz#39abb22dc3289a52dc313e235d80929df0ee075a"- integrity sha512-iYewCigG/517D0xJPQd7RGaCjZAFwROiH8T9h7OTtz0bRVtkxzFhGBFJ9JGKgBBs4uuo1cvxzyQ5iKhDLMcLUQ==+ version "1.6.4"+ resolved "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.6.4.tgz"+ integrity sha512-N0SxazMj4k65DBfaf1azqtMZd6u7MqluP84/NZnB/io8Td9aleFmAhz9hcbvSfsxT5tdYlJ5qgv5aMJGY4zEtA==dependencies:- "@lezer/common" "^1.0.0"+ "@lezer/common" "^1.5.0""@lezer/highlight" "^1.0.0""@lezer/php@^1.0.0":- version "1.0.2"- resolved "https://registry.yarnpkg.com/@lezer/php/-/php-1.0.2.tgz#7c291631fc1e7f7efe99977522bc48bdc732658a"- integrity sha512-GN7BnqtGRpFyeoKSEqxvGvhJQiI4zkgmYnDk/JIyc7H7Ifc1tkPnUn/R2R8meH3h/aBf5rzjvU8ZQoyiNDtDrA==+ version "1.0.5"+ resolved "https://registry.npmjs.org/@lezer/php/-/php-1.0.5.tgz"+ integrity sha512-W7asp9DhM6q0W6DYNwIkLSKOvxlXRrif+UXBMxzsJUuqmhE7oVU+gS3THO4S/Puh7Xzgm858UNaFi6dxTP8dJA==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0""@lezer/lr" "^1.1.0""@lezer/python@^1.1.4":- version "1.1.18"- resolved "https://registry.yarnpkg.com/@lezer/python/-/python-1.1.18.tgz#fa02fbf492741c82dc2dc98a0a042bd0d4d7f1d3"- integrity sha512-31FiUrU7z9+d/ElGQLJFXl+dKOdx0jALlP3KEOsGTex8mvj+SoE1FgItcHWK/axkxCHGUSpqIHt6JAWfWu9Rhg==+ version "1.1.19"+ resolved "https://registry.npmjs.org/@lezer/python/-/python-1.1.19.tgz"+ integrity sha512-MhQIURHRytsNzP/YXnqpYKW6la6voAH3kyplTOOiCdjyFY6cWWGFVmYVdHIPrElqSDf4iCDktQCockB9FxuhzQ==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"@@ -670,7 +686,7 @@"@lezer/rust@^1.0.0":version "1.0.2"- resolved "https://registry.yarnpkg.com/@lezer/rust/-/rust-1.0.2.tgz#cc9a75605d67182a0e799ac40b1965a61dcc6ef0"+ resolved "https://registry.npmjs.org/@lezer/rust/-/rust-1.0.2.tgz"integrity sha512-Lz5sIPBdF2FUXcWeCu1//ojFAZqzTQNRga0aYv6dYXqJqPfMdCAI0NzajWUd4Xijj1IKJLtjoXRPMvTKWBcqKg==dependencies:"@lezer/common" "^1.2.0"@@ -678,9 +694,9 @@"@lezer/lr" "^1.0.0""@lezer/sass@^1.0.0":- version "1.0.7"- resolved "https://registry.yarnpkg.com/@lezer/sass/-/sass-1.0.7.tgz#e90066b1d386eee6160edc88a39293844e4ba106"- integrity sha512-8HLlOkuX/SMHOggI2DAsXUw38TuURe+3eQ5hiuk9QmYOUyC55B1dYEIMkav5A4IELVaW4e1T4P9WRiI5ka4mdw==+ version "1.1.0"+ resolved "https://registry.npmjs.org/@lezer/sass/-/sass-1.1.0.tgz"+ integrity sha512-3mMGdCTUZ/84ArHOuXWQr37pnf7f+Nw9ycPUeKX+wu19b7pSMcZGLbaXwvD2APMBDOGxPmpK/O6S1v1EvLoqgQ==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"@@ -688,7 +704,7 @@"@lezer/xml@^1.0.0":version "1.0.6"- resolved "https://registry.yarnpkg.com/@lezer/xml/-/xml-1.0.6.tgz#908c203923288f854eb8e2f4d9b06c437e8610b9"+ resolved "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.6.tgz"integrity sha512-CdDwirL0OEaStFue/66ZmFSeppuL6Dwjlk8qk153mSQwiSH/Dlri4GNymrNWnUmPl2Um7QfV1FO9KFUyX3Twww==dependencies:"@lezer/common" "^1.2.0"@@ -696,9 +712,9 @@"@lezer/lr" "^1.0.0""@lezer/yaml@^1.0.0":- version "1.0.3"- resolved "https://registry.yarnpkg.com/@lezer/yaml/-/yaml-1.0.3.tgz#b23770ab42b390056da6b187d861b998fd60b1ff"- integrity sha512-GuBLekbw9jDBDhGur82nuwkxKQ+a3W5H0GfaAthDXcAu+XdpS43VlnxA9E9hllkpSP5ellRDKjLLj7Lu9Wr6xA==+ version "1.0.4"+ resolved "https://registry.npmjs.org/@lezer/yaml/-/yaml-1.0.4.tgz"+ integrity sha512-2lrrHqxalACEbxIbsjhqGpSW8kWpUKuY6RHgnSAFZa6qK62wvnPxA8hGOwOoDbwHcOFs5M4o27mjGu+P7TvBmw==dependencies:"@lezer/common" "^1.2.0""@lezer/highlight" "^1.0.0"@@ -706,17 +722,17 @@"@marijn/find-cluster-break@^1.0.0":version "1.0.2"- resolved "https://registry.yarnpkg.com/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz#775374306116d51c0c500b8c4face0f9a04752d8"+ resolved "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz"integrity sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="@mixmark-io/domino@^2.2.0":version "2.2.0"- resolved "https://registry.yarnpkg.com/@mixmark-io/domino/-/domino-2.2.0.tgz#4e8ec69bf1afeb7a14f0628b7e2c0f35bdb336c3"+ resolved "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz"integrity sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="@nodelib/[email protected]":version "2.1.5"- resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"+ resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==dependencies:"@nodelib/fs.stat" "2.0.5"@@ -724,12 +740,12 @@"@nodelib/[email protected]":version "2.0.5"- resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"+ resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="@nodelib/fs.walk@^1.2.8":version "1.2.8"- resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"+ resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==dependencies:"@nodelib/fs.scandir" "2.1.5"@@ -737,300 +753,181 @@"@one-ini/[email protected]":version "0.1.1"- resolved "https://registry.yarnpkg.com/@one-ini/wasm/-/wasm-0.1.1.tgz#6013659736c9dbfccc96e8a9c2b3de317df39323"+ resolved "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz"integrity sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==-"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz#e32d3dda6647791ee930556aee206fcd5ea0fb7a"- integrity sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz#0d9e680b7e9ec1c8f54944f1b945aa8755afb12f"- integrity sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz#f9f1d5ce9d5878d344f14ef1856b7a830c59d1bb"- integrity sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz#2b77f0c82d19e84ff4c21de6da7f7d096b1a7e82"- integrity sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz#92ed322c56dbafa3d2545dcf2803334aee131e42"- integrity sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz#cd48e9bfde0cdbbd2ecd9accfc52967e22f849a4"- integrity sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz#7b81f6d5a442bb89fbabaf6c13573e94a46feb03"- integrity sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz#dcb8ff01077cdf59a18d9e0a4dff7a0cfe5fd732"- integrity sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz#2e254600fda4e32d83942384d1106e1eed84494d"- integrity sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz#01fcea60fedbb3225af808d3f0a7b11229792eef"- integrity sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz#87cdb16e0783e770197e52fb1dc027bb0c847154"- integrity sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz#778c39b56da33e045ba21c678c31a9f9d7c6b220"- integrity sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==--"@parcel/[email protected]":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz#33873876d0bbc588aacce38e90d1d7480ce81cb7"- integrity sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==--"@parcel/watcher@^2.4.1":- version "2.5.0"- resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.0.tgz#5c88818b12b8de4307a9d3e6dc3e28eba0dfbd10"- integrity sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==- dependencies:- detect-libc "^1.0.3"- is-glob "^4.0.3"- micromatch "^4.0.5"- node-addon-api "^7.0.0"- optionalDependencies:- "@parcel/watcher-android-arm64" "2.5.0"- "@parcel/watcher-darwin-arm64" "2.5.0"- "@parcel/watcher-darwin-x64" "2.5.0"- "@parcel/watcher-freebsd-x64" "2.5.0"- "@parcel/watcher-linux-arm-glibc" "2.5.0"- "@parcel/watcher-linux-arm-musl" "2.5.0"- "@parcel/watcher-linux-arm64-glibc" "2.5.0"- "@parcel/watcher-linux-arm64-musl" "2.5.0"- "@parcel/watcher-linux-x64-glibc" "2.5.0"- "@parcel/watcher-linux-x64-musl" "2.5.0"- "@parcel/watcher-win32-arm64" "2.5.0"- "@parcel/watcher-win32-ia32" "2.5.0"- "@parcel/watcher-win32-x64" "2.5.0"-"@pkgjs/parseargs@^0.11.0":version "0.11.0"- resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"+ resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==-"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz#a6742c74c7d9d6d604ef8a48f99326b4ecda3d82"- integrity sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz#97247be098de4df0c11971089fd2edf80a5da8cf"- integrity sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz#674852cf14cf11b8056e0b1a2f4e872b523576cf"- integrity sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz#36dfd7ed0aaf4d9d89d9ef983af72632455b0246"- integrity sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz#2f87c2074b4220260fdb52a9996246edfc633c22"- integrity sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz#9b5a26522a38a95dc06616d1939d4d9a76937803"- integrity sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz#86aa4859385a8734235b5e40a48e52d770758c3a"- integrity sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz#cbe70e56e6ece8dac83eb773b624fc9e5a460976"- integrity sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz#d14992a2e653bc3263d284bc6579b7a2890e1c45"- integrity sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz#2fdd1ddc434ea90aeaa0851d2044789b4d07f6da"- integrity sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz#8a181e6f89f969f21666a743cd411416c80099e7"- integrity sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz#904125af2babc395f8061daa27b5af1f4e3f2f78"- integrity sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz#a57970ac6864c9a3447411a658224bdcf948be22"- integrity sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz#bb84de5b26870567a4267666e08891e80bb56a63"- integrity sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz#72d00d2c7fb375ce3564e759db33f17a35bffab9"- integrity sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz#4c166ef58e718f9245bd31873384ba15a5c1a883"- integrity sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz#bb5025cde9a61db478c2ca7215808ad3bce73a09"- integrity sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==+"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz#14c737dc19603a096568044eadaa60395eefb809"+ integrity sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.1.tgz#9d81ea54fc5650eb4ebbc0a7d84cee331bfa30ad"+ integrity sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.1.tgz#29448cb1370cf678b50743d2e392be18470abc23"+ integrity sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.1.tgz#0ca99741c3ed096700557a43bb03359450c7857d"+ integrity sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.1.tgz#233f8e4c2f54ad9b719cd9645887dcbd12b38003"+ integrity sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.1.tgz#dfba762a023063dc901610722995286df4a48360"+ integrity sha512-1MEdGqogQLccphhX5myCJqeGNYTNcmTyaic9S7CG3JhwuIByJ7J05vGbZxsizQthP1xpVx7kd3o31eOogfEirw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.1.tgz#b9da54171726266c5ef4237f462a85b3c3cf6ac9"+ integrity sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.1.tgz#b9db69b3f85f5529eb992936d8f411ee6d04297b"+ integrity sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.1.tgz#2550cf9bb4d47d917fd1ab4af756d7bbc3ee1528"+ integrity sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.1.tgz#9d06b26d286c7dded6336961a2f83e48330e0c80"+ integrity sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.1.tgz#e957bb8fee0c8021329a34ca8dfa825826ee0e2e"+ integrity sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.1.tgz#e8585075ddfb389222c5aada39ea62d6d2511ccc"+ integrity sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.1.tgz#7d0d40cee7946ccaa5a4e19a35c6925444696a9e"+ integrity sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.1.tgz#c2dcd8a4b08b2f2778eceb7a5a5dfde6240ebdea"+ integrity sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA=="@rollup/[email protected]":version "4.18.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz#1a7481137a54740bee1ded4ae5752450f155d942"+ resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz"integrity sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==-"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz#9b66b1f9cd95c6624c788f021c756269ffed1552"- integrity sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz#b007ca255dc7166017d57d7d2451963f0bd23fd9"- integrity sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz#e8b357b2d1aa2c8d76a98f5f0d889eabe93f4ef9"- integrity sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz#96c2e3f4aacd3d921981329831ff8dde492204dc"- integrity sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz#2d865149d706d938df8b4b8f117e69a77646d581"- integrity sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz#abe1593be0fa92325e9971c8da429c5e05b92c36"- integrity sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz#c4af3e9518c9a5cd4b1c163dc81d0ad4d82e7eab"- integrity sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==--"@rollup/[email protected]":- version "4.59.0"- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz#4584a8a87b29188a4c1fe987a9fcf701e256d86c"- integrity sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==+"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.1.tgz"+ integrity sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.1.tgz"+ integrity sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.1.tgz#51cad812456e616bfe4db5238fb9c7497e042a52"+ integrity sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.1.tgz#661c8b3e4cd60f51deaa39d153aac4566e748e5e"+ integrity sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==++"@rollup/[email protected]":+ version "4.30.1"+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.1.tgz#73bf1885ff052b82fbb0f82f8671f73c36e9137c"+ integrity sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og=="@rtsao/scc@^1.1.0":version "1.1.0"- resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"+ resolved "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz"integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="@tinymce/tinymce-vue@^3":version "3.2.8"- resolved "https://registry.yarnpkg.com/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz#014571b52ec8fa83665a7fa887bf65140207de71"+ resolved "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-3.2.8.tgz"integrity sha512-jEz+NZ0g+FZFz273OEUWz9QkwPMyjc5AJYyxOgu51O1Y5UaJ/6IUddXTX6A20mwCleEv5ebwNYdalviafx4fnA==-"@types/[email protected]":- version "1.0.8"- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"- integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==+"@types/[email protected]":+ version "1.0.6"+ resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"+ integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="@types/js-beautify@^1.14.3":version "1.14.3"- resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.14.3.tgz#6ced76f79935e37e0d613110dea369881d93c1ff"+ resolved "https://registry.npmjs.org/@types/js-beautify/-/js-beautify-1.14.3.tgz"integrity sha512-FMbQHz+qd9DoGvgLHxeqqVPaNRffpIu5ZjozwV8hf9JAGpIOzuAf4wGbRSo8LNITHqGjmmVjaMggTT5P4v4IHg=="@types/json5@^0.0.29":version "0.0.29"- resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"+ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="@types/node@*":version "22.10.5"- resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.5.tgz#95af89a3fb74a2bb41ef9927f206e6472026e48b"+ resolved "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz"integrity sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==dependencies:undici-types "~6.20.0""@types/[email protected]":version "8.1.1"- resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"+ resolved "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz"integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g=="@types/sizzle@^2.3.2":version "2.3.9"- resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz#d4597dbd4618264c414d7429363e3f50acb66ea2"+ resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz"integrity sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w=="@types/tmp@^0.2.3":version "0.2.6"- resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"+ resolved "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz"integrity sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA=="@types/yauzl@^2.9.1":version "2.10.3"- resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"+ resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz"integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==dependencies:"@types/node" "*""@ungap/structured-clone@^1.2.0":version "1.2.1"- resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.1.tgz#28fa185f67daaf7b7a1a8c1d445132c5d979f8bd"+ resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz"integrity sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA=="@vitejs/plugin-vue2@^2.3.1":version "2.3.3"- resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.3.3.tgz#6e1772caeb66914bfcc49bea21d08949d43b3fde"+ resolved "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-2.3.3.tgz"integrity sha512-qexY6+bbwY8h0AZerzUuGywNTi0cLOkbiSbggr0R3WEW95iB2hblQFyv4MAkkc2vm4gZN1cO5kzT1Kp6xlVzZw=="@vue/[email protected]":version "2.7.16"- resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"+ resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz"integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==dependencies:"@babel/parser" "^7.23.5"@@ -1041,7 +938,7 @@"@vue/eslint-config-airbnb@^7.0.1":version "7.0.1"- resolved "https://registry.yarnpkg.com/@vue/eslint-config-airbnb/-/eslint-config-airbnb-7.0.1.tgz#56abc0c3364c36e5453fa1727844baa7d010237a"+ resolved "https://registry.npmjs.org/@vue/eslint-config-airbnb/-/eslint-config-airbnb-7.0.1.tgz"integrity sha512-8d5QJeaL3PxKXfCVNGSA7RSKk+GNQLkOAMgN33ST+wJaXSdUI/4dJ0+LfqoLOu92NqwmKiIEZWMyPiGywhS1BA==dependencies:eslint-config-airbnb-base "^15.0.0"@@ -1055,22 +952,29 @@abbrev@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf"+ resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz"integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==acorn-jsx@^5.3.2:version "5.3.2"- resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"+ resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==acorn@^8.9.0:version "8.14.0"- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"+ resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz"integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==+agent-base@6:+ version "6.0.2"+ resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"+ integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==+ dependencies:+ debug "4"+aggregate-error@^3.0.0:version "3.1.0"- resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"+ resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==dependencies:clean-stack "^2.0.0"@@ -1078,7 +982,7 @@ aggregate-error@^3.0.0:ajv@^6.12.4:version "6.12.6"- resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"+ resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==dependencies:fast-deep-equal "^3.1.1"@@ -1088,7 +992,7 @@ ajv@^6.12.4:altcha@^2.3.0:version "2.3.0"- resolved "https://registry.yarnpkg.com/altcha/-/altcha-2.3.0.tgz#4433f0206ccc4207624821d1acad12292cecb016"+ resolved "https://registry.npmjs.org/altcha/-/altcha-2.3.0.tgz"integrity sha512-vl8I0dQvSQB7/Mx09XuWZ1+LdSP7vEda6OLbg9kUQ2ZO2LT7MzgUyLK7Iips+GAV6c0ntVcS1XWOqhEPpwbDhQ==dependencies:"@altcha/crypto" "^0.0.1"@@ -1097,46 +1001,46 @@ altcha@^2.3.0:ansi-colors@^4.1.1:version "4.1.3"- resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"+ resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==ansi-escapes@^4.3.0:version "4.3.2"- resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"+ resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==dependencies:type-fest "^0.21.3"ansi-regex@^5.0.1:version "5.0.1"- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"+ resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==ansi-styles@^4.0.0, ansi-styles@^4.1.0:version "4.3.0"- resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"+ resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==dependencies:color-convert "^2.0.1"arch@^2.2.0:version "2.2.0"- resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"+ resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==argparse@^2.0.1:version "2.0.1"- resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"+ resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==aria-query@^5.0.0, aria-query@^5.3.2:version "5.3.2"- resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"+ resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz"integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"+ resolved "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz"integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==dependencies:call-bound "^1.0.3"@@ -1144,7 +1048,7 @@ array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:array-includes@^3.1.6, array-includes@^3.1.8:version "3.1.8"- resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d"+ resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz"integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==dependencies:call-bind "^1.0.7"@@ -1156,7 +1060,7 @@ array-includes@^3.1.6, array-includes@^3.1.8:array.prototype.findlast@^1.2.5:version "1.2.5"- resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904"+ resolved "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz"integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==dependencies:call-bind "^1.0.7"@@ -1168,7 +1072,7 @@ array.prototype.findlast@^1.2.5:array.prototype.findlastindex@^1.2.5:version "1.2.5"- resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d"+ resolved "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz"integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==dependencies:call-bind "^1.0.7"@@ -1180,7 +1084,7 @@ array.prototype.findlastindex@^1.2.5:array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2:version "1.3.3"- resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"+ resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz"integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==dependencies:call-bind "^1.0.8"@@ -1190,7 +1094,7 @@ array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2:array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:version "1.3.3"- resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"+ resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz"integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==dependencies:call-bind "^1.0.8"@@ -1200,7 +1104,7 @@ array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:array.prototype.tosorted@^1.1.4:version "1.1.4"- resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc"+ resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz"integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==dependencies:call-bind "^1.0.7"@@ -1211,7 +1115,7 @@ array.prototype.tosorted@^1.1.4:arraybuffer.prototype.slice@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"+ resolved "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz"integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==dependencies:array-buffer-byte-length "^1.0.1"@@ -1224,107 +1128,108 @@ arraybuffer.prototype.slice@^1.0.4:asn1@~0.2.3:version "0.2.6"- resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"+ resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==dependencies:safer-buffer "~2.1.0"[email protected], assert-plus@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"+ resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==ast-types-flow@^0.0.8:version "0.0.8"- resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6"+ resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz"integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==astral-regex@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"+ resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==asynckit@^0.4.0:version "0.4.0"- resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"+ resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==at-least-node@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"+ resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==available-typed-arrays@^1.0.7:version "1.0.7"- resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"+ resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz"integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==dependencies:possible-typed-array-names "^1.0.0"aws-sign2@~0.7.0:version "0.7.0"- resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"+ resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==aws4@^1.8.0:version "1.13.2"- resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"+ resolved "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz"integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==axe-core@^4.10.0:version "4.10.2"- resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"+ resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz"integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==axios@^1.16.0:- version "1.16.0"- resolved "https://registry.yarnpkg.com/axios/-/axios-1.16.0.tgz#f8e5dd931cef2a5f8c32216d5784eda2f8750eb7"- integrity sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==+ version "1.16.1"+ resolved "https://registry.npmjs.org/axios/-/axios-1.16.1.tgz"+ integrity sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==dependencies:follow-redirects "^1.16.0"form-data "^4.0.5"+ https-proxy-agent "^5.0.1"proxy-from-env "^2.1.0"axobject-query@^4.1.0:version "4.1.0"- resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"+ resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz"integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==balanced-match@^1.0.0:version "1.0.2"- resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"+ resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==base64-js@^1.3.1:version "1.5.1"- resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"+ resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==bcrypt-pbkdf@^1.0.0:version "1.0.2"- resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"+ resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==dependencies:tweetnacl "^0.14.3"blob-util@^2.0.2:version "2.0.2"- resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"+ resolved "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz"integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==bluebird@^3.7.2:version "3.7.2"- resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"+ resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==boolbase@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"+ resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==brace-expansion@^1.1.7:version "1.1.11"- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"+ resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==dependencies:balanced-match "^1.0.0"@@ -1332,51 +1237,32 @@ brace-expansion@^1.1.7:brace-expansion@^2.0.1:version "2.0.1"- resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"+ resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==dependencies:balanced-match "^1.0.0"-braces@^3.0.3:- version "3.0.3"- resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"- integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==- dependencies:- fill-range "^7.1.1"--buefy@^0.9.25:- version "0.9.29"- resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.9.29.tgz#1d1fe57a407ef7cd6e9295679371eee63d21bd0f"- integrity sha512-iJutB/ezTQcxqcKvKz129DzomMjNRGdy23lJBtoFQBG//2NveTcPkN/VRUF70z2WH3JB/5nmVeoxr8QOPcs42w==- dependencies:- bulma "0.9.4"-buffer-crc32@~0.2.3:version "0.2.13"- resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"+ resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==buffer@^5.7.1:version "5.7.1"- resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"+ resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==dependencies:base64-js "^1.3.1"ieee754 "^1.1.13"[email protected], bulma@^0.9.4:- version "0.9.4"- resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1"- integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ==-cachedir@^2.3.0:version "2.4.0"- resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.4.0.tgz#7fef9cf7367233d7c88068fe6e34ed0d355a610d"+ resolved "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz"integrity sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840"+ resolved "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz"integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==dependencies:es-errors "^1.3.0"@@ -1384,7 +1270,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:call-bind@^1.0.7, call-bind@^1.0.8:version "1.0.8"- resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"+ resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz"integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==dependencies:call-bind-apply-helpers "^1.0.0"@@ -1394,7 +1280,7 @@ call-bind@^1.0.7, call-bind@^1.0.8:call-bound@^1.0.2, call-bound@^1.0.3:version "1.0.3"- resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.3.tgz#41cfd032b593e39176a71533ab4f384aa04fd681"+ resolved "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz"integrity sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==dependencies:call-bind-apply-helpers "^1.0.1"@@ -1402,17 +1288,17 @@ call-bound@^1.0.2, call-bound@^1.0.3:callsites@^3.0.0:version "3.1.0"- resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"+ resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==caseless@~0.12.0:version "0.12.0"- resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"+ resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==chalk@^4.0.0, chalk@^4.1.0:version "4.1.2"- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"+ resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==dependencies:ansi-styles "^4.1.0"@@ -1420,38 +1306,31 @@ chalk@^4.0.0, chalk@^4.1.0:chart.js@^4.4.1:version "4.4.7"- resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.7.tgz#7a01ee0b4dac3c03f2ab0589af888db296d896fa"+ resolved "https://registry.npmjs.org/chart.js/-/chart.js-4.4.7.tgz"integrity sha512-pwkcKfdzTMAU/+jNosKhNL2bHtJc/sSmYgVbuGTEDhzkrhmyihmP7vUc/5ZK9WopidMDHNe3Wm7jOd/WhuHWuw==dependencies:"@kurkle/color" "^0.3.0"-chokidar@^4.0.0:- version "4.0.3"- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"- integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==- dependencies:- readdirp "^4.0.1"-ci-info@^4.1.0:- version "4.3.1"- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa"- integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==+ version "4.4.0"+ resolved "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz"+ integrity sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==clean-stack@^2.0.0:version "2.2.0"- resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"+ resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==cli-cursor@^3.1.0:version "3.1.0"- resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"+ resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==dependencies:restore-cursor "^3.1.0"version "0.6.1"- resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"+ resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz"integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==dependencies:string-width "^4.2.0"@@ -1460,7 +1339,7 @@ [email protected]:cli-truncate@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"+ resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==dependencies:slice-ansi "^3.0.0"@@ -1476,9 +1355,9 @@ cliui@^8.0.1:wrap-ansi "^7.0.0"codemirror@^6.0.0:- version "6.0.1"- resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29"- integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==+ version "6.0.2"+ resolved "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz"+ integrity sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==dependencies:"@codemirror/autocomplete" "^6.0.0""@codemirror/commands" "^6.0.0"@@ -1490,56 +1369,56 @@ codemirror@^6.0.0:color-convert@^2.0.1:version "2.0.1"- resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"+ resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==dependencies:color-name "~1.1.4"color-name@~1.1.4:version "1.1.4"- resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"+ resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==colorette@^2.0.16:version "2.0.20"- resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"+ resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==version "1.4.0"- resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"+ resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==combined-stream@^1.0.8, combined-stream@~1.0.6:version "1.0.8"- resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"+ resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==dependencies:delayed-stream "~1.0.0"commander@^10.0.0:version "10.0.1"- resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"+ resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz"integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==commander@^6.2.1:version "6.2.1"- resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"+ resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==common-tags@^1.8.0:version "1.8.2"- resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"+ resolved "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==version "0.0.1"- resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"+ resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==config-chain@^1.1.13:version "1.1.13"- resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"+ resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==dependencies:ini "^1.3.4"@@ -1547,22 +1426,22 @@ config-chain@^1.1.13:confusing-browser-globals@^1.0.10:version "1.0.11"- resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"+ resolved "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==version "1.0.2"- resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"+ resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==-crelt@^1.0.5:+crelt@^1.0.5, crelt@^1.0.6:version "1.0.6"- resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"+ resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz"integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==cross-spawn@^7.0.0, cross-spawn@^7.0.2:version "7.0.6"- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"+ resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz"integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==dependencies:path-key "^3.1.0"@@ -1571,27 +1450,27 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:cssesc@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"+ resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==csstype@^3.1.0:version "3.1.3"- resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"+ resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz"integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==cypress-file-upload@^5.0.2:version "5.0.8"- resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"+ resolved "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz"integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==cypress-wait-until@^3.0.2:version "3.0.2"- resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-3.0.2.tgz#c90dddfa4c46a2c422f5b91d486531c560bae46e"+ resolved "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-3.0.2.tgz"integrity sha512-iemies796dD5CgjG5kV0MnpEmKSH+s7O83ZoJLVzuVbZmm4lheMsZqAVT73hlMx4QlkwhxbyUzhOBUOZwoOe0w==version "15.8.1"- resolved "https://registry.yarnpkg.com/cypress/-/cypress-15.8.1.tgz#48fcb0859b8b656534c9bb3f3abbf37554a2bb2d"+ resolved "https://registry.npmjs.org/cypress/-/cypress-15.8.1.tgz"integrity sha512-ogc62stTQGh1395ipKxfCE5hQuSApTzeH5e0d9U6m7wYO9HQeCpgnkYtBtd0MbkN2Fnch5Od2mX9u4hoTlrH4Q==dependencies:"@cypress/request" "^3.0.9"@@ -1639,19 +1518,19 @@ [email protected]:damerau-levenshtein@^1.0.8:version "1.0.8"- resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"+ resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz"integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==dashdash@^1.12.0:version "1.14.1"- resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"+ resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==dependencies:assert-plus "^1.0.0"data-view-buffer@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"+ resolved "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz"integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==dependencies:call-bound "^1.0.3"@@ -1660,7 +1539,7 @@ data-view-buffer@^1.0.2:data-view-byte-length@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"+ resolved "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz"integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==dependencies:call-bound "^1.0.3"@@ -1669,7 +1548,7 @@ data-view-byte-length@^1.0.2:data-view-byte-offset@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"+ resolved "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz"integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==dependencies:call-bound "^1.0.2"@@ -1678,36 +1557,36 @@ data-view-byte-offset@^1.0.1:dayjs@^1.10.4, dayjs@^1.11.10:version "1.11.13"- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"+ resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==de-indent@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"+ resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==+debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:+ version "4.4.0"+ resolved "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz"+ integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==+ dependencies:+ ms "^2.1.3"+debug@^3.1.0, debug@^3.2.7:version "3.2.7"- resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"+ resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==dependencies:ms "^2.1.1"-debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:- version "4.4.0"- resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"- integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==- dependencies:- ms "^2.1.3"-deep-is@^0.1.3:version "0.1.4"- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"+ resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==define-data-property@^1.0.1, define-data-property@^1.1.4:version "1.1.4"- resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"+ resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz"integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==dependencies:es-define-property "^1.0.0"@@ -1716,7 +1595,7 @@ define-data-property@^1.0.1, define-data-property@^1.1.4:define-properties@^1.1.3, define-properties@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"+ resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz"integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==dependencies:define-data-property "^1.0.1"@@ -1725,31 +1604,26 @@ define-properties@^1.1.3, define-properties@^1.2.1:delayed-stream@~1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"+ resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==-detect-libc@^1.0.3:- version "1.0.3"- resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"- integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==-doctrine@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"+ resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==dependencies:esutils "^2.0.2"doctrine@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"+ resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==dependencies:esutils "^2.0.2"dunder-proto@^1.0.0, dunder-proto@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"+ resolved "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz"integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==dependencies:call-bind-apply-helpers "^1.0.1"@@ -1758,7 +1632,7 @@ dunder-proto@^1.0.0, dunder-proto@^1.0.1:ecc-jsbn@~0.1.1:version "0.1.2"- resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"+ resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==dependencies:jsbn "~0.1.0"@@ -1766,7 +1640,7 @@ ecc-jsbn@~0.1.1:editorconfig@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"+ resolved "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz"integrity sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==dependencies:"@one-ini/wasm" "0.1.1"@@ -1776,29 +1650,29 @@ editorconfig@^1.0.4:emoji-regex@^10.0.0:version "10.4.0"- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"+ resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz"integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==emoji-regex@^8.0.0:version "8.0.0"- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"+ resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==emoji-regex@^9.2.2:version "9.2.2"- resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"+ resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==end-of-stream@^1.1.0:version "1.4.4"- resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"+ resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==dependencies:once "^1.4.0"enquirer@^2.3.6:version "2.4.1"- resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"+ resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz"integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==dependencies:ansi-colors "^4.1.1"@@ -1806,7 +1680,7 @@ enquirer@^2.3.6:es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9:version "1.23.9"- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"+ resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz"integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==dependencies:array-buffer-byte-length "^1.0.2"@@ -1863,17 +1737,17 @@ es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23es-define-property@^1.0.0, es-define-property@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"+ resolved "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz"integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==es-errors@^1.3.0:version "1.3.0"- resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"+ resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==es-iterator-helpers@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"+ resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz"integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==dependencies:call-bind "^1.0.8"@@ -1895,14 +1769,14 @@ es-iterator-helpers@^1.2.1:es-object-atoms@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"+ resolved "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz"integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==dependencies:es-errors "^1.3.0"es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"+ resolved "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz"integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==dependencies:es-errors "^1.3.0"@@ -1912,14 +1786,14 @@ es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:es-shim-unscopables@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"+ resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz"integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==dependencies:hasown "^2.0.0"es-to-primitive@^1.3.0:version "1.3.0"- resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"+ resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz"integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==dependencies:is-callable "^1.2.7"@@ -1928,7 +1802,7 @@ es-to-primitive@^1.3.0:esbuild@^0.21.3:version "0.21.5"- resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"+ resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz"integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==optionalDependencies:"@esbuild/aix-ppc64" "0.21.5"@@ -1957,17 +1831,17 @@ esbuild@^0.21.3:escape-string-regexp@^1.0.5:version "1.0.5"- resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"+ resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==escape-string-regexp@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"+ resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==eslint-config-airbnb-base@^15.0.0:version "15.0.0"- resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236"+ resolved "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz"integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==dependencies:confusing-browser-globals "^1.0.10"@@ -1977,12 +1851,12 @@ eslint-config-airbnb-base@^15.0.0:eslint-define-config@^2.0.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/eslint-define-config/-/eslint-define-config-2.1.0.tgz#9708b3efd57637b6fb685d9c2fb6285b9acfbd71"+ resolved "https://registry.npmjs.org/eslint-define-config/-/eslint-define-config-2.1.0.tgz"integrity sha512-QUp6pM9pjKEVannNAbSJNeRuYwW3LshejfyBBpjeMGaJjaDUpVps4C6KVR8R7dWZnD3i0synmrE36znjTkJvdQ==eslint-import-resolver-custom-alias@^1.3.0:version "1.3.2"- resolved "https://registry.yarnpkg.com/eslint-import-resolver-custom-alias/-/eslint-import-resolver-custom-alias-1.3.2.tgz#e509097e87de7a10b8c205c24644c3eb3fdf03c4"+ resolved "https://registry.npmjs.org/eslint-import-resolver-custom-alias/-/eslint-import-resolver-custom-alias-1.3.2.tgz"integrity sha512-wBPcZA2k6/IXaT8FsLMyiyVSG6WVEuaYIAbeKLXeGwr523BmeB9lKAAoLJWSqp3txsnU4gpkgD2x1q6K8k0uDQ==dependencies:glob-parent "^6.0.2"@@ -1990,7 +1864,7 @@ eslint-import-resolver-custom-alias@^1.3.0:eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:version "0.3.9"- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"+ resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz"integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==dependencies:debug "^3.2.7"@@ -1999,14 +1873,14 @@ eslint-import-resolver-node@^0.3.6, eslint-import-resolver-node@^0.3.9:eslint-module-utils@^2.12.0:version "2.12.0"- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz#fe4cfb948d61f49203d7b08871982b65b9af0b0b"+ resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz"integrity sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==dependencies:debug "^3.2.7"eslint-plugin-import@^2.23.3, eslint-plugin-import@^2.26.0:version "2.31.0"- resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz#310ce7e720ca1d9c0bb3f69adfd1c6bdd7d9e0e7"+ resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz"integrity sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==dependencies:"@rtsao/scc" "^1.1.0"@@ -2031,7 +1905,7 @@ eslint-plugin-import@^2.23.3, eslint-plugin-import@^2.26.0:eslint-plugin-jsx-a11y@^6.6.1:version "6.10.2"- resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz#d2812bb23bf1ab4665f1718ea442e8372e638483"+ resolved "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz"integrity sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==dependencies:aria-query "^5.3.2"@@ -2052,7 +1926,7 @@ eslint-plugin-jsx-a11y@^6.6.1:eslint-plugin-react@^7.30.1:version "7.37.3"- resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz#567549e9251533975c4ea9706f986c3a64832031"+ resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz"integrity sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==dependencies:array-includes "^3.1.8"@@ -2076,7 +1950,7 @@ eslint-plugin-react@^7.30.1:eslint-plugin-vue@^9.19.2:version "9.32.0"- resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz#2b558e827886b567dfaa156cc1cad0f596461fab"+ resolved "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.32.0.tgz"integrity sha512-b/Y05HYmnB/32wqVcjxjHZzNpwxj1onBOvqW89W+V+XNG1dRuaFbNd3vT9CLbr2LXjEoq+3vn8DanWf7XU22Ug==dependencies:"@eslint-community/eslint-utils" "^4.4.0"@@ -2090,7 +1964,7 @@ eslint-plugin-vue@^9.19.2:eslint-plugin-vuejs-accessibility@^1.2.0:version "1.2.0"- resolved "https://registry.yarnpkg.com/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-1.2.0.tgz#b7304bc8dfe4fad930c5d95cd51a2e0979225bda"+ resolved "https://registry.npmjs.org/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-1.2.0.tgz"integrity sha512-wF7kT22lS2VOmIpDeI65bnFFKFgESEEpI+CWKr43mdfDRywA4sCk7cKhtZsvfbPOtKO0GDlnpFxZbOIGsFn7IQ==dependencies:aria-query "^5.0.0"@@ -2099,7 +1973,7 @@ eslint-plugin-vuejs-accessibility@^1.2.0:eslint-scope@^7.1.1, eslint-scope@^7.2.2:version "7.2.2"- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"+ resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz"integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==dependencies:esrecurse "^4.3.0"@@ -2107,12 +1981,12 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.2:eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:version "3.4.3"- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"+ resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz"integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==eslint@^8.56.0:version "8.57.1"- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.1.tgz#7df109654aba7e3bbe5c8eae533c5e461d3c6ca9"+ resolved "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz"integrity sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==dependencies:"@eslint-community/eslint-utils" "^4.2.0"@@ -2156,7 +2030,7 @@ eslint@^8.56.0:espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:version "9.6.1"- resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"+ resolved "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz"integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==dependencies:acorn "^8.9.0"@@ -2165,36 +2039,36 @@ espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:esquery@^1.4.0, esquery@^1.4.2:version "1.6.0"- resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"+ resolved "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz"integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==dependencies:estraverse "^5.1.0"esrecurse@^4.3.0:version "4.3.0"- resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"+ resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==dependencies:estraverse "^5.2.0"estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:version "5.3.0"- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"+ resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==esutils@^2.0.2:version "2.0.3"- resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"+ resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==version "6.4.7"- resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"+ resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz"integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==version "4.1.0"- resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"+ resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==dependencies:cross-spawn "^7.0.0"@@ -2209,19 +2083,19 @@ [email protected]:executable@^4.1.1:version "4.1.1"- resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"+ resolved "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==dependencies:pify "^2.2.0"extend@~3.0.2:version "3.0.2"- resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"+ resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==version "2.0.1"- resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"+ resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==dependencies:debug "^4.1.1"@@ -2230,69 +2104,57 @@ [email protected]:optionalDependencies:"@types/yauzl" "^2.9.1"[email protected], extsprintf@^1.2.0:version "1.3.0"- resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"+ resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==-extsprintf@^1.2.0:- version "1.4.1"- resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"- integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==-fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:version "3.1.3"- resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"+ resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==fast-json-stable-stringify@^2.0.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"+ resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==fast-levenshtein@^2.0.6:version "2.0.6"- resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"+ resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==fastq@^1.6.0:version "1.18.0"- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.18.0.tgz#d631d7e25faffea81887fe5ea8c9010e1b36fee0"+ resolved "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz"integrity sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==dependencies:reusify "^1.0.4"fd-slicer@~1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"+ resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==dependencies:pend "~1.2.0"figures@^3.2.0:version "3.2.0"- resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"+ resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==dependencies:escape-string-regexp "^1.0.5"file-entry-cache@^6.0.1:version "6.0.1"- resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"+ resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==dependencies:flat-cache "^3.0.4"-fill-range@^7.1.1:- version "7.1.1"- resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"- integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==- dependencies:- to-regex-range "^5.0.1"-find-up@^5.0.0:version "5.0.0"- resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"+ resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==dependencies:locate-path "^6.0.0"@@ -2300,7 +2162,7 @@ find-up@^5.0.0:flat-cache@^3.0.4:version "3.2.0"- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"+ resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz"integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==dependencies:flatted "^3.2.9"@@ -2308,25 +2170,25 @@ flat-cache@^3.0.4:rimraf "^3.0.2"flatted@^3.2.9:- version "3.4.2"- resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"- integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==+ version "3.3.2"+ resolved "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz"+ integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==follow-redirects@^1.16.0:version "1.16.0"- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc"+ resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz"integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==for-each@^0.3.3:version "0.3.3"- resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"+ resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==dependencies:is-callable "^1.1.3"foreground-child@^3.1.0:version "3.3.0"- resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"+ resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz"integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==dependencies:cross-spawn "^7.0.0"@@ -2334,12 +2196,12 @@ foreground-child@^3.1.0:forever-agent@~0.6.1:version "0.6.1"- resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"+ resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==form-data@^4.0.5, form-data@~4.0.4:version "4.0.5"- resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"+ resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz"integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==dependencies:asynckit "^0.4.0"@@ -2350,7 +2212,7 @@ form-data@^4.0.5, form-data@~4.0.4:fs-extra@^9.1.0:version "9.1.0"- resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"+ resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==dependencies:at-least-node "^1.0.0"@@ -2360,22 +2222,22 @@ fs-extra@^9.1.0:fs.realpath@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"+ resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==fsevents@~2.3.2, fsevents@~2.3.3:version "2.3.3"- resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"+ resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==function-bind@^1.1.2:version "1.1.2"- resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"+ resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:version "1.1.8"- resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"+ resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz"integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==dependencies:call-bind "^1.0.8"@@ -2387,12 +2249,12 @@ function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:functions-have-names@^1.2.3:version "1.2.3"- resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"+ resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7:version "1.2.7"- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044"+ resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz"integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==dependencies:call-bind-apply-helpers "^1.0.1"@@ -2408,7 +2270,7 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@get-proto@^1.0.0, get-proto@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"+ resolved "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz"integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==dependencies:dunder-proto "^1.0.1"@@ -2416,14 +2278,14 @@ get-proto@^1.0.0, get-proto@^1.0.1:get-stream@^5.0.0, get-stream@^5.1.0:version "5.2.0"- resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"+ resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==dependencies:pump "^3.0.0"get-symbol-description@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"+ resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz"integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==dependencies:call-bound "^1.0.3"@@ -2432,21 +2294,21 @@ get-symbol-description@^1.1.0:getpass@^0.1.1:version "0.1.7"- resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"+ resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==dependencies:assert-plus "^1.0.0"glob-parent@^6.0.2:version "6.0.2"- resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"+ resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==dependencies:is-glob "^4.0.3"glob@^10.3.3:version "10.4.5"- resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"+ resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz"integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==dependencies:foreground-child "^3.1.0"@@ -2458,7 +2320,7 @@ glob@^10.3.3:glob@^7.1.3:version "7.2.3"- resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"+ resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==dependencies:fs.realpath "^1.0.0"@@ -2470,21 +2332,21 @@ glob@^7.1.3:global-dirs@^3.0.0:version "3.0.1"- resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"+ resolved "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz"integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==dependencies:ini "2.0.0"globals@^13.19.0, globals@^13.24.0:version "13.24.0"- resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"+ resolved "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz"integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==dependencies:type-fest "^0.20.2"globalthis@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"+ resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==dependencies:define-properties "^1.2.1"@@ -2492,58 +2354,58 @@ globalthis@^1.0.4:gopd@^1.0.1, gopd@^1.2.0:version "1.2.0"- resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"+ resolved "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz"integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==graceful-fs@^4.1.6, graceful-fs@^4.2.0:version "4.2.11"- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"+ resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==graphemer@^1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"+ resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz"integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==has-bigints@^1.0.2:version "1.1.0"- resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"+ resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz"integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==has-flag@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"+ resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"+ resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==dependencies:es-define-property "^1.0.0"has-proto@^1.2.0:version "1.2.0"- resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"+ resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz"integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==dependencies:dunder-proto "^1.0.0"has-symbols@^1.0.3, has-symbols@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"+ resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz"integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==has-tostringtag@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"+ resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz"integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==dependencies:has-symbols "^1.0.3"version "5.2.2"- resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"+ resolved "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz"integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==dependencies:is-stream "^2.0.0"@@ -2551,48 +2413,51 @@ [email protected]:hasown@^2.0.0, hasown@^2.0.2:version "2.0.2"- resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"+ resolved "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz"integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==dependencies:function-bind "^1.1.2"he@^1.2.0:version "1.2.0"- resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"+ resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==http-signature@~1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.4.0.tgz#dee5a9ba2bf49416abc544abd6d967f6a94c8c3f"+ resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz"integrity sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==dependencies:assert-plus "^1.0.0"jsprim "^2.0.2"sshpk "^1.18.0"+https-proxy-agent@^5.0.1:+ version "5.0.1"+ resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"+ integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==+ dependencies:+ agent-base "6"+ debug "4"+human-signals@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"+ resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==ieee754@^1.1.13:version "1.2.1"- resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"+ resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==ignore@^5.2.0:version "5.3.2"- resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"+ resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz"integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==-immutable@^5.0.2:- version "5.1.5"- resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.5.tgz#93ee4db5c2a9ab42a4a783069f3c5d8847d40165"- integrity sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==-import-fresh@^3.2.1:version "3.3.0"- resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"+ resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==dependencies:parent-module "^1.0.0"@@ -2600,22 +2465,22 @@ import-fresh@^3.2.1:imurmurhash@^0.1.4:version "0.1.4"- resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"+ resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==indent-string@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"+ resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==indent.js@^0.3.5:version "0.3.5"- resolved "https://registry.yarnpkg.com/indent.js/-/indent.js-0.3.5.tgz#e2fefa04043b7be69c33635dc9e0cfb9cc7c4d7f"+ resolved "https://registry.npmjs.org/indent.js/-/indent.js-0.3.5.tgz"integrity sha512-wiTA5fEz0kc8tHzY6CSujl/k62WVNvTxAZzmPe5V7MYxRCeGGibPCIYWYBzPp/bcJh3CXUO/8qrTrO/x9s1i2Q==inflight@^1.0.4:version "1.0.6"- resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"+ resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==dependencies:once "^1.3.0"@@ -2623,22 +2488,22 @@ inflight@^1.0.4:inherits@2:version "2.0.4"- resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"+ resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==version "2.0.0"- resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"+ resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==ini@^1.3.4:version "1.3.8"- resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"+ resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==internal-slot@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"+ resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz"integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==dependencies:es-errors "^1.3.0"@@ -2647,7 +2512,7 @@ internal-slot@^1.1.0:is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:version "3.0.5"- resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"+ resolved "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz"integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==dependencies:call-bind "^1.0.8"@@ -2656,7 +2521,7 @@ is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:is-async-function@^2.0.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.0.tgz#1d1080612c493608e93168fc4458c245074c06a6"+ resolved "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz"integrity sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==dependencies:call-bound "^1.0.3"@@ -2666,14 +2531,14 @@ is-async-function@^2.0.0:is-bigint@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"+ resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz"integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==dependencies:has-bigints "^1.0.2"is-boolean-object@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89"+ resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz"integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==dependencies:call-bound "^1.0.2"@@ -2681,19 +2546,19 @@ is-boolean-object@^1.2.1:is-callable@^1.1.3, is-callable@^1.2.7:version "1.2.7"- resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"+ resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0:version "2.16.1"- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"+ resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz"integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==dependencies:hasown "^2.0.2"is-data-view@^1.0.1, is-data-view@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"+ resolved "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz"integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==dependencies:call-bound "^1.0.2"@@ -2702,7 +2567,7 @@ is-data-view@^1.0.1, is-data-view@^1.0.2:is-date-object@^1.0.5, is-date-object@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"+ resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz"integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==dependencies:call-bound "^1.0.2"@@ -2710,24 +2575,24 @@ is-date-object@^1.0.5, is-date-object@^1.1.0:is-extglob@^2.1.1:version "2.1.1"- resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"+ resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==is-finalizationregistry@^1.1.0:version "1.1.1"- resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"+ resolved "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz"integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==dependencies:call-bound "^1.0.3"is-fullwidth-code-point@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"+ resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==is-generator-function@^1.0.10:version "1.1.0"- resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"+ resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz"integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==dependencies:call-bound "^1.0.3"@@ -2737,14 +2602,14 @@ is-generator-function@^1.0.10:is-glob@^4.0.0, is-glob@^4.0.3:version "4.0.3"- resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"+ resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==dependencies:is-extglob "^2.1.1"is-installed-globally@~0.4.0:version "0.4.0"- resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"+ resolved "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==dependencies:global-dirs "^3.0.0"@@ -2752,30 +2617,25 @@ is-installed-globally@~0.4.0:is-map@^2.0.3:version "2.0.3"- resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"+ resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz"integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==is-number-object@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"+ resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz"integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==dependencies:call-bound "^1.0.3"has-tostringtag "^1.0.2"-is-number@^7.0.0:- version "7.0.0"- resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"- integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==-is-path-inside@^3.0.2, is-path-inside@^3.0.3:version "3.0.3"- resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"+ resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==is-regex@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"+ resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz"integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==dependencies:call-bound "^1.0.2"@@ -2785,24 +2645,24 @@ is-regex@^1.2.1:is-set@^2.0.3:version "2.0.3"- resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"+ resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz"integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==is-shared-array-buffer@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"+ resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz"integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==dependencies:call-bound "^1.0.3"is-stream@^2.0.0:version "2.0.1"- resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"+ resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==is-string@^1.0.7, is-string@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"+ resolved "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz"integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==dependencies:call-bound "^1.0.3"@@ -2810,7 +2670,7 @@ is-string@^1.0.7, is-string@^1.1.1:is-symbol@^1.0.4, is-symbol@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"+ resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz"integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==dependencies:call-bound "^1.0.2"@@ -2819,36 +2679,36 @@ is-symbol@^1.0.4, is-symbol@^1.1.1:is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:version "1.1.15"- resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"+ resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz"integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==dependencies:which-typed-array "^1.1.16"is-typedarray@~1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"+ resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==is-unicode-supported@^0.1.0:version "0.1.0"- resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"+ resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==is-weakmap@^2.0.2:version "2.0.2"- resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"+ resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz"integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==is-weakref@^1.0.2, is-weakref@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.0.tgz#47e3472ae95a63fa9cf25660bcf0c181c39770ef"+ resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz"integrity sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==dependencies:call-bound "^1.0.2"is-weakset@^2.0.3:version "2.0.4"- resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.4.tgz#c9f5deb0bc1906c6d6f1027f284ddf459249daca"+ resolved "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz"integrity sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==dependencies:call-bound "^1.0.3"@@ -2856,22 +2716,22 @@ is-weakset@^2.0.3:isarray@^2.0.5:version "2.0.5"- resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"+ resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==isexe@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"+ resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==isstream@~0.1.2:version "0.1.2"- resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"+ resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==iterator.prototype@^1.1.4:version "1.1.5"- resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"+ resolved "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz"integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==dependencies:define-data-property "^1.1.4"@@ -2892,7 +2752,7 @@ [email protected], jackspeak@^3.1.2:js-beautify@^1.15.1:version "1.15.1"- resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.15.1.tgz#4695afb508c324e1084ee0b952a102023fc65b64"+ resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz"integrity sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==dependencies:config-chain "^1.1.13"@@ -2902,62 +2762,62 @@ js-beautify@^1.15.1:nopt "^7.2.0"js-cookie@^3.0.5:- version "3.0.7"- resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.7.tgz#0a53abfc459c8e89c85d7a38eb6cb68714965b8c"- integrity sha512-z/wZZgDrkNV1eA0ULjM/F9/50Ya8fbzgKneSpoPsXSGd0KnpdtHfOZWK+GcwLk+EZbS4F9RBhU+K2RgzuDaItw==+ version "3.0.5"+ resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz"+ integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="js-tokens@^3.0.0 || ^4.0.0":version "4.0.0"- resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"+ resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==js-yaml@^4.1.0:- version "4.1.1"- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"- integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==+ version "4.1.0"+ resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"+ integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==dependencies:argparse "^2.0.1"jsbn@~0.1.0:version "0.1.1"- resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"+ resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==version "3.0.1"- resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"+ resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==json-schema-traverse@^0.4.1:version "0.4.1"- resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"+ resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==version "0.4.0"- resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"+ resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==json-stable-stringify-without-jsonify@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"+ resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==json-stringify-safe@~5.0.1:version "5.0.1"- resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"+ resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==json5@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"+ resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==dependencies:minimist "^1.2.0"jsonfile@^6.0.1:version "6.1.0"- resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"+ resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==dependencies:universalify "^2.0.0"@@ -2966,7 +2826,7 @@ jsonfile@^6.0.1:jsprim@^2.0.2:version "2.0.2"- resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"+ resolved "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==dependencies:assert-plus "1.0.0"@@ -2976,7 +2836,7 @@ jsprim@^2.0.2:"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5:version "3.3.5"- resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a"+ resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz"integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==dependencies:array-includes "^3.1.6"@@ -2986,26 +2846,26 @@ jsprim@^2.0.2:keyv@^4.5.3:version "4.5.4"- resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"+ resolved "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz"integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==dependencies:json-buffer "3.0.1"language-subtag-registry@^0.3.20:version "0.3.23"- resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz#23529e04d9e3b74679d70142df3fd2eb6ec572e7"+ resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz"integrity sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==language-tags@^1.0.9:version "1.0.9"- resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.9.tgz#1ffdcd0ec0fafb4b1be7f8b11f306ad0f9c08777"+ resolved "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz"integrity sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==dependencies:language-subtag-registry "^0.3.20"levn@^0.4.1:version "0.4.1"- resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"+ resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==dependencies:prelude-ls "^1.2.1"@@ -3013,7 +2873,7 @@ levn@^0.4.1:listr2@^3.8.3:version "3.14.0"- resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"+ resolved "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==dependencies:cli-truncate "^2.1.0"@@ -3027,29 +2887,29 @@ listr2@^3.8.3:locate-path@^6.0.0:version "6.0.0"- resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"+ resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==dependencies:p-locate "^5.0.0"lodash.merge@^4.6.2:version "4.6.2"- resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"+ resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==lodash.once@^4.1.1:version "4.1.1"- resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"+ resolved "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==lodash@^4.17.21:- version "4.18.1"- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"- integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==+ version "4.17.21"+ resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==log-symbols@^4.0.0:version "4.1.0"- resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"+ resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==dependencies:chalk "^4.1.0"@@ -3057,7 +2917,7 @@ log-symbols@^4.0.0:log-update@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"+ resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==dependencies:ansi-escapes "^4.3.0"@@ -3067,141 +2927,128 @@ log-update@^4.0.0:loose-envify@^1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"+ resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==dependencies:js-tokens "^3.0.0 || ^4.0.0"lru-cache@^10.2.0:version "10.4.3"- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"+ resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==math-intrinsics@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"+ resolved "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz"integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==merge-stream@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"+ resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==-micromatch@^4.0.5:- version "4.0.8"- resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"- integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==- dependencies:- braces "^3.0.3"- picomatch "^2.3.1"-version "1.52.0"- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"+ resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==mime-types@^2.1.12, mime-types@~2.1.19:version "2.1.35"- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"+ resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==dependencies:mime-db "1.52.0"mimic-fn@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"+ resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==version "9.0.1"- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"+ resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz"integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==dependencies:brace-expansion "^2.0.1"minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:version "3.1.2"- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"+ resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==dependencies:brace-expansion "^1.1.7"minimatch@^9.0.4:version "9.0.5"- resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"+ resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz"integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==dependencies:brace-expansion "^2.0.1"minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:version "1.2.8"- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"+ resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:version "7.1.2"- resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"+ resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz"integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==ms@^2.1.1, ms@^2.1.3:version "2.1.3"- resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"+ resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==-nanoid@^3.3.11:- version "3.3.11"- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"- integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==+nanoid@^3.3.7:+ version "3.3.8"+ resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz"+ integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==natural-compare@^1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"+ resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==-node-addon-api@^7.0.0:- version "7.1.1"- resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"- integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==-nopt@^7.2.0:version "7.2.1"- resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7"+ resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz"integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==dependencies:abbrev "^2.0.0"npm-run-path@^4.0.0:version "4.0.1"- resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"+ resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==dependencies:path-key "^3.0.0"nth-check@^2.1.1:version "2.1.1"- resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"+ resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==dependencies:boolbase "^1.0.0"object-assign@^4.1.1:version "4.1.1"- resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"+ resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==object-inspect@^1.13.3:version "1.13.3"- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"+ resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz"integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==object-keys@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"+ resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.7:version "4.1.7"- resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"+ resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz"integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==dependencies:call-bind "^1.0.8"@@ -3213,7 +3060,7 @@ object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.7:object.entries@^1.1.5, object.entries@^1.1.8:version "1.1.8"- resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41"+ resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz"integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==dependencies:call-bind "^1.0.7"@@ -3222,7 +3069,7 @@ object.entries@^1.1.5, object.entries@^1.1.8:object.fromentries@^2.0.8:version "2.0.8"- resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"+ resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz"integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==dependencies:call-bind "^1.0.7"@@ -3232,7 +3079,7 @@ object.fromentries@^2.0.8:object.groupby@^1.0.3:version "1.0.3"- resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"+ resolved "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz"integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==dependencies:call-bind "^1.0.7"@@ -3241,7 +3088,7 @@ object.groupby@^1.0.3:object.values@^1.1.6, object.values@^1.2.0, object.values@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"+ resolved "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz"integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==dependencies:call-bind "^1.0.8"@@ -3251,21 +3098,21 @@ object.values@^1.1.6, object.values@^1.2.0, object.values@^1.2.1:once@^1.3.0, once@^1.3.1, once@^1.4.0:version "1.4.0"- resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"+ resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==dependencies:wrappy "1"onetime@^5.1.0:version "5.1.2"- resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"+ resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==dependencies:mimic-fn "^2.1.0"optionator@^0.9.3:version "0.9.4"- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"+ resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz"integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==dependencies:deep-is "^0.1.3"@@ -3277,12 +3124,12 @@ optionator@^0.9.3:ospath@^1.2.2:version "1.2.2"- resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"+ resolved "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==own-keys@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"+ resolved "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz"integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==dependencies:get-intrinsic "^1.2.6"@@ -3291,60 +3138,60 @@ own-keys@^1.0.1:p-limit@^3.0.2:version "3.1.0"- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"+ resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==dependencies:yocto-queue "^0.1.0"p-locate@^5.0.0:version "5.0.0"- resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"+ resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==dependencies:p-limit "^3.0.2"p-map@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"+ resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==dependencies:aggregate-error "^3.0.0"package-json-from-dist@^1.0.0:version "1.0.1"- resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"+ resolved "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz"integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==parent-module@^1.0.0:version "1.0.1"- resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"+ resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==dependencies:callsites "^3.0.0"path-exists@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"+ resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==path-is-absolute@^1.0.0:version "1.0.1"- resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"+ resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==path-key@^3.0.0, path-key@^3.1.0:version "3.1.1"- resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"+ resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==path-parse@^1.0.7:version "1.0.7"- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"+ resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==path-scurry@^1.11.1:version "1.11.1"- resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"+ resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz"integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==dependencies:lru-cache "^10.2.0"@@ -3352,79 +3199,74 @@ path-scurry@^1.11.1:pend@~1.2.0:version "1.2.0"- resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"+ resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==performance-now@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"+ resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==picocolors@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"+ resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz"integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==-picomatch@^2.3.1:- version "2.3.2"- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"- integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==-pify@^2.2.0:version "2.3.0"- resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"+ resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==possible-typed-array-names@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"+ resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz"integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==postcss-selector-parser@^6.0.15:version "6.1.2"- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"+ resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz"integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==dependencies:cssesc "^3.0.0"util-deprecate "^1.0.2"postcss@^8.4.14, postcss@^8.4.43:- version "8.5.12"- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.12.tgz#cd0c0f667f7cb0521e2313234ea6e707a9ec1ddb"- integrity sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==+ version "8.4.49"+ resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz"+ integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==dependencies:- nanoid "^3.3.11"+ nanoid "^3.3.7"picocolors "^1.1.1"source-map-js "^1.2.1"prelude-ls@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"+ resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="prettier@^1.18.2 || ^2.0.0":version "2.8.8"- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"+ resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==pretty-bytes@^5.6.0:version "5.6.0"- resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"+ resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==prismjs@^1.30.0:version "1.30.0"- resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"+ resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz"integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==process@^0.11.10:version "0.11.10"- resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"+ resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz"integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==prop-types@^15.8.1:version "15.8.1"- resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"+ resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==dependencies:loose-envify "^1.4.0"@@ -3433,22 +3275,22 @@ prop-types@^15.8.1:proto-list@~1.2.1:version "1.2.4"- resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"+ resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==version "1.0.0"- resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"+ resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==proxy-from-env@^2.1.0:version "2.1.0"- resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-2.1.0.tgz#a7487568adad577cfaaa7e88c49cab3ab3081aba"+ resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz"integrity sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==pump@^3.0.0:version "3.0.2"- resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8"+ resolved "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz"integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==dependencies:end-of-stream "^1.1.0"@@ -3456,41 +3298,36 @@ pump@^3.0.0:punycode@^2.1.0:version "2.3.1"- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"+ resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==- version "6.14.0"- resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"- integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==- dependencies:- side-channel "^1.1.0"-qs@^6.15.2:version "6.15.2"- resolved "https://registry.yarnpkg.com/qs/-/qs-6.15.2.tgz#fd55426d710403ddccc45e0f9eab16db7727ece9"+ resolved "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz"integrity sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==dependencies:side-channel "^1.1.0"+qs@~6.14.1:+ version "6.14.2"+ resolved "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz"+ integrity sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==+ dependencies:+ side-channel "^1.1.0"+queue-microtask@^1.2.2:version "1.2.3"- resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"+ resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==react-is@^16.13.1:version "16.13.1"- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"+ resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==-readdirp@^4.0.1:- version "4.0.2"- resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"- integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==-reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:version "1.0.10"- resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"+ resolved "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz"integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==dependencies:call-bind "^1.0.8"@@ -3504,7 +3341,7 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:regexp.prototype.flags@^1.5.3:version "1.5.4"- resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"+ resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz"integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==dependencies:call-bind "^1.0.8"@@ -3516,19 +3353,19 @@ regexp.prototype.flags@^1.5.3:request-progress@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"+ resolved "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"integrity sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==dependencies:throttleit "^1.0.0"resolve-from@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"+ resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==resolve@^1.22.2, resolve@^1.22.4:version "1.22.10"- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"+ resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz"integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==dependencies:is-core-module "^2.16.0"@@ -3537,7 +3374,7 @@ resolve@^1.22.2, resolve@^1.22.4:resolve@^2.0.0-next.5:version "2.0.0-next.5"- resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c"+ resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz"integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==dependencies:is-core-module "^2.13.0"@@ -3546,7 +3383,7 @@ resolve@^2.0.0-next.5:restore-cursor@^3.1.0:version "3.1.0"- resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"+ resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==dependencies:onetime "^5.1.0"@@ -3554,72 +3391,66 @@ restore-cursor@^3.1.0:reusify@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"+ resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==rfdc@^1.3.0:version "1.4.1"- resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"+ resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz"integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==rimraf@^3.0.2:version "3.0.2"- resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"+ resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==dependencies:glob "^7.1.3"rollup@^4.20.0:- version "4.59.0"- resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.59.0.tgz#cf74edac17c1486f562d728a4d923a694abdf06f"- integrity sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==+ version "4.30.1"+ resolved "https://registry.npmjs.org/rollup/-/rollup-4.30.1.tgz"+ integrity sha512-mlJ4glW020fPuLi7DkM/lN97mYEZGWeqBnrljzN0gs7GLctqX3lNWxKQ7Gl712UAX+6fog/L3jh4gb7R6aVi3w==dependencies:- "@types/estree" "1.0.8"+ "@types/estree" "1.0.6"optionalDependencies:- "@rollup/rollup-android-arm-eabi" "4.59.0"- "@rollup/rollup-android-arm64" "4.59.0"- "@rollup/rollup-darwin-arm64" "4.59.0"- "@rollup/rollup-darwin-x64" "4.59.0"- "@rollup/rollup-freebsd-arm64" "4.59.0"- "@rollup/rollup-freebsd-x64" "4.59.0"- "@rollup/rollup-linux-arm-gnueabihf" "4.59.0"- "@rollup/rollup-linux-arm-musleabihf" "4.59.0"- "@rollup/rollup-linux-arm64-gnu" "4.59.0"- "@rollup/rollup-linux-arm64-musl" "4.59.0"- "@rollup/rollup-linux-loong64-gnu" "4.59.0"- "@rollup/rollup-linux-loong64-musl" "4.59.0"- "@rollup/rollup-linux-ppc64-gnu" "4.59.0"- "@rollup/rollup-linux-ppc64-musl" "4.59.0"- "@rollup/rollup-linux-riscv64-gnu" "4.59.0"- "@rollup/rollup-linux-riscv64-musl" "4.59.0"- "@rollup/rollup-linux-s390x-gnu" "4.59.0"- "@rollup/rollup-linux-x64-gnu" "4.59.0"- "@rollup/rollup-linux-x64-musl" "4.59.0"- "@rollup/rollup-openbsd-x64" "4.59.0"- "@rollup/rollup-openharmony-arm64" "4.59.0"- "@rollup/rollup-win32-arm64-msvc" "4.59.0"- "@rollup/rollup-win32-ia32-msvc" "4.59.0"- "@rollup/rollup-win32-x64-gnu" "4.59.0"- "@rollup/rollup-win32-x64-msvc" "4.59.0"+ "@rollup/rollup-android-arm-eabi" "4.30.1"+ "@rollup/rollup-android-arm64" "4.30.1"+ "@rollup/rollup-darwin-arm64" "4.30.1"+ "@rollup/rollup-darwin-x64" "4.30.1"+ "@rollup/rollup-freebsd-arm64" "4.30.1"+ "@rollup/rollup-freebsd-x64" "4.30.1"+ "@rollup/rollup-linux-arm-gnueabihf" "4.30.1"+ "@rollup/rollup-linux-arm-musleabihf" "4.30.1"+ "@rollup/rollup-linux-arm64-gnu" "4.30.1"+ "@rollup/rollup-linux-arm64-musl" "4.30.1"+ "@rollup/rollup-linux-loongarch64-gnu" "4.30.1"+ "@rollup/rollup-linux-powerpc64le-gnu" "4.30.1"+ "@rollup/rollup-linux-riscv64-gnu" "4.30.1"+ "@rollup/rollup-linux-s390x-gnu" "4.30.1"+ "@rollup/rollup-linux-x64-gnu" "4.30.1"+ "@rollup/rollup-linux-x64-musl" "4.30.1"+ "@rollup/rollup-win32-arm64-msvc" "4.30.1"+ "@rollup/rollup-win32-ia32-msvc" "4.30.1"+ "@rollup/rollup-win32-x64-msvc" "4.30.1"fsevents "~2.3.2"run-parallel@^1.1.9:version "1.2.0"- resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"+ resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==dependencies:queue-microtask "^1.2.2"rxjs@^7.5.1:version "7.8.1"- resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"+ resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==dependencies:tslib "^2.1.0"safe-array-concat@^1.1.3:version "1.1.3"- resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"+ resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz"integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==dependencies:call-bind "^1.0.8"@@ -3630,12 +3461,12 @@ safe-array-concat@^1.1.3:safe-buffer@^5.0.1, safe-buffer@^5.1.2:version "5.2.1"- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"+ resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==safe-push-apply@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"+ resolved "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz"integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==dependencies:es-errors "^1.3.0"@@ -3643,7 +3474,7 @@ safe-push-apply@^1.0.0:safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"+ resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz"integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==dependencies:call-bound "^1.0.2"@@ -3652,33 +3483,22 @@ safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:version "2.1.2"- resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"+ resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==-sass@^1.34.0:- version "1.83.1"- resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"- integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==- dependencies:- chokidar "^4.0.0"- immutable "^5.0.2"- source-map-js ">=0.6.2 <2.0.0"- optionalDependencies:- "@parcel/watcher" "^2.4.1"-semver@^6.3.0, semver@^6.3.1:version "6.3.1"- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"+ resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==semver@^7.3.6, semver@^7.5.3, semver@^7.6.3:version "7.6.3"- resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"+ resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==set-function-length@^1.2.2:version "1.2.2"- resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"+ resolved "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz"integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==dependencies:define-data-property "^1.1.4"@@ -3690,7 +3510,7 @@ set-function-length@^1.2.2:set-function-name@^2.0.2:version "2.0.2"- resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"+ resolved "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz"integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==dependencies:define-data-property "^1.1.4"@@ -3700,7 +3520,7 @@ set-function-name@^2.0.2:set-proto@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"+ resolved "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz"integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==dependencies:dunder-proto "^1.0.1"@@ -3709,19 +3529,19 @@ set-proto@^1.0.0:shebang-command@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"+ resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==dependencies:shebang-regex "^3.0.0"shebang-regex@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"+ resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==side-channel-list@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"+ resolved "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz"integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==dependencies:es-errors "^1.3.0"@@ -3729,7 +3549,7 @@ side-channel-list@^1.0.0:side-channel-map@^1.0.1:version "1.0.1"- resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"+ resolved "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz"integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==dependencies:call-bound "^1.0.2"@@ -3739,7 +3559,7 @@ side-channel-map@^1.0.1:side-channel-weakmap@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"+ resolved "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz"integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==dependencies:call-bound "^1.0.2"@@ -3750,7 +3570,7 @@ side-channel-weakmap@^1.0.2:side-channel@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"+ resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz"integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==dependencies:es-errors "^1.3.0"@@ -3761,17 +3581,17 @@ side-channel@^1.1.0:signal-exit@^3.0.2:version "3.0.7"- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"+ resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==signal-exit@^4.0.1:version "4.1.0"- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"+ resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==slice-ansi@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"+ resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==dependencies:ansi-styles "^4.0.0"@@ -3780,26 +3600,26 @@ slice-ansi@^3.0.0:slice-ansi@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"+ resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==dependencies:ansi-styles "^4.0.0"astral-regex "^2.0.0"is-fullwidth-code-point "^3.0.0"-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1:+source-map-js@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"+ resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz"integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==source-map@^0.6.1:version "0.6.1"- resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"+ resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==sshpk@^1.18.0:version "1.18.0"- resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"+ resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz"integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==dependencies:asn1 "~0.2.3"@@ -3814,7 +3634,7 @@ sshpk@^1.18.0:string-width@^4.1.0, string-width@^4.2.0:version "4.2.3"- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"+ resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==dependencies:emoji-regex "^8.0.0"@@ -3823,7 +3643,7 @@ string-width@^4.1.0, string-width@^4.2.0:string.prototype.includes@^2.0.1:version "2.0.1"- resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"+ resolved "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz"integrity sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==dependencies:call-bind "^1.0.7"@@ -3832,7 +3652,7 @@ string.prototype.includes@^2.0.1:string.prototype.matchall@^4.0.12:version "4.0.12"- resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"+ resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz"integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==dependencies:call-bind "^1.0.8"@@ -3851,7 +3671,7 @@ string.prototype.matchall@^4.0.12:string.prototype.repeat@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a"+ resolved "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz"integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==dependencies:define-properties "^1.1.3"@@ -3859,7 +3679,7 @@ string.prototype.repeat@^1.0.0:string.prototype.trim@^1.2.10:version "1.2.10"- resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"+ resolved "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz"integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==dependencies:call-bind "^1.0.8"@@ -3872,7 +3692,7 @@ string.prototype.trim@^1.2.10:string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9:version "1.0.9"- resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"+ resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz"integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==dependencies:call-bind "^1.0.8"@@ -3882,7 +3702,7 @@ string.prototype.trimend@^1.0.8, string.prototype.trimend@^1.0.9:string.prototype.trimstart@^1.0.8:version "1.0.8"- resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"+ resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz"integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==dependencies:call-bind "^1.0.7"@@ -3891,119 +3711,112 @@ string.prototype.trimstart@^1.0.8:strip-ansi@^6.0.0, strip-ansi@^6.0.1:version "6.0.1"- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"+ resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==dependencies:ansi-regex "^5.0.1"strip-bom@^3.0.0:version "3.0.0"- resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"+ resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==strip-final-newline@^2.0.0:version "2.0.0"- resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"+ resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==strip-json-comments@^3.1.1:version "3.1.1"- resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"+ resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==style-mod@^4.0.0, style-mod@^4.1.0:- version "4.1.2"- resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67"- integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==+ version "4.1.3"+ resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz"+ integrity sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==supports-color@^7.1.0:version "7.2.0"- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"+ resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==dependencies:has-flag "^4.0.0"supports-color@^8.1.1:version "8.1.1"- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"+ resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==dependencies:has-flag "^4.0.0"supports-preserve-symlinks-flag@^1.0.0:version "1.0.0"- resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"+ resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==systeminformation@^5.27.14:- version "5.31.6"- resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.31.6.tgz#2da4979a7262974fd068a3a306ded30aed6127c0"- integrity sha512-Uv2b2uGGM6ns+26czgW2cYRabYdnswM0ddSOOlryHOaelzsmDSet1iM/NT7VOYxW8x/BW+HkY+b1Ve2pLTSGSA==+ version "5.31.7"+ resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.7.tgz"+ integrity sha512-/8NC53e5nP9nmhn42/ncdOkyJnOoue/Vy+tJOyUGd1Yv66G069wK4rrziwhrqDETgk78CudTQupw5z19S5uoZw==text-table@^0.2.0:version "0.2.0"- resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"+ resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==textversionjs@^1.1.3:version "1.1.3"- resolved "https://registry.yarnpkg.com/textversionjs/-/textversionjs-1.1.3.tgz#1b700aef780467786882e28ab126f77ca326a1e8"+ resolved "https://registry.npmjs.org/textversionjs/-/textversionjs-1.1.3.tgz"integrity sha512-yZbBK7+1KRkgTJFOeIkCbQSZ+jR9ojDO/KrUKN3xEA6hA/DCMJ+aMWqjZ0rpxBJDjesbP795P5NEw+j3NnWJtA==throttleit@^1.0.0:version "1.0.1"- resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5"+ resolved "https://registry.npmjs.org/throttleit/-/throttleit-1.0.1.tgz"integrity sha512-vDZpf9Chs9mAdfY046mcPt8fg5QSZr37hEH4TXYBnDF+izxgrbRGUAAaBvIk/fJm9aOFCGFd1EsNg5AZCbnQCQ==through@^2.3.8:version "2.3.8"- resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"+ resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==tinymce@^5.10.9:version "5.10.9"- resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.9.tgz#1dfacb3231c71a688d90ff44a0b3f2e91b3b9edf"+ resolved "https://registry.npmjs.org/tinymce/-/tinymce-5.10.9.tgz"integrity sha512-5bkrors87X9LhYX2xq8GgPHrIgJYHl87YNs+kBcjQ5I3CiUgzo/vFcGvT3MZQ9QHsEeYMhYO6a5CLGGffR8hMg==-tldts-core@^6.1.71:- version "6.1.71"- resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.71.tgz#04069cbdcf75b7fcb68fb4c1e00591cd3a2d4a5c"- integrity sha512-LRbChn2YRpic1KxY+ldL1pGXN/oVvKfCVufwfVzEQdFYNo39uF7AJa/WXdo+gYO7PTvdfkCPCed6Hkvz/kR7jg==+tldts-core@^6.1.86:+ version "6.1.86"+ resolved "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz"+ integrity sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==tldts@^6.1.32:- version "6.1.71"- resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.71.tgz#e0db0853dd533628729d6a97a211450205fa21e4"- integrity sha512-LQIHmHnuzfZgZWAf2HzL83TIIrD8NhhI0DVxqo9/FdOd4ilec+NTNZOlDZf7EwrTNoutccbsHjvWHYXLAtvxjw==+ version "6.1.86"+ resolved "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz"+ integrity sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==dependencies:- tldts-core "^6.1.71"+ tldts-core "^6.1.86"tmp@~0.2.4:version "0.2.7"- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.7.tgz#26f4db11d1601ce8012dcb8a798ece1c06a99059"+ resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz"integrity sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==-to-regex-range@^5.0.1:- version "5.0.1"- resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"- integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==- dependencies:- is-number "^7.0.0"-tough-cookie@^5.0.0:- version "5.0.0"- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"- integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==+ version "5.1.2"+ resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz"+ integrity sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==dependencies:tldts "^6.1.32"version "1.2.2"- resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"+ resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==tsconfig-paths@^3.15.0:version "3.15.0"- resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"+ resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz"integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==dependencies:"@types/json5" "^0.0.29"@@ -4013,53 +3826,53 @@ tsconfig-paths@^3.15.0:tslib@^2.1.0:version "2.8.1"- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"+ resolved "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz"integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==tunnel-agent@^0.6.0:version "0.6.0"- resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"+ resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==dependencies:safe-buffer "^5.0.1"turndown@^7.1.2:version "7.2.0"- resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.2.0.tgz#67d614fe8371fb511079a93345abfd156c0ffcf4"+ resolved "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz"integrity sha512-eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==dependencies:"@mixmark-io/domino" "^2.2.0"tweetnacl@^0.14.3, tweetnacl@~0.14.0:version "0.14.5"- resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"+ resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==type-check@^0.4.0, type-check@~0.4.0:version "0.4.0"- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"+ resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==dependencies:prelude-ls "^1.2.1"type-fest@^0.20.2:version "0.20.2"- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"+ resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==type-fest@^0.21.3:version "0.21.3"- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"+ resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==type-fest@^0.8.0:version "0.8.1"- resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"+ resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==typed-array-buffer@^1.0.3:version "1.0.3"- resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"+ resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz"integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==dependencies:call-bound "^1.0.3"@@ -4068,7 +3881,7 @@ typed-array-buffer@^1.0.3:typed-array-byte-length@^1.0.3:version "1.0.3"- resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"+ resolved "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz"integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==dependencies:call-bind "^1.0.8"@@ -4079,7 +3892,7 @@ typed-array-byte-length@^1.0.3:typed-array-byte-offset@^1.0.4:version "1.0.4"- resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"+ resolved "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz"integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==dependencies:available-typed-arrays "^1.0.7"@@ -4092,7 +3905,7 @@ typed-array-byte-offset@^1.0.4:typed-array-length@^1.0.7:version "1.0.7"- resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"+ resolved "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz"integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==dependencies:call-bind "^1.0.7"@@ -4104,7 +3917,7 @@ typed-array-length@^1.0.7:unbox-primitive@^1.1.0:version "1.1.0"- resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"+ resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz"integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==dependencies:call-bound "^1.0.3"@@ -4114,39 +3927,39 @@ unbox-primitive@^1.1.0:undici-types@~6.20.0:version "6.20.0"- resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"+ resolved "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz"integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==universalify@^2.0.0:version "2.0.1"- resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"+ resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==untildify@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"+ resolved "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==uri-js@^4.2.2:version "4.4.1"- resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"+ resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==dependencies:punycode "^2.1.0"util-deprecate@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"+ resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==uuid@^8.3.2:version "8.3.2"- resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"+ resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==version "1.10.0"- resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"+ resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==dependencies:assert-plus "^1.0.0"@@ -4155,7 +3968,7 @@ [email protected]:vite@^5.4.21:version "5.4.21"- resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.21.tgz#84a4f7c5d860b071676d39ba513c0d598fdc7027"+ resolved "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz"integrity sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==dependencies:esbuild "^0.21.3"@@ -4166,12 +3979,12 @@ vite@^5.4.21:vue-chartjs@^5.3.0:version "5.3.2"- resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-5.3.2.tgz#c0f2009af6b08845af158ddee9d0a68d9dae631b"+ resolved "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.2.tgz"integrity sha512-NrkbRRoYshbXbWqJkTN6InoDVwVb90C0R7eAVgMWcB9dPikbruaOoTFjFYHE/+tNPdIe6qdLCDjfjPHQ0fw4jw==vue-eslint-parser@^9.0.1, vue-eslint-parser@^9.0.3, vue-eslint-parser@^9.3.2, vue-eslint-parser@^9.4.3:version "9.4.3"- resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"+ resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz"integrity sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==dependencies:debug "^4.3.4"@@ -4184,17 +3997,17 @@ vue-eslint-parser@^9.0.1, vue-eslint-parser@^9.0.3, vue-eslint-parser@^9.3.2, vuvue-i18n@^8.28.2:version "8.28.2"- resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840"+ resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz"integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==vue-router@^3.2.0:version "3.6.5"- resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"+ resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.6.5.tgz"integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==vue-template-compiler@^2.6.12:version "2.7.16"- resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"+ resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz"integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==dependencies:de-indent "^1.0.2"@@ -4202,7 +4015,7 @@ vue-template-compiler@^2.6.12:vue@^2.7.14:version "2.7.16"- resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"+ resolved "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz"integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==dependencies:"@vue/compiler-sfc" "2.7.16"@@ -4210,17 +4023,17 @@ vue@^2.7.14:vuex@^3.6.2:version "3.6.2"- resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"+ resolved "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==w3c-keyname@^2.2.4:version "2.2.8"- resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"+ resolved "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz"integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:version "1.1.1"- resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"+ resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz"integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==dependencies:is-bigint "^1.1.0"@@ -4231,7 +4044,7 @@ which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:which-builtin-type@^1.2.1:version "1.2.1"- resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"+ resolved "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz"integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==dependencies:call-bound "^1.0.2"@@ -4250,7 +4063,7 @@ which-builtin-type@^1.2.1:which-collection@^1.0.2:version "1.0.2"- resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"+ resolved "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz"integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==dependencies:is-map "^2.0.3"@@ -4260,7 +4073,7 @@ which-collection@^1.0.2:which-typed-array@^1.1.16, which-typed-array@^1.1.18:version "1.1.18"- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad"+ resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz"integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==dependencies:available-typed-arrays "^1.0.7"@@ -4272,19 +4085,19 @@ which-typed-array@^1.1.16, which-typed-array@^1.1.18:which@^2.0.1:version "2.0.2"- resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"+ resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==dependencies:isexe "^2.0.0"word-wrap@^1.2.5:version "1.2.5"- resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"+ resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==wrap-ansi@^6.2.0:version "6.2.0"- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"+ resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==dependencies:ansi-styles "^4.0.0"@@ -4293,7 +4106,7 @@ wrap-ansi@^6.2.0:wrap-ansi@^7.0.0:version "7.0.0"- resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"+ resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==dependencies:ansi-styles "^4.0.0"@@ -4302,17 +4115,17 @@ wrap-ansi@^7.0.0:wrappy@1:version "1.0.2"- resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"+ resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==xml-name-validator@^4.0.0:version "4.0.0"- resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"+ resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==yauzl@^2.10.0:version "2.10.0"- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"+ resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==dependencies:buffer-crc32 "~0.2.3"@@ -4320,5 +4133,5 @@ yauzl@^2.10.0:yocto-queue@^0.1.0:version "0.1.0"- resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"+ resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==