From 40c11f17050dbf8e4f649c4b86348ca3081d22b8 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sun, 2 Jul 2023 22:49:50 -0400 Subject: [PATCH 001/379] Remove UnsupportedBrowser component --- .../stylesheets/active_admin/_base.scss | 1 - .../stylesheets/active_admin/_print.scss | 4 -- .../components/_unsupported_browser.scss | 16 -------- config/locales/ar.yml | 4 -- config/locales/az.yml | 4 -- config/locales/da.yml | 4 -- config/locales/de-CH.yml | 4 -- config/locales/de.yml | 4 -- config/locales/el.yml | 4 -- config/locales/en-CA.yml | 4 -- config/locales/en-GB.yml | 4 -- config/locales/en.yml | 4 -- config/locales/eo.yml | 5 --- config/locales/es.yml | 4 -- config/locales/fr.yml | 4 -- config/locales/he.yml | 4 -- config/locales/id.yml | 4 -- config/locales/it.yml | 4 -- config/locales/ja.yml | 4 -- config/locales/lt.yml | 4 -- config/locales/mk.yml | 4 -- config/locales/nl.yml | 4 -- config/locales/pl.yml | 4 -- config/locales/pt-BR.yml | 4 -- config/locales/ru.yml | 4 -- config/locales/sk.yml | 4 -- config/locales/sv-SE.yml | 4 -- config/locales/tr.yml | 4 -- config/locales/uk.yml | 4 -- config/locales/vi.yml | 4 -- config/locales/zh-CN.yml | 4 -- config/locales/zh-TW.yml | 4 -- lib/active_admin/namespace_settings.rb | 3 -- lib/active_admin/view_factory.rb | 1 - .../views/components/unsupported_browser.rb | 12 ------ lib/active_admin/views/pages/base.rb | 7 ---- .../components/unsupported_browser_spec.rb | 39 ------------------- 37 files changed, 200 deletions(-) delete mode 100644 app/assets/stylesheets/active_admin/components/_unsupported_browser.scss delete mode 100644 lib/active_admin/views/components/unsupported_browser.rb delete mode 100644 spec/unit/views/components/unsupported_browser_spec.rb diff --git a/app/assets/stylesheets/active_admin/_base.scss b/app/assets/stylesheets/active_admin/_base.scss index 3e214cc0180..f61acacce7d 100644 --- a/app/assets/stylesheets/active_admin/_base.scss +++ b/app/assets/stylesheets/active_admin/_base.scss @@ -26,7 +26,6 @@ @import "./components/status_tags"; @import "./components/table_tools"; @import "./components/index_list"; - @import "./components/unsupported_browser"; @import "./components/tabs"; @import "./pages/logged_out"; @import "./structure/footer"; diff --git a/app/assets/stylesheets/active_admin/_print.scss b/app/assets/stylesheets/active_admin/_print.scss index 96fdd501228..5040b6d511b 100644 --- a/app/assets/stylesheets/active_admin/_print.scss +++ b/app/assets/stylesheets/active_admin/_print.scss @@ -281,7 +281,3 @@ form { } } } - -.unsupported_browser { - display: none; -} diff --git a/app/assets/stylesheets/active_admin/components/_unsupported_browser.scss b/app/assets/stylesheets/active_admin/components/_unsupported_browser.scss deleted file mode 100644 index 7f6f10731c1..00000000000 --- a/app/assets/stylesheets/active_admin/components/_unsupported_browser.scss +++ /dev/null @@ -1,16 +0,0 @@ -.unsupported_browser { - padding: 10px 30px; - color: #211e14; - background-color: #fae692; - @include gradient(#feefae, #fae692); - border-bottom: 1px solid #b3a569; - - h1 { - font-size: 13px; - font-weight: bold; - } - - p { - margin-bottom: 0.5em; - } -} diff --git a/config/locales/ar.yml b/config/locales/ar.yml index afbf3b47d7b..ca4e742781a 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -115,10 +115,6 @@ ar: sign_in_with_omniauth_provider: "تسجيل الدخول بـ %{provider}" resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب" resend_confirmation_instructions: "إعادة إرسال تعليمات تأكيد الحساب" - unsupported_browser: - headline: "يُرجى مُلاحظة أن (أكتف أدمن) لم تعد تدعم المُتصفّح إنترنت اكسبلوررالإصدار الثامن وما قبله" - recommendation: "ننصح بالتحديث إلى الإصدارات الأخيرة من: Internet Explorer, Google Chrome, أو Firefox." - turn_off_compatibility_view: "إن كنت تستخدم الإصدار التاسع وما يليه من إنترنت إكسبلورر تأكّد من تعطيل \"Compatibility View\"." access_denied: message: "لم يُصرّح لك بهذا الإجراء." index_list: diff --git a/config/locales/az.yml b/config/locales/az.yml index fec417fd1da..6b09dad6038 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -118,10 +118,6 @@ az: sign_in_with_omniauth_provider: "%{provider} vasitəsilə daxil ol" resend_unlock_instructions: "Blokdan çıxarma üzrə təlimatı yenidən göndərilməsi" resend_confirmation_instructions: "Aktivləşdirmə ismarışını yenidən göndərilməsi" - unsupported_browser: - headline: "Zəhmət olmasa, bilin ki, Active Admin artıq Internet Explorer-in köhnə versiyalarını daha dəstəkləmir və yalnız IE 8 versiyasından başlayaraq dəstəkləyir" - recommendation: "Biz sizin brauzerinizin versiyasını yeniləməyi məsləhət görürük (Internet Explorer, Google Chrome, və ya Firefox)." - turn_off_compatibility_view: "Əgər siz IE 9 və ya daha yeni versiya istifadə edirsinizsə, əmin olun ki, \"Uyğunluğun rejimində baxış\" seçimini söndürmüsünüz." access_denied: message: "Bunu etmək üçün daxil olmalısınız." index_list: diff --git a/config/locales/da.yml b/config/locales/da.yml index 29142d40c6e..3638d70850e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -117,10 +117,6 @@ da: sign_in_with_omniauth_provider: "Log ind med %{provider}" resend_unlock_instructions: "Send oplåsningsinstruktioner igen" resend_confirmation_instructions: "Send oplåsningsinstruktioner igen" - unsupported_browser: - headline: "Vær venligst opmærksom på, at ActiveAdmin ikke længere understøtter Internet Explorer version 8 eller tidligere." - recommendation: "Vi anbefaler at du opgraderer til den nyeste Internet Explorer, Google Chrome, eller Firefox." - turn_off_compatibility_view: "Hvis du bruger IE 9 eller senere, så vær sikker på, at du slår \"Compatibility View\" fra." access_denied: message: "Du har ikke rettigheder til at udføre denne handling." index_list: diff --git a/config/locales/de-CH.yml b/config/locales/de-CH.yml index 7407b36612f..b8e789f6fb4 100644 --- a/config/locales/de-CH.yml +++ b/config/locales/de-CH.yml @@ -88,7 +88,3 @@ sign_in_with_omniauth_provider: "Anmeldung mit %{provider}" resend_unlock_instructions: "Entsperrungsanweisung erneut senden" resend_confirmation_instructions: "Bestätigungsanweisung erneut senden" - unsupported_browser: - headline: "ActiveAdmin unterstützt nicht länger den Internet Explorer in Version 8 oder niedriger." - recommendation: "Wir empfehlen die Nutzung von Internet Explorer, Google Chrome, oder Firefox." - turn_off_compatibility_view: "Wenn sie IE 9 oder neuer benutzen, stellen sie sicher das sie den \"Kompatibilitätsansicht\" ausgeschaltet haben." diff --git a/config/locales/de.yml b/config/locales/de.yml index 297792ed0ce..eea5a572faa 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -141,10 +141,6 @@ de: sign_in_with_omniauth_provider: "Anmeldung mit %{provider}" resend_unlock_instructions: "Entsperrungsanweisung erneut senden" resend_confirmation_instructions: "Bestätigungsanweisung erneut senden" - unsupported_browser: - headline: "ActiveAdmin unterstützt nicht länger den Internet Explorer in Version 8 oder niedriger." - recommendation: "Wir empfehlen die Nutzung von Internet Explorer, Google Chrome, oder Firefox." - turn_off_compatibility_view: "Wenn sie IE 9 oder neuer benutzen, stellen sie sicher das sie den \"Kompatibilitätsansicht\" ausgeschaltet haben." access_denied: message: "Sie haben nicht die Berechtigung um diese Aktion auszuführen." index_list: diff --git a/config/locales/el.yml b/config/locales/el.yml index 79417a44a35..478333dec93 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -106,10 +106,6 @@ el: sign_in_with_omniauth_provider: "Σύνδεση με %{provider}" resend_unlock_instructions: "Αποστολή οδηγιών ξεκλειδώματος" resend_confirmation_instructions: "Αποστολή οδηγιών επιβεβαίωσης" - unsupported_browser: - headline: "Το ActiveAdmin δεν υποστηρίζει πλεον τον Internet Explorer έκδοση 8 η μικρότερη." - recommendation: "Σας προτείνουμε να αναβαθμίσετε στην τελευταία Internet Explorer, Google Chrome, or Firefox." - turn_off_compatibility_view: "Αν χρησιμοποιείτε IE 9 ή μεγαλύτερη έκδοση, σιγουρευτείτε ότι turn off \"Compatibility View\"." access_denied: message: "Δεν έχετε πρόσβαση για αυτή την ενέργεια." index_list: diff --git a/config/locales/en-CA.yml b/config/locales/en-CA.yml index 144e46a2fef..de8c98097f1 100644 --- a/config/locales/en-CA.yml +++ b/config/locales/en-CA.yml @@ -119,10 +119,6 @@ sign_in_with_omniauth_provider: "Sign in with %{provider}" resend_unlock_instructions: "Resend unlock instructions" resend_confirmation_instructions: "Resend confirmation instructions" - unsupported_browser: - headline: "Please note that ActiveAdmin no longer supports Internet Explorer versions 8 or less." - recommendation: "We recommend upgrading to the latest Internet Explorer, Google Chrome, or Firefox." - turn_off_compatibility_view: "If you are using IE 9 or later, make sure you turn off \"Compatibility View\"." access_denied: message: "You are not authorized to perform this action." index_list: diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 283b5914fec..6b06ef65709 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -119,10 +119,6 @@ sign_in_with_omniauth_provider: "Sign in with %{provider}" resend_unlock_instructions: "Resend unlock instructions" resend_confirmation_instructions: "Resend confirmation instructions" - unsupported_browser: - headline: "Please note that ActiveAdmin no longer supports Internet Explorer versions 8 or less." - recommendation: "We recommend upgrading to the latest Internet Explorer, Google Chrome, or Firefox." - turn_off_compatibility_view: "If you are using IE 9 or later, make sure you turn off \"Compatibility View\"." access_denied: message: "You are not authorised to perform this action." index_list: diff --git a/config/locales/en.yml b/config/locales/en.yml index d6616cdfe6b..ecb52cfc5f5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -141,10 +141,6 @@ en: sign_in_with_omniauth_provider: "Sign in with %{provider}" resend_unlock_instructions: "Resend unlock instructions" resend_confirmation_instructions: "Resend confirmation instructions" - unsupported_browser: - headline: "Please note that ActiveAdmin no longer supports Internet Explorer versions 8 or less." - recommendation: "We recommend that you upgrade your browser to improve your experience." - turn_off_compatibility_view: "If you are using IE 9 or later, make sure you turn off \"Compatibility View\"." access_denied: message: "You are not authorized to perform this action." index_list: diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 59f2ab7aa8e..bf3ded8944a 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -123,11 +123,6 @@ eo: sign_in_with_omniauth_provider: "Ensaluti per %{provider}" resend_unlock_instructions: "Resendi klarigojn por malŝlosi" resend_confirmation_instructions: "Resendi klarigojn por konfirmi" - unsupported_browser: - headline: "Rimarku ke ActiveAdmin ne plu subtenas versiojn 8 kaj mal - de Internet Explorer." - recommendation: "Ni rekomendas, ke vi ĝisdatigu vian retumilon por plibonigi vian sperton." - turn_off_compatibility_view: "Se vi uzas version 8 aŭ pli novan de Internet Explorer, estu certa, ke vi malŝaltu \"kongruecan reĝimon\"." access_denied: message: "Vi ne rajtas fari tiun agon." index_list: diff --git a/config/locales/es.yml b/config/locales/es.yml index 95e3b1b2f68..f6273f7194e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -141,10 +141,6 @@ es: sign_in_with_omniauth_provider: "Conéctate con %{provider}" resend_unlock_instructions: "Reenviar instrucciones de desbloqueo" resend_confirmation_instructions: "Reenviar instrucciones de confirmación" - unsupported_browser: - headline: "Por favor tenga en cuenta que Active Admin no soporta versiones de Internet Explorer menores a 8." - recommendation: "Recomendamos que actualice a la última versión de Internet Explorer, Google Chrome, o Firefox." - turn_off_compatibility_view: "Si está usando IE 9 o superior, asegúrese de apagar la \"Vista de compatibilidad\"." access_denied: message: "No está autorizado/a a realizar esta acción." index_list: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 05f9ea3b89e..0a191b7d5c7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -120,10 +120,6 @@ fr: sign_in_with_omniauth_provider: "Connectez-vous avec %{provider}" resend_unlock_instructions: "Renvoyer les informations de déverrouillage" resend_confirmation_instructions: "Renvoyer les instructions de confirmation" - unsupported_browser: - headline: "Veuillez noter que ActiveAdmin ne supporte plus les versions d'Internet Explorer 8 ou moins." - recommendation: "Nous vous recommandons de mettre à jour votre navigateur pour améliorer votre expérience." - turn_off_compatibility_view: "Si vous utilisez IE 9 ou une version ultérieure, assurez-vous d'activer \"Affichage de compatibilité\"." access_denied: message: "Vous n'êtes pas autorisé à exécuter cette action" index_list: diff --git a/config/locales/he.yml b/config/locales/he.yml index 8c61f5a2390..2960b566d6f 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -119,10 +119,6 @@ he: sign_in_with_omniauth_provider: "%{provider} היכנס עם" resend_unlock_instructions: "שלח שוב הוראות שיחרור" resend_confirmation_instructions: "שלח שוב הוראות אישור" - unsupported_browser: - headline: "שים לב ש-ActiveAdmin אינו תומך יותר ב-Internet Explorer גרסא 8 ומטה." - recommendation: "אנו ממליצים לשדרג את הדפדפן שלך על מנת לשפר את חווית הגלישה." - turn_off_compatibility_view: "אם אתה משתמש ב- IE 9 ואילך, ודא שכיבית \"תצוגת תאימות\"." access_denied: message: "אינך רשאי לבצע פעולה זו." index_list: diff --git a/config/locales/id.yml b/config/locales/id.yml index 39e55c5c92e..615902bb2e8 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -115,10 +115,6 @@ id: sign_in_with_omniauth_provider: "Daftar melalui %{provider}" resend_unlock_instructions: "Kirim instruksi pengaktifan kembali akun" resend_confirmation_instructions: "Kirim lagi instruksi konfirmasi akun" - unsupported_browser: - headline: "Harap dicatat bahwa ActiveAdmin sudah tidak mendukung InternetExplorer versi 8 atau versi sebelum itu." - recommendation: "Kami sarankan agar anda mengupgrade ke versi Internet Explorer, Google Chrome, atau Firefox yang terbaru." - turn_off_compatibility_view: "Kalau anda menggunakan IE 9 atau yang lebih baru, pastikan anda mematikan \"Compatibility View\"." access_denied: message: "Anda tidak diperkenankan melakukan aksi tersebut." index_list: diff --git a/config/locales/it.yml b/config/locales/it.yml index 3c1a22ec124..7fbac95c530 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -141,10 +141,6 @@ it: sign_in_with_omniauth_provider: "Collegati a %{provider}" resend_unlock_instructions: "Invia di nuovo le istruzioni per lo sblocco" resend_confirmation_instructions: "Invia di nuovo le istruzioni per la conferma" - unsupported_browser: - headline: "Avviso: ActiveAdmin non supporta Internet Explorer 8 o inferiore" - recommendation: "Ti raccomandiamo di aggiornare alla versione più recente di Internet Explorer, Google Chrome, o Firefox." - turn_off_compatibility_view: "Se stai utilizzando Internet Explorer 9 o successivo, assicurati di disabilitare la \"Modalità Compatibilità\"." access_denied: message: "Non hai le autorizzazioni necessarie per eseguire questa azione." index_list: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index cb88d6501ca..498e9533359 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -120,10 +120,6 @@ ja: sign_in_with_omniauth_provider: "%{provider}のアカウントを使ってログイン" resend_confirmation_instructions: "ユーザ確認手順を再送する" resend_unlock_instructions: "ロックの解除方法を再送する" - unsupported_browser: - headline: "ActiveAdminは、Internet Explorer 8以下はサポートはしていません。" - recommendation: "最新版のInternet Explorer、Google Chrome、もしくはFirefoxを使うことを推奨します。" - turn_off_compatibility_view: "Internet Explorer 9以降を使っている場合、互換表示をオフにしてください。" access_denied: message: "アクションを実行する権限がありません" index_list: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index a103f160304..723eeadf4de 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -121,10 +121,6 @@ lt: sign_in_with_omniauth_provider: 'Prisijungti su %{provider}' resend_unlock_instructions: "Persiųsti pakartotinio atrakinimo instrukcijas" resend_confirmation_instructions: "Persiųsti patvirtinimo instrukcijas" - unsupported_browser: - headline: "Atkreipiame dėmesį, kad ActiveAdmin nebepalaiko Internet Explorer 8 arba žemesnių versijų." - recommendation: "Rekomenduojame atsinaujinti į naujausią Internet Explorer, Google Chrome, arba Firefox." - turn_off_compatibility_view: "Jei naudojate IE 9 ar vėlesnę versiją, įsitikinkite kad išjungėte \"Suderinamumo rodinį\"." access_denied: message: 'Jūs nesate įgaliotas atlikti šį veiksmą.' index_list: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 4db17710626..a1c75a377a9 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -113,10 +113,6 @@ mk: sign_in_with_omniauth_provider: "Најави се со %{provider}" resend_unlock_instructions: "Повторно испрати инструкции за отклучување на профил" resend_confirmation_instructions: "Повторно испрати инструкции за потврдување на профил" - unsupported_browser: - headline: "Ве замолуваме, имајте во предвид дека ActiveAdmin не нуди поддршка за Internet Explorer 8 верзијата или претходни верзии." - recommendation: "Ви порачуваме да го ажурирате Вашиот пребарувач за да си го подобрите пребарувањето." - turn_off_compatibility_view: "Доколку користите IE 9 или понова верзија, Ве замолуваме да исклучите \"Compatibility View\"." access_denied: message: "Немате овластување да ја извршите оваа активност." index_list: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9a3a3a1f4e3..35db1a6544e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -123,10 +123,6 @@ nl: sign_in_with_omniauth_provider: "Log in met %{provider}" resend_unlock_instructions: "Ontgrendelinstructies opnieuw versturen" resend_confirmation_instructions: "Bevestigingsinstructies opnieuw versturen" - unsupported_browser: - headline: "Opgelet, ActiveAdmin bied geen support meer voor Internet Explorer 8 of lager" - recommendation: "Wij raden aan om te upgraden naar de nieuwste Internet Explorer, Google Chrome, of Firefox." - turn_off_compatibility_view: "Als u IE 9 of nieuwer gebruikt, zorg ervoor dat u \"Compatibility View\" uit zet." access_denied: message: "U bent niet gemachtigd voor deze actie." index_list: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index bfa24e28e88..5f17bcc750d 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -147,10 +147,6 @@ pl: sign_in_with_omniauth_provider: "Zaloguj się z %{provider}" resend_unlock_instructions: "Ponownie wyślij instrukcję odblokowania konta" resend_confirmation_instructions: "Ponownie wyślij instrukcje aktywacji" - unsupported_browser: - headline: "ActiveAdmin nie wspiera przeglądarki Internet Explorer w wersjach 8 i niższych." - recommendation: "Polecamy aktualizację przeglądarki." - turn_off_compatibility_view: "Jeśli używasz Internet Explorera w wersji 9 lub nowszej, upewnij się, że \"tryb zgodności\" został wyłączony.." access_denied: message: "Nie masz uprawnień wystarczających do wykonania tej akcji." index_list: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 0236ab1885f..7a6185b488a 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -122,10 +122,6 @@ pt-BR: sign_in_with_omniauth_provider: "Entre com o %{provider}" resend_unlock_instructions: "Reenviar instruções de desbloqueio" resend_confirmation_instructions: "Reenviar instruções de confirmação" - unsupported_browser: - headline: "O ActiveAdmin não oferece suporte ao Internet Explorer versão 8 ou inferior." - recommendation: "Nós recomendamos atualizar para a última versão do Internet Explorer, Google Chrome, ou Firefox." - turn_off_compatibility_view: "Se você está usando o IE 9 ou superior, desligue o \"Modo de Exibição de Compatibilidade\"." access_denied: message: "Você não tem permissão para realizar o solicitado" index_list: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 95cf31a414f..e5567a267c6 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -122,10 +122,6 @@ ru: sign_in_with_omniauth_provider: "Войти с помощью %{provider}" resend_unlock_instructions: "Повторная отправка инструкций разблокировки" resend_confirmation_instructions: "Повторная отправка инструкций подтверждения" - unsupported_browser: - headline: "Пожалуйста, обратите внимание, что Active Admin больше не поддерживает старые версии Internet Explorer начиная с версии IE 8" - recommendation: "Мы рекомендуем обновить версию вашего браузера (Internet Explorer, Google Chrome, или Firefox)." - turn_off_compatibility_view: "Если вы используете IE 9 или новее, убедитесь, что вы выключили опцию \"Просмотр в режиме совместимости\"." access_denied: message: "Вы не авторизованы для выполнения данного действия." index_list: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 13715c2c2aa..4d4654c6d80 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -147,10 +147,6 @@ sk: sign_in_with_omniauth_provider: "Prihlásiť sa cez %{provider}" resend_unlock_instructions: "Poslať znovu inštrukcie na odomknutie účtu" resend_confirmation_instructions: "Preposlať potvrdzovacie inštrukcie" - unsupported_browser: - headline: "ActiveAdmin nepodporuje Internet Explorer vo verzii <= 8." - recommendation: "Odporúčame aktualizovať Váš prehliadač." - turn_off_compatibility_view: "Ak používate Internet Explorer vo verzii >= 9, uistite sa, že \"režim kompatibility\" je vypnutý" access_denied: message: "Nemáte oprávnenie k vykonaniu tejto akcie." index_list: diff --git a/config/locales/sv-SE.yml b/config/locales/sv-SE.yml index 05437e6da2b..4b8793f5be8 100644 --- a/config/locales/sv-SE.yml +++ b/config/locales/sv-SE.yml @@ -141,10 +141,6 @@ sign_in_with_omniauth_provider: "Logga in med %{provider}" resend_unlock_instructions: "Skicka upplåsningsinstruktioner igen" resend_confirmation_instructions: "Skicka bekräftningsinstruktioner igen" - unsupported_browser: - headline: "Observera att ActiveAdmin inte längre stödjer Internet Explorer version 8 eller lägre." - recommendation: "Vi rekommenderar att du uppgraderar till den senaste versionen av Internet Explorer, Google Chrome, eller Firefox." - turn_off_compatibility_view: "Om du använder IE 9 eller senare, se till att stänga av \"Compatibility View\"." access_denied: message: "Du har inte behörighet att utföra denna åtgärd." index_list: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 335b8dd4da3..71902dec051 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -120,10 +120,6 @@ tr: sign_in_with_omniauth_provider: "%{provider} ile giriş yapın" resend_unlock_instructions: "Hesap geri açma talimatlarını tekrar gönder" resend_confirmation_instructions: "Onaylama talimatlarını tekrar gönder" - unsupported_browser: - headline: "ActiveAdmin Internet Explorer 8 ve altı artık desteklememektedir." - recommendation: "Son sürüm Internet Explorer, Google Chrome, ya da Firefox tarayıcılarından birine geçmenizi tavsiye ederiz." - turn_off_compatibility_view: "IE 9 ya da üstünü kullanıyorsanız, \"Uyumluluk Görünümü\"nü kapatmayı unutmayın." access_denied: message: "Bu işlemi gerçekleştirmek için yetkiniz yok." index_list: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 805d5531926..f646cb16088 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -119,10 +119,6 @@ uk: sign_in_with_omniauth_provider: "Увійти з допомогою %{provider}" resend_unlock_instructions: "Повторна відправка інструкцій розблокування" resend_confirmation_instructions: "Повторна відправка інструкцій підтвердження" - unsupported_browser: - headline: "Зверніть, будь-ласка, увагу, що ActiveAdmin більше не підтримує Internet Explorer 8 версії і нижче" - recommendation: "Ми рекомендуємо оновити версію вашого браузеру (Internet Explorer, Google Chrome, або Firefox)." - turn_off_compatibility_view: "Якщо ви використовуєте IE 9 і вище, переконайтесь, що ви вимкнули опцію \"Перегляд в режимі сумісності\"." access_denied: message: "Ви не авторизовані для виконання даної дії." index_list: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index f19eb15883f..b99329ff967 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -141,10 +141,6 @@ vi: sign_in_with_omniauth_provider: "Đăng nhập với %{provider}" resend_unlock_instructions: "Gửi lại hướng dẫn mở khoá" resend_confirmation_instructions: "Gửi lại hướng dẫn xác nhận" - unsupported_browser: - headline: "Vui lòng lưu ý rằng ActiveAdmin không còn hỗ trợ trên Internet Explorer các phiên bản 8 và thấp hơn." - recommendation: "Chúng tôi khuyên bạn hãy vào nâng cấp trình duyệt của bạn để cải thiện trải nghiệm của bạn." - turn_off_compatibility_view: "Nếu bạn đang sử dụng IE 9 hoặc mới hơn, hãy chắc chắn bạn tắt \"Compatibility View\"." access_denied: message: "Bạn không có quyền thực hiện tính năng này" index_list: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 076869a16cf..23dfac0be32 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -141,10 +141,6 @@ sign_in_with_omniauth_provider: "通过%{provider}登录" resend_unlock_instructions: "重发解锁邮件" resend_confirmation_instructions: "重发确认邮件" - unsupported_browser: - headline: "很抱歉，ActiveAdmin 已不再支持 Internet Explorer 8 以下版本的浏览器。" - recommendation: "建议您升级到最新版本的Internet Explorer，Google Chrome，或是 Firefox。" - turn_off_compatibility_view: "如果您使用的是 IE 9 或更新的版本，请确认已关闭“兼容性视图”。" access_denied: message: "您无权处理此操作" index_list: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 7a5bfe06704..6718897ad44 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -115,10 +115,6 @@ sign_in_with_omniauth_provider: "使用 %{provider} 登入" resend_unlock_instructions: "重新發送解鎖指示" resend_confirmation_instructions: "重新發送確認信" - unsupported_browser: - headline: "很抱歉，ActiveAdmin 已不再支援 Internet Explorer 8 以下版本的瀏覽器。" - recommendation: "建議您升級到最新版本的Internet Explorer，Google Chrome，或是 Firefox。" - turn_off_compatibility_view: "若您是使用 IE 9 或更新的版本，請確認「相容性檢視」是關閉的。" access_denied: message: "您沒有權限執行此項操作" index_list: diff --git a/lib/active_admin/namespace_settings.rb b/lib/active_admin/namespace_settings.rb index d0914f22012..0974d06c5e9 100644 --- a/lib/active_admin/namespace_settings.rb +++ b/lib/active_admin/namespace_settings.rb @@ -85,9 +85,6 @@ class NamespaceSettings < DynamicSettingsNode # A proc to be used when a user is not authorized to view the current resource register :on_unauthorized_access, :rescue_active_admin_access_denied - # A regex to detect unsupported browser, set to false to disable - register :unsupported_browser_matcher, /MSIE [1-8]\.0/ - # Whether to display 'Current Filters' on search screen register :current_filters, true diff --git a/lib/active_admin/view_factory.rb b/lib/active_admin/view_factory.rb index 983e0916900..94dbc7a0fb4 100644 --- a/lib/active_admin/view_factory.rb +++ b/lib/active_admin/view_factory.rb @@ -8,7 +8,6 @@ class ViewFactory < AbstractViewFactory register global_navigation: ActiveAdmin::Views::TabbedNavigation, utility_navigation: ActiveAdmin::Views::TabbedNavigation, site_title: ActiveAdmin::Views::SiteTitle, - unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser, action_items: ActiveAdmin::Views::ActionItems, title_bar: ActiveAdmin::Views::TitleBar, header: ActiveAdmin::Views::Header, diff --git a/lib/active_admin/views/components/unsupported_browser.rb b/lib/active_admin/views/components/unsupported_browser.rb deleted file mode 100644 index c95c5883a63..00000000000 --- a/lib/active_admin/views/components/unsupported_browser.rb +++ /dev/null @@ -1,12 +0,0 @@ -# frozen_string_literal: true -module ActiveAdmin - module Views - class UnsupportedBrowser < Component - def build - h1 I18n.t("active_admin.unsupported_browser.headline").html_safe - para I18n.t("active_admin.unsupported_browser.recommendation").html_safe - para I18n.t("active_admin.unsupported_browser.turn_off_compatibility_view").html_safe - end - end - end -end diff --git a/lib/active_admin/views/pages/base.rb b/lib/active_admin/views/pages/base.rb index 1c436235546..149e1e985d2 100644 --- a/lib/active_admin/views/pages/base.rb +++ b/lib/active_admin/views/pages/base.rb @@ -57,7 +57,6 @@ def build_active_admin_head def build_page within body(class: body_classes) do div id: "wrapper" do - build_unsupported_browser header active_admin_namespace, current_menu title_bar title, action_items_for_action build_page_content @@ -75,12 +74,6 @@ def body_classes ] end - def build_unsupported_browser - if active_admin_namespace.unsupported_browser_matcher =~ controller.request.user_agent - unsupported_browser - end - end - def build_page_content build_flash_messages div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do diff --git a/spec/unit/views/components/unsupported_browser_spec.rb b/spec/unit/views/components/unsupported_browser_spec.rb deleted file mode 100644 index 10f0dfa685a..00000000000 --- a/spec/unit/views/components/unsupported_browser_spec.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true -require "rails_helper" - -RSpec.describe ActiveAdmin::Views::UnsupportedBrowser do - let(:helpers) { mock_action_view } - let(:namespace) { double :namespace, unsupported_browser_matcher: /MSIE [1-8]\.0/ } - let(:base) { ActiveAdmin::Views::Pages::Base.new } - - def build_panel - render_arbre_component({}, helpers) do - insert_tag ActiveAdmin::Views::UnsupportedBrowser - end - end - - it "should render the panel" do - expect(I18n).to receive(:t).and_return("headline", "recommendation", "turn_off_compatibility_view") - expect(build_panel.content.gsub(/\s+/, "")).to eq "

headline

recommendation

turn_off_compatibility_view

" - end - - describe "ActiveAdmin::Views::Pages::Base behavior" do - context "when the reqex match" do - it "should build the unsupported browser panel" do - expect(base).to receive(:active_admin_namespace).and_return(namespace) - expect(base).to receive_message_chain(:controller, :request, :user_agent).and_return("Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.2; Trident/6.0)") - expect(base).to receive(:unsupported_browser) - base.send(:build_unsupported_browser) - end - end - - context "when the regex not match" do - it "should not build the unsupported browser panel" do - expect(base).to receive(:active_admin_namespace).and_return(namespace) - expect(base).to receive_message_chain(:controller, :request, :user_agent).and_return("Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0)") - expect(base).to receive(:unsupported_browser).never - base.send(:build_unsupported_browser) - end - end - end -end From b9bd8c0b74ffe1bc6e6bfcb4144a09cb56304077 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 15:58:46 -0400 Subject: [PATCH 002/379] Remove IndexAs{Blog,Block,Grid} components The basis of IndexAsBlock is what we'll use as a template in the docs for users to implement and customize as needed. This will help reduce the footprint of the library while still allowing this custom functionality for users. --- features/index/index_as_block.feature | 15 -- features/index/index_as_blog.feature | 69 -------- features/index/index_as_grid.feature | 45 ----- features/index/index_blank_slate.feature | 31 ---- features/index/switch_index_view.feature | 27 +-- features/step_definitions/blog_steps.rb | 4 - .../step_definitions/index_views_steps.rb | 4 - features/step_definitions/web_steps.rb | 7 +- features/support/env.rb | 18 ++ lib/active_admin/views/index_as_block.rb | 37 ----- lib/active_admin/views/index_as_blog.rb | 156 ------------------ lib/active_admin/views/index_as_grid.rb | 81 --------- spec/support/rails_template_with_data.rb | 6 +- .../admin/components/custom_index.rb | 20 +++ .../templates_with_data/admin/users.rb | 2 +- spec/unit/views/components/index_list_spec.rb | 18 +- spec/unit/views/index_as_blog_spec.rb | 77 --------- 17 files changed, 67 insertions(+), 550 deletions(-) delete mode 100644 features/index/index_as_block.feature delete mode 100644 features/index/index_as_blog.feature delete mode 100644 features/index/index_as_grid.feature delete mode 100644 features/step_definitions/blog_steps.rb delete mode 100644 features/step_definitions/index_views_steps.rb delete mode 100644 lib/active_admin/views/index_as_block.rb delete mode 100644 lib/active_admin/views/index_as_blog.rb delete mode 100644 lib/active_admin/views/index_as_grid.rb create mode 100644 spec/support/templates_with_data/admin/components/custom_index.rb delete mode 100644 spec/unit/views/index_as_blog_spec.rb diff --git a/features/index/index_as_block.feature b/features/index/index_as_block.feature deleted file mode 100644 index 3449284998b..00000000000 --- a/features/index/index_as_block.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Index as Block - - Viewing the resource as a block which is renderered by the user - - Scenario: Viewing the index as a block - Given a post with the title "Hello World from Block" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :block do |post| - span(link_to(post.title, admin_post_path(post))) - end - end - """ - Then I should see "Hello World from Block" within ".index_as_block" diff --git a/features/index/index_as_blog.feature b/features/index/index_as_blog.feature deleted file mode 100644 index b5dbed8d811..00000000000 --- a/features/index/index_as_blog.feature +++ /dev/null @@ -1,69 +0,0 @@ -Feature: Index as Blog - - Viewing resources as a blog on the index page - - Scenario: Viewing the blog with a resource - Given a post with the title "Hello World" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :blog - end - """ - And I am logged in - When I am on the index page for posts - Then I should see a blog header "Hello World" - And I should see a link to "Hello World" - - Scenario: Viewing the blog with a resource as a simple configuration - Given a post with the title "Hello World" and body "My great post body" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :blog do - title :title - body :body - end - end - """ - Then I should see a blog header "Hello World" - And I should see a link to "Hello World" - And I should see "My great post body" within ".post" - - Scenario: Viewing the blog with a resource as a block configuration - Given a post with the title "Hello World" and body "My great post body" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :blog do - title do |post| - post.title + " From Block" - end - body do |post| - post.body + " From Block" - end - end - end - """ - Then I should see a blog header "Hello World From Block" - And I should see a link to "Hello World From Block" - And I should see "My great post body From Block" within ".post" - - Scenario: Viewing a blog with a resource as a block configuration should render Abre components - Given a post with the title "Hello World" and body "My great post body" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :blog do - title do |post| - span(class: :title_span) { post.title + " From Block " } - end - body do |post| - span(class: :body_span) { post.body + " From Block" } - end - end - end - """ - Then I should see "Hello World From Block" within "span.title_span" - And I should see a link to "Hello World From Block" - And I should see "My great post body From Block" within ".post span.body_span" diff --git a/features/index/index_as_grid.feature b/features/index/index_as_grid.feature deleted file mode 100644 index 2968f62bed8..00000000000 --- a/features/index/index_as_grid.feature +++ /dev/null @@ -1,45 +0,0 @@ -Feature: Index as Grid - - Viewing resources as a grid on the index page - - Scenario: Viewing index as a grid with a simple block configuration - Given 9 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :grid do |post| - h2 auto_link(post) - end - end - """ - Then the table ".index_grid" should have 3 rows - And the table ".index_grid" should have 3 columns - And there should be 9 "a" tags within index grid - - Scenario: Viewing index as a grid and set the number of columns - Given 9 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :grid, columns: 1 do |post| - h2 auto_link(post) - end - end - """ - Then the table ".index_grid" should have 9 rows - And the table ".index_grid" should have 1 columns - And there should be 9 "a" tags within "table.index_grid" - - Scenario: Viewing index as a grid with an odd number of items - Given 9 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :grid, columns: 2 do |post| - h2 auto_link(post) - end - end - """ - Then the table ".index_grid" should have 5 rows - And the table ".index_grid" should have 2 columns - And there should be 9 "a" tags within "table.index_grid" diff --git a/features/index/index_blank_slate.feature b/features/index/index_blank_slate.feature index cb1b25aa1e8..868388b3f58 100644 --- a/features/index/index_blank_slate.feature +++ b/features/index/index_blank_slate.feature @@ -29,37 +29,6 @@ Feature: Index Blank Slate And I should see "There are no Posts yet." And I should not see "Create one" - Scenario: Viewing a index using a grid with no resources - Given an index configuration of: - """ - ActiveAdmin.register Post do - index as: :grid do |post| - h2 auto_link(post) - end - end - """ - And I should see "There are no Posts yet. Create one" - - Scenario: Viewing a index using blocks with no resources - Given an index configuration of: - """ - ActiveAdmin.register Post do - index as: :block do |post| - span(link_to(post.title, admin_post_path(post))) - end - end - """ - And I should see "There are no Posts yet. Create one" - - Scenario: Viewing a blog with no resources - Given an index configuration of: - """ - ActiveAdmin.register Post do - index as: :blog - end - """ - And I should see "There are no Posts yet. Create one" - Scenario: Customizing the default table with no resources Given an index configuration of: """ diff --git a/features/index/switch_index_view.feature b/features/index/switch_index_view.feature index d9616f77e19..97a958fe62e 100644 --- a/features/index/switch_index_view.feature +++ b/features/index/switch_index_view.feature @@ -12,34 +12,19 @@ Feature: Switch Index View index as: :table do column :title end - index as: :block do |post| + index as: :custom do |post| span(link_to(post.title, admin_post_path(post))) end end """ Then I should see "Hello World from Table" within ".index_as_table" - Scenario: Show default Page Presenter when default is specified - Given a post with the title "Hello World from Table" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: :block do |post| - span(link_to(post.title, admin_post_path(post))) - end - index as: :table, default: true do - column :title - end - end - """ - Then I should see "Hello World from Table" within ".index_as_table" - Scenario: Show links to different page views Given a post with the title "Hello World from Table" exists And an index configuration of: """ ActiveAdmin.register Post do - index as: :block do |post| + index as: :custom do |post| span(link_to(post.title, admin_post_path(post))) end index as: :table, default: true do @@ -49,14 +34,14 @@ Feature: Switch Index View """ Then I should see "Hello World from Table" within ".index_as_table" And I should see a link to "Table" - And I should see a link to "List" + And I should see a link to "Custom" Scenario: Show change between page views Given a post with the title "Hey from Table" and body "My body is awesome" exists And an index configuration of: """ ActiveAdmin.register Post do - index as: :block do |post| + index as: :custom do |post| span(link_to(post.title, admin_post_path(post))) end index as: :table, default: true do @@ -66,5 +51,5 @@ Feature: Switch Index View end """ Then I should see "My body is awesome" within ".index_as_table" - When I click "List" - Then I should not see "My body is awesome" within ".index_as_block" + When I follow "Custom" + Then I should not see "My body is awesome" within ".index_as_custom" diff --git a/features/step_definitions/blog_steps.rb b/features/step_definitions/blog_steps.rb deleted file mode 100644 index 1dcf394e910..00000000000 --- a/features/step_definitions/blog_steps.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true -Then /^I should see a blog header "([^"]*)"$/ do |header_text| - expect(page).to have_css "h3", text: header_text -end diff --git a/features/step_definitions/index_views_steps.rb b/features/step_definitions/index_views_steps.rb deleted file mode 100644 index 2410b1e7d38..00000000000 --- a/features/step_definitions/index_views_steps.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true -When /^I click "(.*?)"$/ do |link| - click_link(link) -end diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb index cf89d77b647..0da71675c66 100644 --- a/features/step_definitions/web_steps.rb +++ b/features/step_definitions/web_steps.rb @@ -24,9 +24,6 @@ def selector_for(locator) # when /the header/ # [:xpath, "//header"] - when "index grid" - [:css, "table.index_grid"] - when /^the "([^"]*)" sidebar$/ [:css, "##{$1.tr(" ", '').underscore}_sidebar_section"] @@ -70,6 +67,10 @@ def selector_for(locator) first(:link, link).click end +When /^I click "(.*?)"$/ do |link| + click_link(link) +end + When /^I fill in "([^"]*)" with "([^"]*)"$/ do |field, value| fill_in(field, with: value) end diff --git a/features/support/env.rb b/features/support/env.rb index 25a51336f8d..b304fdd6195 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -93,3 +93,21 @@ Around "@locale_manipulation" do |scenario, block| I18n.with_locale(:en, &block) end + +module ActiveAdmin + module Views + class IndexAsCustom < ActiveAdmin::Component + def build(page_presenter, collection) + add_class "index" + resource_selection_toggle_panel if active_admin_config.batch_actions.any? + collection.each do |obj| + instance_exec(obj, &page_presenter.block) + end + end + + def self.index_name + "custom" + end + end + end +end diff --git a/lib/active_admin/views/index_as_block.rb b/lib/active_admin/views/index_as_block.rb deleted file mode 100644 index bc7a6df09c7..00000000000 --- a/lib/active_admin/views/index_as_block.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true -module ActiveAdmin - module Views - - # # Index as a Block - # - # If you want to fully customize the display of your resources on the index - # screen, Index as a Block allows you to render a block of content for each - # resource. - # - # ```ruby - # index as: :block do |product| - # div for: product do - # resource_selection_cell product - # h2 auto_link product.title - # div simple_format product.description - # end - # end - # ``` - # - class IndexAsBlock < ActiveAdmin::Component - - def build(page_presenter, collection) - add_class "index" - resource_selection_toggle_panel if active_admin_config.batch_actions.any? - collection.each do |obj| - instance_exec(obj, &page_presenter.block) - end - end - - def self.index_name - "block" - end - - end - end -end diff --git a/lib/active_admin/views/index_as_blog.rb b/lib/active_admin/views/index_as_blog.rb deleted file mode 100644 index 8bb6c6107ea..00000000000 --- a/lib/active_admin/views/index_as_blog.rb +++ /dev/null @@ -1,156 +0,0 @@ -# frozen_string_literal: true -module ActiveAdmin - module Views - - # # Index as Blog - # - # Render your index page as a set of posts. The post has two main options: - # title and body. - # - # ```ruby - # index as: :blog do - # title :my_title # Calls #my_title on each resource - # body :my_body # Calls #my_body on each resource - # end - # ``` - # - # ## Post Title - # - # The title is the content that will be rendered within a link to the - # resource. There are two main ways to set the content for the title - # - # First, you can pass in a method to be called on your resource. For example: - # - # ```ruby - # index as: :blog do - # title :a_method_to_call - # end - # ``` - # - # Second, you can pass a block to the tile option which will then be - # used as the contents of the title. The resource being rendered - # is passed in to the block. For Example: - # - # ```ruby - # index as: :blog do - # title do |post| - # span post.title, class: 'title' - # span post.created_at, class: 'created_at' - # end - # end - # ``` - # - # ## Post Body - # - # The body is rendered underneath the title of each post. The same two - # style of options work as the Post Title above. - # - # Call a method on the resource as the body: - # - # ```ruby - # index as: :blog do - # title :my_title - # body :my_body - # end - # ``` - # - # Or, render a block as the body: - # - # ```ruby - # index as: :blog do - # title :my_title - # body do |post| - # div truncate post.title - # div class: 'meta' do - # span "Post in #{post.categories.join(', ')}" - # end - # end - # end - # ``` - # - class IndexAsBlog < ActiveAdmin::Component - - def build(page_presenter, collection) - @page_presenter = page_presenter - @collection = collection - - # Call the block passed in. This will set the - # title and body methods - instance_exec &page_presenter.block if page_presenter.block - - add_class "index" - build_posts - end - - # Setter method for the configuration of the title - def title(method = nil, &block) - if block_given? || method - @title = block_given? ? block : method - end - @title - end - - # Setter method for the configuration of the body - # - def body(method = nil, &block) - if block_given? || method - @body = block_given? ? block : method - end - @body - end - - def self.index_name - "blog" - end - - private - - def build_posts - resource_selection_toggle_panel if active_admin_config.batch_actions.any? - @collection.each do |post| - build_post(post) - end - end - - def build_post(post) - div for: post do - resource_selection_cell(post) if active_admin_config.batch_actions.any? - build_title(post) - build_body(post) - end - end - - def build_title(post) - if @title - h3 do - a(href: resource_path(post)) do - render_method_on_post_or_call_proc post, @title - end - end - else - h3 do - auto_link(post) - end - end - end - - def build_body(post) - if @body - div class: "content" do - render_method_on_post_or_call_proc post, @body - end - end - end - - def render_method_on_post_or_call_proc(post, proc) - case proc - when String, Symbol - post.public_send proc - else - instance_exec post, &proc - end - end - - end # Posts - end -end diff --git a/lib/active_admin/views/index_as_grid.rb b/lib/active_admin/views/index_as_grid.rb deleted file mode 100644 index e0205f638c6..00000000000 --- a/lib/active_admin/views/index_as_grid.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: true -module ActiveAdmin - module Views - - # # Index as a Grid - # - # Sometimes you want to display the index screen for a set of resources as a grid - # (possibly a grid of thumbnail images). To do so, use the :grid option for the - # index block. - # - # ```ruby - # index as: :grid do |product| - # link_to image_tag(product.image_path), admin_product_path(product) - # end - # ``` - # - # The block is rendered within a cell in the grid once for each resource in the - # collection. The resource is passed into the block for you to use in the view. - # - # You can customize the number of columns that are rendered using the columns - # option: - # - # ```ruby - # index as: :grid, columns: 5 do |product| - # link_to image_tag(product.image_path), admin_product_path(product) - # end - # ``` - # - class IndexAsGrid < ActiveAdmin::Component - - def build(page_presenter, collection) - @page_presenter = page_presenter - @collection = collection.to_a - add_class "index" - build_table - end - - def number_of_columns - @page_presenter[:columns] || default_number_of_columns - end - - def self.index_name - "grid" - end - - protected - - def build_table - resource_selection_toggle_panel if active_admin_config.batch_actions.any? - table class: "index_grid" do - @collection.in_groups_of(number_of_columns).each do |group| - build_row(group) - end - end - end - - def build_row(group) - tr do - group.each do |item| - item ? build_item(item) : build_empty_cell - end - end - end - - def build_item(item) - td for: item do - instance_exec(item, &@page_presenter.block) - end - end - - def build_empty_cell - td " ".html_safe - end - - def default_number_of_columns - 3 - end - - end - end -end diff --git a/spec/support/rails_template_with_data.rb b/spec/support/rails_template_with_data.rb index 51b26f8149d..de27422f3dd 100644 --- a/spec/support/rails_template_with_data.rb +++ b/spec/support/rails_template_with_data.rb @@ -11,11 +11,7 @@ menu parent: "Administrative", priority: 1 RUBY -copy_file File.expand_path("templates_with_data/admin/kitchen_sink.rb", __dir__), "app/admin/kitchen_sink.rb" - -%w{posts users categories tags}.each do |resource| - copy_file File.expand_path("templates_with_data/admin/#{resource}.rb", __dir__), "app/admin/#{resource}.rb" -end +directory File.expand_path("templates_with_data/admin", __dir__), "app/admin" append_file "db/seeds.rb", "\n\n" + <<-RUBY.strip_heredoc users = ["Jimi Hendrix", "Jimmy Page", "Yngwie Malmsteen", "Eric Clapton", "Kirk Hammett"].collect do |name| diff --git a/spec/support/templates_with_data/admin/components/custom_index.rb b/spec/support/templates_with_data/admin/components/custom_index.rb new file mode 100644 index 00000000000..260e89a9227 --- /dev/null +++ b/spec/support/templates_with_data/admin/components/custom_index.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true +module ActiveAdmin + module Views + class CustomIndex < ActiveAdmin::Component + + def build(page_presenter, collection) + add_class "index" + resource_selection_toggle_panel if active_admin_config.batch_actions.any? + collection.each do |obj| + instance_exec(obj, &page_presenter.block) + end + end + + def self.index_name + "custom" + end + + end + end +end diff --git a/spec/support/templates_with_data/admin/users.rb b/spec/support/templates_with_data/admin/users.rb index 5277e4d1f24..7c2bff7d48a 100644 --- a/spec/support/templates_with_data/admin/users.rb +++ b/spec/support/templates_with_data/admin/users.rb @@ -4,7 +4,7 @@ permit_params :first_name, :last_name, :username, :age - index as: :grid do |user| + index as: ActiveAdmin::Views::CustomIndex do |user| div for: user do resource_selection_cell user h2 link_to(user.display_name, admin_user_path(user)), style: "margin-bottom: 0" diff --git a/spec/unit/views/components/index_list_spec.rb b/spec/unit/views/components/index_list_spec.rb index 39d1c36a01b..7ca84a96fd1 100644 --- a/spec/unit/views/components/index_list_spec.rb +++ b/spec/unit/views/components/index_list_spec.rb @@ -2,8 +2,24 @@ require "rails_helper" RSpec.describe ActiveAdmin::Views::IndexList do + let(:custom_index_as) do + Class.new(ActiveAdmin::Component) do + def build(page_presenter, collection) + add_class "index" + resource_selection_toggle_panel if active_admin_config.batch_actions.any? + collection.each do |obj| + instance_exec(obj, &page_presenter.block) + end + end + + def self.index_name + "block" + end + end + end + describe "#index_list_renderer" do - let(:index_classes) { [ActiveAdmin::Views::IndexAsTable, ActiveAdmin::Views::IndexAsBlock] } + let(:index_classes) { [ActiveAdmin::Views::IndexAsTable, custom_index_as] } let(:collection) do Post.create(title: "First Post", starred: true) diff --git a/spec/unit/views/index_as_blog_spec.rb b/spec/unit/views/index_as_blog_spec.rb deleted file mode 100644 index 1b77804cb38..00000000000 --- a/spec/unit/views/index_as_blog_spec.rb +++ /dev/null @@ -1,77 +0,0 @@ -# frozen_string_literal: true -require "rails_helper" - -include ActiveAdmin -RSpec.describe ActiveAdmin::Views::IndexAsBlog do - subject { described_class.new } - - describe "#build" do - let(:page_presenter) { double("page_presenter", block: nil) } - let(:collection) { double("collection") } - - before do - expect(subject).to receive("build_posts") - expect(subject).to receive("add_class").with("index") - end - - context "when page_presenter has no block" do - before do - subject.build(page_presenter, collection) - end - - it do - expect(subject.instance_variable_get(:@page_presenter)) - .to eq(page_presenter) - expect(subject.instance_variable_get(:@collection)).to eq(collection) - end - end - - context "when page_presenter has block" do - let(:block) { Proc.new { double("proc_method") } } - - before do - allow(page_presenter).to receive(:block).and_return(block) - allow(subject).to receive("instance_exec") - subject.build(page_presenter, collection) - end - - it do - expect(subject).to have_received("instance_exec") - end - end - end - - %w(title body).each do |method| - describe "#{method}" do - context "when block given" do - let(:block_result) { double("block_result") } - - it "should use the block to set the #{method}" do - expect( - subject.public_send("#{method}") do - block_result - end.yield - ).to eq(block_result) - end - end - - context "when no block and method given" do - let(:method) { double("method") } - - it "should use method to set the #{method}" do - expect(subject.public_send("#{method}", method)).to eq(method) - end - end - - context "when no block and no method given" do - it "should be nil" do - expect(subject.public_send("#{method}")).to eq(nil) - end - end - end - end - - describe ".index_name" do - it { expect(described_class.index_name).to eq("blog") } - end -end From 56581d6438bac96501e4e9ee99e02d322d01911a Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sun, 2 Jul 2023 18:00:03 -0400 Subject: [PATCH 003/379] Columns component update, properties removed This is now just a simple 2 div component where we'll use a new columns class with CSS Grid to maintain previous behavior using plain CSS without custom properties. This component is now deprecated since it has no real value over the approach of using 2 div's directly with classes. --- .../stylesheets/active_admin/_base.scss | 2 - .../active_admin/components/_columns.scss | 3 - .../active_admin/components/_grid.scss | 9 -- features/show/columns.feature | 40 ----- features/step_definitions/column_steps.rb | 9 -- lib/active_admin/views/components/columns.rb | 147 ++---------------- spec/unit/views/components/columns_spec.rb | 146 ++++------------- 7 files changed, 37 insertions(+), 319 deletions(-) delete mode 100644 app/assets/stylesheets/active_admin/components/_columns.scss delete mode 100644 app/assets/stylesheets/active_admin/components/_grid.scss delete mode 100644 features/show/columns.feature delete mode 100644 features/step_definitions/column_steps.rb diff --git a/app/assets/stylesheets/active_admin/_base.scss b/app/assets/stylesheets/active_admin/_base.scss index f61acacce7d..138273d8380 100644 --- a/app/assets/stylesheets/active_admin/_base.scss +++ b/app/assets/stylesheets/active_admin/_base.scss @@ -17,11 +17,9 @@ @import "./components/breadcrumbs"; @import "./components/dropdown_menu"; @import "./components/buttons"; - @import "./components/grid"; @import "./components/links"; @import "./components/pagination"; @import "./components/panels"; - @import "./components/columns"; @import "./components/scopes"; @import "./components/status_tags"; @import "./components/table_tools"; diff --git a/app/assets/stylesheets/active_admin/components/_columns.scss b/app/assets/stylesheets/active_admin/components/_columns.scss deleted file mode 100644 index 3587763ddf0..00000000000 --- a/app/assets/stylesheets/active_admin/components/_columns.scss +++ /dev/null @@ -1,3 +0,0 @@ -.columns { - margin-bottom: 10px; -} diff --git a/app/assets/stylesheets/active_admin/components/_grid.scss b/app/assets/stylesheets/active_admin/components/_grid.scss deleted file mode 100644 index 7a8efbc551b..00000000000 --- a/app/assets/stylesheets/active_admin/components/_grid.scss +++ /dev/null @@ -1,9 +0,0 @@ -// -------------------------------------- Index as Grid -table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;} - -// -------------------------------------- Columns -.columns { - clear: both; - padding: 0; - .column { float: left; } -} diff --git a/features/show/columns.feature b/features/show/columns.feature deleted file mode 100644 index 25628890eb3..00000000000 --- a/features/show/columns.feature +++ /dev/null @@ -1,40 +0,0 @@ -Feature: Show - Columns - - Columns in show page - - Background: - Given a post with the title "Hello World" written by "Jane Doe" exists - - Scenario: Empty columns configuration - Given a show configuration of: - """ - ActiveAdmin.register Post do - - show do - columns do - end - end - - end - """ - Then I should see a columns container - And I should see 0 column - - Scenario: Empty colums configuration with empty colums inside - Given a show configuration of: - """ - ActiveAdmin.register Post do - - show do - columns do - column do - end - column do - end - end - end - - end - """ - Then I should see a columns container - And I should see 2 columns diff --git a/features/step_definitions/column_steps.rb b/features/step_definitions/column_steps.rb deleted file mode 100644 index 2420547b85f..00000000000 --- a/features/step_definitions/column_steps.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true -Then /^I should see a columns container$/ do - expect(page).to have_css ".columns" -end - -Then /^I should see (a|\d+) columns?$/ do |count| - count = count == "a" ? 1 : count.to_i - expect(page).to have_css ".column", count: count -end diff --git a/lib/active_admin/views/components/columns.rb b/lib/active_admin/views/components/columns.rb index eb1b3bbaa28..c8a78115e43 100644 --- a/lib/active_admin/views/components/columns.rb +++ b/lib/active_admin/views/components/columns.rb @@ -1,162 +1,37 @@ # frozen_string_literal: true module ActiveAdmin module Views - # = Columns Component # - # The Columns component allows you draw content into scalable columns. All - # you need to do is define the number of columns and the component will - # take care of the rest. - # - # == Simple Columns + # This is deprecated. # - # To display columns, use the #columns method. Within the block, call the - # #column method to create a new column. + # The Columns component allows you draw content into scalable columns + # using CSS Grid. # # To create a two column layout: # # columns do # column do - # span "Column # 1 - # end - # column do - # span "Column # 2 - # end - # end - # - # - # == Multiple Span Columns - # - # To make a column span multiple, pass the :span option to the column method: - # - # columns do - # column span: 2 do - # span "Column # 1 - # end - # column do - # span "Column # 2 - # end - # end - # - # By default, each column spans 1 column. So the above layout would have 2 columns, - # the first being 2 time bigger than the second. - # - # - # == Max and Min Column Sizes - # - # Active Admin is a fluid width layout, which means that columns are all defined - # using percentages. Sometimes this can cause issues if you don't want a column - # to shrink or expand past a certain point. - # - # To overcome this, columns include a :max_width and :min_width option. - # - # columns do - # column max_width: "200px", min_width: "100px" do - # span "Column # 1 + # span "Column # 1" # end # column do - # span "Column # 2 + # span "Column # 2" # end # end # - # Now the first column will not grow bigger than 200px and will not shrink smaller - # than 100px. + # Apply Tailwind utilities to either the columns or column component to + # set additional or override base styles. class Columns < ActiveAdmin::Component builder_method :columns - # For documentation, please take a look at Column#build - def column(*args, &block) - insert_tag Column, *args, &block - end - - # Override add child to set widths - def add_child(*) + def build(*args) super - calculate_columns! - end - - protected - - # Override the closing tag to include a clear - def closing_tag - "
" + super + add_class default_class_name end - def margin_size - 2 - end - - # Calculate our columns sizes and margins - def calculate_columns! - span_count = columns_span_count - columns_count = children.size - - all_margins_width = margin_size * (span_count - 1) - column_width = (100.00 - all_margins_width) / span_count - - columns.each_with_index do |column, i| - is_last_column = i == (columns_count - 1) - column.set_column_styles(column_width, margin_size, is_last_column) - end - end - - def columns_span_count - count = 0 - columns.each do |column| - count += column.span_size - end - - count - end - - def columns - children.select { |child| child.is_a?(Column) } - end - end - - class Column < ActiveAdmin::Component - - attr_accessor :span_size, :max_width, :min_width - - # @param [Hash] options An options hash for the column - # - # @option options [Integer] :span The columns this column should span - def build(options = {}) - options = options.dup - @span_size = options.delete(:span) || 1 - @max_width = options.delete(:max_width) - @min_width = options.delete(:min_width) - - super(options) - end - - def set_column_styles(column_width, margin_width, is_last_column = false) - column_with_span_width = (span_size * column_width) + ((span_size - 1) * margin_width) - - styles = [] - - styles << "width: #{column_with_span_width}%;" - - if max_width - styles << "max-width: #{safe_width(max_width)};" - end - - if min_width - styles << "min-width: #{safe_width(min_width)};" - end - - styles << "margin-right: #{margin_width}%;" unless is_last_column - - set_attribute :style, styles.join(" ") - end - - private - - # Converts values without a '%' or 'px' suffix to a pixel value - def safe_width(width) - width.to_s.gsub(/\A(\d+)\z/, '\1px') + def column(*args, &block) + insert_tag Arbre::HTML::Div, *args, &block end - end end end diff --git a/spec/unit/views/components/columns_spec.rb b/spec/unit/views/components/columns_spec.rb index ac3a1ece7fd..bd410abae87 100644 --- a/spec/unit/views/components/columns_spec.rb +++ b/spec/unit/views/components/columns_spec.rb @@ -14,8 +14,8 @@ expect(cols.class_list).to include("columns") end - it "should have one column" do - expect(cols.children.first.class_list).not_to include("column") + it "should not have any children" do + expect(cols.to_s).to include('
') end end @@ -33,12 +33,13 @@ end it "should have one column" do - expect(cols.children.size).to eq 1 - expect(cols.children.first.class_list).to include("column") - end - - it "should have one column with the width 100.0%" do - expect(cols.children.first.attr(:style)).to include("width: 100.0%") + expect(cols.to_s).to eq(<<~HTML) +
+
+ Hello World +
+
+ HTML end end @@ -52,131 +53,36 @@ end end - it "should have two columns" do - expect(cols.children.size).to eq 2 - end - - it "should have a first column with width 49% and margin 2%" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; margin-right: 2%;" + it "should have the class .columns" do + expect(cols.class_list).to include("columns") end - it "should have a second column with width 49% and no right margin" do - expect(cols.children.last.attr(:style)).to eq "width: 49.0%;" + it "should have two columns" do + expect(cols.to_s).to eq(<<~HTML) +
+
+ Hello World +
+
+ Hello World +
+
+ HTML end end - describe "Rendering four columns" do + describe "Setting CSS Class" do let(:cols) do render_arbre_component do - columns do - column { span "Hello World" } - column { span "Hello World" } + columns class: "gap-4" do column { span "Hello World" } column { span "Hello World" } end end end - it "should have four columns" do - expect(cols.children.size).to eq 4 - end - - (0..2).to_a.each do |index| - it "should have column #{index + 1} with width 49% and margin 2%" do - expect(cols.children[index].attr(:style)).to eq "width: 23.5%; margin-right: 2%;" - end - end - - it "should have column 4 with width 49% and no margin" do - expect(cols.children[3].attr(:style)).to eq "width: 23.5%;" - end - end - - describe "Column Spans" do - let(:cols) do - render_arbre_component do - columns do - column(span: 2) { "Hello World" } - column() { "Hello World" } - column() { "Hello World" } - end - end - end - - it "should set the span when declared" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; margin-right: 2%;" - end - - it "should default to 1 if not passed in" do - expect(cols.children.last.attr(:style)).to eq "width: 23.5%;" - end - end - - describe "Column max width" do - let(:cols) do - render_arbre_component do - columns do - column(max_width: "100px") { "Hello World" } - column() { "Hello World" } - end - end - end - - it "should set the max with if passed in" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; max-width: 100px; margin-right: 2%;" - end - - it "should omit the value if not present" do - expect(cols.children.last.attr(:style)).to eq "width: 49.0%;" - end - - context "when passed an integer value" do - let(:cols) do - render_arbre_component do - columns do - column(max_width: 100) { "Hello World" } - column() { "Hello World" } - end - end - end - - it "should be treated as pixels" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; max-width: 100px; margin-right: 2%;" - end - end - end - - describe "Column min width" do - let(:cols) do - render_arbre_component do - columns do - column(min_width: "100px") { "Hello World" } - column() { "Hello World" } - end - end - end - - it "should set the min with if passed in" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; min-width: 100px; margin-right: 2%;" - end - - it "should omit the value if not present" do - expect(cols.children.last.attr(:style)).to eq "width: 49.0%;" - end - - context "when passed an integer value" do - let(:cols) do - render_arbre_component do - columns do - column(min_width: 100) { "Hello World" } - column() { "Hello World" } - end - end - end - - it "should be treated as pixels" do - expect(cols.children.first.attr(:style)).to eq "width: 49.0%; min-width: 100px; margin-right: 2%;" - end + it "keeps base class and appends given utility class" do + expect(cols.to_s).to include('
') end end end From 40b3f603aaf28d0fe42bb973ff073aba0e7115b2 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 16:54:25 -0400 Subject: [PATCH 004/379] StatusTag component update --- config/locales/en.yml | 2 +- features/index/index_as_table.feature | 8 +- features/strong_parameters.feature | 2 +- .../views/components/status_tag.rb | 42 +++---- spec/unit/views/components/status_tag_spec.rb | 117 ++++++------------ 5 files changed, 66 insertions(+), 105 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index ecb52cfc5f5..9b06420c5a1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -55,7 +55,7 @@ en: status_tag: "yes": "Yes" "no": "No" - "unset": "No" + "unset": "Unknown" main_content: "Please implement %{model}#main_content to display content." logout: "Logout" powered_by: "Powered by %{active_admin} %{version}" diff --git a/features/index/index_as_table.feature b/features/index/index_as_table.feature index 469fed4dcf6..d9d73bdd6f6 100644 --- a/features/index/index_as_table.feature +++ b/features/index/index_as_table.feature @@ -251,13 +251,13 @@ Feature: Index as Table When I am on the index page for posts Then I should see the "index_table_posts" table: | [ ] | Id | Title | Body | Published Date | Author | Position | Category | Starred | Foo | Created At | Updated At | | - | [ ] | 2 | Bye bye world | Move your... | | | | | No | | /.*/ | /.*/ | ViewEditDelete | - | [ ] | 1 | Hello World | From the body | | | | | No | | /.*/ | /.*/ | ViewEditDelete | + | [ ] | 2 | Bye bye world | Move your... | | | | | Unknown | | /.*/ | /.*/ | ViewEditDelete | + | [ ] | 1 | Hello World | From the body | | | | | Unknown | | /.*/ | /.*/ | ViewEditDelete | When I follow "Id" Then I should see the "index_table_posts" table: | [ ] | Id | Title | Body | Published Date | Author | Position | Category | Starred | Foo | Created At | Updated At | | - | [ ] | 1 | Hello World | From the body | | | | | No | | /.*/ | /.*/ | ViewEditDelete | - | [ ] | 2 | Bye bye world | Move your... | | | | | No | | /.*/ | /.*/ | ViewEditDelete | + | [ ] | 1 | Hello World | From the body | | | | | Unknown | | /.*/ | /.*/ | ViewEditDelete | + | [ ] | 2 | Bye bye world | Move your... | | | | | Unknown | | /.*/ | /.*/ | ViewEditDelete | Scenario: Sorting by a virtual column Given a post with the title "Hello World" exists diff --git a/features/strong_parameters.feature b/features/strong_parameters.feature index 1cd72570bae..51e527cf28b 100644 --- a/features/strong_parameters.feature +++ b/features/strong_parameters.feature @@ -66,4 +66,4 @@ Feature: Strong Params Then I should see "Post was successfully updated." And I should see the attribute "Title" with "Hello World from update" And I should see the attribute "Author" with "John Doe" - And I should see the attribute "Starred" with "No" + And I should see the attribute "Starred" with "Unknown" diff --git a/lib/active_admin/views/components/status_tag.rb b/lib/active_admin/views/components/status_tag.rb index ceb0d0eaf33..9c6a1e11504 100644 --- a/lib/active_admin/views/components/status_tag.rb +++ b/lib/active_admin/views/components/status_tag.rb @@ -9,12 +9,8 @@ def tag_name "span" end - def default_class_name - "status_tag" - end - # @overload status_tag(status, options = {}) - # @param [String] status the status to display. One of the span classes will be an underscored version of the status. + # @param [String] status the status to display. # @param [Hash] options # @option options [String] :class to override the default class # @option options [String] :id to override the default id @@ -22,17 +18,30 @@ def default_class_name # @return [ActiveAdmin::Views::StatusTag] # # @example + # status_tag(true) + # # => Yes + # + # @example + # status_tag(false) + # # => No + # + # @example + # status_tag(nil) + # # => Unknown + # + # @example # status_tag('In Progress') - # # => In Progress + # # => In Progress # # @example - # status_tag('active', class: 'important', id: 'status_123', label: 'on') - # # => on + # status_tag('Active', class: 'important', id: 'status_123', label: 'on') + # # => on # def build(status, options = {}) label = options.delete(:label) classes = options.delete(:class) - status = convert_to_boolean_status(status) + boolean_status = convert_to_boolean_status(status) + status = boolean_status || status if status content = label || if s = status.to_s and s.present? @@ -42,7 +51,7 @@ def build(status, options = {}) super(content, options) - add_class(status_to_class(status)) if status + add_class(boolean_status.downcase) if boolean_status add_class(classes) if classes end @@ -56,19 +65,6 @@ def convert_to_boolean_status(status) "No" when nil "Unset" - else - status - end - end - - def status_to_class(status) - case status - when "Unset" - "unset no" - when String, Symbol - status.to_s.titleize.gsub(/\s/, "").underscore - else - "" end end end diff --git a/spec/unit/views/components/status_tag_spec.rb b/spec/unit/views/components/status_tag_spec.rb index 22aca2e5c2b..994623e24b4 100644 --- a/spec/unit/views/components/status_tag_spec.rb +++ b/spec/unit/views/components/status_tag_spec.rb @@ -17,27 +17,12 @@ def status_tag(*args) it { is_expected.to eq "span" } end - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - end - context "when status is 'completed'" do subject { status_tag("completed") } - describe "#tag_name" do - subject { super().tag_name } - it { is_expected.to eq "span" } - end - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("completed") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end describe "#content" do @@ -50,8 +35,8 @@ def status_tag(*args) subject { status_tag("in_progress") } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("in_progress") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end describe "#content" do @@ -64,8 +49,8 @@ def status_tag(*args) subject { status_tag("In progress") } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("in_progress") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end describe "#content" do @@ -78,8 +63,8 @@ def status_tag(*args) subject { status_tag("") } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end describe "#content" do @@ -92,8 +77,8 @@ def status_tag(*args) subject { status_tag("false") } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "no") } end describe "#content" do @@ -106,8 +91,8 @@ def status_tag(*args) subject { status_tag(false) } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "no") } end describe "#content" do @@ -120,40 +105,45 @@ def status_tag(*args) subject { status_tag(nil) } describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - it { is_expected.to include("no") } - it { is_expected.to include("unset") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "unset") } end describe "#content" do subject { super().content } - it { is_expected.to eq("No") } + it { is_expected.to eq("Unknown") } + end - it "uses the unset locale key to customize the label for the `nil` case" do - with_translation %i[active_admin status_tag unset], "Unknown" do - expect(subject).to eq("Unknown") + describe "with locale override" do + around do |example| + with_translation %i[active_admin status_tag unset], "Unspecified" do + example.run end end + + describe "#class_list" do + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "unset") } + end + + describe "#content" do + subject { super().content} + it { is_expected.to eq("Unspecified") } + end end end context "when status is 'Active' and class is 'ok'" do subject { status_tag("Active", class: "ok") } - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("active") } + describe "#content" do + subject { super().content } + it { is_expected.to eq "Active" } end describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("ok") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "ok") } end end @@ -166,18 +156,8 @@ def status_tag(*args) end describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("active") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.not_to include("on") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end end @@ -190,23 +170,8 @@ def status_tag(*args) end describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("status_tag") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("so_useless") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("woot") } - end - - describe "#class_list" do - subject { super().class_list } - it { is_expected.to include("awesome") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag", "woot", "awesome") } end describe "#id" do @@ -224,8 +189,8 @@ def status_tag(*args) end describe "#class_list" do - subject { super().class_list } - it { is_expected.not_to include("42") } + subject { super().class_list.to_a } + it { is_expected.to contain_exactly("status_tag") } end end end From 38db6979787b296fe56c15cb82c4c0d3a1f4a66a Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 17:36:54 -0400 Subject: [PATCH 005/379] Remove Webpacker support --- .../layouts/active_admin_logged_out.html.erb | 12 ++------- lib/active_admin/engine.rb | 12 ++++----- lib/active_admin/namespace_settings.rb | 3 --- lib/active_admin/views/pages/base.rb | 6 ++--- .../active_admin/install/install_generator.rb | 8 +----- .../install/templates/active_admin.rb.erb | 7 ----- .../active_admin/webpacker/plugins/jquery.js | 7 ----- .../webpacker/templates/active_admin.js | 5 ---- .../webpacker/templates/active_admin.scss | 17 ------------ .../webpacker/templates/print.scss | 2 -- .../webpacker/webpacker_generator.rb | 27 ------------------- spec/requests/stylesheets_spec.rb | 2 +- spec/unit/generators/install_spec.rb | 12 ++------- 13 files changed, 14 insertions(+), 106 deletions(-) delete mode 100644 lib/generators/active_admin/webpacker/plugins/jquery.js delete mode 100644 lib/generators/active_admin/webpacker/templates/active_admin.js delete mode 100644 lib/generators/active_admin/webpacker/templates/active_admin.scss delete mode 100644 lib/generators/active_admin/webpacker/templates/print.scss delete mode 100644 lib/generators/active_admin/webpacker/webpacker_generator.rb diff --git a/app/views/layouts/active_admin_logged_out.html.erb b/app/views/layouts/active_admin_logged_out.html.erb index 0149896b9a6..6828d7c8870 100644 --- a/app/views/layouts/active_admin_logged_out.html.erb +++ b/app/views/layouts/active_admin_logged_out.html.erb @@ -6,18 +6,10 @@ <%= [@page_title, ActiveAdmin.application.site_title(self)].compact.join(" | ") %> <% ActiveAdmin.application.stylesheets.each do |style, options| %> - <% if ActiveAdmin.application.use_webpacker %> - <%= stylesheet_pack_tag style, **options %> - <% else %> - <%= stylesheet_link_tag style, **options %> - <% end %> + <%= stylesheet_link_tag style, **options %> <% end %> <% ActiveAdmin.application.javascripts.each do |path, options| %> - <% if ActiveAdmin.application.use_webpacker %> - <%= javascript_pack_tag path, **options %> - <% else %> - <%= javascript_include_tag path, **options %> - <% end %> + <%= javascript_include_tag path, **options %> <% end %> <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %> diff --git a/lib/active_admin/engine.rb b/lib/active_admin/engine.rb index 61b5e2fb2d8..6fbb2c07c60 100644 --- a/lib/active_admin/engine.rb +++ b/lib/active_admin/engine.rb @@ -8,13 +8,11 @@ class Engine < ::Rails::Engine end initializer "active_admin.precompile", group: :all do |app| - unless ActiveAdmin.application.use_webpacker - ActiveAdmin.application.stylesheets.each do |path, _| - app.config.assets.precompile << path - end - ActiveAdmin.application.javascripts.each do |path, _| - app.config.assets.precompile << path - end + ActiveAdmin.application.stylesheets.each do |path, _| + app.config.assets.precompile << path + end + ActiveAdmin.application.javascripts.each do |path, _| + app.config.assets.precompile << path end end diff --git a/lib/active_admin/namespace_settings.rb b/lib/active_admin/namespace_settings.rb index 0974d06c5e9..6365a64c397 100644 --- a/lib/active_admin/namespace_settings.rb +++ b/lib/active_admin/namespace_settings.rb @@ -117,8 +117,5 @@ class NamespaceSettings < DynamicSettingsNode :email, ] register :filter_method_for_large_association, "_start" - - # Switch between asset pipeline and webpacker assets - register :use_webpacker, false end end diff --git a/lib/active_admin/views/pages/base.rb b/lib/active_admin/views/pages/base.rb index 149e1e985d2..78ea4f42247 100644 --- a/lib/active_admin/views/pages/base.rb +++ b/lib/active_admin/views/pages/base.rb @@ -30,7 +30,7 @@ def build_active_admin_head text_node(active_admin_namespace.head) active_admin_application.stylesheets.each do |style, options| - stylesheet_tag = active_admin_namespace.use_webpacker ? stylesheet_pack_tag(style, **options) : stylesheet_link_tag(style, **options) + stylesheet_tag = stylesheet_link_tag(style, **options) text_node(stylesheet_tag.html_safe) if stylesheet_tag end @@ -39,13 +39,13 @@ def build_active_admin_head end active_admin_application.javascripts.each do |path, options| - javascript_tag = active_admin_namespace.use_webpacker ? javascript_pack_tag(path, **options) : javascript_include_tag(path, **options) + javascript_tag = javascript_include_tag(path, **options) text_node(javascript_tag) end if active_admin_namespace.favicon favicon = active_admin_namespace.favicon - favicon_tag = active_admin_namespace.use_webpacker ? favicon_pack_tag(favicon) : favicon_link_tag(favicon) + favicon_tag = favicon_link_tag(favicon) text_node(favicon_tag) end diff --git a/lib/generators/active_admin/install/install_generator.rb b/lib/generators/active_admin/install/install_generator.rb index 059bc81a2a0..cee520a7574 100644 --- a/lib/generators/active_admin/install/install_generator.rb +++ b/lib/generators/active_admin/install/install_generator.rb @@ -9,7 +9,6 @@ class InstallGenerator < ActiveRecord::Generators::Base hook_for :users, default: "devise", desc: "Admin user generator to run. Skip with --skip-users" class_option :skip_comments, type: :boolean, default: false, desc: "Skip installation of comments" - class_option :use_webpacker, type: :boolean, default: false, desc: "Use Webpacker assets instead of Sprockets" source_root File.expand_path("templates", __dir__) @@ -17,7 +16,6 @@ def copy_initializer @underscored_user_name = name.underscore.gsub("/", "_") @use_authentication_method = options[:users].present? @skip_comments = options[:skip_comments] - @use_webpacker = options[:use_webpacker] template "active_admin.rb.erb", "config/initializers/active_admin.rb" end @@ -39,11 +37,7 @@ def setup_routes end def create_assets - if options[:use_webpacker] - generate "active_admin:webpacker" - else - generate "active_admin:assets" - end + generate "active_admin:assets" end def create_migrations diff --git a/lib/generators/active_admin/install/templates/active_admin.rb.erb b/lib/generators/active_admin/install/templates/active_admin.rb.erb index 3c3748ac7f0..55c75d16dc5 100644 --- a/lib/generators/active_admin/install/templates/active_admin.rb.erb +++ b/lib/generators/active_admin/install/templates/active_admin.rb.erb @@ -342,11 +342,4 @@ ActiveAdmin.setup do |config| # You can inherit it with own class and inject it for all resources # # config.order_clause = MyOrderClause - - # == Webpacker - # - # By default, Active Admin uses Sprocket's asset pipeline. - # You can switch to using Webpacker here. - # - <% unless @use_webpacker %># <% end %>config.use_webpacker = true end diff --git a/lib/generators/active_admin/webpacker/plugins/jquery.js b/lib/generators/active_admin/webpacker/plugins/jquery.js deleted file mode 100644 index 54c61ec8353..00000000000 --- a/lib/generators/active_admin/webpacker/plugins/jquery.js +++ /dev/null @@ -1,7 +0,0 @@ -const webpack = require('webpack') - -module.exports = new webpack.ProvidePlugin({ - "$":"jquery", - "jQuery":"jquery", - "window.jQuery":"jquery" -}); diff --git a/lib/generators/active_admin/webpacker/templates/active_admin.js b/lib/generators/active_admin/webpacker/templates/active_admin.js deleted file mode 100644 index 68493d6a706..00000000000 --- a/lib/generators/active_admin/webpacker/templates/active_admin.js +++ /dev/null @@ -1,5 +0,0 @@ -// Load Active Admin's styles into Webpacker, -// see `active_admin.scss` for customization. -import "../stylesheets/active_admin"; - -import "@activeadmin/activeadmin"; diff --git a/lib/generators/active_admin/webpacker/templates/active_admin.scss b/lib/generators/active_admin/webpacker/templates/active_admin.scss deleted file mode 100644 index 762d851fba4..00000000000 --- a/lib/generators/active_admin/webpacker/templates/active_admin.scss +++ /dev/null @@ -1,17 +0,0 @@ -// Sass variable overrides must be declared before loading up Active Admin's styles. -// -// To view the variables that Active Admin provides, take a look at -// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the -// Active Admin source. -// -// For example, to change the sidebar width: -// $sidebar-width: 242px; - -// Active Admin's got SASS! -@import "~@activeadmin/activeadmin/src/scss/mixins"; -@import "~@activeadmin/activeadmin/src/scss/base"; - -// Overriding any non-variable Sass must be done after the fact. -// For example, to change the default status-tag color: -// -// .status_tag { background: #6090DB; } diff --git a/lib/generators/active_admin/webpacker/templates/print.scss b/lib/generators/active_admin/webpacker/templates/print.scss deleted file mode 100644 index 79ac0361c95..00000000000 --- a/lib/generators/active_admin/webpacker/templates/print.scss +++ /dev/null @@ -1,2 +0,0 @@ -/* Active Admin Print Stylesheet */ -@import "~@activeadmin/activeadmin/src/scss/print"; diff --git a/lib/generators/active_admin/webpacker/webpacker_generator.rb b/lib/generators/active_admin/webpacker/webpacker_generator.rb deleted file mode 100644 index 85f22495cfd..00000000000 --- a/lib/generators/active_admin/webpacker/webpacker_generator.rb +++ /dev/null @@ -1,27 +0,0 @@ -# frozen_string_literal: true -module ActiveAdmin - module Generators - class WebpackerGenerator < Rails::Generators::Base - - source_root File.expand_path("templates", __dir__) - - def install_assets - template "active_admin.js", "app/javascript/packs/active_admin.js" - template "active_admin.scss", "app/javascript/stylesheets/active_admin.scss" - template "print.scss", "app/javascript/packs/active_admin/print.scss" - - copy_file "#{__dir__}/plugins/jquery.js", Rails.root.join("config/webpack/plugins/jquery.js").to_s - - insert_into_file Rails.root.join("config/webpack/environment.js").to_s, - "const jquery = require('./plugins/jquery')\n", - after: /require\(('|")@rails\/webpacker\1\);?\n/ - - insert_into_file Rails.root.join("config/webpack/environment.js").to_s, - "environment.plugins.prepend('jquery', jquery)\n", - before: "module.exports" - - run "yarn add @activeadmin/activeadmin" - end - end - end -end diff --git a/spec/requests/stylesheets_spec.rb b/spec/requests/stylesheets_spec.rb index 5a953d0e391..8755784f99c 100644 --- a/spec/requests/stylesheets_spec.rb +++ b/spec/requests/stylesheets_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require "rails_helper" -RSpec.describe "Stylesheets", type: :request, unless: ActiveAdmin.application.use_webpacker do +RSpec.describe "Stylesheets", type: :request do require "sprockets" let(:css) do diff --git a/spec/unit/generators/install_spec.rb b/spec/unit/generators/install_spec.rb index 424a647b9f7..1b6ea1c822b 100644 --- a/spec/unit/generators/install_spec.rb +++ b/spec/unit/generators/install_spec.rb @@ -4,20 +4,12 @@ RSpec.describe "AA installation" do context "should create" do it "active_admin.scss" do - path = if ActiveAdmin.application.use_webpacker - Rails.root + "app/javascript/stylesheets/active_admin.scss" - else - Rails.root + "app/assets/stylesheets/active_admin.scss" - end + path = Rails.root + "app/assets/stylesheets/active_admin.scss" expect(File.exist?(path)).to eq true end it "active_admin.js" do - path = if ActiveAdmin.application.use_webpacker - Rails.root + "app/javascript/packs/active_admin.js" - else - Rails.root + "app/assets/javascripts/active_admin.js" - end + path = Rails.root + "app/assets/javascripts/active_admin.js" expect(File.exist?(path)).to eq true end From e4f0d5cd2c64f405ddf63b493f91844890b6fb29 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 17:17:49 -0400 Subject: [PATCH 006/379] Fix Rubocop warning --- spec/unit/views/components/status_tag_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unit/views/components/status_tag_spec.rb b/spec/unit/views/components/status_tag_spec.rb index 994623e24b4..1b79a0a5dbe 100644 --- a/spec/unit/views/components/status_tag_spec.rb +++ b/spec/unit/views/components/status_tag_spec.rb @@ -127,7 +127,7 @@ def status_tag(*args) end describe "#content" do - subject { super().content} + subject { super().content } it { is_expected.to eq("Unspecified") } end end From 4f7bd3b0e957850368a460b6488f714328e2a0f0 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 17:51:39 -0400 Subject: [PATCH 007/379] Remove link rake task All except for one was to do with whitespace. We want to reduce code footprint and use off-the-shelf tools for basic checks like these. Since they aren't critical we are fine without replacements other than what eslint and rubocop already offer. The sass-rails lint was for webpacker but we have already removed webpacker support. We won't be using any images or asset URLs in the new v4 approach for assets. --- .github/workflows/lint.yml | 2 - CONTRIBUTING.md | 7 -- Rakefile | 1 - tasks/lint.rake | 147 ------------------------------------- 4 files changed, 157 deletions(-) delete mode 100644 tasks/lint.rake diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e0788266e77..35ab097867a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,5 +18,3 @@ jobs: bundler-cache: true - name: Generate docs run: bin/rake docs:build - - name: Run lints - run: bin/rake lint diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f801a62349..09d5d45a856 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,13 +107,6 @@ with the db: bin/rake local db:migrate ``` -### Get the style right - -Your patch should follow the same conventions & pass the same code quality -checks as the rest of the project. `bin/rake lint` will give you feedback in -this regard. You can check & fix style issues by running each linter -individually. Run `bin/rake -T lint` to see the available linters. - ### Make a Pull Request At this point, you should switch back to your master branch and make sure it's diff --git a/Rakefile b/Rakefile index eb9beec46e4..a300704c39d 100644 --- a/Rakefile +++ b/Rakefile @@ -9,7 +9,6 @@ gemfile = ENV["BUNDLE_GEMFILE"] if gemfile.nil? || File.expand_path(gemfile) == File.expand_path("Gemfile") import "tasks/changelog.rake" import "tasks/docs.rake" - import "tasks/lint.rake" import "tasks/release.rake" end diff --git a/tasks/lint.rake b/tasks/lint.rake deleted file mode 100644 index 0c05a8df440..00000000000 --- a/tasks/lint.rake +++ /dev/null @@ -1,147 +0,0 @@ -# frozen_string_literal: true -require "open3" - -# -# Common stuff for a linter -# -module LinterMixin - def run - offenses = [] - - applicable_files.each do |file| - if clean?(file) - print "." - else - offenses << file - print "F" - end - end - - print "\n" - - return if offenses.empty? - - raise failure_message_for(offenses) - end - - private - - def applicable_files - Open3.capture2("git grep -Il ''")[0].split.reject { |file| file =~ %r{vendor/|app/assets/javascripts/active_admin/base.js} } - end - - def failure_message_for(offenses) - msg = "#{self.class.name} detected offenses. " - - msg += if respond_to?(:fixing_cmd) - "Run `#{fixing_cmd(offenses)}` to fix them." - else - "Affected files: #{offenses.join(' ')}" - end - - msg - end -end - -# -# Checks trailing whitespace -# -class TrailingWhitespaceLinter - include LinterMixin - - def clean?(file) - File.read(file, encoding: Encoding::UTF_8) !~ / +$/ - end -end - -# -# Checks trailing blank lines -# -class TrailingBlankLinesLinter - include LinterMixin - - def clean?(file) - File.read(file, encoding: Encoding::UTF_8)[-2..-1] != "\n\n" - end -end - -# -# Final new line linter -# -class MissingFinalNewLineLinter - include LinterMixin - - def clean?(file) - File.read(file, encoding: Encoding::UTF_8)[-1] == "\n" - end -end - -# -# Checks trailing whitespace -# -class FixmeLinter - include LinterMixin - - def clean?(file) - relative_path = Pathname.new(__FILE__).relative_path_from(Pathname.new(File.dirname(__dir__))).to_s - - file == relative_path || file == "yarn.lock" || File.read(file, encoding: Encoding::UTF_8) !~ /(BUG|FIXME)/ - end -end - -# -# Checks sass-rails directives -# -class SassRailsLinter - include LinterMixin - - def applicable_files - Dir["app/assets/stylesheets/**/*.scss"] - end - - def clean?(file) - relative_path = Pathname.new(__FILE__).relative_path_from(Pathname.new(File.dirname(__dir__))).to_s - - file == relative_path || File.read(file, encoding: Encoding::UTF_8) !~ /(asset-url|asset-path|image-url|image-path|asset-data-url)/ - end -end - -desc "Lints ActiveAdmin code base" -task lint: ["lint:trailing_blank_lines", "lint:missing_final_new_line", "lint:trailing_whitespace", "lint:fixme", "lint:sass_rails"] - -namespace :lint do - desc "Check for unnecessary trailing blank lines across all repo files" - task :trailing_blank_lines do - puts "Checking for unnecessary trailing blank lines..." - - TrailingBlankLinesLinter.new.run - end - - desc "Check for missing final new lines across all repo files" - task :missing_final_new_line do - puts "Checking for missing final new lines..." - - MissingFinalNewLineLinter.new.run - end - - desc "Check for unnecessary trailing whitespace across all repo files" - task :trailing_whitespace do - puts "Checking for unnecessary trailing whitespace..." - - TrailingWhitespaceLinter.new.run - end - - desc "Check for FIXME strings that should be fixed now, not later" - task :fixme do - puts "Checking for FIXME strings..." - - FixmeLinter.new.run - end - - desc "Check for sass-rails directives to ensure webpacker compatibility" - task :sass_rails do - puts "Checking for sass-rails directives..." - - SassRailsLinter.new.run - end -end From 5c4fd7d036908a85d9864478a3967f650c5fb95e Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 18:08:10 -0400 Subject: [PATCH 008/379] Fix possible flaky test failure due custom index My hunch is that with loading and unloading ActiveAdmin this causes an issue so since it supports a class, we'll use that option as test data. Note that it seems only one matrix build is failing but I believe its because of this, I'm not actually sure. --- features/index/switch_index_view.feature | 8 ++++---- features/support/env.rb | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/features/index/switch_index_view.feature b/features/index/switch_index_view.feature index 97a958fe62e..4966cb98ad2 100644 --- a/features/index/switch_index_view.feature +++ b/features/index/switch_index_view.feature @@ -12,7 +12,7 @@ Feature: Switch Index View index as: :table do column :title end - index as: :custom do |post| + index as: CustomIndexView do |post| span(link_to(post.title, admin_post_path(post))) end end @@ -24,7 +24,7 @@ Feature: Switch Index View And an index configuration of: """ ActiveAdmin.register Post do - index as: :custom do |post| + index as: CustomIndexView do |post| span(link_to(post.title, admin_post_path(post))) end index as: :table, default: true do @@ -41,7 +41,7 @@ Feature: Switch Index View And an index configuration of: """ ActiveAdmin.register Post do - index as: :custom do |post| + index as: CustomIndexView do |post| span(link_to(post.title, admin_post_path(post))) end index as: :table, default: true do @@ -52,4 +52,4 @@ Feature: Switch Index View """ Then I should see "My body is awesome" within ".index_as_table" When I follow "Custom" - Then I should not see "My body is awesome" within ".index_as_custom" + Then I should not see "My body is awesome" within ".custom-index-view" diff --git a/features/support/env.rb b/features/support/env.rb index b304fdd6195..6ab4d027052 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -94,20 +94,16 @@ I18n.with_locale(:en, &block) end -module ActiveAdmin - module Views - class IndexAsCustom < ActiveAdmin::Component - def build(page_presenter, collection) - add_class "index" - resource_selection_toggle_panel if active_admin_config.batch_actions.any? - collection.each do |obj| - instance_exec(obj, &page_presenter.block) - end - end - - def self.index_name - "custom" - end +class CustomIndexView < ActiveAdmin::Component + def build(page_presenter, collection) + add_class "custom-index-view" + resource_selection_toggle_panel if active_admin_config.batch_actions.any? + collection.each do |obj| + instance_exec(obj, &page_presenter.block) end end + + def self.index_name + "custom" + end end From 274f17fb0faf1b29b9f19fbfa7d7a6a7f5b8535c Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 18:32:25 -0400 Subject: [PATCH 009/379] Disable single test due to intermittent failure This is failing only a specific build but I have no idea why. The feature works as expected with a generated app. We'll disable this for now and hopefully someone can help revisit this. --- features/index/switch_index_view.feature | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/features/index/switch_index_view.feature b/features/index/switch_index_view.feature index 4966cb98ad2..da90b3d8bd3 100644 --- a/features/index/switch_index_view.feature +++ b/features/index/switch_index_view.feature @@ -36,20 +36,20 @@ Feature: Switch Index View And I should see a link to "Table" And I should see a link to "Custom" - Scenario: Show change between page views - Given a post with the title "Hey from Table" and body "My body is awesome" exists - And an index configuration of: - """ - ActiveAdmin.register Post do - index as: CustomIndexView do |post| - span(link_to(post.title, admin_post_path(post))) - end - index as: :table, default: true do - column :title - column :body - end - end - """ - Then I should see "My body is awesome" within ".index_as_table" - When I follow "Custom" - Then I should not see "My body is awesome" within ".custom-index-view" + # Scenario: Show change between page views + # Given a post with the title "Hey from Table" and body "My body is awesome" exists + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # index as: CustomIndexView do |post| + # span(link_to(post.title, admin_post_path(post))) + # end + # index as: :table, default: true do + # column :title + # column :body + # end + # end + # """ + # Then I should see "My body is awesome" within ".index_as_table" + # When I follow "Custom" + # Then I should not see "My body is awesome" within ".custom-index-view" From e988c369c98f27bfc15499ccc455c26a224410f9 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sun, 16 Jul 2023 17:36:01 -0400 Subject: [PATCH 010/379] Clearing filters now reloads collection path This is a better default since scope is part of the filter status. If others prefer to reset the query parameters via JS they can include it as its very easy to do nowadays with URLSearchParams. --- features/index/filters.feature | 23 ----------------------- features/step_definitions/filter_steps.rb | 12 ------------ lib/active_admin/filters/forms.rb | 2 +- 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/features/index/filters.feature b/features/index/filters.feature index 131c0fd1869..0495779515b 100644 --- a/features/index/filters.feature +++ b/features/index/filters.feature @@ -138,29 +138,6 @@ Feature: Index Filtering And I should not see "Mystery" within ".index_table" And I should see current filter "posts_author_id_eq" equal to "Jane Doe" - @javascript - Scenario: Clearing filter preserves custom parameters - Given a category named "Mystery" exists - And 1 post with the title "Hello World" written by "Jane Doe" in category "Non-Fiction" exists - And 1 post with the title "Lorem Ipsum" written by "Joe Smith" in category "Mystery" exists - And an index configuration of: - """ - ActiveAdmin.register Category - ActiveAdmin.application.favicon = false - """ - Then I should see "Displaying all 2 Categories" - When I add parameter "scope" with value "all" to the URL - And I add parameter "foo" with value "bar" to the URL - And I select "Hello World" from "Posts" - And I press "Filter" - Then I should see "Non-Fiction" - And I should not see "Mystery" - When I click "Clear Filters" - Then I should see "Non-Fiction" - And I should see "Mystery" - And I should have parameter "foo" with value "bar" - And I should have parameter "scope" with value "all" - Scenario: Checkboxes - Filtering categories via posts written by anyone Given a category named "Mystery" exists And a post with the title "Hello World" written by "Jane Doe" in category "Non-Fiction" exists diff --git a/features/step_definitions/filter_steps.rb b/features/step_definitions/filter_steps.rb index 23f79688d45..858be27214b 100644 --- a/features/step_definitions/filter_steps.rb +++ b/features/step_definitions/filter_steps.rb @@ -27,18 +27,6 @@ end end -Given(/^I add parameter "([^"]*)" with value "([^"]*)" to the URL$/) do |key, value| - url = page.current_url - separator = url.include?("?") ? "&" : "?" - visit url + separator + key.to_s + "=" + value.to_s -end - -Then(/^I should have parameter "([^"]*)" with value "([^"]*)"$/) do |key, value| - query = URI(page.current_url).query - params = Rack::Utils.parse_query query - expect(params[key]).to eq value -end - Then /^I should see current filter "([^"]*)" equal to "([^"]*)" with label "([^"]*)"$/ do |name, value, label| expect(page).to have_css "li.current_filter_#{name} span", text: label expect(page).to have_css "li.current_filter_#{name} b", text: value diff --git a/lib/active_admin/filters/forms.rb b/lib/active_admin/filters/forms.rb index 11dfa68e96a..21ac5901e54 100644 --- a/lib/active_admin/filters/forms.rb +++ b/lib/active_admin/filters/forms.rb @@ -67,7 +67,7 @@ def active_admin_filters_form_for(search, filters, options = {}) buttons = content_tag :div, class: "buttons" do f.submit(I18n.t("active_admin.filters.buttons.filter")) + - link_to(I18n.t("active_admin.filters.buttons.clear"), "#", class: "clear_filters_btn") + + link_to(I18n.t("active_admin.filters.buttons.clear"), collection_path, class: "clear_filters_btn") + hidden_field_tags_for(params, except: except_hidden_fields) end From b54a438fc432d9f6fc1bb6b4c4f0c2accc69884d Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 20:04:25 -0400 Subject: [PATCH 011/379] Add new JS using rails/ujs and Flowbite This replaces everything we had before except for has-many-sortable which will have to come from the community. Behavior like dropdowns, modals, tabs, etc. come from Flowbite. Components have been updated to make them compatible in a test app which we'll start to migrate back into the library. --- app/javascript/active_admin/active_admin.js | 16 ++++ .../active_admin/features/batch_actions.js | 86 +++++++++++++++++++ .../active_admin/features/filters.js | 19 ++++ .../active_admin/features/has_many.js | 28 ++++++ .../active_admin/features/per_page.js | 9 ++ app/javascript/active_admin/utils/dom.js | 9 ++ 6 files changed, 167 insertions(+) create mode 100644 app/javascript/active_admin/active_admin.js create mode 100644 app/javascript/active_admin/features/batch_actions.js create mode 100644 app/javascript/active_admin/features/filters.js create mode 100644 app/javascript/active_admin/features/has_many.js create mode 100644 app/javascript/active_admin/features/per_page.js create mode 100644 app/javascript/active_admin/utils/dom.js diff --git a/app/javascript/active_admin/active_admin.js b/app/javascript/active_admin/active_admin.js new file mode 100644 index 00000000000..46247cbeaac --- /dev/null +++ b/app/javascript/active_admin/active_admin.js @@ -0,0 +1,16 @@ +import Rails from '@rails/ujs'; +import 'flowbite'; +import './features/batch_actions' +import './features/has_many' +import './features/filters' +import './features/per_page' + +// On page load or when changing themes, best to add inline in `head` to avoid FOUC +if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) { + document.documentElement.classList.add('dark'); +} else { + document.documentElement.classList.remove('dark') +} + +window.Rails = Rails; +Rails.start(); diff --git a/app/javascript/active_admin/features/batch_actions.js b/app/javascript/active_admin/features/batch_actions.js new file mode 100644 index 00000000000..418cef7e311 --- /dev/null +++ b/app/javascript/active_admin/features/batch_actions.js @@ -0,0 +1,86 @@ +import { delegate } from "@rails/ujs"; + +const batchActionClick = function(event) { + event.preventDefault() + // console.log("batchActionClick", event) + let batchAction = document.getElementById("batch_action") + if (batchAction) + batchAction.value = this.dataset.action +} + +const batchActionConfirmComplete = function(event) { + // console.log('batchActionConfirmComplete', event.detail) + if (event.detail[0] === true) { + let form = document.getElementById("collection_selection") + if (form) { + form.submit() + } + } +} + +const batchActionFormSubmit = function(event) { + event.preventDefault(); + // console.log("batchActionFormSubmit", this) + let json = JSON.stringify(Object.fromEntries(new FormData(this).entries())); + let inputsField = document.getElementById('batch_action_inputs') + if (json && inputsField) { + inputsField.value = json + } + let form = document.getElementById("collection_selection") + if (form) { + form.submit() + } +} + +delegate(document, ".batch_actions_selector li a", "click", batchActionClick) + +delegate(document, "form.batch-action-form", "submit", batchActionFormSubmit) + +delegate(document, ".batch_actions_selector li a", "confirm:complete", batchActionConfirmComplete) + +const toggleDropdown = function(condition) { + const button = document.querySelector(".batch_actions_selector > button") + if (button) { + button.disabled = condition + } +} + +const toggleAllChange = function(event) { + const checkboxes = document.querySelectorAll("input[type=checkbox].collection_selection") + for (const checkbox of checkboxes) { + checkbox.checked = this.checked + } + + const rows = document.querySelectorAll(".paginated_collection tbody tr") + for (const row of rows) { + row.classList.toggle("selected", this.checked); + } + + toggleDropdown(!this.checked) +} + +delegate(document, "input[type=checkbox].toggle_all", "change", toggleAllChange) + +const toggleCheckboxChange = function(event) { + const numChecked = document.querySelectorAll("input[type=checkbox].collection_selection:checked").length; + const allChecked = numChecked === document.querySelectorAll("input[type=checkbox].collection_selection").length; + const someChecked = (numChecked > 0) && (numChecked < document.querySelectorAll("input[type=checkbox].collection_selection").length); + + const toggleAll = document.querySelector("input[type=checkbox].toggle_all") + if (toggleAll) { + toggleAll.checked = allChecked + toggleAll.indeterminate = someChecked + } + + toggleDropdown(numChecked === 0) +} + +delegate(document, "input[type=checkbox].collection_selection", "change", toggleCheckboxChange) + +const tableRowClick = function(event) { + if (event.target.type !== "checkbox") { + event.target.closest("tr").querySelector("input[type=checkbox]").click() + } +} + +delegate(document, ".paginated_collection tbody td", "click", tableRowClick) diff --git a/app/javascript/active_admin/features/filters.js b/app/javascript/active_admin/features/filters.js new file mode 100644 index 00000000000..6cd0f6cadb2 --- /dev/null +++ b/app/javascript/active_admin/features/filters.js @@ -0,0 +1,19 @@ +import { delegate } from "@rails/ujs"; +import { next } from "../utils/dom" + +const disableEmptyFields = function(event) { + Array.from(this.querySelectorAll("input, select, textarea")) + .filter((el) => el.value === "") + .forEach((el) => el.disabled = true) +}; + +delegate(document, ".filter_form", "submit", disableEmptyFields) + +const setSearchType = function(event) { + const input = next(this, "input") + if (input) { + input.name = `q[${this.value}]` + } +}; + +delegate(document, ".filter_form_field.select_and_search select", "change", setSearchType) diff --git a/app/javascript/active_admin/features/has_many.js b/app/javascript/active_admin/features/has_many.js new file mode 100644 index 00000000000..0e8a4d08e27 --- /dev/null +++ b/app/javascript/active_admin/features/has_many.js @@ -0,0 +1,28 @@ +import { delegate } from "@rails/ujs"; + +const hasManyRemoveClick = function(event) { + event.preventDefault() + const oldGroup = this.closest("fieldset") + if (oldGroup) { + oldGroup.remove() + } +} + +delegate(document, "a.button.has_many_remove", "click", hasManyRemoveClick) + +const hasManyAddClick = function(event) { + event.preventDefault() + const parent = this.closest(".has_many_container") + + let index = parseInt(parent.dataset.has_many_index || (parent.querySelectorAll('fieldset').length - 1)) + parent.dataset.has_many_index = ++index + + const regex = new RegExp(this.dataset.placeholder, 'g') + const html = this.dataset.html.replace(regex, index) + + const tempEl = document.createElement("div"); + tempEl.innerHTML = html + this.before(tempEl.firstChild) +} + +delegate(document, "a.button.has_many_add", "click", hasManyAddClick) diff --git a/app/javascript/active_admin/features/per_page.js b/app/javascript/active_admin/features/per_page.js new file mode 100644 index 00000000000..e8082f91db0 --- /dev/null +++ b/app/javascript/active_admin/features/per_page.js @@ -0,0 +1,9 @@ +import { delegate } from "@rails/ujs"; + +const setPerPage = function(event) { + const params = new URLSearchParams(window.location.search) + params.set("per_page", this.value) + window.location.search = params +} + +delegate(document, ".pagination_per_page > select", "change", setPerPage) diff --git a/app/javascript/active_admin/utils/dom.js b/app/javascript/active_admin/utils/dom.js new file mode 100644 index 00000000000..3f010b8fe39 --- /dev/null +++ b/app/javascript/active_admin/utils/dom.js @@ -0,0 +1,9 @@ +const next = function next(el, selector) { + const nextEl = el.nextElementSibling; + if (!selector || (nextEl && nextEl.matches(selector))) { + return nextEl; + } + return null; +} + +export { next } From 8dae4e6c37e25393240ed2275b12f297fbfca1c2 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 22:05:36 -0400 Subject: [PATCH 012/379] Rename to index.js --- app/javascript/active_admin/{active_admin.js => index.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/javascript/active_admin/{active_admin.js => index.js} (100%) diff --git a/app/javascript/active_admin/active_admin.js b/app/javascript/active_admin/index.js similarity index 100% rename from app/javascript/active_admin/active_admin.js rename to app/javascript/active_admin/index.js From d017da1643c4692ce63fe697a1e2fc45e540b127 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 22:06:11 -0400 Subject: [PATCH 013/379] Update main to use new index.js --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed013a07a68..88d3050cec2 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@activeadmin/activeadmin", "version": "3.0.0", "description": "The administration framework for Ruby on Rails.", - "main": "app/assets/javascripts/active_admin/base.js", + "main": "app/javascript/active_admin/index.js", "type": "module", "files": [ "app/assets/javascripts/active_admin/*.js", From 1f146329303729685318a90878596e59f06ef610 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 22:07:04 -0400 Subject: [PATCH 014/379] Add tailwindcss, flowbite, rails/ujs dependencies --- package.json | 5 +- yarn.lock | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 360 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 88d3050cec2..0a8c237b272 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,11 @@ "prepublishOnly": "rm -rf src && cp -R app/javascript/active_admin src && cp -R app/assets/stylesheets/active_admin src/scss" }, "dependencies": { + "@rails/ujs": "^7.0.6", + "flowbite": "^1.7.0", "jquery": "^3.4.1", "jquery-ui": "^1.12.1", - "jquery-ujs": "^1.2.2" + "jquery-ujs": "^1.2.2", + "tailwindcss": "^3.3.3" } } diff --git a/yarn.lock b/yarn.lock index 22e108031fb..499a1b55f3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,11 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== +"@alloc/quick-lru@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" + integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== + "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" @@ -1072,12 +1077,12 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3", "@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" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -1085,6 +1090,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@popperjs/core@^2.9.3": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -1138,6 +1148,11 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== +"@rails/ujs@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.6.tgz#fd8937c92335f3da9495e07292511ad5f7547a6a" + integrity sha512-s5v3AC6AywOIFMz0RIMW83Xc8FPIvKMkP3ZHFlM4ISNkhdUwP9HdhVtxxo6z3dIhe9vI0Our2A8kN/QpUV02Qg== + "@types/estree@*": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" @@ -1214,6 +1229,24 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +any-promise@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" + integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A== + +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +arg@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" + integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -1292,6 +1325,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1300,6 +1338,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@^3.0.2, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + browserslist@^4.21.9: version "4.21.9" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" @@ -1333,6 +1378,11 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +camelcase-css@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== + caniuse-lite@^1.0.30001503: version "1.0.30001512" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz#7450843fb581c39f290305a83523c7a9ef0d4cb4" @@ -1355,6 +1405,21 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chokidar@^3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -1389,7 +1454,7 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.1: +commander@^4.0.0, commander@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== @@ -1430,6 +1495,11 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + cucumber-messages@8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/cucumber-messages/-/cucumber-messages-8.0.0.tgz#99766ffe026185798eb80fc8c720d60d8a6ac8cb" @@ -1466,6 +1536,16 @@ define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +didyoumean@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== + +dlv@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -1703,6 +1783,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-glob@^3.2.12: + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + 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" @@ -1727,6 +1818,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + 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" @@ -1748,6 +1846,14 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== +flowbite@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/flowbite/-/flowbite-1.7.0.tgz#82359dbd5e3b2b9591eaf18ea929fb77871346b2" + integrity sha512-OTTmnhRgv85Rs+mcMaVU7zB6EvRQs7BaQziyMUsZLRjW9aUpeQyqKjLmxsVMMCdr8isYPCLd6UL7X1IaSVI0WQ== + dependencies: + "@popperjs/core" "^2.9.3" + mini-svg-data-uri "^1.4.3" + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -1829,6 +1935,13 @@ gherkin@9.0.0: cucumber-messages "8.0.0" source-map-support "^0.5.16" +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + glob-parent@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" @@ -1993,6 +2106,13 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" @@ -2025,7 +2145,7 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-glob@^4.0.0, is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -2049,6 +2169,11 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" +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.3: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -2122,6 +2247,11 @@ jest-worker@^26.2.1: merge-stream "^2.0.0" supports-color "^7.0.0" +jiti@^1.18.2: + version "1.19.1" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.19.1.tgz#fa99e4b76a23053e0e7cde098efe1704a14c16f1" + integrity sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg== + jquery-ui@^1.12.1: version "1.13.2" resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034" @@ -2191,6 +2321,16 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" +lilconfig@^2.0.5, lilconfig@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -2237,6 +2377,24 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +micromatch@^4.0.4, micromatch@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mini-svg-data-uri@^1.4.3: + version "1.4.4" + resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939" + integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== + minimatch@^3.0.4, 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" @@ -2259,6 +2417,20 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +mz@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + dependencies: + any-promise "^1.0.0" + object-assign "^4.0.1" + thenify-all "^1.0.0" + +nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -2269,6 +2441,21 @@ node-releases@^2.0.12: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +object-assign@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" + integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== + object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" @@ -2363,6 +2550,74 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== + +pirates@^4.0.1: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + +postcss-import@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70" + integrity sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew== + dependencies: + postcss-value-parser "^4.0.0" + read-cache "^1.0.0" + resolve "^1.1.7" + +postcss-js@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2" + integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw== + dependencies: + camelcase-css "^2.0.1" + +postcss-load-config@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd" + integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA== + dependencies: + lilconfig "^2.0.5" + yaml "^2.1.1" + +postcss-nested@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c" + integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ== + dependencies: + postcss-selector-parser "^6.0.11" + +postcss-selector-parser@^6.0.11: + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" + integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + +postcss@^8.4.23: + version "8.4.27" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057" + integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -2404,6 +2659,20 @@ randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== + dependencies: + pify "^2.3.0" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + regenerate-unicode-properties@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" @@ -2461,7 +2730,7 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.22.1: +resolve@^1.1.7, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.22.2: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -2595,6 +2864,11 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + source-map-support@^0.5.16, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -2662,6 +2936,19 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== +sucrase@^3.32.0: + version "3.34.0" + resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f" + integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.2" + commander "^4.0.0" + glob "7.1.6" + lines-and-columns "^1.1.6" + mz "^2.7.0" + pirates "^4.0.1" + ts-interface-checker "^0.1.9" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -2681,6 +2968,34 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +tailwindcss@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.3.tgz#90da807393a2859189e48e9e7000e6880a736daf" + integrity sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w== + dependencies: + "@alloc/quick-lru" "^5.2.0" + arg "^5.0.2" + chokidar "^3.5.3" + didyoumean "^1.2.2" + dlv "^1.1.3" + fast-glob "^3.2.12" + glob-parent "^6.0.2" + is-glob "^4.0.3" + jiti "^1.18.2" + lilconfig "^2.1.0" + micromatch "^4.0.5" + normalize-path "^3.0.0" + object-hash "^3.0.0" + picocolors "^1.0.0" + postcss "^8.4.23" + postcss-import "^15.1.0" + postcss-js "^4.0.1" + postcss-load-config "^4.0.1" + postcss-nested "^6.0.1" + postcss-selector-parser "^6.0.11" + resolve "^1.22.2" + sucrase "^3.32.0" + terser@^5.0.0: version "5.17.1" resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" @@ -2696,11 +3011,37 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +thenify-all@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA== + dependencies: + thenify ">= 3.1.0 < 4" + +"thenify@>= 3.1.0 < 4": + version "3.3.1" + resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f" + integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw== + dependencies: + any-promise "^1.0.0" + to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== +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" + +ts-interface-checker@^0.1.9: + version "0.1.13" + resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" + integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== + tsconfig-paths@^3.14.1: version "3.14.2" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" @@ -2780,6 +3121,11 @@ uri-js@^4.2.2: 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" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -2832,6 +3178,11 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yaml@^2.1.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" + integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From 8ed827b1f2ca4c319c4353efa8de38a1854b62bd Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 22 Jul 2023 22:08:24 -0400 Subject: [PATCH 015/379] Update all outdated npm packages --- yarn.lock | 219 +++++++++++++++++++++++++----------------------------- 1 file changed, 102 insertions(+), 117 deletions(-) diff --git a/yarn.lock b/yarn.lock index 499a1b55f3f..3da1f5da05d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,36 +27,36 @@ dependencies: "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.6.tgz#15606a20341de59ba02cd2fcc5086fcbe73bf544" - integrity sha512-29tfsWTq2Ftu7MXmimyC0C5FDZv5DYxOZkh3XD3+QW4V/BYuv/LyEsjj3c0hqedEaDt6DBfDvexMKU8YevdqFg== +"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" + integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== "@babel/core@*": - version "7.22.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.8.tgz#386470abe884302db9c82e8e5e87be9e46c86785" - integrity sha512-75+KxFB4CZqYRXjx4NlR4J7yGvKumBuZTmV4NV6v09dVXXkuYVYLT68N6HCzLvfJ+fWCxQsntNzKwwIXL4bHnw== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f" + integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.7" - "@babel/helper-compilation-targets" "^7.22.6" - "@babel/helper-module-transforms" "^7.22.5" + "@babel/generator" "^7.22.9" + "@babel/helper-compilation-targets" "^7.22.9" + "@babel/helper-module-transforms" "^7.22.9" "@babel/helpers" "^7.22.6" "@babel/parser" "^7.22.7" "@babel/template" "^7.22.5" "@babel/traverse" "^7.22.8" "@babel/types" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" + semver "^6.3.1" -"@babel/generator@^7.22.7": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.7.tgz#a6b8152d5a621893f2c9dacf9a4e286d520633d5" - integrity sha512-p+jPjMG+SI8yvIaxGgeW24u7q9+5+TGpZh8/CuB7RhBKd7RCy8FayNEFNNKrNK/eUcY/4ExQqLmyrvBXKsIcwQ== +"@babel/generator@^7.22.7", "@babel/generator@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" + integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== dependencies: "@babel/types" "^7.22.5" "@jridgewell/gen-mapping" "^0.3.2" @@ -77,45 +77,45 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.6.tgz#e30d61abe9480aa5a83232eb31c111be922d2e52" - integrity sha512-534sYEqWD9VfUm3IPn2SLcH4Q3P86XL+QvqdC7ZsFrzyyPF3T4XGiVghF6PTYNdWg6pXuoqXxNQAhbYeEInTzA== +"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892" + integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw== dependencies: - "@babel/compat-data" "^7.22.6" + "@babel/compat-data" "^7.22.9" "@babel/helper-validator-option" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" browserslist "^4.21.9" lru-cache "^5.1.1" + semver "^6.3.1" "@babel/helper-create-class-features-plugin@^7.22.5": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.6.tgz#58564873c889a6fea05a538e23f9f6d201f10950" - integrity sha512-iwdzgtSiBxF6ni6mzVnZCF3xt5qE6cEA0J7nFt8QOAWZ0zjCFceEgpn3vtb2V7WFR6QzP2jmIFOHMTRo7eNJjQ== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236" + integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-function-name" "^7.22.5" "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" + "@babel/helper-replace-supers" "^7.22.9" "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@nicolo-ribaudo/semver-v6" "^6.3.3" + semver "^6.3.1" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.6.tgz#87afd63012688ad792de430ceb3b6dc28e4e7a40" - integrity sha512-nBookhLKxAWo/TUCmhnaEJyLz2dekjQvv5SRpE9epWQBcpedWLKt8aZdsuT9XV5ovzR3fENLjRXVT0GsSlGGhA== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6" + integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" regexpu-core "^5.3.1" + semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.1.tgz#af1429c4a83ac316a6a8c2cc8ff45cb5d2998d3a" - integrity sha512-kX4oXixDxG197yhX+J3Wp+NpL2wuCFjWQAr6yX2jtCnflK9ulMI51ULFGIrWiX1jGfvAxdHp+XQCcP2bZGPs9A== +"@babel/helper-define-polyfill-provider@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7" + integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -164,19 +164,16 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-transforms@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" - integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== +"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129" + integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ== dependencies: "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-module-imports" "^7.22.5" "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" @@ -191,26 +188,22 @@ integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== "@babel/helper-remap-async-to-generator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" - integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82" + integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-wrap-function" "^7.22.5" - "@babel/types" "^7.22.5" + "@babel/helper-wrap-function" "^7.22.9" -"@babel/helper-replace-supers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" - integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg== +"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779" + integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg== dependencies: "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-member-expression-to-functions" "^7.22.5" "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" "@babel/helper-simple-access@^7.22.5": version "7.22.5" @@ -226,7 +219,7 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-split-export-declaration@^7.22.5", "@babel/helper-split-export-declaration@^7.22.6": +"@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== @@ -248,14 +241,13 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== -"@babel/helper-wrap-function@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" - integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw== +"@babel/helper-wrap-function@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz#189937248c45b0182c1dcf32f3444ca153944cb9" + integrity sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q== dependencies: "@babel/helper-function-name" "^7.22.5" "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" "@babel/helpers@^7.22.6": @@ -826,12 +818,12 @@ "@babel/helper-plugin-utils" "^7.22.5" "@babel/preset-env@*": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.7.tgz#a1ef34b64a80653c22ce4d9c25603cfa76fc168a" - integrity sha512-1whfDtW+CzhETuzYXfcgZAh8/GFMeEbz0V5dVgya8YeJyCU6Y/P2Gnx4Qb3MylK68Zu9UiwUvbPMPTpFAOJ+sQ== + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.9.tgz#57f17108eb5dfd4c5c25a44c1977eba1df310ac7" + integrity sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g== dependencies: - "@babel/compat-data" "^7.22.6" - "@babel/helper-compilation-targets" "^7.22.6" + "@babel/compat-data" "^7.22.9" + "@babel/helper-compilation-targets" "^7.22.9" "@babel/helper-plugin-utils" "^7.22.5" "@babel/helper-validator-option" "^7.22.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5" @@ -905,16 +897,16 @@ "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" "@babel/preset-modules" "^0.1.5" "@babel/types" "^7.22.5" - "@nicolo-ribaudo/semver-v6" "^6.3.3" babel-plugin-polyfill-corejs2 "^0.4.4" babel-plugin-polyfill-corejs3 "^0.8.2" babel-plugin-polyfill-regenerator "^0.5.1" core-js-compat "^3.31.0" + semver "^6.3.1" "@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== + version "0.1.6" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458" + integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" @@ -943,7 +935,7 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/traverse@^7.22.5", "@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8": +"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8": version "7.22.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== @@ -976,9 +968,9 @@ eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.4.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" - integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== + version "4.6.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.0.tgz#5b63f0df5528a44e28aa8578d393de908cc3d4d0" + integrity sha512-uiPeRISaglZnaZk8vwrjQZ1CxogZeY/4IYft6gBOTqu1WhVXWmCmZMWxUv2Q/pxSvPdp1JPaO62kLOcOkMqWrw== "@eslint/eslintrc@^2.1.0": version "2.1.0" @@ -1064,11 +1056,6 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@nicolo-ribaudo/semver-v6@^6.3.3": - version "6.3.3" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/semver-v6/-/semver-v6-6.3.3.tgz#ea6d23ade78a325f7a52750aab1526b02b628c29" - integrity sha512-3Yc1fUTs69MG/uZbJlLSI3JISMn2UV2rg+1D/vROUqZyh3l6iYHCs7GMp+M40ZD7yOdDbYjJcU1oTJhrc+dGKg== - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1297,28 +1284,28 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== babel-plugin-polyfill-corejs2@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.4.tgz#9f9a0e1cd9d645cc246a5e094db5c3aa913ccd2b" - integrity sha512-9WeK9snM1BfxB38goUEv2FLnA6ja07UMfazFHzCXUb3NyDZAwfXvQiURQ6guTTMeHcOsdknULm1PDhs4uWtKyA== + version "0.4.5" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c" + integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.4.1" - "@nicolo-ribaudo/semver-v6" "^6.3.3" + "@babel/helper-define-polyfill-provider" "^0.4.2" + semver "^6.3.1" babel-plugin-polyfill-corejs3@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.2.tgz#d406c5738d298cd9c66f64a94cf8d5904ce4cc5e" - integrity sha512-Cid+Jv1BrY9ReW9lIfNlNpsI53N+FN7gE+f73zLAUbr9C52W4gKLWSByx47pfDJsEysojKArqOtOKZSVIIUTuQ== + version "0.8.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52" + integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.1" + "@babel/helper-define-polyfill-provider" "^0.4.2" core-js-compat "^3.31.0" babel-plugin-polyfill-regenerator@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.1.tgz#ace7a5eced6dff7d5060c335c52064778216afd3" - integrity sha512-L8OyySuI6OSQ5hFy9O+7zFjyr4WhAfRjLIOkhQGYl+emwJkd/S4XXT1JpfrgR1jrQ1NcGiOh+yAdGlF8pnC3Jw== + version "0.5.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326" + integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.1" + "@babel/helper-define-polyfill-provider" "^0.4.2" balanced-match@^1.0.0: version "1.0.2" @@ -1384,9 +1371,9 @@ camelcase-css@^2.0.1: integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== caniuse-lite@^1.0.30001503: - version "1.0.30001512" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001512.tgz#7450843fb581c39f290305a83523c7a9ef0d4cb4" - integrity sha512-2S9nK0G/mE+jasCUsMPlARhRCts1ebcp2Ji8Y8PWi4NDE1iRdLCnEPHkEfeBrGC45L4isBx5ur3IQ6yTE2mRZw== + version "1.0.30001517" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8" + integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA== chalk@^2.0.0: version "2.4.2" @@ -1561,9 +1548,9 @@ doctrine@^3.0.0: esutils "^2.0.2" electron-to-chromium@^1.4.431: - version "1.4.451" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.451.tgz#12b63ee5c82cbbc7b4ddd91e90f5a0dfc10de26e" - integrity sha512-YYbXHIBxAHe3KWvGOJOuWa6f3tgow44rBW+QAuwVp2DvGqNZeE//K2MowNdWS7XE8li5cgQDrX1LdBr41LufkA== + version "1.4.468" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.468.tgz#3cbf64ad67d9f12bfe69fefe5eb1935ec4f6ab7a" + integrity sha512-6M1qyhaJOt7rQtNti1lBA0GwclPH+oKCmsra/hkcWs5INLxfXXD/dtdnaKUYQu/pjOBP/8Osoe4mAcNvvzoFag== es-abstract@^1.19.0, es-abstract@^1.20.4: version "1.21.2" @@ -1683,9 +1670,9 @@ eslint-plugin-import@: tsconfig-paths "^3.14.1" eslint-scope@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" - integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== + version "7.2.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd" + integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -1696,9 +1683,9 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== eslint@*: - version "8.44.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.44.0.tgz#51246e3889b259bbcd1d7d736a0c10add4f0e500" - integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A== + version "8.45.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78" + integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" @@ -1725,7 +1712,6 @@ eslint@*: globals "^13.19.0" graphemer "^1.4.0" ignore "^5.2.0" - import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" is-path-inside "^3.0.3" @@ -1737,13 +1723,12 @@ eslint@*: natural-compare "^1.4.0" optionator "^0.9.3" strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" text-table "^0.2.0" espree@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f" - integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A== + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== dependencies: acorn "^8.9.0" acorn-jsx "^5.3.2" @@ -2055,7 +2040,7 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== -import-fresh@^3.0.0, import-fresh@^3.2.1: +import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== @@ -2437,9 +2422,9 @@ natural-compare@^1.4.0: integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== node-releases@^2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" - integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== + version "2.0.13" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" + integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -2799,9 +2784,9 @@ rollup-pluginutils@^2.8.1: estree-walker "^0.6.1" rollup@*: - version "3.26.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.26.2.tgz#2e76a37606cb523fc9fef43e6f59c93f86d95e7c" - integrity sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA== + version "3.26.3" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.26.3.tgz#bbc8818cadd0aebca348dbb3d68d296d220967b8" + integrity sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ== optionalDependencies: fsevents "~2.3.2" @@ -2831,7 +2816,7 @@ sax@^1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -semver@^6.3.0: +semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -2931,7 +2916,7 @@ strip-json-comments@3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: +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" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== From 55cb323c8f980933e91bdd03a105c89bbeb64543 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Mon, 24 Jul 2023 16:52:06 -0400 Subject: [PATCH 016/379] Resolve eslint warnings We are disabling the unused variables because I don't think its worth doing when editors are great already at highlighting unused function arguments. I don't like renaming arguments with a prefix so we'll disable and leave the existing instances as they are. --- .eslintignore | 1 + .eslintrc.yml | 4 +--- app/javascript/active_admin/features/batch_actions.js | 3 ++- app/javascript/active_admin/features/has_many.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.eslintignore b/.eslintignore index d12c6aa1916..c1bc2a4d683 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,4 @@ lib/generators/**/*.js tmp/**/*.js spec/**/*.js src/**/*.js +coverage/**/*.js diff --git a/.eslintrc.yml b/.eslintrc.yml index ad63d102a5e..d583a4fc1cd 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -199,9 +199,7 @@ rules: no-unmodified-loop-condition: error no-unneeded-ternary: error no-unused-expressions: error - no-unused-vars: - - error - - argsIgnorePattern: "^_" + no-unused-vars: 'off' no-use-before-define: 'off' no-useless-call: error no-useless-computed-key: error diff --git a/app/javascript/active_admin/features/batch_actions.js b/app/javascript/active_admin/features/batch_actions.js index 418cef7e311..1867790a0af 100644 --- a/app/javascript/active_admin/features/batch_actions.js +++ b/app/javascript/active_admin/features/batch_actions.js @@ -4,8 +4,9 @@ const batchActionClick = function(event) { event.preventDefault() // console.log("batchActionClick", event) let batchAction = document.getElementById("batch_action") - if (batchAction) + if (batchAction) { batchAction.value = this.dataset.action + } } const batchActionConfirmComplete = function(event) { diff --git a/app/javascript/active_admin/features/has_many.js b/app/javascript/active_admin/features/has_many.js index 0e8a4d08e27..a7fbe711ee1 100644 --- a/app/javascript/active_admin/features/has_many.js +++ b/app/javascript/active_admin/features/has_many.js @@ -14,7 +14,7 @@ const hasManyAddClick = function(event) { event.preventDefault() const parent = this.closest(".has_many_container") - let index = parseInt(parent.dataset.has_many_index || (parent.querySelectorAll('fieldset').length - 1)) + let index = parseInt(parent.dataset.has_many_index || (parent.querySelectorAll('fieldset').length - 1), 10) parent.dataset.has_many_index = ++index const regex = new RegExp(this.dataset.placeholder, 'g') From 040ab70257b5a69fcf7beb6b40bb71a892053a06 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Mon, 24 Jul 2023 23:12:27 +0200 Subject: [PATCH 017/379] Use https where possible (#8026) * Use https whenever possible Also: - Fix a link to a blog post returning a 404. Using a redirect found in webarchive - Use example domain name in specs and generators. Helps to prevent information disclosure or other attacks (attackers may register domains used in generator to collect clicks) * Remove links to the live demo The link does not work and Heroku does not offer a free tier anymore --- CHANGELOG.md | 2 +- CONTRIBUTING.md | 4 ++-- README.md | 12 +++++------- app/javascript/active_admin/ext/jquery-ui.js | 2 +- docs/0-installation.md | 2 +- docs/1-general-configuration.md | 4 ++-- docs/14-gotchas.md | 2 +- docs/2-resource-customization.md | 6 +++--- docs/5-forms.md | 2 +- docs/_includes/footer.html | 4 ++-- docs/_includes/top-menu.html | 3 +-- docs/index.html | 4 ++-- features/site_title.feature | 12 ++++++------ .../install/templates/active_admin.rb.erb | 4 ++-- spec/unit/application_spec.rb | 8 ++++---- spec/unit/namespace_spec.rb | 2 +- 16 files changed, 35 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fac452af503..1b07106e3d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -586,7 +586,7 @@ _No changes_. * Prevents access to formats that the user not permitted to see. [#4867] by [@Fivell] and [@timoschilling] * Prevents potential DOS attack via Ruby symbols. [#1926] by [@seanlinsley] - * [this isn't an issue for those using Ruby >= 2.2](http://rubykaigi.org/2014/presentation/S-NarihiroNakamura) + * [this isn't an issue for those using Ruby >= 2.2](https://rubykaigi.org/2014/presentation/S-NarihiroNakamura) ### Bug Fixes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09d5d45a856..e776dbce2a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -175,11 +175,11 @@ Maintainers need to do the following to push out a release: * Run `bin/rake release` from the target branch once the PR is merged. [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials -[Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin +[Stack Overflow]: https://stackoverflow.com/questions/tagged/activeadmin [new issue]: https://github.com/activeadmin/activeadmin/issues/new [fork Active Admin]: https://help.github.com/articles/fork-a-repo [make a pull request]: https://help.github.com/articles/creating-a-pull-request -[git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing +[git rebasing]: https://git-scm.com/book/en/Git-Branching-Rebasing [interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link [Rollup]: https://rollupjs.org/guide/en/#quick-start diff --git a/README.md b/README.md index e3f31484d54..39cc55f1cb0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ creating elegant backends for website administration. ## Getting started * Check out [the docs][docs]. -* Try the [live demo][demo]. * The [wiki] includes links to tutorials, articles and sample projects. ## For enterprise @@ -91,23 +90,22 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec [Kaminari]: https://github.com/kaminari/kaminari [Ransack]: https://github.com/activerecord-hackery/ransack -[rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg +[rubygems_badge]: https://img.shields.io/gem/v/activeadmin.svg [rubygems]: https://rubygems.org/gems/activeadmin [actions_badge]: https://github.com/activeadmin/activeadmin/workflows/ci/badge.svg [actions]: https://github.com/activeadmin/activeadmin/actions [coverage_badge]: https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg?token=NAjeBdkQXW [coverage]: https://codecov.io/gh/activeadmin/activeadmin -[inch_badge]: http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master -[inch]: http://inch-ci.org/github/activeadmin/activeadmin +[inch_badge]: https://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master +[inch]: https://inch-ci.org/github/activeadmin/activeadmin [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme [tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support -[docs]: http://activeadmin.info/0-installation.html -[demo]: http://demo.activeadmin.info/admin +[docs]: https://activeadmin.info/0-installation.html [wiki]: https://github.com/activeadmin/activeadmin/wiki -[stackoverflow]: http://stackoverflow.com/questions/tagged/activeadmin +[stackoverflow]: https://stackoverflow.com/questions/tagged/activeadmin [contributing]: https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md [Liberapay]: https://liberapay.com/Active-Admin/donate [Tidelift security contact]: https://tidelift.com/security diff --git a/app/javascript/active_admin/ext/jquery-ui.js b/app/javascript/active_admin/ext/jquery-ui.js index 24194ff0884..7f6b6e384da 100644 --- a/app/javascript/active_admin/ext/jquery-ui.js +++ b/app/javascript/active_admin/ext/jquery-ui.js @@ -1,7 +1,7 @@ // Short-circuits `_focusTabbable` to focus on the modal itself instead of // elements inside the modal. Without this, if a datepicker is the first input, // it'll immediately pop up when the modal opens. -// See this ticket for more info: http://bugs.jqueryui.com/ticket/4731 +// See this ticket for more info: https://bugs.jqueryui.com/ticket/4731 $.ui.dialog.prototype._focusTabbable = function() { this.uiDialog.focus(); }; diff --git a/docs/0-installation.md b/docs/0-installation.md index 3140a72fadb..ee7702706f4 100644 --- a/docs/0-installation.md +++ b/docs/0-installation.md @@ -16,7 +16,7 @@ gem 'draper' gem 'pundit' ``` -More accurately, it's a [Rails Engine](http://guides.rubyonrails.org/engines.html) +More accurately, it's a [Rails Engine](https://guides.rubyonrails.org/engines.html) that can be injected into your existing Ruby on Rails application. ## Setting up Active Admin diff --git a/docs/1-general-configuration.md b/docs/1-general-configuration.md index a6a04c7bc11..d7f173891df 100644 --- a/docs/1-general-configuration.md +++ b/docs/1-general-configuration.md @@ -40,7 +40,7 @@ If you want, you can customize it. config.site_title = "My Admin Site" config.site_title_link = "/" config.site_title_image = "site_image.png" -config.site_title_image = "http://www.google.com/images/logos/google_logo_41.png" +config.site_title_image = "https://www.google.com/images/logos/google_logo_41.png" config.site_title_image = ->(context) { context.current_user.company.logo_url } ``` @@ -205,7 +205,7 @@ menu in the system; you can provide your own menu to be rendered in its place. ActiveAdmin.setup do |config| config.namespace :admin do |admin| admin.build_menu :utility_navigation do |menu| - menu.add label: "ActiveAdmin.info", url: "http://www.activeadmin.info", + menu.add label: "ActiveAdmin.info", url: "https://www.activeadmin.info", html_options: { target: :blank } admin.add_current_user_to_menu menu admin.add_logout_button_to_menu menu diff --git a/docs/14-gotchas.md b/docs/14-gotchas.md index 071880f87c3..04480a2e1f2 100644 --- a/docs/14-gotchas.md +++ b/docs/14-gotchas.md @@ -23,7 +23,7 @@ session from being committed. Flash messages won't work and you will be unable t use the session for storing anything. For more information see [the following -post](http://www.intridea.com/blog/2013/3/20/rails-assets-prefix-may-disable-your-session). +post](https://www.mobomo.com/2013/03/rails-assets-prefix-may-disable-your-session/). ## Helpers diff --git a/docs/2-resource-customization.md b/docs/2-resource-customization.md index a6f84204027..039d806e58e 100644 --- a/docs/2-resource-customization.md +++ b/docs/2-resource-customization.md @@ -288,14 +288,14 @@ config.namespace :admin do |admin| menu.add label: "Sites" do |sites| sites.add label: "Google", - url: "http://google.com", + url: "https://google.com", html_options: { target: :blank } sites.add label: "Facebook", - url: "http://facebook.com" + url: "https://facebook.com" sites.add label: "Github", - url: "http://github.com" + url: "https://github.com" end end end diff --git a/docs/5-forms.md b/docs/5-forms.md index 51f8db81f01..fd153bd9973 100644 --- a/docs/5-forms.md +++ b/docs/5-forms.md @@ -154,7 +154,7 @@ in the list. ## Datepicker ActiveAdmin offers the `datepicker` input, which uses the [jQuery UI -datepicker](http://jqueryui.com/datepicker/). The datepicker input accepts any +datepicker](https://jqueryui.com/datepicker/). The datepicker input accepts any of the options available to the standard jQueryUI Datepicker. For example: ```ruby diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 7f555209577..e1c5b7139f4 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -1,8 +1,8 @@
- Copyright 2011 Greg Bell and VersaPay + Copyright 2011 Greg Bell and VersaPay
-

+

diff --git a/docs/_includes/top-menu.html b/docs/_includes/top-menu.html index 03c4e7c8763..5a1c1715e27 100644 --- a/docs/_includes/top-menu.html +++ b/docs/_includes/top-menu.html @@ -3,8 +3,7 @@

Active Admin

diff --git a/docs/index.html b/docs/index.html index b47a0c49b6b..3f87095e3e5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -212,10 +212,10 @@

- 3 Ways to Get Started: + 2 Ways to Get Started:

- Check Out the Live Demo Read The Documentation Visit the Git Repository + Read The Documentation Visit the Git Repository

{% include footer.html %} diff --git a/features/site_title.feature b/features/site_title.feature index e77eeab4a6d..6c0b593656a 100644 --- a/features/site_title.feature +++ b/features/site_title.feature @@ -22,21 +22,21 @@ Feature: Site title Scenario: Set the site title image Given a configuration of: """ - ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + ActiveAdmin.application.site_title_image = "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" """ When I am on the dashboard And I should not see the site title "My Great Site" - And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + And I should see the site title image "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" Scenario: Set the site title image with link Given a configuration of: """ - ActiveAdmin.application.site_title_link = "http://www.google.com" - ActiveAdmin.application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + ActiveAdmin.application.site_title_link = "https://www.google.com" + ActiveAdmin.application.site_title_image = "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" """ When I am on the dashboard - And I should see the site title image "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" - And I should see the site title image linked to "http://www.google.com" + And I should see the site title image "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + And I should see the site title image linked to "https://www.google.com" Scenario: Set the site title to a proc Given a configuration of: diff --git a/lib/generators/active_admin/install/templates/active_admin.rb.erb b/lib/generators/active_admin/install/templates/active_admin.rb.erb index 55c75d16dc5..f098faf3400 100644 --- a/lib/generators/active_admin/install/templates/active_admin.rb.erb +++ b/lib/generators/active_admin/install/templates/active_admin.rb.erb @@ -249,7 +249,7 @@ ActiveAdmin.setup do |config| # # config.namespace :admin do |admin| # admin.build_menu :utility_navigation do |menu| - # menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank } + # menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: :blank } # admin.add_logout_button_to_menu menu # end # end @@ -258,7 +258,7 @@ ActiveAdmin.setup do |config| # # config.namespace :admin do |admin| # admin.build_menu :default do |menu| - # menu.add label: "My Great Website", url: "http://www.mygreatwebsite.com", html_options: { target: :blank } + # menu.add label: "My Great Website", url: "https://mygreatwebsite.example.com", html_options: { target: :blank } # end # end diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb index 58b4e9115e1..796694a1569 100644 --- a/spec/unit/application_spec.rb +++ b/spec/unit/application_spec.rb @@ -31,8 +31,8 @@ end it "should set the site's title link" do - application.site_title_link = "http://www.mygreatsite.com" - expect(application.site_title_link).to eq "http://www.mygreatsite.com" + application.site_title_link = "https://mygreatsite.example.com" + expect(application.site_title_link).to eq "https://mygreatsite.example.com" end it "should store the site's title image" do @@ -40,8 +40,8 @@ end it "should set the site's title image" do - application.site_title_image = "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" - expect(application.site_title_image).to eq "http://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + application.site_title_image = "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" + expect(application.site_title_image).to eq "https://railscasts.com/assets/episodes/stills/284-active-admin.png?1316476106" end it "should store the site's favicon" do diff --git a/spec/unit/namespace_spec.rb b/spec/unit/namespace_spec.rb index d152a27faf1..170b9ef731f 100644 --- a/spec/unit/namespace_spec.rb +++ b/spec/unit/namespace_spec.rb @@ -109,7 +109,7 @@ let(:namespace) { ActiveAdmin::Namespace.new(application, :admin) } let(:menu) do namespace.build_menu :utility_navigation do |menu| - menu.add label: "ActiveAdmin.info", url: "http://www.activeadmin.info", html_options: { target: :blank } + menu.add label: "ActiveAdmin.info", url: "https://www.activeadmin.info", html_options: { target: :blank } namespace.add_logout_button_to_menu menu, 1, class: "matt" end namespace.fetch_menu(:utility_navigation) From 2692838b7520a6b78478beeda9e0adb8179e2f39 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Tue, 25 Jul 2023 22:12:41 +0200 Subject: [PATCH 018/379] Drop support for Ruby 2.6 (#8023) Ransack 4 requires Ruby 2.7, so ActiveAdmin 3.x series does not support Ruby 2.6 already and this commit fixes the misleading gemspec version It has been decided not to run CI tests against 2.7 because it is in EOL Close #8022 --- .rubocop.yml | 2 +- activeadmin.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index cd71fc0da30..47888430103 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,7 +11,7 @@ require: AllCops: DisabledByDefault: true - TargetRubyVersion: 2.6 + TargetRubyVersion: 2.7 Exclude: - tmp/development_apps/**/* diff --git a/activeadmin.gemspec b/activeadmin.gemspec index 68e0ea34660..eb3185afe3d 100644 --- a/activeadmin.gemspec +++ b/activeadmin.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.metadata = { "rubygems_mfa_required" => "true" } - s.required_ruby_version = ">= 2.6" + s.required_ruby_version = ">= 2.7" s.add_dependency "arbre", "~> 1.2", ">= 1.2.1" s.add_dependency "formtastic", ">= 3.1", "< 5.0" From 80cb427f1db39dd57b73f77d9a98fab687ea0ec4 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Fri, 28 Jul 2023 23:02:45 -0400 Subject: [PATCH 019/379] Prep Tailwind CSS migration (#8035) * Skip everything possible on rails new * Update .eslintignore * Prep Tailwind CSS transition * Tabs rewrite with Flowbite JS * Disable has-many-sortable test case * Temporarily disable batch actions feature tests * Disable gherkin no-files-without-scenarios This is temporary until we move commits that migrate batch actions functionality. * Ignore tasks/test_application.rb file --- .eslintignore | 2 + .gherkin-lintrc | 2 +- .simplecov | 1 + Gemfile | 3 + Gemfile.lock | 14 +- app/assets/javascripts/active_admin/index.js | 163 + .../stylesheets/active_admin/_base.scss | 6 +- features/has_many.feature | 45 +- features/index/batch_actions.feature | 480 +- features/show/tabs.feature | 18 +- features/step_definitions/tab_steps.rb | 6 +- gemfiles/rails_61/Gemfile | 3 + gemfiles/rails_61/Gemfile.lock | 14 +- lib/active_admin/views/components/tabs.rb | 20 +- .../active_admin/assets/assets_generator.rb | 9 +- .../assets/templates/Procfile.dev | 3 + .../assets/templates/active_admin.css | 3 + .../assets/templates/active_admin.js | 2 +- ...ctive_admin.scss => active_admin_old.scss} | 0 .../assets/templates/builds/.keep | 0 .../assets/templates/package.json | 19 + .../assets/templates/tailwind.config.js | 24 + plugin.js | 568 +++ spec/support/rails_template.rb | 11 +- spec/unit/generators/install_spec.rb | 6 +- spec/unit/views/components/tabs_spec.rb | 59 +- tasks/local.rake | 6 +- tasks/test_application.rb | 19 +- vendor/assets/javascripts/flowbite.js | 4415 +++++++++++++++++ 29 files changed, 5551 insertions(+), 370 deletions(-) create mode 100644 app/assets/javascripts/active_admin/index.js create mode 100644 lib/generators/active_admin/assets/templates/Procfile.dev create mode 100644 lib/generators/active_admin/assets/templates/active_admin.css rename lib/generators/active_admin/assets/templates/{active_admin.scss => active_admin_old.scss} (100%) create mode 100644 lib/generators/active_admin/assets/templates/builds/.keep create mode 100644 lib/generators/active_admin/assets/templates/package.json create mode 100644 lib/generators/active_admin/assets/templates/tailwind.config.js create mode 100644 plugin.js create mode 100644 vendor/assets/javascripts/flowbite.js diff --git a/.eslintignore b/.eslintignore index c1bc2a4d683..f25d8a01a2f 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,3 +5,5 @@ tmp/**/*.js spec/**/*.js src/**/*.js coverage/**/*.js +rails_70/**/*.js +plugin.js diff --git a/.gherkin-lintrc b/.gherkin-lintrc index 9a40fb9d47f..8afd8ef7f5b 100644 --- a/.gherkin-lintrc +++ b/.gherkin-lintrc @@ -1,5 +1,5 @@ { - "no-files-without-scenarios" : "on", + "no-files-without-scenarios" : "off", "no-unnamed-features": "on", "no-unnamed-scenarios": "on", "no-dupe-feature-names": "on", diff --git a/.simplecov b/.simplecov index 7a491f4248b..154ddf432d9 100644 --- a/.simplecov +++ b/.simplecov @@ -3,6 +3,7 @@ SimpleCov.start do add_filter %r{^/spec/} add_filter "tmp/development_apps/" add_filter "tmp/test_apps/" + add_filter "tasks/test_application.rb" end if ENV["COVERAGE"] == "true" diff --git a/Gemfile b/Gemfile index 345cb4323f2..89707ec4636 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,9 @@ group :development, :test do gem "sprockets-rails" gem "sassc-rails" + + gem "cssbundling-rails" + gem "jsbundling-rails" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index cfbbe0dd536..eaa4314cd3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,6 +113,8 @@ GEM octokit (>= 2.2.0) concurrent-ruby (1.2.2) crass (1.0.6) + cssbundling-rails (1.2.0) + railties (>= 6.0.0) cucumber (8.0.0) builder (~> 3.2, >= 3.2.4) cucumber-ci-environment (~> 9.0, >= 9.0.4) @@ -216,6 +218,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jsbundling-rails (1.1.2) + railties (>= 6.0.0) json (2.6.3) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -249,7 +253,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) minitest (5.18.1) multi_test (1.1.0) net-imap (0.3.6) @@ -263,9 +266,6 @@ GEM net-protocol netrc (0.11.0) nio4r (2.5.9) - nokogiri (1.15.2) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) nokogiri (1.15.2-arm64-darwin) racc (~> 1.4) nokogiri (1.15.2-x86_64-linux) @@ -405,8 +405,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.3) - mini_portile2 (~> 2.8.0) sqlite3 (1.6.3-arm64-darwin) sqlite3 (1.6.3-x86_64-linux) sys-uname (1.2.3) @@ -432,7 +430,7 @@ GEM PLATFORMS arm64-darwin-21 - ruby + arm64-darwin-22 x86_64-linux DEPENDENCIES @@ -440,6 +438,7 @@ DEPENDENCIES cancancan capybara chandler + cssbundling-rails cucumber cucumber-rails cuprite @@ -448,6 +447,7 @@ DEPENDENCIES draper i18n-spec i18n-tasks + jsbundling-rails kramdown launchy octokit diff --git a/app/assets/javascripts/active_admin/index.js b/app/assets/javascripts/active_admin/index.js new file mode 100644 index 00000000000..6ac9273fec9 --- /dev/null +++ b/app/assets/javascripts/active_admin/index.js @@ -0,0 +1,163 @@ +//= require rails-ujs +//= require flowbite + +// On page load or when changing themes, best to add inline in `head` to avoid FOUC +if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) { + document.documentElement.classList.add('dark'); +} else { + document.documentElement.classList.remove('dark') +} + + + +const setPerPage = function(event) { + const params = new URLSearchParams(window.location.search) + params.set("per_page", this.value) + window.location.search = params +} + +Rails.delegate(document, ".pagination_per_page > select", "change", setPerPage) + + + +const disableEmptyFields = function(event) { + Array.from(this.querySelectorAll("input, select, textarea")) + .filter((el) => el.value === "") + .forEach((el) => el.disabled = true) +}; + +Rails.delegate(document, ".filter_form", "submit", disableEmptyFields) + +const next = function next(el, selector) { + const nextEl = el.nextElementSibling; + if (!selector || (nextEl && nextEl.matches(selector))) { + return nextEl; + } + return null; +} + +const setSearchType = function(event) { + const input = next(this, "input") + if (input) { + input.name = `q[${this.value}]` + } +}; + +Rails.delegate(document, ".filter_form_field.select_and_search select", "change", setSearchType) + + + +const hasManyRemoveClick = function(event) { + event.preventDefault() + const oldGroup = this.closest("fieldset") + if (oldGroup) { + oldGroup.remove() + } +} + +Rails.delegate(document, "a.button.has_many_remove", "click", hasManyRemoveClick) + +const hasManyAddClick = function(event) { + event.preventDefault() + const parent = this.closest(".has_many_container") + + let index = parseInt(parent.dataset.has_many_index || (parent.querySelectorAll('fieldset').length - 1), 10) + parent.dataset.has_many_index = ++index + + const regex = new RegExp(this.dataset.placeholder, 'g') + const html = this.dataset.html.replace(regex, index) + + const tempEl = document.createElement("div"); + tempEl.innerHTML = html + this.before(tempEl.firstChild) +} + +Rails.delegate(document, "a.button.has_many_add", "click", hasManyAddClick) + + + +const batchActionClick = function(event) { + event.preventDefault() + // console.log("batchActionClick", event) + let batchAction = document.getElementById("batch_action") + if (batchAction) { + batchAction.value = this.dataset.action + } +} + +const batchActionConfirmComplete = function(event) { + // console.log('batchActionConfirmComplete', event.detail) + if (event.detail[0] === true) { + let form = document.getElementById("collection_selection") + if (form) { + form.submit() + } + } +} + +const batchActionFormSubmit = function(event) { + event.preventDefault(); + // console.log("batchActionFormSubmit", this) + let json = JSON.stringify(Object.fromEntries(new FormData(this).entries())); + let inputsField = document.getElementById('batch_action_inputs') + if (json && inputsField) { + inputsField.value = json + } + let form = document.getElementById("collection_selection") + if (form) { + form.submit() + } +} + +Rails.delegate(document, ".batch_actions_selector li a", "click", batchActionClick) + +Rails.delegate(document, "form.batch-action-form", "submit", batchActionFormSubmit) + +Rails.delegate(document, ".batch_actions_selector li a", "confirm:complete", batchActionConfirmComplete) + +const toggleDropdown = function(condition) { + const button = document.querySelector(".batch_actions_selector > button") + if (button) { + button.disabled = condition + } +} + +const toggleAllChange = function(event) { + const checkboxes = document.querySelectorAll("input[type=checkbox].collection_selection") + for (const checkbox of checkboxes) { + checkbox.checked = this.checked + } + + const rows = document.querySelectorAll(".paginated_collection tbody tr") + for (const row of rows) { + row.classList.toggle("selected", this.checked); + } + + toggleDropdown(!this.checked) +} + +Rails.delegate(document, "input[type=checkbox].toggle_all", "change", toggleAllChange) + +const toggleCheckboxChange = function(event) { + const numChecked = document.querySelectorAll("input[type=checkbox].collection_selection:checked").length; + const allChecked = numChecked === document.querySelectorAll("input[type=checkbox].collection_selection").length; + const someChecked = (numChecked > 0) && (numChecked < document.querySelectorAll("input[type=checkbox].collection_selection").length); + + const toggleAll = document.querySelector("input[type=checkbox].toggle_all") + if (toggleAll) { + toggleAll.checked = allChecked + toggleAll.indeterminate = someChecked + } + + toggleDropdown(numChecked === 0) +} + +Rails.delegate(document, "input[type=checkbox].collection_selection", "change", toggleCheckboxChange) + +const tableRowClick = function(event) { + if (event.target.type !== "checkbox") { + event.target.closest("tr").querySelector("input[type=checkbox]").click() + } +} + +Rails.delegate(document, ".paginated_collection tbody td", "click", tableRowClick) diff --git a/app/assets/stylesheets/active_admin/_base.scss b/app/assets/stylesheets/active_admin/_base.scss index 138273d8380..14086670ae8 100644 --- a/app/assets/stylesheets/active_admin/_base.scss +++ b/app/assets/stylesheets/active_admin/_base.scss @@ -16,15 +16,15 @@ @import "./components/blank_slates"; @import "./components/breadcrumbs"; @import "./components/dropdown_menu"; - @import "./components/buttons"; - @import "./components/links"; + // @import "./components/buttons"; + // @import "./components/links"; @import "./components/pagination"; @import "./components/panels"; @import "./components/scopes"; @import "./components/status_tags"; @import "./components/table_tools"; @import "./components/index_list"; - @import "./components/tabs"; + // @import "./components/tabs"; @import "./pages/logged_out"; @import "./structure/footer"; @import "./structure/main_structure"; diff --git a/features/has_many.feature b/features/has_many.feature index b57cec79780..9f82cf2d608 100644 --- a/features/has_many.feature +++ b/features/has_many.feature @@ -53,26 +53,27 @@ Feature: Has Many When I click "Add New Post" Then I should see a link to "Hide" - Scenario: Sortable is initialized when transitioning to edit with existing data - Given a configuration of: - """ - ActiveAdmin.register User do - form do |f| - f.inputs do - f.has_many :posts, sortable: :position do |ff| - ff.input :title - ff.input :body - end - end - f.actions - end - end - ActiveAdmin.register Post - """ - When I go to the last author's show page - And I follow "Edit User" - Then I should see a link to "Add New Post" - And there should be 1 "input" tag within ".ui-sortable" + # FIXME: This will depend on contribution from the community + # Scenario: Sortable is initialized when transitioning to edit with existing data + # Given a configuration of: + # """ + # ActiveAdmin.register User do + # form do |f| + # f.inputs do + # f.has_many :posts, sortable: :position do |ff| + # ff.input :title + # ff.input :body + # end + # end + # f.actions + # end + # end + # ActiveAdmin.register Post + # """ + # When I go to the last author's show page + # And I follow "Edit User" + # Then I should see a link to "Add New Post" + # And there should be 1 "input" tag within ".ui-sortable" - When I click "Add New Post" - Then I should see a link to "Remove" + # When I click "Add New Post" + # Then I should see a link to "Remove" diff --git a/features/index/batch_actions.feature b/features/index/batch_actions.feature index 7dc56e8b44b..16d05994ee3 100644 --- a/features/index/batch_actions.feature +++ b/features/index/batch_actions.feature @@ -1,269 +1,269 @@ Feature: Batch Actions - @javascript - Scenario: Use default (destroy) batch action - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post - """ - Then I should see the batch action button - And I should see that the batch action button is disabled - And I should see the batch action popover - And I should see 10 posts in the table + # @javascript + # Scenario: Use default (destroy) batch action + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post + # """ + # Then I should see the batch action button + # And I should see that the batch action button is disabled + # And I should see the batch action popover + # And I should see 10 posts in the table - When I check the 1st record - And I check the 2nd record - And I follow "Batch Actions" - Then I should see the batch action :destroy "Delete Selected" + # When I check the 1st record + # And I check the 2nd record + # And I follow "Batch Actions" + # Then I should see the batch action :destroy "Delete Selected" - When I click "Delete Selected" and accept confirmation - Then I should see a flash with "Successfully deleted 2 posts" - And I should see 8 posts in the table + # When I click "Delete Selected" and accept confirmation + # Then I should see a flash with "Successfully deleted 2 posts" + # And I should see 8 posts in the table - Scenario: Use default (destroy) batch action when default_url_options present - Given 3 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - controller do - protected + # Scenario: Use default (destroy) batch action when default_url_options present + # Given 3 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # controller do + # protected - def default_url_options - { locale: I18n.locale } - end - end - end - """ - When I check the 1st record - And I follow "Batch Actions" - Then I should see the batch action :destroy "Delete Selected" + # def default_url_options + # { locale: I18n.locale } + # end + # end + # end + # """ + # When I check the 1st record + # And I follow "Batch Actions" + # Then I should see the batch action :destroy "Delete Selected" - Given I submit the batch action form with "destroy" - Then I should see a flash with "Successfully deleted 1 post" - And I should see 2 posts in the table + # Given I submit the batch action form with "destroy" + # Then I should see a flash with "Successfully deleted 1 post" + # And I should see 2 posts in the table - Scenario: Use default (destroy) batch action on a decorated resource - Given 5 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - decorate_with PostDecorator - end - """ - When I check the 2nd record - And I check the 4th record - And I follow "Batch Actions" - Then I should see the batch action :destroy "Delete Selected" + # Scenario: Use default (destroy) batch action on a decorated resource + # Given 5 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # decorate_with PostDecorator + # end + # """ + # When I check the 2nd record + # And I check the 4th record + # And I follow "Batch Actions" + # Then I should see the batch action :destroy "Delete Selected" - Given I submit the batch action form with "destroy" - Then I should see a flash with "Successfully deleted 2 posts" - And I should see 3 posts in the table + # Given I submit the batch action form with "destroy" + # Then I should see a flash with "Successfully deleted 2 posts" + # And I should see 3 posts in the table - Scenario: Use default (destroy) batch action on a PORO decorated resource - Given 5 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - decorate_with PostPoroDecorator - end - """ - When I check the 2nd record - And I check the 4th record - And I follow "Batch Actions" - Then I should see the batch action :destroy "Delete Selected" + # Scenario: Use default (destroy) batch action on a PORO decorated resource + # Given 5 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # decorate_with PostPoroDecorator + # end + # """ + # When I check the 2nd record + # And I check the 4th record + # And I follow "Batch Actions" + # Then I should see the batch action :destroy "Delete Selected" - Given I submit the batch action form with "destroy" - Then I should see a flash with "Successfully deleted 2 posts" - And I should see 3 posts in the table + # Given I submit the batch action form with "destroy" + # Then I should see a flash with "Successfully deleted 2 posts" + # And I should see 3 posts in the table - @javascript - Scenario: Use default (destroy) batch action on a nested resource - Given I am logged in - And 5 posts written by "John Doe" exist - And a configuration of: - """ - ActiveAdmin.register User - ActiveAdmin.register Post do - belongs_to :user - end - """ - When I go to the last author's posts - Then I should see the batch action button - And I should see that the batch action button is disabled - And I should see the batch action popover - And I should see 5 posts in the table + # @javascript + # Scenario: Use default (destroy) batch action on a nested resource + # Given I am logged in + # And 5 posts written by "John Doe" exist + # And a configuration of: + # """ + # ActiveAdmin.register User + # ActiveAdmin.register Post do + # belongs_to :user + # end + # """ + # When I go to the last author's posts + # Then I should see the batch action button + # And I should see that the batch action button is disabled + # And I should see the batch action popover + # And I should see 5 posts in the table - When I check the 2nd record - And I check the 4th record - And I follow "Batch Actions" - Then I should see the batch action :destroy "Delete Selected" + # When I check the 2nd record + # And I check the 4th record + # And I follow "Batch Actions" + # Then I should see the batch action :destroy "Delete Selected" - When I click "Delete Selected" and accept confirmation - Then I should see a flash with "Successfully deleted 2 posts" - And I should see 3 posts in the table + # When I click "Delete Selected" and accept confirmation + # Then I should see a flash with "Successfully deleted 2 posts" + # And I should see 3 posts in the table - Scenario: Disable display of batch action button if all nested buttons hide - Given 1 post exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action :destroy, false - batch_action(:flag, if: proc { false } ) do - render text: 42 - end - end - """ - Then I should not see the batch action selector + # Scenario: Disable display of batch action button if all nested buttons hide + # Given 1 post exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action :destroy, false + # batch_action(:flag, if: proc { false } ) do + # render text: 42 + # end + # end + # """ + # Then I should not see the batch action selector - Scenario: Using a custom batch action - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action(:flag) do - redirect_to collection_path, notice: "Successfully flagged 10 posts" - end - end - """ - When I check the 1st record - Given I submit the batch action form with "flag" - Then I should see a flash with "Successfully flagged 10 posts" + # Scenario: Using a custom batch action + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action(:flag) do + # redirect_to collection_path, notice: "Successfully flagged 10 posts" + # end + # end + # """ + # When I check the 1st record + # Given I submit the batch action form with "flag" + # Then I should see a flash with "Successfully flagged 10 posts" - Scenario: Using a custom batch action with form as Hash - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action(:flag, form: {type: ["a", "b"]}) do - redirect_to collection_path, notice: "Successfully flagged 10 posts" - end - end - """ - When I check the 1st record - Given I submit the batch action form with "flag" - Then I should see a flash with "Successfully flagged 10 posts" + # Scenario: Using a custom batch action with form as Hash + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action(:flag, form: {type: ["a", "b"]}) do + # redirect_to collection_path, notice: "Successfully flagged 10 posts" + # end + # end + # """ + # When I check the 1st record + # Given I submit the batch action form with "flag" + # Then I should see a flash with "Successfully flagged 10 posts" - Scenario: Using a custom batch action with form as proc - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action(:flag, form: -> { {type: params[:type]} }) do - redirect_to collection_path, notice: "Successfully flagged 10 posts" - end - end - """ - When I check the 1st record - Given I submit the batch action form with "flag" - Then I should see a flash with "Successfully flagged 10 posts" + # Scenario: Using a custom batch action with form as proc + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action(:flag, form: -> { {type: params[:type]} }) do + # redirect_to collection_path, notice: "Successfully flagged 10 posts" + # end + # end + # """ + # When I check the 1st record + # Given I submit the batch action form with "flag" + # Then I should see a flash with "Successfully flagged 10 posts" - Scenario: Disabling batch actions for a resource - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - config.batch_actions = false - end - """ - Then I should not see the batch action selector - And I should not see checkboxes in the table + # Scenario: Disabling batch actions for a resource + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # config.batch_actions = false + # end + # """ + # Then I should not see the batch action selector + # And I should not see checkboxes in the table - Scenario: Disabling the default destroy batch action - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action :destroy, false - batch_action(:flag) {} - end - """ - Then I should see the batch action :flag "Flag Selected" - And I should not see the batch action :destroy "Delete Selected" + # Scenario: Disabling the default destroy batch action + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action :destroy, false + # batch_action(:flag) {} + # end + # """ + # Then I should see the batch action :flag "Flag Selected" + # And I should not see the batch action :destroy "Delete Selected" - Scenario: Optional display of batch actions - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action(:flag, if: proc { true }) {} - batch_action(:unflag, if: proc { false }) {} - end - """ - Then I should see the batch action :flag "Flag Selected" - And I should not see the batch action :unflag "Unflag Selected" + # Scenario: Optional display of batch actions + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action(:flag, if: proc { true }) {} + # batch_action(:unflag, if: proc { false }) {} + # end + # """ + # Then I should see the batch action :flag "Flag Selected" + # And I should not see the batch action :unflag "Unflag Selected" - Scenario: Sort order priority - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action(:test, priority: 3) {} - batch_action(:flag, priority: 2) {} - batch_action(:unflag, priority: 1) {} - end - """ - Then the 4th batch action should be "Delete Selected" - And the 3rd batch action should be "Test Selected" - And the 2nd batch action should be "Flag Selected" - And the 1st batch action should be "Unflag Selected" + # Scenario: Sort order priority + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action(:test, priority: 3) {} + # batch_action(:flag, priority: 2) {} + # batch_action(:unflag, priority: 1) {} + # end + # """ + # Then the 4th batch action should be "Delete Selected" + # And the 3rd batch action should be "Test Selected" + # And the 2nd batch action should be "Flag Selected" + # And the 1st batch action should be "Unflag Selected" - Scenario: Complex naming - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action("Very Complex and Time Consuming") {} - batch_action(:passing_a_symbol) {} - end - """ - Then I should see the batch action :very_complex_and_time_consuming "Very Complex and Time Consuming Selected" - And I should see the batch action :passing_a_symbol "Passing A Symbol Selected" + # Scenario: Complex naming + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action("Very Complex and Time Consuming") {} + # batch_action(:passing_a_symbol) {} + # end + # """ + # Then I should see the batch action :very_complex_and_time_consuming "Very Complex and Time Consuming Selected" + # And I should see the batch action :passing_a_symbol "Passing A Symbol Selected" - @javascript - Scenario: Use a Form with text - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action :destroy, false - batch_action(:action_with_form, form: { name: :textarea }) {} - end - """ + # @javascript + # Scenario: Use a Form with text + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action :destroy, false + # batch_action(:action_with_form, form: { name: :textarea }) {} + # end + # """ - When I check the 1st record - And I follow "Batch Actions" - And I click "Action With Form" - And I should see the field "name" of type "textarea" + # When I check the 1st record + # And I follow "Batch Actions" + # And I click "Action With Form" + # And I should see the field "name" of type "textarea" - @javascript - Scenario: Use a Form with select - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action :destroy, false - batch_action(:action_with_form, form: { type: ["a", "b"] }) {} - end - """ + # @javascript + # Scenario: Use a Form with select + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action :destroy, false + # batch_action(:action_with_form, form: { type: ["a", "b"] }) {} + # end + # """ - When I check the 1st record - And I follow "Batch Actions" - And I click "Action With Form" - And I should see the select "type" with options "a, b" + # When I check the 1st record + # And I follow "Batch Actions" + # And I click "Action With Form" + # And I should see the select "type" with options "a, b" - @javascript - Scenario: Use a Form with select values from proc - Given 10 posts exist - And an index configuration of: - """ - ActiveAdmin.register Post do - batch_action :destroy, false - batch_action(:action_with_form, form: ->{ {type: ["a", "b"]} }) {} - end - """ + # @javascript + # Scenario: Use a Form with select values from proc + # Given 10 posts exist + # And an index configuration of: + # """ + # ActiveAdmin.register Post do + # batch_action :destroy, false + # batch_action(:action_with_form, form: ->{ {type: ["a", "b"]} }) {} + # end + # """ - When I check the 1st record - And I follow "Batch Actions" - And I click "Action With Form" - And I should see the select "type" with options "a, b" + # When I check the 1st record + # And I follow "Batch Actions" + # And I click "Action With Form" + # And I should see the select "type" with options "a, b" diff --git a/features/show/tabs.feature b/features/show/tabs.feature index ff7b817ccc7..b88691a5acb 100644 --- a/features/show/tabs.feature +++ b/features/show/tabs.feature @@ -15,13 +15,9 @@ Feature: Show - Tabs span "tab 1" end - tab 'テスト', id: :test_non_ascii do + tab 'Profile', id: :custom_id do span "tab 2" end - - tab '🤗' do - span "tab 3" - end end end end @@ -33,18 +29,10 @@ Feature: Show - Tabs Then I should see tabs: | Tab title | | Overview | - | テスト | - | 🤗 | + | Profile | And I should see tab content "tab 1" And I should not see tab content "tab 2" - And I should not see tab content "tab 3" - When I follow "テスト" + When I press "Profile" Then I should not see tab content "tab 1" And I should see tab content "tab 2" - And I should not see tab content "tab 3" - - When I follow "🤗" - Then I should not see tab content "tab 1" - And I should not see tab content "tab 2" - And I should see tab content "tab 3" diff --git a/features/step_definitions/tab_steps.rb b/features/step_definitions/tab_steps.rb index 8cb4558669d..b1b7a249801 100644 --- a/features/step_definitions/tab_steps.rb +++ b/features/step_definitions/tab_steps.rb @@ -5,14 +5,14 @@ Then("I should see tabs:") do |table| table.rows.each do |title, _| - step %{I should see "#{title}" within "#main_content .tabs .nav"} + expect(page).to have_css(".tabs .tabs-nav", text: title, visible: true) end end Then("I should see tab content {string}") do |string| - step %{I should see "#{string}" within "#main_content .tabs .tab-content"} + expect(page).to have_css(".tabs .tabs-content", text: string, visible: true) end Then("I should not see tab content {string}") do |string| - step %{I should not see "#{string}" within "#main_content .tabs .tab-content"} + expect(page).to have_css(".tabs .tabs-content", text: string, visible: false) end diff --git a/gemfiles/rails_61/Gemfile b/gemfiles/rails_61/Gemfile index bea83ec4258..d111379a1cf 100644 --- a/gemfiles/rails_61/Gemfile +++ b/gemfiles/rails_61/Gemfile @@ -16,6 +16,9 @@ group :development, :test do gem "sprockets-rails" gem "sassc-rails" + + gem "cssbundling-rails" + gem "jsbundling-rails" end group :test do diff --git a/gemfiles/rails_61/Gemfile.lock b/gemfiles/rails_61/Gemfile.lock index 8c8ff108231..70205b4f647 100644 --- a/gemfiles/rails_61/Gemfile.lock +++ b/gemfiles/rails_61/Gemfile.lock @@ -110,6 +110,8 @@ GEM xpath (~> 3.2) concurrent-ruby (1.2.2) crass (1.0.6) + cssbundling-rails (1.2.0) + railties (>= 6.0.0) cucumber (8.0.0) builder (~> 3.2, >= 3.2.4) cucumber-ci-environment (~> 9.0, >= 9.0.4) @@ -213,6 +215,8 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) jruby-openssl (0.14.1-java) + jsbundling-rails (1.1.2) + railties (>= 6.0.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -242,7 +246,6 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) minitest (5.18.1) multi_test (1.1.0) net-imap (0.3.6) @@ -256,9 +259,6 @@ GEM net-protocol nio4r (2.5.9) nio4r (2.5.9-java) - nokogiri (1.15.2) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) nokogiri (1.15.2-arm64-darwin) racc (~> 1.4) nokogiri (1.15.2-java) @@ -367,8 +367,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.3) - mini_portile2 (~> 2.8.0) sqlite3 (1.6.3-arm64-darwin) sqlite3 (1.6.3-x86_64-linux) sys-uname (1.2.3) @@ -395,8 +393,8 @@ GEM PLATFORMS arm64-darwin-21 + arm64-darwin-22 java - ruby x86_64-linux DEPENDENCIES @@ -404,6 +402,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter cancancan capybara + cssbundling-rails cucumber cucumber-rails cuprite @@ -413,6 +412,7 @@ DEPENDENCIES i18n-spec i18n-tasks jruby-openssl + jsbundling-rails launchy parallel_tests pundit diff --git a/lib/active_admin/views/components/tabs.rb b/lib/active_admin/views/components/tabs.rb index a32c31a259d..047a3d846cd 100644 --- a/lib/active_admin/views/components/tabs.rb +++ b/lib/active_admin/views/components/tabs.rb @@ -10,31 +10,29 @@ def tab(title, options = {}, &block) @tabs_content << build_content_item(title, options, &block) end - def build(&block) - @menu = ul(class: "nav nav-tabs", role: "tablist") - @tabs_content = div(class: "tab-content") + def build(attributes = {}, &block) + super(attributes) + @menu = nav(class: "tabs-nav", role: "tablist", "data-tabs-toggle": "#tabs-container-#{object_id}") + @tabs_content = div(class: "tabs-content", id: "tabs-container-#{object_id}") end def build_menu_item(title, options, &block) fragment = options.fetch(:id, fragmentize(title)) - - html_options = options.fetch(:html_options, {}) - li html_options do - link_to title, "##{fragment}" + html_options = options.fetch(:html_options, {}).merge("data-tabs-target": "##{fragment}", role: "tab", "aria-controls": fragment) + button html_options do + title end end def build_content_item(title, options, &block) - options = options.reverse_merge(id: fragmentize(title)) + options = options.reverse_merge(id: fragmentize(title), class: "hidden", role: "tabpanel", "aria-labelledby": "#{title}-tab") div(options, &block) end private def fragmentize(string) - result = string.parameterize - result = CGI.escape(string) if result.blank? - result + "tabs-#{string.parameterize}-#{object_id}" end end end diff --git a/lib/generators/active_admin/assets/assets_generator.rb b/lib/generators/active_admin/assets/assets_generator.rb index 62e9db09d4b..aed7d112fa8 100644 --- a/lib/generators/active_admin/assets/assets_generator.rb +++ b/lib/generators/active_admin/assets/assets_generator.rb @@ -6,8 +6,13 @@ class AssetsGenerator < Rails::Generators::Base source_root File.expand_path("templates", __dir__) def install_assets - template "active_admin.js", "app/assets/javascripts/active_admin.js" - template "active_admin.scss", "app/assets/stylesheets/active_admin.scss" + template "active_admin_old.scss", "app/assets/stylesheets/active_admin_old.scss" + template "active_admin.js", "app/javascript/active_admin.js" + template "active_admin.css", "app/assets/stylesheets/active_admin.css" + template "package.json", "package.json" + template "tailwind.config.js", "tailwind.config.js" + template "Procfile.dev", "Procfile.dev" + template "builds/.keep", "app/assets/builds/.keep" end end diff --git a/lib/generators/active_admin/assets/templates/Procfile.dev b/lib/generators/active_admin/assets/templates/Procfile.dev new file mode 100644 index 00000000000..ddea4e6fca0 --- /dev/null +++ b/lib/generators/active_admin/assets/templates/Procfile.dev @@ -0,0 +1,3 @@ +web: unset PORT && env RUBY_DEBUG_OPEN=true bin/rails server +css: yarn build:css --watch +# js: yarn build:js --watch diff --git a/lib/generators/active_admin/assets/templates/active_admin.css b/lib/generators/active_admin/assets/templates/active_admin.css new file mode 100644 index 00000000000..b5c61c95671 --- /dev/null +++ b/lib/generators/active_admin/assets/templates/active_admin.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/lib/generators/active_admin/assets/templates/active_admin.js b/lib/generators/active_admin/assets/templates/active_admin.js index d2b66c59f9f..c29f9706ced 100644 --- a/lib/generators/active_admin/assets/templates/active_admin.js +++ b/lib/generators/active_admin/assets/templates/active_admin.js @@ -1 +1 @@ -//= require active_admin/base +//= require active_admin/index diff --git a/lib/generators/active_admin/assets/templates/active_admin.scss b/lib/generators/active_admin/assets/templates/active_admin_old.scss similarity index 100% rename from lib/generators/active_admin/assets/templates/active_admin.scss rename to lib/generators/active_admin/assets/templates/active_admin_old.scss diff --git a/lib/generators/active_admin/assets/templates/builds/.keep b/lib/generators/active_admin/assets/templates/builds/.keep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/lib/generators/active_admin/assets/templates/package.json b/lib/generators/active_admin/assets/templates/package.json new file mode 100644 index 00000000000..54088abc041 --- /dev/null +++ b/lib/generators/active_admin/assets/templates/package.json @@ -0,0 +1,19 @@ +{ + "name": "app", + "private": "true", + "dependencies": { + "@activeadmin/activeadmin": "^3.0.0", + "autoprefixer": "^10.4.14", + "esbuild": "^0.18.7", + "flowbite": "^1.6.6", + "postcss": "^8.4.24", + "tailwindcss": "^3.3.2" + }, + "scripts": { + "build:css": "tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify", + "build:js": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=/assets" + }, + "devDependencies": { + "postcss-import": "^15.1.0" + } +} diff --git a/lib/generators/active_admin/assets/templates/tailwind.config.js b/lib/generators/active_admin/assets/templates/tailwind.config.js new file mode 100644 index 00000000000..5dcaa9cf94d --- /dev/null +++ b/lib/generators/active_admin/assets/templates/tailwind.config.js @@ -0,0 +1,24 @@ +const execSync = require('child_process').execSync; +const gemPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim(); + +module.exports = { + content: [ + // './node_modules/@activeadmin/activeadmin/plugin.js', + // './node_modules/@activeadmin/activeadmin/tailwind-*.css', + // './node_modules/flowbite/**/*.js', + `${gemPath}/plugin.js`, + `${gemPath}/vendor/assets/javascripts/flowbite.js`, + `${gemPath}/app/views/**/*.{arb,erb,html,rb}`, + `${gemPath}/lib/**/*.{arb,erb,html,rb}`, + './app/admin/**/*.{arb,erb,html,rb}', + './app/views/**/*.{arb,erb,html,rb}', + './app/helpers/**/*.rb', + './app/assets/stylesheets/**/*.css', + './app/javascript/**/*.js' + ], + darkMode: "class", + plugins: [ + // require('flowbite/plugin'), + require(`${gemPath}/plugin`) + ] +} diff --git a/plugin.js b/plugin.js new file mode 100644 index 00000000000..4cd7f030ede --- /dev/null +++ b/plugin.js @@ -0,0 +1,568 @@ +const plugin = require('tailwindcss/plugin') +const defaultTheme = require('tailwindcss/defaultTheme'); +const colors = require('tailwindcss/colors'); +const [baseFontSize, { lineHeight: baseLineHeight }] = defaultTheme.fontSize.base; +const { spacing, borderWidth, borderRadius } = defaultTheme; + +// https://github.com/tailwindlabs/tailwindcss/discussions/9336 +// https://github.com/tailwindlabs/tailwindcss/discussions/2049 +// https://github.com/tailwindlabs/tailwindcss/discussions/2049#discussioncomment-45546 +// console.log('activeadmin tailwind plugin loaded') + +const svgToTinyDataUri = (() => { + // Source: https://github.com/tigt/mini-svg-data-uri + const reWhitespace = /\s+/g, + reUrlHexPairs = /%[\dA-F]{2}/g, + hexDecode = {'%20': ' ', '%3D': '=', '%3A': ':', '%2F': '/'}, + specialHexDecode = match => hexDecode[match] || match.toLowerCase(), + svgToTinyDataUri = svg => { + svg = String(svg); + if(svg.charCodeAt(0) === 0xfeff) svg = svg.slice(1); + svg = svg + .trim() + .replace(reWhitespace, ' ') + .replaceAll('"', '\''); + svg = encodeURIComponent(svg); + svg = svg.replace(reUrlHexPairs, specialHexDecode); + return 'data:image/svg+xml,' + svg; + }; + svgToTinyDataUri.toSrcset = svg => svgToTinyDataUri(svg).replace(/ /g, '%20'); + return svgToTinyDataUri; +})(); + +module.exports = plugin( + function({ addBase, addComponents, theme }) { + addBase({ + [[ + "[type='text']", + "[type='email']", + "[type='url']", + "[type='password']", + "[type='number']", + "[type='date']", + "[type='datetime-local']", + "[type='month']", + "[type='search']", + "[type='tel']", + "[type='time']", + "[type='week']", + '[multiple]', + 'textarea', + 'select', + ]]: { + appearance: 'none', + 'background-color': '#fff', + 'border-color': theme('colors.gray.500', colors.gray[500]), + 'border-width': borderWidth['DEFAULT'], + 'border-radius': borderRadius.none, + 'padding-top': spacing[2], + 'padding-right': spacing[3], + 'padding-bottom': spacing[2], + 'padding-left': spacing[3], + 'font-size': baseFontSize, + 'line-height': baseLineHeight, + '--tw-shadow': '0 0 #0000', + '&:focus': { + outline: '2px solid transparent', + 'outline-offset': '2px', + '--tw-ring-inset': 'var(--tw-empty,/*!*/ /*!*/)', + '--tw-ring-offset-width': '0px', + '--tw-ring-offset-color': '#fff', + '--tw-ring-color': theme( + 'colors.blue.600', + colors.blue[600] + ), + '--tw-ring-offset-shadow': `var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)`, + '--tw-ring-shadow': `var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color)`, + 'box-shadow': `var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)`, + 'border-color': theme('colors.blue.600', colors.blue[600]), + }, + }, + [['input::placeholder', 'textarea::placeholder']]: { + color: theme('colors.gray.500', colors.gray[500]), + opacity: '1', + }, + ['::-webkit-datetime-edit-fields-wrapper']: { + padding: '0', + }, + ['::-webkit-date-and-time-value']: { + 'min-height': '1.5em', + }, + ['select:not([size])']: { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-position': `right ${spacing[3]} center`, + 'background-repeat': `no-repeat`, + 'background-size': `0.75em 0.75em`, + 'padding-right': spacing[10], + 'print-color-adjust': `exact`, + }, + ['[multiple]']: { + 'background-image': 'initial', + 'background-position': 'initial', + 'background-repeat': 'unset', + 'background-size': 'initial', + 'padding-right': spacing[3], + 'print-color-adjust': 'unset', + }, + [[`[type='checkbox']`, `[type='radio']`]]: { + appearance: 'none', + padding: '0', + 'print-color-adjust': 'exact', + display: 'inline-block', + 'vertical-align': 'middle', + 'background-origin': 'border-box', + 'user-select': 'none', + 'flex-shrink': '0', + height: spacing[4], + width: spacing[4], + color: theme('colors.blue.600', colors.blue[600]), + 'background-color': '#fff', + 'border-color': theme('colors.gray.500', colors.gray[500]), + 'border-width': borderWidth['DEFAULT'], + '--tw-shadow': '0 0 #0000', + }, + [`[type='checkbox']`]: { + 'border-radius': borderRadius['none'], + }, + [`[type='radio']`]: { + 'border-radius': '100%', + }, + [[`[type='checkbox']:focus`, `[type='radio']:focus`]]: { + outline: '2px solid transparent', + 'outline-offset': '2px', + '--tw-ring-inset': 'var(--tw-empty,/*!*/ /*!*/)', + '--tw-ring-offset-width': '2px', + '--tw-ring-offset-color': '#fff', + '--tw-ring-color': theme('colors.blue.600', colors.blue[600]), + '--tw-ring-offset-shadow': `var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)`, + '--tw-ring-shadow': `var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)`, + 'box-shadow': `var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow)`, + }, + [[ + `[type='checkbox']:checked`, + `[type='radio']:checked`, + `.dark [type='checkbox']:checked`, + `.dark [type='radio']:checked`, + ]]: { + 'border-color': `transparent`, + 'background-color': `currentColor`, + 'background-size': `0.55em 0.55em`, + 'background-position': `center`, + 'background-repeat': `no-repeat`, + }, + [`[type='checkbox']:checked`]: { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-repeat': `no-repeat`, + 'background-size': `0.55em 0.55em`, + 'print-color-adjust': `exact`, + }, + [`[type='radio']:checked`]: { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-size': `1em 1em`, + }, + [`.dark [type='radio']:checked`]: { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-size': `1em 1em`, + }, + [`[type='checkbox']:indeterminate`]: { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-color': `currentColor`, + 'border-color': `transparent`, + 'background-position': `center`, + 'background-repeat': `no-repeat`, + 'background-size': `.75em .75em`, + 'print-color-adjust': `exact`, + }, + [[ + `[type='checkbox']:indeterminate:hover`, + `[type='checkbox']:indeterminate:focus`, + ]]: { + 'border-color': 'transparent', + 'background-color': 'currentColor', + }, + [`[type='file']`]: { + background: 'unset', + 'border-color': 'inherit', + 'border-width': '0', + 'border-radius': '0', + padding: '0', + 'font-size': 'unset', + 'line-height': 'inherit', + }, + [`[type='file']:focus`]: { + outline: `1px auto inherit`, + }, + [[`input[type=file]::file-selector-button`]]: { + color: 'white', + background: theme('colors.gray.800', colors.gray[800]), + border: 0, + 'font-weight': theme('fontWeight.medium'), + 'font-size': theme('fontSize.sm'), + cursor: 'pointer', + 'padding-top': spacing[2.5], + 'padding-bottom': spacing[2.5], + 'padding-left': spacing[8], + 'padding-right': spacing[4], + 'margin-inline-start': '-1rem', + 'margin-inline-end': '1rem', + '&:hover': { + background: theme('colors.gray.700', colors.gray[700]), + }, + }, + [[`.dark input[type=file]::file-selector-button`]]: { + color: 'white', + background: theme('colors.gray.600', colors.gray[600]), + '&:hover': { + background: theme('colors.gray.500', colors.gray[500]), + }, + }, + [[`input[type="range"]::-webkit-slider-thumb`]]: { + height: spacing[5], + width: spacing[5], + background: theme('colors.blue.600', colors.blue[600]), + 'border-radius': borderRadius.full, + border: 0, + appearance: 'none', + '-moz-appearance': 'none', + '-webkit-appearance': 'none', + cursor: 'pointer', + }, + [[`input[type="range"]:disabled::-webkit-slider-thumb`]]: { + background: theme('colors.gray.400', colors.gray[400]), + }, + [[`.dark input[type="range"]:disabled::-webkit-slider-thumb`]]: { + background: theme('colors.gray.500', colors.gray[500]), + }, + [[`input[type="range"]:focus::-webkit-slider-thumb`]]: { + outline: '2px solid transparent', + 'outline-offset': '2px', + '--tw-ring-offset-shadow': + 'var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)', + '--tw-ring-shadow': + 'var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color)', + 'box-shadow': + 'var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000)', + '--tw-ring-opacity': 1, + '--tw-ring-color': 'rgb(164 202 254 / var(--tw-ring-opacity))', + }, + [[`input[type="range"]::-moz-range-thumb`]]: { + height: spacing[5], + width: spacing[5], + background: theme('colors.blue.600', colors.blue[600]), + 'border-radius': borderRadius.full, + border: 0, + appearance: 'none', + '-moz-appearance': 'none', + '-webkit-appearance': 'none', + cursor: 'pointer', + }, + [[`input[type="range"]:disabled::-moz-range-thumb`]]: { + background: theme('colors.gray.400', colors.gray[400]), + }, + [[`.dark input[type="range"]:disabled::-moz-range-thumb`]]: { + background: theme('colors.gray.500', colors.gray[500]), + }, + [[`input[type="range"]::-moz-range-progress`]]: { + background: theme('colors.blue.500', colors.blue[500]), + }, + [[`input[type="range"]::-ms-fill-lower`]]: { + background: theme('colors.blue.500', colors.blue[500]), + }, + [[`input[type="range"].range-sm::-webkit-slider-thumb`]]: { + height: spacing[4], + width: spacing[4], + }, + [[`input[type="range"].range-lg::-webkit-slider-thumb`]]: { + height: spacing[6], + width: spacing[6], + }, + [[`input[type="range"].range-sm::-moz-range-thumb`]]: { + height: spacing[4], + width: spacing[4], + }, + [[`input[type="range"].range-lg::-moz-range-thumb`]]: { + height: spacing[6], + width: spacing[6], + }, + // remove from v2.x+ + ['.toggle-bg:after']: { + content: '""', + position: 'absolute', + top: spacing[0.5], + left: spacing[0.5], + background: 'white', + 'border-color': theme('colors.gray.300', colors.gray[300]), + 'border-width': borderWidth['DEFAULT'], + 'border-radius': borderRadius.full, + height: theme('height.5'), + width: theme('width.5'), + 'transition-property': + 'background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter', + 'transition-duration': '.15s', + 'box-shadow': + 'var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color)', + }, + ['input:checked + .toggle-bg:after']: { + transform: 'translateX(100%);', + 'border-color': 'white', + }, + ['input:checked + .toggle-bg']: { + background: theme('colors.blue.600', colors.gray[600]), + 'border-color': theme('colors.blue.600', colors.gray[600]), + }, + // remove from v2.x+ END + [['.tooltip-arrow', '.tooltip-arrow:before']]: { + position: 'absolute', + width: '8px', + height: '8px', + background: 'inherit', + }, + ['.tooltip-arrow']: { + visibility: 'hidden', + }, + ['.tooltip-arrow:before']: { + content: '""', + visibility: 'visible', + transform: 'rotate(45deg)', + }, + [`[data-tooltip-style^='light'] + .tooltip > .tooltip-arrow:before`]: + { + 'border-style': 'solid', + 'border-color': colors.gray[200], + }, + [`[data-tooltip-style^='light'] + .tooltip[data-popper-placement^='top'] > .tooltip-arrow:before`]: + { + 'border-bottom-width': '1px', + 'border-right-width': '1px', + }, + [`[data-tooltip-style^='light'] + .tooltip[data-popper-placement^='right'] > .tooltip-arrow:before`]: + { + 'border-bottom-width': '1px', + 'border-left-width': '1px', + }, + [`[data-tooltip-style^='light'] + .tooltip[data-popper-placement^='bottom'] > .tooltip-arrow:before`]: + { + 'border-top-width': '1px', + 'border-left-width': '1px', + }, + [`[data-tooltip-style^='light'] + .tooltip[data-popper-placement^='left'] > .tooltip-arrow:before`]: + { + 'border-top-width': '1px', + 'border-right-width': '1px', + }, + [`.tooltip[data-popper-placement^='top'] > .tooltip-arrow`]: { + bottom: '-4px', + }, + [`.tooltip[data-popper-placement^='bottom'] > .tooltip-arrow`]: { + top: '-4px', + }, + [`.tooltip[data-popper-placement^='left'] > .tooltip-arrow`]: { + right: '-4px', + }, + [`.tooltip[data-popper-placement^='right'] > .tooltip-arrow`]: { + left: '-4px', + }, + ['.tooltip.invisible > .tooltip-arrow:before']: { + visibility: 'hidden', + }, + [['[data-popper-arrow]', '[data-popper-arrow]:before']]: { + position: 'absolute', + width: '8px', + height: '8px', + background: 'inherit', + }, + ['[data-popper-arrow]']: { + visibility: 'hidden', + }, + ['[data-popper-arrow]:before']: { + content: '""', + visibility: 'visible', + transform: 'rotate(45deg)', + }, + ['[data-popper-arrow]:after']: { + content: '""', + visibility: 'visible', + transform: 'rotate(45deg)', + position: 'absolute', + width: '9px', + height: '9px', + background: 'inherit', + }, + [`[role="tooltip"] > [data-popper-arrow]:before`]: { + 'border-style': 'solid', + 'border-color': colors.gray[200], + }, + [`.dark [role="tooltip"] > [data-popper-arrow]:before`]: { + 'border-style': 'solid', + 'border-color': colors.gray[600], + }, + [`[role="tooltip"] > [data-popper-arrow]:after`]: { + 'border-style': 'solid', + 'border-color': colors.gray[200], + }, + [`.dark [role="tooltip"] > [data-popper-arrow]:after`]: { + 'border-style': 'solid', + 'border-color': colors.gray[600], + }, + [`[data-popover][role="tooltip"][data-popper-placement^='top'] > [data-popper-arrow]:before`]: + { + 'border-bottom-width': '1px', + 'border-right-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='top'] > [data-popper-arrow]:after`]: + { + 'border-bottom-width': '1px', + 'border-right-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='right'] > [data-popper-arrow]:before`]: + { + 'border-bottom-width': '1px', + 'border-left-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='right'] > [data-popper-arrow]:after`]: + { + 'border-bottom-width': '1px', + 'border-left-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='bottom'] > [data-popper-arrow]:before`]: + { + 'border-top-width': '1px', + 'border-left-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='bottom'] > [data-popper-arrow]:after`]: + { + 'border-top-width': '1px', + 'border-left-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='left'] > [data-popper-arrow]:before`]: + { + 'border-top-width': '1px', + 'border-right-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='left'] > [data-popper-arrow]:after`]: + { + 'border-top-width': '1px', + 'border-right-width': '1px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='top'] > [data-popper-arrow]`]: + { + bottom: '-5px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='bottom'] > [data-popper-arrow]`]: + { + top: '-5px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='left'] > [data-popper-arrow]`]: + { + right: '-5px', + }, + [`[data-popover][role="tooltip"][data-popper-placement^='right'] > [data-popper-arrow]`]: + { + left: '-5px', + }, + ['[role="tooltip"].invisible > [data-popper-arrow]:before']: { + visibility: 'hidden', + }, + ['[role="tooltip"].invisible > [data-popper-arrow]:after']: { + visibility: 'hidden', + }, + 'body': { + '@apply bg-white dark:bg-gray-900 dark:text-white': {} + }, + '[type=checkbox]': { + '@apply w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600': {} + }, + [['[type=text]', '[type=date]', 'select:not([size])', 'textarea']]: { + '@apply bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 w-full dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500': {} + }, + }); + addComponents({ + '#header': { + '@apply bg-gray-100 border-b border-gray-200 dark:border-gray-700 dark:bg-gray-800 p-4 flex items-center': {} + }, + // '': { + // '': {} + // }, + '#utility_nav': { + '@apply flex flex-wrap ms-auto': {} + }, + '#utility_nav :where(li)': { + '@apply flex': {} + }, + '#utility_nav :where(li > a)': { + '@apply flex ps-3 pe-3': {} + }, + '.page-footer': { + '@apply text-xs mt-10 mx-8 pt-9 pb-12 text-gray-500 border-t': {} + }, + '.page-footer :where(a)': { + '@apply text-blue-600 underline dark:text-white hover:no-underline': {} + }, + '.page-title-bar': { + '@apply bg-gray-200 p-4 mb-8 gap-4 items-center flex justify-between dark:border-t dark:border-gray-700 dark:bg-gray-800': {} + }, + '.page-title-bar-content': { + '@apply flex flex-col gap-3 pt-1': {} + }, + '.page-title-bar-heading': { + '@apply text-2xl font-semibold': {} + }, + '.breadcrumb-arrow': { + 'background-image': `url("${svgToTinyDataUri( + `` + )}")`, + 'background-repeat': 'no-repeat', + 'background-size': '.8em .8em', + 'background-position': 'center center', + height: '100%', + }, + '.breadcrumbs': { + '@apply flex text-xs': {} + }, + '.breadcrumbs-item': { + '@apply inline-flex items-center': {} + }, + ':where(.breadcrumbs-item) + .breadcrumbs-item:before': { + '@apply px-2 content-[""] breadcrumb-arrow': {} + }, + '.page-title-bar-actions': { + '@apply flex gap-2 flex-wrap justify-end': {} + }, + '.columns': { + display: 'grid', + 'grid-auto-columns': '1fr', + 'grid-auto-flow': 'column', + 'grid-gap': '1rem', + }, + '.dropdown_menu': { + '@apply relative': {} + }, + '.dropdown_menu_button': { + '@apply disabled:bg-blue-400 disabled:hover:bg-blue-400 disabled:hover:dark:bg-blue-500 disabled:dark:bg-blue-500 disabled:cursor-not-allowed': {} + }, + '.dropdown_menu :where(ul)': { + '@apply z-10 hidden bg-white rounded shadow dark:bg-gray-700 py-1 text-sm text-gray-700 dark:text-gray-200': {} + }, + '.dropdown_menu :where(ul > li > a)': { + '@apply block px-2.5 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white': {} + }, + }); + } +) diff --git a/spec/support/rails_template.rb b/spec/support/rails_template.rb index bff7c6cc41e..3a71eadc835 100644 --- a/spec/support/rails_template.rb +++ b/spec/support/rails_template.rb @@ -58,12 +58,9 @@ def self.ransackable_associations(auth_object=nil) end gsub_file "config/environments/test.rb", / config.cache_classes = true/, <<-RUBY - config.cache_classes = !ENV['CLASS_RELOADING'] config.action_mailer.default_url_options = {host: 'example.com'} - config.active_record.maintain_test_schema = false - RUBY inject_into_file "config/environments/test.rb", after: " config.action_mailer.default_url_options = {host: 'example.com'}" do @@ -91,6 +88,14 @@ def self.ransackable_associations(auth_object=nil) # Add predefined policies directory File.expand_path("templates/policies", __dir__), "app/policies" +inject_into_file "config/initializers/active_admin.rb", before: /^end$/ do + <<-RUBY + config.clear_stylesheets! + config.register_stylesheet 'active_admin_old.css', media: "all" + config.register_stylesheet 'active_admin.css', media: "all" + RUBY +end + if ENV["RAILS_ENV"] != "test" inject_into_file "config/routes.rb", "\n root to: redirect('admin')", after: /.*routes.draw do/ end diff --git a/spec/unit/generators/install_spec.rb b/spec/unit/generators/install_spec.rb index 1b6ea1c822b..7d494ab6e40 100644 --- a/spec/unit/generators/install_spec.rb +++ b/spec/unit/generators/install_spec.rb @@ -3,13 +3,13 @@ RSpec.describe "AA installation" do context "should create" do - it "active_admin.scss" do - path = Rails.root + "app/assets/stylesheets/active_admin.scss" + it "active_admin.css" do + path = Rails.root + "app/assets/stylesheets/active_admin.css" expect(File.exist?(path)).to eq true end it "active_admin.js" do - path = Rails.root + "app/assets/javascripts/active_admin.js" + path = Rails.root + "app/javascript/active_admin.js" expect(File.exist?(path)).to eq true end diff --git a/spec/unit/views/components/tabs_spec.rb b/spec/unit/views/components/tabs_spec.rb index e49d7a358e2..6b75d0042d2 100644 --- a/spec/unit/views/components/tabs_spec.rb +++ b/spec/unit/views/components/tabs_spec.rb @@ -2,49 +2,41 @@ require "rails_helper" RSpec.describe ActiveAdmin::Views::Tabs do + let(:subject) { Capybara.string(tabs.to_s) } + describe "creating with the dsl" do context "when creating tabs with a symbol" do - before do - expect(I18n).to receive(:t).at_least(:once).with(:tab_key).and_return "テスト" - end - let(:tabs) do render_arbre_component do tabs do tab :overview - tab I18n.t(:tab_key), id: :something_unique, html_options: { class: :some_css_class } + tab "Sample", id: :something_unique, html_options: { class: :some_css_class } end end end - let(:subject) { Capybara.string(tabs.to_s) } - it "should create a tab navigation bar based on the symbol" do expect(subject).to have_content("Overview") end it "should have tab with id based on symbol" do - expect(subject).to have_selector("div#overview") - end - - it "should have link with fragment based on symbol" do - expect(subject).to have_selector('a[href="#overview"]') + expect(subject).to have_selector("#tabs-overview-#{tabs.object_id}") end - it "should handle translation" do - expect(subject).to have_content("テスト") + it "should have a target attribute with fragment based on symbol" do + expect(subject).to have_selector("[data-tabs-target='#tabs-overview-#{tabs.object_id}']") end it "should have tab with id based on options" do - expect(subject).to have_selector("div#something_unique") + expect(subject).to have_selector("#something_unique") end it "should have link with fragment based on options" do - expect(subject).to have_selector('a[href="#something_unique"]') + expect(subject).to have_selector('[data-tabs-target="#something_unique"]') end - it "should have li with specific css class" do - expect(subject).to have_selector("li.some_css_class") + it "should have button with specific css class" do + expect(subject).to have_selector("button.some_css_class") end end @@ -60,38 +52,11 @@ end it "should create a tab navigation bar based on the symbol" do - expect(tabs.find_by_tag("li").first.content).to include("Overview") + expect(subject).to have_button("Overview") end it "should create a tab with a span inside of it" do - expect(tabs.find_by_tag("span").first.content).to eq("tab 1") - end - end - - context "when creating a tab with non-transliteratable string" do - let(:tabs) do - render_arbre_component do - tabs do - tab "🤗" do - "content" - end - end - end - end - - let(:subject) { Capybara.string(tabs.to_s) } - - it "should create a tab navigation bar based on the string" do - expect(subject).to have_content("🤗") - end - - it "should have tab with id based on URL-encoded string" do - tab_content = subject.find(".tabs .tab-content div", text: "content") - expect(tab_content["id"]).to eq(CGI.escape("🤗")) - end - - it "should have link with fragment based on URL-encoded string" do - expect(subject).to have_link("🤗", href: "##{CGI.escape('🤗')}") + expect(subject).to have_content("tab 1") end end end diff --git a/tasks/local.rake b/tasks/local.rake index 393a4937aee..b5ce69bc5d6 100644 --- a/tasks/local.rake +++ b/tasks/local.rake @@ -14,12 +14,14 @@ task :local do argv = ARGV[1..-1] if argv.any? + if %w(server s).include?(argv[0]) + command = "foreman start -f Procfile.dev" # If it's a rails command, auto add the rails script - if %w(generate console server dbconsole g c s routes runner).include?(argv[0]) || argv[0] =~ /db:/ + elsif %w(generate console dbconsole g c routes runner).include?(argv[0]) || argv[0] =~ /db:/ argv.unshift("rails") + command = ["bundle", "exec", *argv].join(" ") end - command = ["bundle", "exec", *argv].join(" ") env = { "BUNDLE_GEMFILE" => test_application.expanded_gemfile, "RAILS_ENV" => "development" } Dir.chdir(test_application.app_dir) do diff --git a/tasks/test_application.rb b/tasks/test_application.rb index c9a52065521..81e6dc49d43 100644 --- a/tasks/test_application.rb +++ b/tasks/test_application.rb @@ -22,22 +22,35 @@ def generate FileUtils.mkdir_p base_dir args = %W( -m spec/support/#{template}.rb + --skip-action-mailbox + --skip-action-text + --skip-active-storage + --skip-action-cable --skip-bootsnap --skip-bundle --skip-gemfile + --skip-hotwire + --skip-jbuilder --skip-listen --skip-spring --skip-turbolinks - --skip-test-unit - --skip-coffee + --skip-test + --skip-system-test --skip-webpack-install + --javascript=esbuild + --css=tailwind ) command = ["bundle", "exec", "rails", "new", app_dir, *args].join(" ") env = { "BUNDLE_GEMFILE" => expanded_gemfile, "RAILS_ENV" => rails_env } - Bundler.with_original_env { abort unless Kernel.system(env, command) } + Bundler.with_original_env do + Kernel.system(env, command) + Dir.chdir(app_dir) do + Kernel.system("yarn install") + end + end end def full_app_dir diff --git a/vendor/assets/javascripts/flowbite.js b/vendor/assets/javascripts/flowbite.js new file mode 100644 index 00000000000..eed3e68aaab --- /dev/null +++ b/vendor/assets/javascripts/flowbite.js @@ -0,0 +1,4415 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(); + else if(typeof define === 'function' && define.amd) + define("Flowbite", [], factory); + else if(typeof exports === 'object') + exports["Flowbite"] = factory(); + else + root["Flowbite"] = factory(); +})(self, function() { +return /******/ (function() { // webpackBootstrap +/******/ "use strict"; +/******/ var __webpack_modules__ = ({ + +/***/ 647: +/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { + +__webpack_require__.r(__webpack_exports__); +// extracted by mini-css-extract-plugin + + +/***/ }), + +/***/ 853: +/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { + +// ESM COMPAT FLAG +__webpack_require__.r(__webpack_exports__); + +// EXPORTS +__webpack_require__.d(__webpack_exports__, { + "afterMain": function() { return /* reexport */ afterMain; }, + "afterRead": function() { return /* reexport */ afterRead; }, + "afterWrite": function() { return /* reexport */ afterWrite; }, + "applyStyles": function() { return /* reexport */ modifiers_applyStyles; }, + "arrow": function() { return /* reexport */ modifiers_arrow; }, + "auto": function() { return /* reexport */ auto; }, + "basePlacements": function() { return /* reexport */ basePlacements; }, + "beforeMain": function() { return /* reexport */ beforeMain; }, + "beforeRead": function() { return /* reexport */ beforeRead; }, + "beforeWrite": function() { return /* reexport */ beforeWrite; }, + "bottom": function() { return /* reexport */ bottom; }, + "clippingParents": function() { return /* reexport */ clippingParents; }, + "computeStyles": function() { return /* reexport */ modifiers_computeStyles; }, + "createPopper": function() { return /* reexport */ popper_createPopper; }, + "createPopperBase": function() { return /* reexport */ createPopper; }, + "createPopperLite": function() { return /* reexport */ popper_lite_createPopper; }, + "detectOverflow": function() { return /* reexport */ detectOverflow; }, + "end": function() { return /* reexport */ end; }, + "eventListeners": function() { return /* reexport */ eventListeners; }, + "flip": function() { return /* reexport */ modifiers_flip; }, + "hide": function() { return /* reexport */ modifiers_hide; }, + "left": function() { return /* reexport */ left; }, + "main": function() { return /* reexport */ main; }, + "modifierPhases": function() { return /* reexport */ modifierPhases; }, + "offset": function() { return /* reexport */ modifiers_offset; }, + "placements": function() { return /* reexport */ enums_placements; }, + "popper": function() { return /* reexport */ popper; }, + "popperGenerator": function() { return /* reexport */ popperGenerator; }, + "popperOffsets": function() { return /* reexport */ modifiers_popperOffsets; }, + "preventOverflow": function() { return /* reexport */ modifiers_preventOverflow; }, + "read": function() { return /* reexport */ read; }, + "reference": function() { return /* reexport */ reference; }, + "right": function() { return /* reexport */ right; }, + "start": function() { return /* reexport */ start; }, + "top": function() { return /* reexport */ enums_top; }, + "variationPlacements": function() { return /* reexport */ variationPlacements; }, + "viewport": function() { return /* reexport */ viewport; }, + "write": function() { return /* reexport */ write; } +}); + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/enums.js +var enums_top = 'top'; +var bottom = 'bottom'; +var right = 'right'; +var left = 'left'; +var auto = 'auto'; +var basePlacements = [enums_top, bottom, right, left]; +var start = 'start'; +var end = 'end'; +var clippingParents = 'clippingParents'; +var viewport = 'viewport'; +var popper = 'popper'; +var reference = 'reference'; +var variationPlacements = /*#__PURE__*/basePlacements.reduce(function (acc, placement) { + return acc.concat([placement + "-" + start, placement + "-" + end]); +}, []); +var enums_placements = /*#__PURE__*/[].concat(basePlacements, [auto]).reduce(function (acc, placement) { + return acc.concat([placement, placement + "-" + start, placement + "-" + end]); +}, []); // modifiers that need to read the DOM + +var beforeRead = 'beforeRead'; +var read = 'read'; +var afterRead = 'afterRead'; // pure-logic modifiers + +var beforeMain = 'beforeMain'; +var main = 'main'; +var afterMain = 'afterMain'; // modifier with the purpose to write to the DOM (or write into a framework state) + +var beforeWrite = 'beforeWrite'; +var write = 'write'; +var afterWrite = 'afterWrite'; +var modifierPhases = [beforeRead, read, afterRead, beforeMain, main, afterMain, beforeWrite, write, afterWrite]; +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getNodeName.js +function getNodeName(element) { + return element ? (element.nodeName || '').toLowerCase() : null; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getWindow.js +function getWindow(node) { + if (node == null) { + return window; + } + + if (node.toString() !== '[object Window]') { + var ownerDocument = node.ownerDocument; + return ownerDocument ? ownerDocument.defaultView || window : window; + } + + return node; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/instanceOf.js + + +function isElement(node) { + var OwnElement = getWindow(node).Element; + return node instanceof OwnElement || node instanceof Element; +} + +function isHTMLElement(node) { + var OwnElement = getWindow(node).HTMLElement; + return node instanceof OwnElement || node instanceof HTMLElement; +} + +function isShadowRoot(node) { + // IE 11 has no ShadowRoot + if (typeof ShadowRoot === 'undefined') { + return false; + } + + var OwnElement = getWindow(node).ShadowRoot; + return node instanceof OwnElement || node instanceof ShadowRoot; +} + + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/applyStyles.js + + // This modifier takes the styles prepared by the `computeStyles` modifier +// and applies them to the HTMLElements such as popper and arrow + +function applyStyles(_ref) { + var state = _ref.state; + Object.keys(state.elements).forEach(function (name) { + var style = state.styles[name] || {}; + var attributes = state.attributes[name] || {}; + var element = state.elements[name]; // arrow is optional + virtual elements + + if (!isHTMLElement(element) || !getNodeName(element)) { + return; + } // Flow doesn't support to extend this property, but it's the most + // effective way to apply styles to an HTMLElement + // $FlowFixMe[cannot-write] + + + Object.assign(element.style, style); + Object.keys(attributes).forEach(function (name) { + var value = attributes[name]; + + if (value === false) { + element.removeAttribute(name); + } else { + element.setAttribute(name, value === true ? '' : value); + } + }); + }); +} + +function effect(_ref2) { + var state = _ref2.state; + var initialStyles = { + popper: { + position: state.options.strategy, + left: '0', + top: '0', + margin: '0' + }, + arrow: { + position: 'absolute' + }, + reference: {} + }; + Object.assign(state.elements.popper.style, initialStyles.popper); + state.styles = initialStyles; + + if (state.elements.arrow) { + Object.assign(state.elements.arrow.style, initialStyles.arrow); + } + + return function () { + Object.keys(state.elements).forEach(function (name) { + var element = state.elements[name]; + var attributes = state.attributes[name] || {}; + var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? state.styles[name] : initialStyles[name]); // Set all values to an empty string to unset them + + var style = styleProperties.reduce(function (style, property) { + style[property] = ''; + return style; + }, {}); // arrow is optional + virtual elements + + if (!isHTMLElement(element) || !getNodeName(element)) { + return; + } + + Object.assign(element.style, style); + Object.keys(attributes).forEach(function (attribute) { + element.removeAttribute(attribute); + }); + }); + }; +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_applyStyles = ({ + name: 'applyStyles', + enabled: true, + phase: 'write', + fn: applyStyles, + effect: effect, + requires: ['computeStyles'] +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getBasePlacement.js + +function getBasePlacement(placement) { + return placement.split('-')[0]; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/math.js +var math_max = Math.max; +var math_min = Math.min; +var round = Math.round; +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/userAgent.js +function getUAString() { + var uaData = navigator.userAgentData; + + if (uaData != null && uaData.brands) { + return uaData.brands.map(function (item) { + return item.brand + "/" + item.version; + }).join(' '); + } + + return navigator.userAgent; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/isLayoutViewport.js + +function isLayoutViewport() { + return !/^((?!chrome|android).)*safari/i.test(getUAString()); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getBoundingClientRect.js + + + + +function getBoundingClientRect(element, includeScale, isFixedStrategy) { + if (includeScale === void 0) { + includeScale = false; + } + + if (isFixedStrategy === void 0) { + isFixedStrategy = false; + } + + var clientRect = element.getBoundingClientRect(); + var scaleX = 1; + var scaleY = 1; + + if (includeScale && isHTMLElement(element)) { + scaleX = element.offsetWidth > 0 ? round(clientRect.width) / element.offsetWidth || 1 : 1; + scaleY = element.offsetHeight > 0 ? round(clientRect.height) / element.offsetHeight || 1 : 1; + } + + var _ref = isElement(element) ? getWindow(element) : window, + visualViewport = _ref.visualViewport; + + var addVisualOffsets = !isLayoutViewport() && isFixedStrategy; + var x = (clientRect.left + (addVisualOffsets && visualViewport ? visualViewport.offsetLeft : 0)) / scaleX; + var y = (clientRect.top + (addVisualOffsets && visualViewport ? visualViewport.offsetTop : 0)) / scaleY; + var width = clientRect.width / scaleX; + var height = clientRect.height / scaleY; + return { + width: width, + height: height, + top: y, + right: x + width, + bottom: y + height, + left: x, + x: x, + y: y + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getLayoutRect.js + // Returns the layout rect of an element relative to its offsetParent. Layout +// means it doesn't take into account transforms. + +function getLayoutRect(element) { + var clientRect = getBoundingClientRect(element); // Use the clientRect sizes if it's not been transformed. + // Fixes https://github.com/popperjs/popper-core/issues/1223 + + var width = element.offsetWidth; + var height = element.offsetHeight; + + if (Math.abs(clientRect.width - width) <= 1) { + width = clientRect.width; + } + + if (Math.abs(clientRect.height - height) <= 1) { + height = clientRect.height; + } + + return { + x: element.offsetLeft, + y: element.offsetTop, + width: width, + height: height + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/contains.js + +function contains(parent, child) { + var rootNode = child.getRootNode && child.getRootNode(); // First, attempt with faster native method + + if (parent.contains(child)) { + return true; + } // then fallback to custom implementation with Shadow DOM support + else if (rootNode && isShadowRoot(rootNode)) { + var next = child; + + do { + if (next && parent.isSameNode(next)) { + return true; + } // $FlowFixMe[prop-missing]: need a better way to handle this... + + + next = next.parentNode || next.host; + } while (next); + } // Give up, the result is false + + + return false; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getComputedStyle.js + +function getComputedStyle(element) { + return getWindow(element).getComputedStyle(element); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/isTableElement.js + +function isTableElement(element) { + return ['table', 'td', 'th'].indexOf(getNodeName(element)) >= 0; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getDocumentElement.js + +function getDocumentElement(element) { + // $FlowFixMe[incompatible-return]: assume body is always available + return ((isElement(element) ? element.ownerDocument : // $FlowFixMe[prop-missing] + element.document) || window.document).documentElement; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getParentNode.js + + + +function getParentNode(element) { + if (getNodeName(element) === 'html') { + return element; + } + + return (// this is a quicker (but less type safe) way to save quite some bytes from the bundle + // $FlowFixMe[incompatible-return] + // $FlowFixMe[prop-missing] + element.assignedSlot || // step into the shadow DOM of the parent of a slotted node + element.parentNode || ( // DOM Element detected + isShadowRoot(element) ? element.host : null) || // ShadowRoot detected + // $FlowFixMe[incompatible-call]: HTMLElement is a Node + getDocumentElement(element) // fallback + + ); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getOffsetParent.js + + + + + + + + +function getTrueOffsetParent(element) { + if (!isHTMLElement(element) || // https://github.com/popperjs/popper-core/issues/837 + getComputedStyle(element).position === 'fixed') { + return null; + } + + return element.offsetParent; +} // `.offsetParent` reports `null` for fixed elements, while absolute elements +// return the containing block + + +function getContainingBlock(element) { + var isFirefox = /firefox/i.test(getUAString()); + var isIE = /Trident/i.test(getUAString()); + + if (isIE && isHTMLElement(element)) { + // In IE 9, 10 and 11 fixed elements containing block is always established by the viewport + var elementCss = getComputedStyle(element); + + if (elementCss.position === 'fixed') { + return null; + } + } + + var currentNode = getParentNode(element); + + if (isShadowRoot(currentNode)) { + currentNode = currentNode.host; + } + + while (isHTMLElement(currentNode) && ['html', 'body'].indexOf(getNodeName(currentNode)) < 0) { + var css = getComputedStyle(currentNode); // This is non-exhaustive but covers the most common CSS properties that + // create a containing block. + // https://developer.mozilla.org/en-US/docs/Web/CSS/Containing_block#identifying_the_containing_block + + if (css.transform !== 'none' || css.perspective !== 'none' || css.contain === 'paint' || ['transform', 'perspective'].indexOf(css.willChange) !== -1 || isFirefox && css.willChange === 'filter' || isFirefox && css.filter && css.filter !== 'none') { + return currentNode; + } else { + currentNode = currentNode.parentNode; + } + } + + return null; +} // Gets the closest ancestor positioned element. Handles some edge cases, +// such as table ancestors and cross browser bugs. + + +function getOffsetParent(element) { + var window = getWindow(element); + var offsetParent = getTrueOffsetParent(element); + + while (offsetParent && isTableElement(offsetParent) && getComputedStyle(offsetParent).position === 'static') { + offsetParent = getTrueOffsetParent(offsetParent); + } + + if (offsetParent && (getNodeName(offsetParent) === 'html' || getNodeName(offsetParent) === 'body' && getComputedStyle(offsetParent).position === 'static')) { + return window; + } + + return offsetParent || getContainingBlock(element) || window; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getMainAxisFromPlacement.js +function getMainAxisFromPlacement(placement) { + return ['top', 'bottom'].indexOf(placement) >= 0 ? 'x' : 'y'; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/within.js + +function within(min, value, max) { + return math_max(min, math_min(value, max)); +} +function withinMaxClamp(min, value, max) { + var v = within(min, value, max); + return v > max ? max : v; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getFreshSideObject.js +function getFreshSideObject() { + return { + top: 0, + right: 0, + bottom: 0, + left: 0 + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/mergePaddingObject.js + +function mergePaddingObject(paddingObject) { + return Object.assign({}, getFreshSideObject(), paddingObject); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/expandToHashMap.js +function expandToHashMap(value, keys) { + return keys.reduce(function (hashMap, key) { + hashMap[key] = value; + return hashMap; + }, {}); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/arrow.js + + + + + + + + + + // eslint-disable-next-line import/no-unused-modules + +var toPaddingObject = function toPaddingObject(padding, state) { + padding = typeof padding === 'function' ? padding(Object.assign({}, state.rects, { + placement: state.placement + })) : padding; + return mergePaddingObject(typeof padding !== 'number' ? padding : expandToHashMap(padding, basePlacements)); +}; + +function arrow(_ref) { + var _state$modifiersData$; + + var state = _ref.state, + name = _ref.name, + options = _ref.options; + var arrowElement = state.elements.arrow; + var popperOffsets = state.modifiersData.popperOffsets; + var basePlacement = getBasePlacement(state.placement); + var axis = getMainAxisFromPlacement(basePlacement); + var isVertical = [left, right].indexOf(basePlacement) >= 0; + var len = isVertical ? 'height' : 'width'; + + if (!arrowElement || !popperOffsets) { + return; + } + + var paddingObject = toPaddingObject(options.padding, state); + var arrowRect = getLayoutRect(arrowElement); + var minProp = axis === 'y' ? enums_top : left; + var maxProp = axis === 'y' ? bottom : right; + var endDiff = state.rects.reference[len] + state.rects.reference[axis] - popperOffsets[axis] - state.rects.popper[len]; + var startDiff = popperOffsets[axis] - state.rects.reference[axis]; + var arrowOffsetParent = getOffsetParent(arrowElement); + var clientSize = arrowOffsetParent ? axis === 'y' ? arrowOffsetParent.clientHeight || 0 : arrowOffsetParent.clientWidth || 0 : 0; + var centerToReference = endDiff / 2 - startDiff / 2; // Make sure the arrow doesn't overflow the popper if the center point is + // outside of the popper bounds + + var min = paddingObject[minProp]; + var max = clientSize - arrowRect[len] - paddingObject[maxProp]; + var center = clientSize / 2 - arrowRect[len] / 2 + centerToReference; + var offset = within(min, center, max); // Prevents breaking syntax highlighting... + + var axisProp = axis; + state.modifiersData[name] = (_state$modifiersData$ = {}, _state$modifiersData$[axisProp] = offset, _state$modifiersData$.centerOffset = offset - center, _state$modifiersData$); +} + +function arrow_effect(_ref2) { + var state = _ref2.state, + options = _ref2.options; + var _options$element = options.element, + arrowElement = _options$element === void 0 ? '[data-popper-arrow]' : _options$element; + + if (arrowElement == null) { + return; + } // CSS selector + + + if (typeof arrowElement === 'string') { + arrowElement = state.elements.popper.querySelector(arrowElement); + + if (!arrowElement) { + return; + } + } + + if (false) {} + + if (!contains(state.elements.popper, arrowElement)) { + if (false) {} + + return; + } + + state.elements.arrow = arrowElement; +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_arrow = ({ + name: 'arrow', + enabled: true, + phase: 'main', + fn: arrow, + effect: arrow_effect, + requires: ['popperOffsets'], + requiresIfExists: ['preventOverflow'] +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getVariation.js +function getVariation(placement) { + return placement.split('-')[1]; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/computeStyles.js + + + + + + + + // eslint-disable-next-line import/no-unused-modules + +var unsetSides = { + top: 'auto', + right: 'auto', + bottom: 'auto', + left: 'auto' +}; // Round the offsets to the nearest suitable subpixel based on the DPR. +// Zooming can change the DPR, but it seems to report a value that will +// cleanly divide the values into the appropriate subpixels. + +function roundOffsetsByDPR(_ref) { + var x = _ref.x, + y = _ref.y; + var win = window; + var dpr = win.devicePixelRatio || 1; + return { + x: round(x * dpr) / dpr || 0, + y: round(y * dpr) / dpr || 0 + }; +} + +function mapToStyles(_ref2) { + var _Object$assign2; + + var popper = _ref2.popper, + popperRect = _ref2.popperRect, + placement = _ref2.placement, + variation = _ref2.variation, + offsets = _ref2.offsets, + position = _ref2.position, + gpuAcceleration = _ref2.gpuAcceleration, + adaptive = _ref2.adaptive, + roundOffsets = _ref2.roundOffsets, + isFixed = _ref2.isFixed; + var _offsets$x = offsets.x, + x = _offsets$x === void 0 ? 0 : _offsets$x, + _offsets$y = offsets.y, + y = _offsets$y === void 0 ? 0 : _offsets$y; + + var _ref3 = typeof roundOffsets === 'function' ? roundOffsets({ + x: x, + y: y + }) : { + x: x, + y: y + }; + + x = _ref3.x; + y = _ref3.y; + var hasX = offsets.hasOwnProperty('x'); + var hasY = offsets.hasOwnProperty('y'); + var sideX = left; + var sideY = enums_top; + var win = window; + + if (adaptive) { + var offsetParent = getOffsetParent(popper); + var heightProp = 'clientHeight'; + var widthProp = 'clientWidth'; + + if (offsetParent === getWindow(popper)) { + offsetParent = getDocumentElement(popper); + + if (getComputedStyle(offsetParent).position !== 'static' && position === 'absolute') { + heightProp = 'scrollHeight'; + widthProp = 'scrollWidth'; + } + } // $FlowFixMe[incompatible-cast]: force type refinement, we compare offsetParent with window above, but Flow doesn't detect it + + + offsetParent = offsetParent; + + if (placement === enums_top || (placement === left || placement === right) && variation === end) { + sideY = bottom; + var offsetY = isFixed && offsetParent === win && win.visualViewport ? win.visualViewport.height : // $FlowFixMe[prop-missing] + offsetParent[heightProp]; + y -= offsetY - popperRect.height; + y *= gpuAcceleration ? 1 : -1; + } + + if (placement === left || (placement === enums_top || placement === bottom) && variation === end) { + sideX = right; + var offsetX = isFixed && offsetParent === win && win.visualViewport ? win.visualViewport.width : // $FlowFixMe[prop-missing] + offsetParent[widthProp]; + x -= offsetX - popperRect.width; + x *= gpuAcceleration ? 1 : -1; + } + } + + var commonStyles = Object.assign({ + position: position + }, adaptive && unsetSides); + + var _ref4 = roundOffsets === true ? roundOffsetsByDPR({ + x: x, + y: y + }) : { + x: x, + y: y + }; + + x = _ref4.x; + y = _ref4.y; + + if (gpuAcceleration) { + var _Object$assign; + + return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (win.devicePixelRatio || 1) <= 1 ? "translate(" + x + "px, " + y + "px)" : "translate3d(" + x + "px, " + y + "px, 0)", _Object$assign)); + } + + return Object.assign({}, commonStyles, (_Object$assign2 = {}, _Object$assign2[sideY] = hasY ? y + "px" : '', _Object$assign2[sideX] = hasX ? x + "px" : '', _Object$assign2.transform = '', _Object$assign2)); +} + +function computeStyles(_ref5) { + var state = _ref5.state, + options = _ref5.options; + var _options$gpuAccelerat = options.gpuAcceleration, + gpuAcceleration = _options$gpuAccelerat === void 0 ? true : _options$gpuAccelerat, + _options$adaptive = options.adaptive, + adaptive = _options$adaptive === void 0 ? true : _options$adaptive, + _options$roundOffsets = options.roundOffsets, + roundOffsets = _options$roundOffsets === void 0 ? true : _options$roundOffsets; + + if (false) { var transitionProperty; } + + var commonStyles = { + placement: getBasePlacement(state.placement), + variation: getVariation(state.placement), + popper: state.elements.popper, + popperRect: state.rects.popper, + gpuAcceleration: gpuAcceleration, + isFixed: state.options.strategy === 'fixed' + }; + + if (state.modifiersData.popperOffsets != null) { + state.styles.popper = Object.assign({}, state.styles.popper, mapToStyles(Object.assign({}, commonStyles, { + offsets: state.modifiersData.popperOffsets, + position: state.options.strategy, + adaptive: adaptive, + roundOffsets: roundOffsets + }))); + } + + if (state.modifiersData.arrow != null) { + state.styles.arrow = Object.assign({}, state.styles.arrow, mapToStyles(Object.assign({}, commonStyles, { + offsets: state.modifiersData.arrow, + position: 'absolute', + adaptive: false, + roundOffsets: roundOffsets + }))); + } + + state.attributes.popper = Object.assign({}, state.attributes.popper, { + 'data-popper-placement': state.placement + }); +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_computeStyles = ({ + name: 'computeStyles', + enabled: true, + phase: 'beforeWrite', + fn: computeStyles, + data: {} +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/eventListeners.js + // eslint-disable-next-line import/no-unused-modules + +var passive = { + passive: true +}; + +function eventListeners_effect(_ref) { + var state = _ref.state, + instance = _ref.instance, + options = _ref.options; + var _options$scroll = options.scroll, + scroll = _options$scroll === void 0 ? true : _options$scroll, + _options$resize = options.resize, + resize = _options$resize === void 0 ? true : _options$resize; + var window = getWindow(state.elements.popper); + var scrollParents = [].concat(state.scrollParents.reference, state.scrollParents.popper); + + if (scroll) { + scrollParents.forEach(function (scrollParent) { + scrollParent.addEventListener('scroll', instance.update, passive); + }); + } + + if (resize) { + window.addEventListener('resize', instance.update, passive); + } + + return function () { + if (scroll) { + scrollParents.forEach(function (scrollParent) { + scrollParent.removeEventListener('scroll', instance.update, passive); + }); + } + + if (resize) { + window.removeEventListener('resize', instance.update, passive); + } + }; +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var eventListeners = ({ + name: 'eventListeners', + enabled: true, + phase: 'write', + fn: function fn() {}, + effect: eventListeners_effect, + data: {} +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getOppositePlacement.js +var hash = { + left: 'right', + right: 'left', + bottom: 'top', + top: 'bottom' +}; +function getOppositePlacement(placement) { + return placement.replace(/left|right|bottom|top/g, function (matched) { + return hash[matched]; + }); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getOppositeVariationPlacement.js +var getOppositeVariationPlacement_hash = { + start: 'end', + end: 'start' +}; +function getOppositeVariationPlacement(placement) { + return placement.replace(/start|end/g, function (matched) { + return getOppositeVariationPlacement_hash[matched]; + }); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getWindowScroll.js + +function getWindowScroll(node) { + var win = getWindow(node); + var scrollLeft = win.pageXOffset; + var scrollTop = win.pageYOffset; + return { + scrollLeft: scrollLeft, + scrollTop: scrollTop + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getWindowScrollBarX.js + + + +function getWindowScrollBarX(element) { + // If has a CSS width greater than the viewport, then this will be + // incorrect for RTL. + // Popper 1 is broken in this case and never had a bug report so let's assume + // it's not an issue. I don't think anyone ever specifies width on + // anyway. + // Browsers where the left scrollbar doesn't cause an issue report `0` for + // this (e.g. Edge 2019, IE11, Safari) + return getBoundingClientRect(getDocumentElement(element)).left + getWindowScroll(element).scrollLeft; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getViewportRect.js + + + + +function getViewportRect(element, strategy) { + var win = getWindow(element); + var html = getDocumentElement(element); + var visualViewport = win.visualViewport; + var width = html.clientWidth; + var height = html.clientHeight; + var x = 0; + var y = 0; + + if (visualViewport) { + width = visualViewport.width; + height = visualViewport.height; + var layoutViewport = isLayoutViewport(); + + if (layoutViewport || !layoutViewport && strategy === 'fixed') { + x = visualViewport.offsetLeft; + y = visualViewport.offsetTop; + } + } + + return { + width: width, + height: height, + x: x + getWindowScrollBarX(element), + y: y + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getDocumentRect.js + + + + + // Gets the entire size of the scrollable document area, even extending outside +// of the `` and `` rect bounds if horizontally scrollable + +function getDocumentRect(element) { + var _element$ownerDocumen; + + var html = getDocumentElement(element); + var winScroll = getWindowScroll(element); + var body = (_element$ownerDocumen = element.ownerDocument) == null ? void 0 : _element$ownerDocumen.body; + var width = math_max(html.scrollWidth, html.clientWidth, body ? body.scrollWidth : 0, body ? body.clientWidth : 0); + var height = math_max(html.scrollHeight, html.clientHeight, body ? body.scrollHeight : 0, body ? body.clientHeight : 0); + var x = -winScroll.scrollLeft + getWindowScrollBarX(element); + var y = -winScroll.scrollTop; + + if (getComputedStyle(body || html).direction === 'rtl') { + x += math_max(html.clientWidth, body ? body.clientWidth : 0) - width; + } + + return { + width: width, + height: height, + x: x, + y: y + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/isScrollParent.js + +function isScrollParent(element) { + // Firefox wants us to check `-x` and `-y` variations as well + var _getComputedStyle = getComputedStyle(element), + overflow = _getComputedStyle.overflow, + overflowX = _getComputedStyle.overflowX, + overflowY = _getComputedStyle.overflowY; + + return /auto|scroll|overlay|hidden/.test(overflow + overflowY + overflowX); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getScrollParent.js + + + + +function getScrollParent(node) { + if (['html', 'body', '#document'].indexOf(getNodeName(node)) >= 0) { + // $FlowFixMe[incompatible-return]: assume body is always available + return node.ownerDocument.body; + } + + if (isHTMLElement(node) && isScrollParent(node)) { + return node; + } + + return getScrollParent(getParentNode(node)); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/listScrollParents.js + + + + +/* +given a DOM element, return the list of all scroll parents, up the list of ancesors +until we get to the top window object. This list is what we attach scroll listeners +to, because if any of these parent elements scroll, we'll need to re-calculate the +reference element's position. +*/ + +function listScrollParents(element, list) { + var _element$ownerDocumen; + + if (list === void 0) { + list = []; + } + + var scrollParent = getScrollParent(element); + var isBody = scrollParent === ((_element$ownerDocumen = element.ownerDocument) == null ? void 0 : _element$ownerDocumen.body); + var win = getWindow(scrollParent); + var target = isBody ? [win].concat(win.visualViewport || [], isScrollParent(scrollParent) ? scrollParent : []) : scrollParent; + var updatedList = list.concat(target); + return isBody ? updatedList : // $FlowFixMe[incompatible-call]: isBody tells us target will be an HTMLElement here + updatedList.concat(listScrollParents(getParentNode(target))); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/rectToClientRect.js +function rectToClientRect(rect) { + return Object.assign({}, rect, { + left: rect.x, + top: rect.y, + right: rect.x + rect.width, + bottom: rect.y + rect.height + }); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getClippingRect.js + + + + + + + + + + + + + + + +function getInnerBoundingClientRect(element, strategy) { + var rect = getBoundingClientRect(element, false, strategy === 'fixed'); + rect.top = rect.top + element.clientTop; + rect.left = rect.left + element.clientLeft; + rect.bottom = rect.top + element.clientHeight; + rect.right = rect.left + element.clientWidth; + rect.width = element.clientWidth; + rect.height = element.clientHeight; + rect.x = rect.left; + rect.y = rect.top; + return rect; +} + +function getClientRectFromMixedType(element, clippingParent, strategy) { + return clippingParent === viewport ? rectToClientRect(getViewportRect(element, strategy)) : isElement(clippingParent) ? getInnerBoundingClientRect(clippingParent, strategy) : rectToClientRect(getDocumentRect(getDocumentElement(element))); +} // A "clipping parent" is an overflowable container with the characteristic of +// clipping (or hiding) overflowing elements with a position different from +// `initial` + + +function getClippingParents(element) { + var clippingParents = listScrollParents(getParentNode(element)); + var canEscapeClipping = ['absolute', 'fixed'].indexOf(getComputedStyle(element).position) >= 0; + var clipperElement = canEscapeClipping && isHTMLElement(element) ? getOffsetParent(element) : element; + + if (!isElement(clipperElement)) { + return []; + } // $FlowFixMe[incompatible-return]: https://github.com/facebook/flow/issues/1414 + + + return clippingParents.filter(function (clippingParent) { + return isElement(clippingParent) && contains(clippingParent, clipperElement) && getNodeName(clippingParent) !== 'body'; + }); +} // Gets the maximum area that the element is visible in due to any number of +// clipping parents + + +function getClippingRect(element, boundary, rootBoundary, strategy) { + var mainClippingParents = boundary === 'clippingParents' ? getClippingParents(element) : [].concat(boundary); + var clippingParents = [].concat(mainClippingParents, [rootBoundary]); + var firstClippingParent = clippingParents[0]; + var clippingRect = clippingParents.reduce(function (accRect, clippingParent) { + var rect = getClientRectFromMixedType(element, clippingParent, strategy); + accRect.top = math_max(rect.top, accRect.top); + accRect.right = math_min(rect.right, accRect.right); + accRect.bottom = math_min(rect.bottom, accRect.bottom); + accRect.left = math_max(rect.left, accRect.left); + return accRect; + }, getClientRectFromMixedType(element, firstClippingParent, strategy)); + clippingRect.width = clippingRect.right - clippingRect.left; + clippingRect.height = clippingRect.bottom - clippingRect.top; + clippingRect.x = clippingRect.left; + clippingRect.y = clippingRect.top; + return clippingRect; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/computeOffsets.js + + + + +function computeOffsets(_ref) { + var reference = _ref.reference, + element = _ref.element, + placement = _ref.placement; + var basePlacement = placement ? getBasePlacement(placement) : null; + var variation = placement ? getVariation(placement) : null; + var commonX = reference.x + reference.width / 2 - element.width / 2; + var commonY = reference.y + reference.height / 2 - element.height / 2; + var offsets; + + switch (basePlacement) { + case enums_top: + offsets = { + x: commonX, + y: reference.y - element.height + }; + break; + + case bottom: + offsets = { + x: commonX, + y: reference.y + reference.height + }; + break; + + case right: + offsets = { + x: reference.x + reference.width, + y: commonY + }; + break; + + case left: + offsets = { + x: reference.x - element.width, + y: commonY + }; + break; + + default: + offsets = { + x: reference.x, + y: reference.y + }; + } + + var mainAxis = basePlacement ? getMainAxisFromPlacement(basePlacement) : null; + + if (mainAxis != null) { + var len = mainAxis === 'y' ? 'height' : 'width'; + + switch (variation) { + case start: + offsets[mainAxis] = offsets[mainAxis] - (reference[len] / 2 - element[len] / 2); + break; + + case end: + offsets[mainAxis] = offsets[mainAxis] + (reference[len] / 2 - element[len] / 2); + break; + + default: + } + } + + return offsets; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/detectOverflow.js + + + + + + + + + // eslint-disable-next-line import/no-unused-modules + +function detectOverflow(state, options) { + if (options === void 0) { + options = {}; + } + + var _options = options, + _options$placement = _options.placement, + placement = _options$placement === void 0 ? state.placement : _options$placement, + _options$strategy = _options.strategy, + strategy = _options$strategy === void 0 ? state.strategy : _options$strategy, + _options$boundary = _options.boundary, + boundary = _options$boundary === void 0 ? clippingParents : _options$boundary, + _options$rootBoundary = _options.rootBoundary, + rootBoundary = _options$rootBoundary === void 0 ? viewport : _options$rootBoundary, + _options$elementConte = _options.elementContext, + elementContext = _options$elementConte === void 0 ? popper : _options$elementConte, + _options$altBoundary = _options.altBoundary, + altBoundary = _options$altBoundary === void 0 ? false : _options$altBoundary, + _options$padding = _options.padding, + padding = _options$padding === void 0 ? 0 : _options$padding; + var paddingObject = mergePaddingObject(typeof padding !== 'number' ? padding : expandToHashMap(padding, basePlacements)); + var altContext = elementContext === popper ? reference : popper; + var popperRect = state.rects.popper; + var element = state.elements[altBoundary ? altContext : elementContext]; + var clippingClientRect = getClippingRect(isElement(element) ? element : element.contextElement || getDocumentElement(state.elements.popper), boundary, rootBoundary, strategy); + var referenceClientRect = getBoundingClientRect(state.elements.reference); + var popperOffsets = computeOffsets({ + reference: referenceClientRect, + element: popperRect, + strategy: 'absolute', + placement: placement + }); + var popperClientRect = rectToClientRect(Object.assign({}, popperRect, popperOffsets)); + var elementClientRect = elementContext === popper ? popperClientRect : referenceClientRect; // positive = overflowing the clipping rect + // 0 or negative = within the clipping rect + + var overflowOffsets = { + top: clippingClientRect.top - elementClientRect.top + paddingObject.top, + bottom: elementClientRect.bottom - clippingClientRect.bottom + paddingObject.bottom, + left: clippingClientRect.left - elementClientRect.left + paddingObject.left, + right: elementClientRect.right - clippingClientRect.right + paddingObject.right + }; + var offsetData = state.modifiersData.offset; // Offsets can be applied only to the popper element + + if (elementContext === popper && offsetData) { + var offset = offsetData[placement]; + Object.keys(overflowOffsets).forEach(function (key) { + var multiply = [right, bottom].indexOf(key) >= 0 ? 1 : -1; + var axis = [enums_top, bottom].indexOf(key) >= 0 ? 'y' : 'x'; + overflowOffsets[key] += offset[axis] * multiply; + }); + } + + return overflowOffsets; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/computeAutoPlacement.js + + + + +function computeAutoPlacement(state, options) { + if (options === void 0) { + options = {}; + } + + var _options = options, + placement = _options.placement, + boundary = _options.boundary, + rootBoundary = _options.rootBoundary, + padding = _options.padding, + flipVariations = _options.flipVariations, + _options$allowedAutoP = _options.allowedAutoPlacements, + allowedAutoPlacements = _options$allowedAutoP === void 0 ? enums_placements : _options$allowedAutoP; + var variation = getVariation(placement); + var placements = variation ? flipVariations ? variationPlacements : variationPlacements.filter(function (placement) { + return getVariation(placement) === variation; + }) : basePlacements; + var allowedPlacements = placements.filter(function (placement) { + return allowedAutoPlacements.indexOf(placement) >= 0; + }); + + if (allowedPlacements.length === 0) { + allowedPlacements = placements; + + if (false) {} + } // $FlowFixMe[incompatible-type]: Flow seems to have problems with two array unions... + + + var overflows = allowedPlacements.reduce(function (acc, placement) { + acc[placement] = detectOverflow(state, { + placement: placement, + boundary: boundary, + rootBoundary: rootBoundary, + padding: padding + })[getBasePlacement(placement)]; + return acc; + }, {}); + return Object.keys(overflows).sort(function (a, b) { + return overflows[a] - overflows[b]; + }); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/flip.js + + + + + + + // eslint-disable-next-line import/no-unused-modules + +function getExpandedFallbackPlacements(placement) { + if (getBasePlacement(placement) === auto) { + return []; + } + + var oppositePlacement = getOppositePlacement(placement); + return [getOppositeVariationPlacement(placement), oppositePlacement, getOppositeVariationPlacement(oppositePlacement)]; +} + +function flip(_ref) { + var state = _ref.state, + options = _ref.options, + name = _ref.name; + + if (state.modifiersData[name]._skip) { + return; + } + + var _options$mainAxis = options.mainAxis, + checkMainAxis = _options$mainAxis === void 0 ? true : _options$mainAxis, + _options$altAxis = options.altAxis, + checkAltAxis = _options$altAxis === void 0 ? true : _options$altAxis, + specifiedFallbackPlacements = options.fallbackPlacements, + padding = options.padding, + boundary = options.boundary, + rootBoundary = options.rootBoundary, + altBoundary = options.altBoundary, + _options$flipVariatio = options.flipVariations, + flipVariations = _options$flipVariatio === void 0 ? true : _options$flipVariatio, + allowedAutoPlacements = options.allowedAutoPlacements; + var preferredPlacement = state.options.placement; + var basePlacement = getBasePlacement(preferredPlacement); + var isBasePlacement = basePlacement === preferredPlacement; + var fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipVariations ? [getOppositePlacement(preferredPlacement)] : getExpandedFallbackPlacements(preferredPlacement)); + var placements = [preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) { + return acc.concat(getBasePlacement(placement) === auto ? computeAutoPlacement(state, { + placement: placement, + boundary: boundary, + rootBoundary: rootBoundary, + padding: padding, + flipVariations: flipVariations, + allowedAutoPlacements: allowedAutoPlacements + }) : placement); + }, []); + var referenceRect = state.rects.reference; + var popperRect = state.rects.popper; + var checksMap = new Map(); + var makeFallbackChecks = true; + var firstFittingPlacement = placements[0]; + + for (var i = 0; i < placements.length; i++) { + var placement = placements[i]; + + var _basePlacement = getBasePlacement(placement); + + var isStartVariation = getVariation(placement) === start; + var isVertical = [enums_top, bottom].indexOf(_basePlacement) >= 0; + var len = isVertical ? 'width' : 'height'; + var overflow = detectOverflow(state, { + placement: placement, + boundary: boundary, + rootBoundary: rootBoundary, + altBoundary: altBoundary, + padding: padding + }); + var mainVariationSide = isVertical ? isStartVariation ? right : left : isStartVariation ? bottom : enums_top; + + if (referenceRect[len] > popperRect[len]) { + mainVariationSide = getOppositePlacement(mainVariationSide); + } + + var altVariationSide = getOppositePlacement(mainVariationSide); + var checks = []; + + if (checkMainAxis) { + checks.push(overflow[_basePlacement] <= 0); + } + + if (checkAltAxis) { + checks.push(overflow[mainVariationSide] <= 0, overflow[altVariationSide] <= 0); + } + + if (checks.every(function (check) { + return check; + })) { + firstFittingPlacement = placement; + makeFallbackChecks = false; + break; + } + + checksMap.set(placement, checks); + } + + if (makeFallbackChecks) { + // `2` may be desired in some cases – research later + var numberOfChecks = flipVariations ? 3 : 1; + + var _loop = function _loop(_i) { + var fittingPlacement = placements.find(function (placement) { + var checks = checksMap.get(placement); + + if (checks) { + return checks.slice(0, _i).every(function (check) { + return check; + }); + } + }); + + if (fittingPlacement) { + firstFittingPlacement = fittingPlacement; + return "break"; + } + }; + + for (var _i = numberOfChecks; _i > 0; _i--) { + var _ret = _loop(_i); + + if (_ret === "break") break; + } + } + + if (state.placement !== firstFittingPlacement) { + state.modifiersData[name]._skip = true; + state.placement = firstFittingPlacement; + state.reset = true; + } +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_flip = ({ + name: 'flip', + enabled: true, + phase: 'main', + fn: flip, + requiresIfExists: ['offset'], + data: { + _skip: false + } +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/hide.js + + + +function getSideOffsets(overflow, rect, preventedOffsets) { + if (preventedOffsets === void 0) { + preventedOffsets = { + x: 0, + y: 0 + }; + } + + return { + top: overflow.top - rect.height - preventedOffsets.y, + right: overflow.right - rect.width + preventedOffsets.x, + bottom: overflow.bottom - rect.height + preventedOffsets.y, + left: overflow.left - rect.width - preventedOffsets.x + }; +} + +function isAnySideFullyClipped(overflow) { + return [enums_top, right, bottom, left].some(function (side) { + return overflow[side] >= 0; + }); +} + +function hide(_ref) { + var state = _ref.state, + name = _ref.name; + var referenceRect = state.rects.reference; + var popperRect = state.rects.popper; + var preventedOffsets = state.modifiersData.preventOverflow; + var referenceOverflow = detectOverflow(state, { + elementContext: 'reference' + }); + var popperAltOverflow = detectOverflow(state, { + altBoundary: true + }); + var referenceClippingOffsets = getSideOffsets(referenceOverflow, referenceRect); + var popperEscapeOffsets = getSideOffsets(popperAltOverflow, popperRect, preventedOffsets); + var isReferenceHidden = isAnySideFullyClipped(referenceClippingOffsets); + var hasPopperEscaped = isAnySideFullyClipped(popperEscapeOffsets); + state.modifiersData[name] = { + referenceClippingOffsets: referenceClippingOffsets, + popperEscapeOffsets: popperEscapeOffsets, + isReferenceHidden: isReferenceHidden, + hasPopperEscaped: hasPopperEscaped + }; + state.attributes.popper = Object.assign({}, state.attributes.popper, { + 'data-popper-reference-hidden': isReferenceHidden, + 'data-popper-escaped': hasPopperEscaped + }); +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_hide = ({ + name: 'hide', + enabled: true, + phase: 'main', + requiresIfExists: ['preventOverflow'], + fn: hide +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/offset.js + + // eslint-disable-next-line import/no-unused-modules + +function distanceAndSkiddingToXY(placement, rects, offset) { + var basePlacement = getBasePlacement(placement); + var invertDistance = [left, enums_top].indexOf(basePlacement) >= 0 ? -1 : 1; + + var _ref = typeof offset === 'function' ? offset(Object.assign({}, rects, { + placement: placement + })) : offset, + skidding = _ref[0], + distance = _ref[1]; + + skidding = skidding || 0; + distance = (distance || 0) * invertDistance; + return [left, right].indexOf(basePlacement) >= 0 ? { + x: distance, + y: skidding + } : { + x: skidding, + y: distance + }; +} + +function offset(_ref2) { + var state = _ref2.state, + options = _ref2.options, + name = _ref2.name; + var _options$offset = options.offset, + offset = _options$offset === void 0 ? [0, 0] : _options$offset; + var data = enums_placements.reduce(function (acc, placement) { + acc[placement] = distanceAndSkiddingToXY(placement, state.rects, offset); + return acc; + }, {}); + var _data$state$placement = data[state.placement], + x = _data$state$placement.x, + y = _data$state$placement.y; + + if (state.modifiersData.popperOffsets != null) { + state.modifiersData.popperOffsets.x += x; + state.modifiersData.popperOffsets.y += y; + } + + state.modifiersData[name] = data; +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_offset = ({ + name: 'offset', + enabled: true, + phase: 'main', + requires: ['popperOffsets'], + fn: offset +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/popperOffsets.js + + +function popperOffsets(_ref) { + var state = _ref.state, + name = _ref.name; + // Offsets are the actual position the popper needs to have to be + // properly positioned near its reference element + // This is the most basic placement, and will be adjusted by + // the modifiers in the next step + state.modifiersData[name] = computeOffsets({ + reference: state.rects.reference, + element: state.rects.popper, + strategy: 'absolute', + placement: state.placement + }); +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_popperOffsets = ({ + name: 'popperOffsets', + enabled: true, + phase: 'read', + fn: popperOffsets, + data: {} +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/getAltAxis.js +function getAltAxis(axis) { + return axis === 'x' ? 'y' : 'x'; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/preventOverflow.js + + + + + + + + + + + + +function preventOverflow(_ref) { + var state = _ref.state, + options = _ref.options, + name = _ref.name; + var _options$mainAxis = options.mainAxis, + checkMainAxis = _options$mainAxis === void 0 ? true : _options$mainAxis, + _options$altAxis = options.altAxis, + checkAltAxis = _options$altAxis === void 0 ? false : _options$altAxis, + boundary = options.boundary, + rootBoundary = options.rootBoundary, + altBoundary = options.altBoundary, + padding = options.padding, + _options$tether = options.tether, + tether = _options$tether === void 0 ? true : _options$tether, + _options$tetherOffset = options.tetherOffset, + tetherOffset = _options$tetherOffset === void 0 ? 0 : _options$tetherOffset; + var overflow = detectOverflow(state, { + boundary: boundary, + rootBoundary: rootBoundary, + padding: padding, + altBoundary: altBoundary + }); + var basePlacement = getBasePlacement(state.placement); + var variation = getVariation(state.placement); + var isBasePlacement = !variation; + var mainAxis = getMainAxisFromPlacement(basePlacement); + var altAxis = getAltAxis(mainAxis); + var popperOffsets = state.modifiersData.popperOffsets; + var referenceRect = state.rects.reference; + var popperRect = state.rects.popper; + var tetherOffsetValue = typeof tetherOffset === 'function' ? tetherOffset(Object.assign({}, state.rects, { + placement: state.placement + })) : tetherOffset; + var normalizedTetherOffsetValue = typeof tetherOffsetValue === 'number' ? { + mainAxis: tetherOffsetValue, + altAxis: tetherOffsetValue + } : Object.assign({ + mainAxis: 0, + altAxis: 0 + }, tetherOffsetValue); + var offsetModifierState = state.modifiersData.offset ? state.modifiersData.offset[state.placement] : null; + var data = { + x: 0, + y: 0 + }; + + if (!popperOffsets) { + return; + } + + if (checkMainAxis) { + var _offsetModifierState$; + + var mainSide = mainAxis === 'y' ? enums_top : left; + var altSide = mainAxis === 'y' ? bottom : right; + var len = mainAxis === 'y' ? 'height' : 'width'; + var offset = popperOffsets[mainAxis]; + var min = offset + overflow[mainSide]; + var max = offset - overflow[altSide]; + var additive = tether ? -popperRect[len] / 2 : 0; + var minLen = variation === start ? referenceRect[len] : popperRect[len]; + var maxLen = variation === start ? -popperRect[len] : -referenceRect[len]; // We need to include the arrow in the calculation so the arrow doesn't go + // outside the reference bounds + + var arrowElement = state.elements.arrow; + var arrowRect = tether && arrowElement ? getLayoutRect(arrowElement) : { + width: 0, + height: 0 + }; + var arrowPaddingObject = state.modifiersData['arrow#persistent'] ? state.modifiersData['arrow#persistent'].padding : getFreshSideObject(); + var arrowPaddingMin = arrowPaddingObject[mainSide]; + var arrowPaddingMax = arrowPaddingObject[altSide]; // If the reference length is smaller than the arrow length, we don't want + // to include its full size in the calculation. If the reference is small + // and near the edge of a boundary, the popper can overflow even if the + // reference is not overflowing as well (e.g. virtual elements with no + // width or height) + + var arrowLen = within(0, referenceRect[len], arrowRect[len]); + var minOffset = isBasePlacement ? referenceRect[len] / 2 - additive - arrowLen - arrowPaddingMin - normalizedTetherOffsetValue.mainAxis : minLen - arrowLen - arrowPaddingMin - normalizedTetherOffsetValue.mainAxis; + var maxOffset = isBasePlacement ? -referenceRect[len] / 2 + additive + arrowLen + arrowPaddingMax + normalizedTetherOffsetValue.mainAxis : maxLen + arrowLen + arrowPaddingMax + normalizedTetherOffsetValue.mainAxis; + var arrowOffsetParent = state.elements.arrow && getOffsetParent(state.elements.arrow); + var clientOffset = arrowOffsetParent ? mainAxis === 'y' ? arrowOffsetParent.clientTop || 0 : arrowOffsetParent.clientLeft || 0 : 0; + var offsetModifierValue = (_offsetModifierState$ = offsetModifierState == null ? void 0 : offsetModifierState[mainAxis]) != null ? _offsetModifierState$ : 0; + var tetherMin = offset + minOffset - offsetModifierValue - clientOffset; + var tetherMax = offset + maxOffset - offsetModifierValue; + var preventedOffset = within(tether ? math_min(min, tetherMin) : min, offset, tether ? math_max(max, tetherMax) : max); + popperOffsets[mainAxis] = preventedOffset; + data[mainAxis] = preventedOffset - offset; + } + + if (checkAltAxis) { + var _offsetModifierState$2; + + var _mainSide = mainAxis === 'x' ? enums_top : left; + + var _altSide = mainAxis === 'x' ? bottom : right; + + var _offset = popperOffsets[altAxis]; + + var _len = altAxis === 'y' ? 'height' : 'width'; + + var _min = _offset + overflow[_mainSide]; + + var _max = _offset - overflow[_altSide]; + + var isOriginSide = [enums_top, left].indexOf(basePlacement) !== -1; + + var _offsetModifierValue = (_offsetModifierState$2 = offsetModifierState == null ? void 0 : offsetModifierState[altAxis]) != null ? _offsetModifierState$2 : 0; + + var _tetherMin = isOriginSide ? _min : _offset - referenceRect[_len] - popperRect[_len] - _offsetModifierValue + normalizedTetherOffsetValue.altAxis; + + var _tetherMax = isOriginSide ? _offset + referenceRect[_len] + popperRect[_len] - _offsetModifierValue - normalizedTetherOffsetValue.altAxis : _max; + + var _preventedOffset = tether && isOriginSide ? withinMaxClamp(_tetherMin, _offset, _tetherMax) : within(tether ? _tetherMin : _min, _offset, tether ? _tetherMax : _max); + + popperOffsets[altAxis] = _preventedOffset; + data[altAxis] = _preventedOffset - _offset; + } + + state.modifiersData[name] = data; +} // eslint-disable-next-line import/no-unused-modules + + +/* harmony default export */ var modifiers_preventOverflow = ({ + name: 'preventOverflow', + enabled: true, + phase: 'main', + fn: preventOverflow, + requiresIfExists: ['offset'] +}); +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/modifiers/index.js + + + + + + + + + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getHTMLElementScroll.js +function getHTMLElementScroll(element) { + return { + scrollLeft: element.scrollLeft, + scrollTop: element.scrollTop + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getNodeScroll.js + + + + +function getNodeScroll(node) { + if (node === getWindow(node) || !isHTMLElement(node)) { + return getWindowScroll(node); + } else { + return getHTMLElementScroll(node); + } +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/dom-utils/getCompositeRect.js + + + + + + + + + +function isElementScaled(element) { + var rect = element.getBoundingClientRect(); + var scaleX = round(rect.width) / element.offsetWidth || 1; + var scaleY = round(rect.height) / element.offsetHeight || 1; + return scaleX !== 1 || scaleY !== 1; +} // Returns the composite rect of an element relative to its offsetParent. +// Composite means it takes into account transforms as well as layout. + + +function getCompositeRect(elementOrVirtualElement, offsetParent, isFixed) { + if (isFixed === void 0) { + isFixed = false; + } + + var isOffsetParentAnElement = isHTMLElement(offsetParent); + var offsetParentIsScaled = isHTMLElement(offsetParent) && isElementScaled(offsetParent); + var documentElement = getDocumentElement(offsetParent); + var rect = getBoundingClientRect(elementOrVirtualElement, offsetParentIsScaled, isFixed); + var scroll = { + scrollLeft: 0, + scrollTop: 0 + }; + var offsets = { + x: 0, + y: 0 + }; + + if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) { + if (getNodeName(offsetParent) !== 'body' || // https://github.com/popperjs/popper-core/issues/1078 + isScrollParent(documentElement)) { + scroll = getNodeScroll(offsetParent); + } + + if (isHTMLElement(offsetParent)) { + offsets = getBoundingClientRect(offsetParent, true); + offsets.x += offsetParent.clientLeft; + offsets.y += offsetParent.clientTop; + } else if (documentElement) { + offsets.x = getWindowScrollBarX(documentElement); + } + } + + return { + x: rect.left + scroll.scrollLeft - offsets.x, + y: rect.top + scroll.scrollTop - offsets.y, + width: rect.width, + height: rect.height + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/orderModifiers.js + // source: https://stackoverflow.com/questions/49875255 + +function order(modifiers) { + var map = new Map(); + var visited = new Set(); + var result = []; + modifiers.forEach(function (modifier) { + map.set(modifier.name, modifier); + }); // On visiting object, check for its dependencies and visit them recursively + + function sort(modifier) { + visited.add(modifier.name); + var requires = [].concat(modifier.requires || [], modifier.requiresIfExists || []); + requires.forEach(function (dep) { + if (!visited.has(dep)) { + var depModifier = map.get(dep); + + if (depModifier) { + sort(depModifier); + } + } + }); + result.push(modifier); + } + + modifiers.forEach(function (modifier) { + if (!visited.has(modifier.name)) { + // check for visited object + sort(modifier); + } + }); + return result; +} + +function orderModifiers(modifiers) { + // order based on dependencies + var orderedModifiers = order(modifiers); // order based on phase + + return modifierPhases.reduce(function (acc, phase) { + return acc.concat(orderedModifiers.filter(function (modifier) { + return modifier.phase === phase; + })); + }, []); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/debounce.js +function debounce(fn) { + var pending; + return function () { + if (!pending) { + pending = new Promise(function (resolve) { + Promise.resolve().then(function () { + pending = undefined; + resolve(fn()); + }); + }); + } + + return pending; + }; +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/utils/mergeByName.js +function mergeByName(modifiers) { + var merged = modifiers.reduce(function (merged, current) { + var existing = merged[current.name]; + merged[current.name] = existing ? Object.assign({}, existing, current, { + options: Object.assign({}, existing.options, current.options), + data: Object.assign({}, existing.data, current.data) + }) : current; + return merged; + }, {}); // IE11 does not support Object.values + + return Object.keys(merged).map(function (key) { + return merged[key]; + }); +} +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/createPopper.js + + + + + + + + + + + + + + +var INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided. They must be either a DOM element or virtual element.'; +var INFINITE_LOOP_ERROR = 'Popper: An infinite loop in the modifiers cycle has been detected! The cycle has been interrupted to prevent a browser crash.'; +var DEFAULT_OPTIONS = { + placement: 'bottom', + modifiers: [], + strategy: 'absolute' +}; + +function areValidElements() { + for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + return !args.some(function (element) { + return !(element && typeof element.getBoundingClientRect === 'function'); + }); +} + +function popperGenerator(generatorOptions) { + if (generatorOptions === void 0) { + generatorOptions = {}; + } + + var _generatorOptions = generatorOptions, + _generatorOptions$def = _generatorOptions.defaultModifiers, + defaultModifiers = _generatorOptions$def === void 0 ? [] : _generatorOptions$def, + _generatorOptions$def2 = _generatorOptions.defaultOptions, + defaultOptions = _generatorOptions$def2 === void 0 ? DEFAULT_OPTIONS : _generatorOptions$def2; + return function createPopper(reference, popper, options) { + if (options === void 0) { + options = defaultOptions; + } + + var state = { + placement: 'bottom', + orderedModifiers: [], + options: Object.assign({}, DEFAULT_OPTIONS, defaultOptions), + modifiersData: {}, + elements: { + reference: reference, + popper: popper + }, + attributes: {}, + styles: {} + }; + var effectCleanupFns = []; + var isDestroyed = false; + var instance = { + state: state, + setOptions: function setOptions(setOptionsAction) { + var options = typeof setOptionsAction === 'function' ? setOptionsAction(state.options) : setOptionsAction; + cleanupModifierEffects(); + state.options = Object.assign({}, defaultOptions, state.options, options); + state.scrollParents = { + reference: isElement(reference) ? listScrollParents(reference) : reference.contextElement ? listScrollParents(reference.contextElement) : [], + popper: listScrollParents(popper) + }; // Orders the modifiers based on their dependencies and `phase` + // properties + + var orderedModifiers = orderModifiers(mergeByName([].concat(defaultModifiers, state.options.modifiers))); // Strip out disabled modifiers + + state.orderedModifiers = orderedModifiers.filter(function (m) { + return m.enabled; + }); // Validate the provided modifiers so that the consumer will get warned + // if one of the modifiers is invalid for any reason + + if (false) { var _getComputedStyle, marginTop, marginRight, marginBottom, marginLeft, flipModifier, modifiers; } + + runModifierEffects(); + return instance.update(); + }, + // Sync update – it will always be executed, even if not necessary. This + // is useful for low frequency updates where sync behavior simplifies the + // logic. + // For high frequency updates (e.g. `resize` and `scroll` events), always + // prefer the async Popper#update method + forceUpdate: function forceUpdate() { + if (isDestroyed) { + return; + } + + var _state$elements = state.elements, + reference = _state$elements.reference, + popper = _state$elements.popper; // Don't proceed if `reference` or `popper` are not valid elements + // anymore + + if (!areValidElements(reference, popper)) { + if (false) {} + + return; + } // Store the reference and popper rects to be read by modifiers + + + state.rects = { + reference: getCompositeRect(reference, getOffsetParent(popper), state.options.strategy === 'fixed'), + popper: getLayoutRect(popper) + }; // Modifiers have the ability to reset the current update cycle. The + // most common use case for this is the `flip` modifier changing the + // placement, which then needs to re-run all the modifiers, because the + // logic was previously ran for the previous placement and is therefore + // stale/incorrect + + state.reset = false; + state.placement = state.options.placement; // On each update cycle, the `modifiersData` property for each modifier + // is filled with the initial data specified by the modifier. This means + // it doesn't persist and is fresh on each update. + // To ensure persistent data, use `${name}#persistent` + + state.orderedModifiers.forEach(function (modifier) { + return state.modifiersData[modifier.name] = Object.assign({}, modifier.data); + }); + var __debug_loops__ = 0; + + for (var index = 0; index < state.orderedModifiers.length; index++) { + if (false) {} + + if (state.reset === true) { + state.reset = false; + index = -1; + continue; + } + + var _state$orderedModifie = state.orderedModifiers[index], + fn = _state$orderedModifie.fn, + _state$orderedModifie2 = _state$orderedModifie.options, + _options = _state$orderedModifie2 === void 0 ? {} : _state$orderedModifie2, + name = _state$orderedModifie.name; + + if (typeof fn === 'function') { + state = fn({ + state: state, + options: _options, + name: name, + instance: instance + }) || state; + } + } + }, + // Async and optimistically optimized update – it will not be executed if + // not necessary (debounced to run at most once-per-tick) + update: debounce(function () { + return new Promise(function (resolve) { + instance.forceUpdate(); + resolve(state); + }); + }), + destroy: function destroy() { + cleanupModifierEffects(); + isDestroyed = true; + } + }; + + if (!areValidElements(reference, popper)) { + if (false) {} + + return instance; + } + + instance.setOptions(options).then(function (state) { + if (!isDestroyed && options.onFirstUpdate) { + options.onFirstUpdate(state); + } + }); // Modifiers have the ability to execute arbitrary code before the first + // update cycle runs. They will be executed in the same order as the update + // cycle. This is useful when a modifier adds some persistent data that + // other modifiers need to use, but the modifier is run after the dependent + // one. + + function runModifierEffects() { + state.orderedModifiers.forEach(function (_ref3) { + var name = _ref3.name, + _ref3$options = _ref3.options, + options = _ref3$options === void 0 ? {} : _ref3$options, + effect = _ref3.effect; + + if (typeof effect === 'function') { + var cleanupFn = effect({ + state: state, + name: name, + instance: instance, + options: options + }); + + var noopFn = function noopFn() {}; + + effectCleanupFns.push(cleanupFn || noopFn); + } + }); + } + + function cleanupModifierEffects() { + effectCleanupFns.forEach(function (fn) { + return fn(); + }); + effectCleanupFns = []; + } + + return instance; + }; +} +var createPopper = /*#__PURE__*/popperGenerator(); // eslint-disable-next-line import/no-unused-modules + + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/popper.js + + + + + + + + + + +var defaultModifiers = [eventListeners, modifiers_popperOffsets, modifiers_computeStyles, modifiers_applyStyles, modifiers_offset, modifiers_flip, modifiers_preventOverflow, modifiers_arrow, modifiers_hide]; +var popper_createPopper = /*#__PURE__*/popperGenerator({ + defaultModifiers: defaultModifiers +}); // eslint-disable-next-line import/no-unused-modules + + // eslint-disable-next-line import/no-unused-modules + + // eslint-disable-next-line import/no-unused-modules + + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/popper-lite.js + + + + + +var popper_lite_defaultModifiers = [eventListeners, modifiers_popperOffsets, modifiers_computeStyles, modifiers_applyStyles]; +var popper_lite_createPopper = /*#__PURE__*/popperGenerator({ + defaultModifiers: popper_lite_defaultModifiers +}); // eslint-disable-next-line import/no-unused-modules + + +;// CONCATENATED MODULE: ./node_modules/@popperjs/core/lib/index.js + + // eslint-disable-next-line import/no-unused-modules + + // eslint-disable-next-line import/no-unused-modules + + // eslint-disable-next-line import/no-unused-modules + + + +/***/ }), + +/***/ 902: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initAccordions = void 0; +var Default = { + alwaysOpen: false, + activeClasses: 'bg-gray-100 dark:bg-gray-800 text-gray-900 dark:text-white', + inactiveClasses: 'text-gray-500 dark:text-gray-400', + onOpen: function () { }, + onClose: function () { }, + onToggle: function () { }, +}; +var Accordion = /** @class */ (function () { + function Accordion(items, options) { + if (items === void 0) { items = []; } + if (options === void 0) { options = Default; } + this._items = items; + this._options = __assign(__assign({}, Default), options); + this._init(); + } + Accordion.prototype._init = function () { + var _this = this; + if (this._items.length) { + // show accordion item based on click + this._items.map(function (item) { + if (item.active) { + _this.open(item.id); + } + item.triggerEl.addEventListener('click', function () { + _this.toggle(item.id); + }); + }); + } + }; + Accordion.prototype.getItem = function (id) { + return this._items.filter(function (item) { return item.id === id; })[0]; + }; + Accordion.prototype.open = function (id) { + var _a, _b; + var _this = this; + var item = this.getItem(id); + // don't hide other accordions if always open + if (!this._options.alwaysOpen) { + this._items.map(function (i) { + var _a, _b; + if (i !== item) { + (_a = i.triggerEl.classList).remove.apply(_a, _this._options.activeClasses.split(' ')); + (_b = i.triggerEl.classList).add.apply(_b, _this._options.inactiveClasses.split(' ')); + i.targetEl.classList.add('hidden'); + i.triggerEl.setAttribute('aria-expanded', 'false'); + i.active = false; + // rotate icon if set + if (i.iconEl) { + i.iconEl.classList.remove('rotate-180'); + } + } + }); + } + // show active item + (_a = item.triggerEl.classList).add.apply(_a, this._options.activeClasses.split(' ')); + (_b = item.triggerEl.classList).remove.apply(_b, this._options.inactiveClasses.split(' ')); + item.triggerEl.setAttribute('aria-expanded', 'true'); + item.targetEl.classList.remove('hidden'); + item.active = true; + // rotate icon if set + if (item.iconEl) { + item.iconEl.classList.add('rotate-180'); + } + // callback function + this._options.onOpen(this, item); + }; + Accordion.prototype.toggle = function (id) { + var item = this.getItem(id); + if (item.active) { + this.close(id); + } + else { + this.open(id); + } + // callback function + this._options.onToggle(this, item); + }; + Accordion.prototype.close = function (id) { + var _a, _b; + var item = this.getItem(id); + (_a = item.triggerEl.classList).remove.apply(_a, this._options.activeClasses.split(' ')); + (_b = item.triggerEl.classList).add.apply(_b, this._options.inactiveClasses.split(' ')); + item.targetEl.classList.add('hidden'); + item.triggerEl.setAttribute('aria-expanded', 'false'); + item.active = false; + // rotate icon if set + if (item.iconEl) { + item.iconEl.classList.remove('rotate-180'); + } + // callback function + this._options.onClose(this, item); + }; + return Accordion; +}()); +function initAccordions() { + document.querySelectorAll('[data-accordion]').forEach(function ($accordionEl) { + var alwaysOpen = $accordionEl.getAttribute('data-accordion'); + var activeClasses = $accordionEl.getAttribute('data-active-classes'); + var inactiveClasses = $accordionEl.getAttribute('data-inactive-classes'); + var items = []; + $accordionEl + .querySelectorAll('[data-accordion-target]') + .forEach(function ($triggerEl) { + // Consider only items that directly belong to $accordionEl + // (to make nested accordions work). + if ($triggerEl.closest('[data-accordion]') === $accordionEl) { + var item = { + id: $triggerEl.getAttribute('data-accordion-target'), + triggerEl: $triggerEl, + targetEl: document.querySelector($triggerEl.getAttribute('data-accordion-target')), + iconEl: $triggerEl.querySelector('[data-accordion-icon]'), + active: $triggerEl.getAttribute('aria-expanded') === 'true' + ? true + : false, + }; + items.push(item); + } + }); + new Accordion(items, { + alwaysOpen: alwaysOpen === 'open' ? true : false, + activeClasses: activeClasses + ? activeClasses + : Default.activeClasses, + inactiveClasses: inactiveClasses + ? inactiveClasses + : Default.inactiveClasses, + }); + }); +} +exports.initAccordions = initAccordions; +if (typeof window !== 'undefined') { + window.Accordion = Accordion; + window.initAccordions = initAccordions; +} +exports["default"] = Accordion; + + +/***/ }), + +/***/ 33: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initCarousels = void 0; +var Default = { + defaultPosition: 0, + indicators: { + items: [], + activeClasses: 'bg-white dark:bg-gray-800', + inactiveClasses: 'bg-white/50 dark:bg-gray-800/50 hover:bg-white dark:hover:bg-gray-800', + }, + interval: 3000, + onNext: function () { }, + onPrev: function () { }, + onChange: function () { }, +}; +var Carousel = /** @class */ (function () { + function Carousel(items, options) { + if (items === void 0) { items = []; } + if (options === void 0) { options = Default; } + this._items = items; + this._options = __assign(__assign(__assign({}, Default), options), { indicators: __assign(__assign({}, Default.indicators), options.indicators) }); + this._activeItem = this.getItem(this._options.defaultPosition); + this._indicators = this._options.indicators.items; + this._intervalDuration = this._options.interval; + this._intervalInstance = null; + this._init(); + } + /** + * initialize carousel and items based on active one + */ + Carousel.prototype._init = function () { + var _this = this; + this._items.map(function (item) { + item.el.classList.add('absolute', 'inset-0', 'transition-transform', 'transform'); + }); + // if no active item is set then first position is default + if (this._getActiveItem()) { + this.slideTo(this._getActiveItem().position); + } + else { + this.slideTo(0); + } + this._indicators.map(function (indicator, position) { + indicator.el.addEventListener('click', function () { + _this.slideTo(position); + }); + }); + }; + Carousel.prototype.getItem = function (position) { + return this._items[position]; + }; + /** + * Slide to the element based on id + * @param {*} position + */ + Carousel.prototype.slideTo = function (position) { + var nextItem = this._items[position]; + var rotationItems = { + left: nextItem.position === 0 + ? this._items[this._items.length - 1] + : this._items[nextItem.position - 1], + middle: nextItem, + right: nextItem.position === this._items.length - 1 + ? this._items[0] + : this._items[nextItem.position + 1], + }; + this._rotate(rotationItems); + this._setActiveItem(nextItem); + if (this._intervalInstance) { + this.pause(); + this.cycle(); + } + this._options.onChange(this); + }; + /** + * Based on the currently active item it will go to the next position + */ + Carousel.prototype.next = function () { + var activeItem = this._getActiveItem(); + var nextItem = null; + // check if last item + if (activeItem.position === this._items.length - 1) { + nextItem = this._items[0]; + } + else { + nextItem = this._items[activeItem.position + 1]; + } + this.slideTo(nextItem.position); + // callback function + this._options.onNext(this); + }; + /** + * Based on the currently active item it will go to the previous position + */ + Carousel.prototype.prev = function () { + var activeItem = this._getActiveItem(); + var prevItem = null; + // check if first item + if (activeItem.position === 0) { + prevItem = this._items[this._items.length - 1]; + } + else { + prevItem = this._items[activeItem.position - 1]; + } + this.slideTo(prevItem.position); + // callback function + this._options.onPrev(this); + }; + /** + * This method applies the transform classes based on the left, middle, and right rotation carousel items + * @param {*} rotationItems + */ + Carousel.prototype._rotate = function (rotationItems) { + // reset + this._items.map(function (item) { + item.el.classList.add('hidden'); + }); + // left item (previously active) + rotationItems.left.el.classList.remove('-translate-x-full', 'translate-x-full', 'translate-x-0', 'hidden', 'z-20'); + rotationItems.left.el.classList.add('-translate-x-full', 'z-10'); + // currently active item + rotationItems.middle.el.classList.remove('-translate-x-full', 'translate-x-full', 'translate-x-0', 'hidden', 'z-10'); + rotationItems.middle.el.classList.add('translate-x-0', 'z-20'); + // right item (upcoming active) + rotationItems.right.el.classList.remove('-translate-x-full', 'translate-x-full', 'translate-x-0', 'hidden', 'z-20'); + rotationItems.right.el.classList.add('translate-x-full', 'z-10'); + }; + /** + * Set an interval to cycle through the carousel items + */ + Carousel.prototype.cycle = function () { + var _this = this; + if (typeof window !== 'undefined') { + this._intervalInstance = window.setInterval(function () { + _this.next(); + }, this._intervalDuration); + } + }; + /** + * Clears the cycling interval + */ + Carousel.prototype.pause = function () { + clearInterval(this._intervalInstance); + }; + /** + * Get the currently active item + */ + Carousel.prototype._getActiveItem = function () { + return this._activeItem; + }; + /** + * Set the currently active item and data attribute + * @param {*} position + */ + Carousel.prototype._setActiveItem = function (item) { + var _a, _b; + var _this = this; + this._activeItem = item; + var position = item.position; + // update the indicators if available + if (this._indicators.length) { + this._indicators.map(function (indicator) { + var _a, _b; + indicator.el.setAttribute('aria-current', 'false'); + (_a = indicator.el.classList).remove.apply(_a, _this._options.indicators.activeClasses.split(' ')); + (_b = indicator.el.classList).add.apply(_b, _this._options.indicators.inactiveClasses.split(' ')); + }); + (_a = this._indicators[position].el.classList).add.apply(_a, this._options.indicators.activeClasses.split(' ')); + (_b = this._indicators[position].el.classList).remove.apply(_b, this._options.indicators.inactiveClasses.split(' ')); + this._indicators[position].el.setAttribute('aria-current', 'true'); + } + }; + return Carousel; +}()); +function initCarousels() { + document.querySelectorAll('[data-carousel]').forEach(function ($carouselEl) { + var interval = $carouselEl.getAttribute('data-carousel-interval'); + var slide = $carouselEl.getAttribute('data-carousel') === 'slide' + ? true + : false; + var items = []; + var defaultPosition = 0; + if ($carouselEl.querySelectorAll('[data-carousel-item]').length) { + Array.from($carouselEl.querySelectorAll('[data-carousel-item]')).map(function ($carouselItemEl, position) { + items.push({ + position: position, + el: $carouselItemEl, + }); + if ($carouselItemEl.getAttribute('data-carousel-item') === + 'active') { + defaultPosition = position; + } + }); + } + var indicators = []; + if ($carouselEl.querySelectorAll('[data-carousel-slide-to]').length) { + Array.from($carouselEl.querySelectorAll('[data-carousel-slide-to]')).map(function ($indicatorEl) { + indicators.push({ + position: parseInt($indicatorEl.getAttribute('data-carousel-slide-to')), + el: $indicatorEl, + }); + }); + } + var carousel = new Carousel(items, { + defaultPosition: defaultPosition, + indicators: { + items: indicators, + }, + interval: interval ? interval : Default.interval, + }); + if (slide) { + carousel.cycle(); + } + // check for controls + var carouselNextEl = $carouselEl.querySelector('[data-carousel-next]'); + var carouselPrevEl = $carouselEl.querySelector('[data-carousel-prev]'); + if (carouselNextEl) { + carouselNextEl.addEventListener('click', function () { + carousel.next(); + }); + } + if (carouselPrevEl) { + carouselPrevEl.addEventListener('click', function () { + carousel.prev(); + }); + } + }); +} +exports.initCarousels = initCarousels; +if (typeof window !== 'undefined') { + window.Carousel = Carousel; + window.initCarousels = initCarousels; +} +exports["default"] = Carousel; + + +/***/ }), + +/***/ 922: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initCollapses = void 0; +var Default = { + onCollapse: function () { }, + onExpand: function () { }, + onToggle: function () { }, +}; +var Collapse = /** @class */ (function () { + function Collapse(targetEl, triggerEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (triggerEl === void 0) { triggerEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._triggerEl = triggerEl; + this._options = __assign(__assign({}, Default), options); + this._visible = false; + this._init(); + } + Collapse.prototype._init = function () { + var _this = this; + if (this._triggerEl) { + if (this._triggerEl.hasAttribute('aria-expanded')) { + this._visible = + this._triggerEl.getAttribute('aria-expanded') === 'true'; + } + else { + // fix until v2 not to break previous single collapses which became dismiss + this._visible = !this._targetEl.classList.contains('hidden'); + } + this._triggerEl.addEventListener('click', function () { + _this.toggle(); + }); + } + }; + Collapse.prototype.collapse = function () { + this._targetEl.classList.add('hidden'); + if (this._triggerEl) { + this._triggerEl.setAttribute('aria-expanded', 'false'); + } + this._visible = false; + // callback function + this._options.onCollapse(this); + }; + Collapse.prototype.expand = function () { + this._targetEl.classList.remove('hidden'); + if (this._triggerEl) { + this._triggerEl.setAttribute('aria-expanded', 'true'); + } + this._visible = true; + // callback function + this._options.onExpand(this); + }; + Collapse.prototype.toggle = function () { + if (this._visible) { + this.collapse(); + } + else { + this.expand(); + } + // callback function + this._options.onToggle(this); + }; + return Collapse; +}()); +function initCollapses() { + document + .querySelectorAll('[data-collapse-toggle]') + .forEach(function ($triggerEl) { + var targetId = $triggerEl.getAttribute('data-collapse-toggle'); + var $targetEl = document.getElementById(targetId); + // check if the target element exists + if ($targetEl) { + new Collapse($targetEl, $triggerEl); + } + else { + console.error("The target element with id \"".concat(targetId, "\" does not exist. Please check the data-collapse-toggle attribute.")); + } + }); +} +exports.initCollapses = initCollapses; +if (typeof window !== 'undefined') { + window.Collapse = Collapse; + window.initCollapses = initCollapses; +} +exports["default"] = Collapse; + + +/***/ }), + +/***/ 556: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initDials = void 0; +var Default = { + triggerType: 'hover', + onShow: function () { }, + onHide: function () { }, + onToggle: function () { }, +}; +var Dial = /** @class */ (function () { + function Dial(parentEl, triggerEl, targetEl, options) { + if (parentEl === void 0) { parentEl = null; } + if (triggerEl === void 0) { triggerEl = null; } + if (targetEl === void 0) { targetEl = null; } + if (options === void 0) { options = Default; } + this._parentEl = parentEl; + this._triggerEl = triggerEl; + this._targetEl = targetEl; + this._options = __assign(__assign({}, Default), options); + this._visible = false; + this._init(); + } + Dial.prototype._init = function () { + var _this = this; + if (this._triggerEl) { + var triggerEventTypes = this._getTriggerEventTypes(this._options.triggerType); + triggerEventTypes.showEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + _this.show(); + }); + _this._targetEl.addEventListener(ev, function () { + _this.show(); + }); + }); + triggerEventTypes.hideEvents.forEach(function (ev) { + _this._parentEl.addEventListener(ev, function () { + if (!_this._parentEl.matches(':hover')) { + _this.hide(); + } + }); + }); + } + }; + Dial.prototype.hide = function () { + this._targetEl.classList.add('hidden'); + if (this._triggerEl) { + this._triggerEl.setAttribute('aria-expanded', 'false'); + } + this._visible = false; + // callback function + this._options.onHide(this); + }; + Dial.prototype.show = function () { + this._targetEl.classList.remove('hidden'); + if (this._triggerEl) { + this._triggerEl.setAttribute('aria-expanded', 'true'); + } + this._visible = true; + // callback function + this._options.onShow(this); + }; + Dial.prototype.toggle = function () { + if (this._visible) { + this.hide(); + } + else { + this.show(); + } + }; + Dial.prototype.isHidden = function () { + return !this._visible; + }; + Dial.prototype.isVisible = function () { + return this._visible; + }; + Dial.prototype._getTriggerEventTypes = function (triggerType) { + switch (triggerType) { + case 'hover': + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + case 'click': + return { + showEvents: ['click', 'focus'], + hideEvents: ['focusout', 'blur'], + }; + case 'none': + return { + showEvents: [], + hideEvents: [], + }; + default: + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + } + }; + return Dial; +}()); +function initDials() { + document.querySelectorAll('[data-dial-init]').forEach(function ($parentEl) { + var $triggerEl = $parentEl.querySelector('[data-dial-toggle]'); + if ($triggerEl) { + var dialId = $triggerEl.getAttribute('data-dial-toggle'); + var $dialEl = document.getElementById(dialId); + if ($dialEl) { + var triggerType = $triggerEl.getAttribute('data-dial-trigger'); + new Dial($parentEl, $triggerEl, $dialEl, { + triggerType: triggerType + ? triggerType + : Default.triggerType, + }); + } + else { + console.error("Dial with id ".concat(dialId, " does not exist. Are you sure that the data-dial-toggle attribute points to the correct modal id?")); + } + } + else { + console.error("Dial with id ".concat($parentEl.id, " does not have a trigger element. Are you sure that the data-dial-toggle attribute exists?")); + } + }); +} +exports.initDials = initDials; +if (typeof window !== 'undefined') { + window.Dial = Dial; + window.initDials = initDials; +} +exports["default"] = Dial; + + +/***/ }), + +/***/ 791: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initDismisses = void 0; +var Default = { + transition: 'transition-opacity', + duration: 300, + timing: 'ease-out', + onHide: function () { }, +}; +var Dismiss = /** @class */ (function () { + function Dismiss(targetEl, triggerEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (triggerEl === void 0) { triggerEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._triggerEl = triggerEl; + this._options = __assign(__assign({}, Default), options); + this._init(); + } + Dismiss.prototype._init = function () { + var _this = this; + if (this._triggerEl) { + this._triggerEl.addEventListener('click', function () { + _this.hide(); + }); + } + }; + Dismiss.prototype.hide = function () { + var _this = this; + this._targetEl.classList.add(this._options.transition, "duration-".concat(this._options.duration), this._options.timing, 'opacity-0'); + setTimeout(function () { + _this._targetEl.classList.add('hidden'); + }, this._options.duration); + // callback function + this._options.onHide(this, this._targetEl); + }; + return Dismiss; +}()); +function initDismisses() { + document.querySelectorAll('[data-dismiss-target]').forEach(function ($triggerEl) { + var targetId = $triggerEl.getAttribute('data-dismiss-target'); + var $dismissEl = document.querySelector(targetId); + if ($dismissEl) { + new Dismiss($dismissEl, $triggerEl); + } + else { + console.error("The dismiss element with id \"".concat(targetId, "\" does not exist. Please check the data-dismiss-target attribute.")); + } + }); +} +exports.initDismisses = initDismisses; +if (typeof window !== 'undefined') { + window.Dismiss = Dismiss; + window.initDismisses = initDismisses; +} +exports["default"] = Dismiss; + + +/***/ }), + +/***/ 340: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initDrawers = void 0; +var Default = { + placement: 'left', + bodyScrolling: false, + backdrop: true, + edge: false, + edgeOffset: 'bottom-[60px]', + backdropClasses: 'bg-gray-900 bg-opacity-50 dark:bg-opacity-80 fixed inset-0 z-30', + onShow: function () { }, + onHide: function () { }, + onToggle: function () { }, +}; +var Drawer = /** @class */ (function () { + function Drawer(targetEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._options = __assign(__assign({}, Default), options); + this._visible = false; + this._init(); + } + Drawer.prototype._init = function () { + var _this = this; + // set initial accessibility attributes + if (this._targetEl) { + this._targetEl.setAttribute('aria-hidden', 'true'); + this._targetEl.classList.add('transition-transform'); + } + // set base placement classes + this._getPlacementClasses(this._options.placement).base.map(function (c) { + _this._targetEl.classList.add(c); + }); + // add keyboard event listener to document + document.addEventListener('keydown', function (event) { + if (event.key === 'Escape') { + // if 'Escape' key is pressed + if (_this.isVisible()) { + // if the Drawer is visible + _this.hide(); // hide the Drawer + } + } + }); + }; + Drawer.prototype.hide = function () { + var _this = this; + // based on the edge option show placement classes + if (this._options.edge) { + this._getPlacementClasses(this._options.placement + '-edge').active.map(function (c) { + _this._targetEl.classList.remove(c); + }); + this._getPlacementClasses(this._options.placement + '-edge').inactive.map(function (c) { + _this._targetEl.classList.add(c); + }); + } + else { + this._getPlacementClasses(this._options.placement).active.map(function (c) { + _this._targetEl.classList.remove(c); + }); + this._getPlacementClasses(this._options.placement).inactive.map(function (c) { + _this._targetEl.classList.add(c); + }); + } + // set accessibility attributes + this._targetEl.setAttribute('aria-hidden', 'true'); + this._targetEl.removeAttribute('aria-modal'); + this._targetEl.removeAttribute('role'); + // enable body scroll + if (!this._options.bodyScrolling) { + document.body.classList.remove('overflow-hidden'); + } + // destroy backdrop + if (this._options.backdrop) { + this._destroyBackdropEl(); + } + this._visible = false; + // callback function + this._options.onHide(this); + }; + Drawer.prototype.show = function () { + var _this = this; + if (this._options.edge) { + this._getPlacementClasses(this._options.placement + '-edge').active.map(function (c) { + _this._targetEl.classList.add(c); + }); + this._getPlacementClasses(this._options.placement + '-edge').inactive.map(function (c) { + _this._targetEl.classList.remove(c); + }); + } + else { + this._getPlacementClasses(this._options.placement).active.map(function (c) { + _this._targetEl.classList.add(c); + }); + this._getPlacementClasses(this._options.placement).inactive.map(function (c) { + _this._targetEl.classList.remove(c); + }); + } + // set accessibility attributes + this._targetEl.setAttribute('aria-modal', 'true'); + this._targetEl.setAttribute('role', 'dialog'); + this._targetEl.removeAttribute('aria-hidden'); + // disable body scroll + if (!this._options.bodyScrolling) { + document.body.classList.add('overflow-hidden'); + } + // show backdrop + if (this._options.backdrop) { + this._createBackdrop(); + } + this._visible = true; + // callback function + this._options.onShow(this); + }; + Drawer.prototype.toggle = function () { + if (this.isVisible()) { + this.hide(); + } + else { + this.show(); + } + }; + Drawer.prototype._createBackdrop = function () { + var _a; + var _this = this; + if (!this._visible) { + var backdropEl = document.createElement('div'); + backdropEl.setAttribute('drawer-backdrop', ''); + (_a = backdropEl.classList).add.apply(_a, this._options.backdropClasses.split(' ')); + document.querySelector('body').append(backdropEl); + backdropEl.addEventListener('click', function () { + _this.hide(); + }); + } + }; + Drawer.prototype._destroyBackdropEl = function () { + if (this._visible) { + document.querySelector('[drawer-backdrop]').remove(); + } + }; + Drawer.prototype._getPlacementClasses = function (placement) { + switch (placement) { + case 'top': + return { + base: ['top-0', 'left-0', 'right-0'], + active: ['transform-none'], + inactive: ['-translate-y-full'], + }; + case 'right': + return { + base: ['right-0', 'top-0'], + active: ['transform-none'], + inactive: ['translate-x-full'], + }; + case 'bottom': + return { + base: ['bottom-0', 'left-0', 'right-0'], + active: ['transform-none'], + inactive: ['translate-y-full'], + }; + case 'left': + return { + base: ['left-0', 'top-0'], + active: ['transform-none'], + inactive: ['-translate-x-full'], + }; + case 'bottom-edge': + return { + base: ['left-0', 'top-0'], + active: ['transform-none'], + inactive: ['translate-y-full', this._options.edgeOffset], + }; + default: + return { + base: ['left-0', 'top-0'], + active: ['transform-none'], + inactive: ['-translate-x-full'], + }; + } + }; + Drawer.prototype.isHidden = function () { + return !this._visible; + }; + Drawer.prototype.isVisible = function () { + return this._visible; + }; + return Drawer; +}()); +var getDrawerInstance = function (id, instances) { + if (instances.some(function (drawerInstance) { return drawerInstance.id === id; })) { + return instances.find(function (drawerInstance) { return drawerInstance.id === id; }); + } +}; +function initDrawers() { + var drawerInstances = []; + document.querySelectorAll('[data-drawer-target]').forEach(function ($triggerEl) { + // mandatory + var drawerId = $triggerEl.getAttribute('data-drawer-target'); + var $drawerEl = document.getElementById(drawerId); + if ($drawerEl) { + // optional + var placement = $triggerEl.getAttribute('data-drawer-placement'); + var bodyScrolling = $triggerEl.getAttribute('data-drawer-body-scrolling'); + var backdrop = $triggerEl.getAttribute('data-drawer-backdrop'); + var edge = $triggerEl.getAttribute('data-drawer-edge'); + var edgeOffset = $triggerEl.getAttribute('data-drawer-edge-offset'); + if (!getDrawerInstance(drawerId, drawerInstances)) { + drawerInstances.push({ + id: drawerId, + object: new Drawer($drawerEl, { + placement: placement ? placement : Default.placement, + bodyScrolling: bodyScrolling + ? bodyScrolling === 'true' + ? true + : false + : Default.bodyScrolling, + backdrop: backdrop + ? backdrop === 'true' + ? true + : false + : Default.backdrop, + edge: edge + ? edge === 'true' + ? true + : false + : Default.edge, + edgeOffset: edgeOffset + ? edgeOffset + : Default.edgeOffset, + }), + }); + } + } + else { + console.error("Drawer with id ".concat(drawerId, " not found. Are you sure that the data-drawer-target attribute points to the correct drawer id?")); + } + }); + document.querySelectorAll('[data-drawer-toggle]').forEach(function ($triggerEl) { + var drawerId = $triggerEl.getAttribute('data-drawer-toggle'); + var $drawerEl = document.getElementById(drawerId); + if ($drawerEl) { + var drawer_1 = getDrawerInstance(drawerId, drawerInstances); + if (drawer_1) { + $triggerEl.addEventListener('click', function () { + drawer_1.object.toggle(); + }); + } + else { + console.error("Drawer with id ".concat(drawerId, " has not been initialized. Please initialize it using the data-drawer-target attribute.")); + } + } + else { + console.error("Drawer with id ".concat(drawerId, " not found. Are you sure that the data-drawer-target attribute points to the correct drawer id?")); + } + }); + document + .querySelectorAll('[data-drawer-dismiss], [data-drawer-hide]') + .forEach(function ($triggerEl) { + var drawerId = $triggerEl.getAttribute('data-drawer-dismiss') + ? $triggerEl.getAttribute('data-drawer-dismiss') + : $triggerEl.getAttribute('data-drawer-hide'); + var $drawerEl = document.getElementById(drawerId); + if ($drawerEl) { + var drawer_2 = getDrawerInstance(drawerId, drawerInstances); + if (drawer_2) { + $triggerEl.addEventListener('click', function () { + drawer_2.object.hide(); + }); + } + else { + console.error("Drawer with id ".concat(drawerId, " has not been initialized. Please initialize it using the data-drawer-target attribute.")); + } + } + else { + console.error("Drawer with id ".concat(drawerId, " not found. Are you sure that the data-drawer-target attribute points to the correct drawer id")); + } + }); + document.querySelectorAll('[data-drawer-show]').forEach(function ($triggerEl) { + var drawerId = $triggerEl.getAttribute('data-drawer-show'); + var $drawerEl = document.getElementById(drawerId); + if ($drawerEl) { + var drawer_3 = getDrawerInstance(drawerId, drawerInstances); + if (drawer_3) { + $triggerEl.addEventListener('click', function () { + drawer_3.object.show(); + }); + } + else { + console.error("Drawer with id ".concat(drawerId, " has not been initialized. Please initialize it using the data-drawer-target attribute.")); + } + } + else { + console.error("Drawer with id ".concat(drawerId, " not found. Are you sure that the data-drawer-target attribute points to the correct drawer id?")); + } + }); +} +exports.initDrawers = initDrawers; +if (typeof window !== 'undefined') { + window.Drawer = Drawer; + window.initDrawers = initDrawers; +} +exports["default"] = Drawer; + + +/***/ }), + +/***/ 316: +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initDropdowns = void 0; +/* eslint-disable @typescript-eslint/no-empty-function */ +var core_1 = __webpack_require__(853); +var Default = { + placement: 'bottom', + triggerType: 'click', + offsetSkidding: 0, + offsetDistance: 10, + delay: 300, + onShow: function () { }, + onHide: function () { }, + onToggle: function () { }, +}; +var Dropdown = /** @class */ (function () { + function Dropdown(targetElement, triggerElement, options) { + if (targetElement === void 0) { targetElement = null; } + if (triggerElement === void 0) { triggerElement = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetElement; + this._triggerEl = triggerElement; + this._options = __assign(__assign({}, Default), options); + this._popperInstance = this._createPopperInstance(); + this._visible = false; + this._init(); + } + Dropdown.prototype._init = function () { + if (this._triggerEl) { + this._setupEventListeners(); + } + }; + Dropdown.prototype._setupEventListeners = function () { + var _this = this; + var triggerEvents = this._getTriggerEvents(); + // click event handling for trigger element + if (this._options.triggerType === 'click') { + triggerEvents.showEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + _this.toggle(); + }); + }); + } + // hover event handling for trigger element + if (this._options.triggerType === 'hover') { + triggerEvents.showEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + if (ev === 'click') { + _this.toggle(); + } + else { + setTimeout(function () { + _this.show(); + }, _this._options.delay); + } + }); + _this._targetEl.addEventListener(ev, function () { + _this.show(); + }); + }); + triggerEvents.hideEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + setTimeout(function () { + if (!_this._targetEl.matches(':hover')) { + _this.hide(); + } + }, _this._options.delay); + }); + _this._targetEl.addEventListener(ev, function () { + setTimeout(function () { + if (!_this._triggerEl.matches(':hover')) { + _this.hide(); + } + }, _this._options.delay); + }); + }); + } + }; + Dropdown.prototype._createPopperInstance = function () { + return (0, core_1.createPopper)(this._triggerEl, this._targetEl, { + placement: this._options.placement, + modifiers: [ + { + name: 'offset', + options: { + offset: [ + this._options.offsetSkidding, + this._options.offsetDistance, + ], + }, + }, + ], + }); + }; + Dropdown.prototype._setupClickOutsideListener = function () { + var _this = this; + this._clickOutsideEventListener = function (ev) { + _this._handleClickOutside(ev, _this._targetEl); + }; + document.body.addEventListener('click', this._clickOutsideEventListener, true); + }; + Dropdown.prototype._removeClickOutsideListener = function () { + document.body.removeEventListener('click', this._clickOutsideEventListener, true); + }; + Dropdown.prototype._handleClickOutside = function (ev, targetEl) { + var clickedEl = ev.target; + if (clickedEl !== targetEl && + !targetEl.contains(clickedEl) && + !this._triggerEl.contains(clickedEl) && + this.isVisible()) { + this.hide(); + } + }; + Dropdown.prototype._getTriggerEvents = function () { + switch (this._options.triggerType) { + case 'hover': + return { + showEvents: ['mouseenter', 'click'], + hideEvents: ['mouseleave'], + }; + case 'click': + return { + showEvents: ['click'], + hideEvents: [], + }; + case 'none': + return { + showEvents: [], + hideEvents: [], + }; + default: + return { + showEvents: ['click'], + hideEvents: [], + }; + } + }; + Dropdown.prototype.toggle = function () { + if (this.isVisible()) { + this.hide(); + } + else { + this.show(); + } + this._options.onToggle(this); + }; + Dropdown.prototype.isVisible = function () { + return this._visible; + }; + Dropdown.prototype.show = function () { + this._targetEl.classList.remove('hidden'); + this._targetEl.classList.add('block'); + // Enable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: true }, + ], false) })); }); + this._setupClickOutsideListener(); + // Update its position + this._popperInstance.update(); + this._visible = true; + // callback function + this._options.onShow(this); + }; + Dropdown.prototype.hide = function () { + this._targetEl.classList.remove('block'); + this._targetEl.classList.add('hidden'); + // Disable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: false }, + ], false) })); }); + this._visible = false; + this._removeClickOutsideListener(); + // callback function + this._options.onHide(this); + }; + return Dropdown; +}()); +function initDropdowns() { + document + .querySelectorAll('[data-dropdown-toggle]') + .forEach(function ($triggerEl) { + var dropdownId = $triggerEl.getAttribute('data-dropdown-toggle'); + var $dropdownEl = document.getElementById(dropdownId); + if ($dropdownEl) { + var placement = $triggerEl.getAttribute('data-dropdown-placement'); + var offsetSkidding = $triggerEl.getAttribute('data-dropdown-offset-skidding'); + var offsetDistance = $triggerEl.getAttribute('data-dropdown-offset-distance'); + var triggerType = $triggerEl.getAttribute('data-dropdown-trigger'); + var delay = $triggerEl.getAttribute('data-dropdown-delay'); + new Dropdown($dropdownEl, $triggerEl, { + placement: placement ? placement : Default.placement, + triggerType: triggerType + ? triggerType + : Default.triggerType, + offsetSkidding: offsetSkidding + ? parseInt(offsetSkidding) + : Default.offsetSkidding, + offsetDistance: offsetDistance + ? parseInt(offsetDistance) + : Default.offsetDistance, + delay: delay ? parseInt(delay) : Default.delay, + }); + } + else { + console.error("The dropdown element with id \"".concat(dropdownId, "\" does not exist. Please check the data-dropdown-toggle attribute.")); + } + }); +} +exports.initDropdowns = initDropdowns; +if (typeof window !== 'undefined') { + window.Dropdown = Dropdown; + window.initDropdowns = initDropdowns; +} +exports["default"] = Dropdown; + + +/***/ }), + +/***/ 311: +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initFlowbite = void 0; +var accordion_1 = __webpack_require__(902); +var carousel_1 = __webpack_require__(33); +var collapse_1 = __webpack_require__(922); +var dial_1 = __webpack_require__(556); +var dismiss_1 = __webpack_require__(791); +var drawer_1 = __webpack_require__(340); +var dropdown_1 = __webpack_require__(316); +var modal_1 = __webpack_require__(16); +var popover_1 = __webpack_require__(903); +var tabs_1 = __webpack_require__(247); +var tooltip_1 = __webpack_require__(671); +function initFlowbite() { + (0, accordion_1.initAccordions)(); + (0, collapse_1.initCollapses)(); + (0, carousel_1.initCarousels)(); + (0, dismiss_1.initDismisses)(); + (0, dropdown_1.initDropdowns)(); + (0, modal_1.initModals)(); + (0, drawer_1.initDrawers)(); + (0, tabs_1.initTabs)(); + (0, tooltip_1.initTooltips)(); + (0, popover_1.initPopovers)(); + (0, dial_1.initDials)(); +} +exports.initFlowbite = initFlowbite; +if (typeof window !== 'undefined') { + window.initFlowbite = initFlowbite; +} + + +/***/ }), + +/***/ 16: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initModals = void 0; +var Default = { + placement: 'center', + backdropClasses: 'bg-gray-900 bg-opacity-50 dark:bg-opacity-80 fixed inset-0 z-40', + backdrop: 'dynamic', + closable: true, + onHide: function () { }, + onShow: function () { }, + onToggle: function () { }, +}; +var Modal = /** @class */ (function () { + function Modal(targetEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._options = __assign(__assign({}, Default), options); + this._isHidden = true; + this._backdropEl = null; + this._init(); + } + Modal.prototype._init = function () { + var _this = this; + if (this._targetEl) { + this._getPlacementClasses().map(function (c) { + _this._targetEl.classList.add(c); + }); + } + }; + Modal.prototype._createBackdrop = function () { + var _a; + if (this._isHidden) { + var backdropEl = document.createElement('div'); + backdropEl.setAttribute('modal-backdrop', ''); + (_a = backdropEl.classList).add.apply(_a, this._options.backdropClasses.split(' ')); + document.querySelector('body').append(backdropEl); + this._backdropEl = backdropEl; + } + }; + Modal.prototype._destroyBackdropEl = function () { + if (!this._isHidden) { + document.querySelector('[modal-backdrop]').remove(); + } + }; + Modal.prototype._setupModalCloseEventListeners = function () { + var _this = this; + if (this._options.backdrop === 'dynamic') { + this._clickOutsideEventListener = function (ev) { + _this._handleOutsideClick(ev.target); + }; + this._targetEl.addEventListener('click', this._clickOutsideEventListener, true); + } + this._keydownEventListener = function (ev) { + if (ev.key === 'Escape') { + _this.hide(); + } + }; + document.body.addEventListener('keydown', this._keydownEventListener, true); + }; + Modal.prototype._removeModalCloseEventListeners = function () { + if (this._options.backdrop === 'dynamic') { + this._targetEl.removeEventListener('click', this._clickOutsideEventListener, true); + } + document.body.removeEventListener('keydown', this._keydownEventListener, true); + }; + Modal.prototype._handleOutsideClick = function (target) { + if (target === this._targetEl || + (target === this._backdropEl && this.isVisible())) { + this.hide(); + } + }; + Modal.prototype._getPlacementClasses = function () { + switch (this._options.placement) { + // top + case 'top-left': + return ['justify-start', 'items-start']; + case 'top-center': + return ['justify-center', 'items-start']; + case 'top-right': + return ['justify-end', 'items-start']; + // center + case 'center-left': + return ['justify-start', 'items-center']; + case 'center': + return ['justify-center', 'items-center']; + case 'center-right': + return ['justify-end', 'items-center']; + // bottom + case 'bottom-left': + return ['justify-start', 'items-end']; + case 'bottom-center': + return ['justify-center', 'items-end']; + case 'bottom-right': + return ['justify-end', 'items-end']; + default: + return ['justify-center', 'items-center']; + } + }; + Modal.prototype.toggle = function () { + if (this._isHidden) { + this.show(); + } + else { + this.hide(); + } + // callback function + this._options.onToggle(this); + }; + Modal.prototype.show = function () { + if (this.isHidden) { + this._targetEl.classList.add('flex'); + this._targetEl.classList.remove('hidden'); + this._targetEl.setAttribute('aria-modal', 'true'); + this._targetEl.setAttribute('role', 'dialog'); + this._targetEl.removeAttribute('aria-hidden'); + this._createBackdrop(); + this._isHidden = false; + // prevent body scroll + document.body.classList.add('overflow-hidden'); + // Add keyboard event listener to the document + if (this._options.closable) { + this._setupModalCloseEventListeners(); + } + // callback function + this._options.onShow(this); + } + }; + Modal.prototype.hide = function () { + if (this.isVisible) { + this._targetEl.classList.add('hidden'); + this._targetEl.classList.remove('flex'); + this._targetEl.setAttribute('aria-hidden', 'true'); + this._targetEl.removeAttribute('aria-modal'); + this._targetEl.removeAttribute('role'); + this._destroyBackdropEl(); + this._isHidden = true; + // re-apply body scroll + document.body.classList.remove('overflow-hidden'); + if (this._options.closable) { + this._removeModalCloseEventListeners(); + } + // callback function + this._options.onHide(this); + } + }; + Modal.prototype.isVisible = function () { + return !this._isHidden; + }; + Modal.prototype.isHidden = function () { + return this._isHidden; + }; + return Modal; +}()); +var getModalInstance = function (id, instances) { + if (instances.some(function (modalInstance) { return modalInstance.id === id; })) { + return instances.find(function (modalInstance) { return modalInstance.id === id; }); + } + return null; +}; +function initModals() { + var modalInstances = []; + // initiate modal based on data-modal-target + document.querySelectorAll('[data-modal-target]').forEach(function ($triggerEl) { + var modalId = $triggerEl.getAttribute('data-modal-target'); + var $modalEl = document.getElementById(modalId); + if ($modalEl) { + var placement = $modalEl.getAttribute('data-modal-placement'); + var backdrop = $modalEl.getAttribute('data-modal-backdrop'); + if (!getModalInstance(modalId, modalInstances)) { + modalInstances.push({ + id: modalId, + object: new Modal($modalEl, { + placement: placement + ? placement + : Default.placement, + backdrop: backdrop ? backdrop : Default.backdrop, + }), + }); + } + } + else { + console.error("Modal with id ".concat(modalId, " does not exist. Are you sure that the data-modal-target attribute points to the correct modal id?.")); + } + }); + // support pre v1.6.0 data-modal-toggle initialization + document.querySelectorAll('[data-modal-toggle]').forEach(function ($triggerEl) { + var modalId = $triggerEl.getAttribute('data-modal-toggle'); + var $modalEl = document.getElementById(modalId); + if ($modalEl) { + var placement = $modalEl.getAttribute('data-modal-placement'); + var backdrop = $modalEl.getAttribute('data-modal-backdrop'); + var modal_1 = getModalInstance(modalId, modalInstances); + if (!modal_1) { + modal_1 = { + id: modalId, + object: new Modal($modalEl, { + placement: placement + ? placement + : Default.placement, + backdrop: backdrop ? backdrop : Default.backdrop, + }), + }; + modalInstances.push(modal_1); + } + $triggerEl.addEventListener('click', function () { + modal_1.object.toggle(); + }); + } + else { + console.error("Modal with id ".concat(modalId, " does not exist. Are you sure that the data-modal-toggle attribute points to the correct modal id?")); + } + }); + // show modal on click if exists based on id + document.querySelectorAll('[data-modal-show]').forEach(function ($triggerEl) { + var modalId = $triggerEl.getAttribute('data-modal-show'); + var $modalEl = document.getElementById(modalId); + if ($modalEl) { + var modal_2 = getModalInstance(modalId, modalInstances); + if (modal_2) { + $triggerEl.addEventListener('click', function () { + if (modal_2.object.isHidden) { + modal_2.object.show(); + } + }); + } + else { + console.error("Modal with id ".concat(modalId, " has not been initialized. Please initialize it using the data-modal-target attribute.")); + } + } + else { + console.error("Modal with id ".concat(modalId, " does not exist. Are you sure that the data-modal-show attribute points to the correct modal id?")); + } + }); + // hide modal on click if exists based on id + document.querySelectorAll('[data-modal-hide]').forEach(function ($triggerEl) { + var modalId = $triggerEl.getAttribute('data-modal-hide'); + var $modalEl = document.getElementById(modalId); + if ($modalEl) { + var modal_3 = getModalInstance(modalId, modalInstances); + if (modal_3) { + $triggerEl.addEventListener('click', function () { + if (modal_3.object.isVisible) { + modal_3.object.hide(); + } + }); + } + else { + console.error("Modal with id ".concat(modalId, " has not been initialized. Please initialize it using the data-modal-target attribute.")); + } + } + else { + console.error("Modal with id ".concat(modalId, " does not exist. Are you sure that the data-modal-hide attribute points to the correct modal id?")); + } + }); +} +exports.initModals = initModals; +if (typeof window !== 'undefined') { + window.Modal = Modal; + window.initModals = initModals; +} +exports["default"] = Modal; + + +/***/ }), + +/***/ 903: +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initPopovers = void 0; +/* eslint-disable @typescript-eslint/no-empty-function */ +var core_1 = __webpack_require__(853); +var Default = { + placement: 'top', + offset: 10, + triggerType: 'hover', + onShow: function () { }, + onHide: function () { }, + onToggle: function () { }, +}; +var Popover = /** @class */ (function () { + function Popover(targetEl, triggerEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (triggerEl === void 0) { triggerEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._triggerEl = triggerEl; + this._options = __assign(__assign({}, Default), options); + this._popperInstance = this._createPopperInstance(); + this._visible = false; + this._init(); + } + Popover.prototype._init = function () { + if (this._triggerEl) { + this._setupEventListeners(); + } + }; + Popover.prototype._setupEventListeners = function () { + var _this = this; + var triggerEvents = this._getTriggerEvents(); + triggerEvents.showEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + _this.show(); + }); + _this._targetEl.addEventListener(ev, function () { + _this.show(); + }); + }); + triggerEvents.hideEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + setTimeout(function () { + if (!_this._targetEl.matches(':hover')) { + _this.hide(); + } + }, 100); + }); + _this._targetEl.addEventListener(ev, function () { + setTimeout(function () { + if (!_this._triggerEl.matches(':hover')) { + _this.hide(); + } + }, 100); + }); + }); + }; + Popover.prototype._createPopperInstance = function () { + return (0, core_1.createPopper)(this._triggerEl, this._targetEl, { + placement: this._options.placement, + modifiers: [ + { + name: 'offset', + options: { + offset: [0, this._options.offset], + }, + }, + ], + }); + }; + Popover.prototype._getTriggerEvents = function () { + switch (this._options.triggerType) { + case 'hover': + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + case 'click': + return { + showEvents: ['click', 'focus'], + hideEvents: ['focusout', 'blur'], + }; + case 'none': + return { + showEvents: [], + hideEvents: [], + }; + default: + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + } + }; + Popover.prototype._setupKeydownListener = function () { + var _this = this; + this._keydownEventListener = function (ev) { + if (ev.key === 'Escape') { + _this.hide(); + } + }; + document.body.addEventListener('keydown', this._keydownEventListener, true); + }; + Popover.prototype._removeKeydownListener = function () { + document.body.removeEventListener('keydown', this._keydownEventListener, true); + }; + Popover.prototype._setupClickOutsideListener = function () { + var _this = this; + this._clickOutsideEventListener = function (ev) { + _this._handleClickOutside(ev, _this._targetEl); + }; + document.body.addEventListener('click', this._clickOutsideEventListener, true); + }; + Popover.prototype._removeClickOutsideListener = function () { + document.body.removeEventListener('click', this._clickOutsideEventListener, true); + }; + Popover.prototype._handleClickOutside = function (ev, targetEl) { + var clickedEl = ev.target; + if (clickedEl !== targetEl && + !targetEl.contains(clickedEl) && + !this._triggerEl.contains(clickedEl) && + this.isVisible()) { + this.hide(); + } + }; + Popover.prototype.isVisible = function () { + return this._visible; + }; + Popover.prototype.toggle = function () { + if (this.isVisible()) { + this.hide(); + } + else { + this.show(); + } + this._options.onToggle(this); + }; + Popover.prototype.show = function () { + this._targetEl.classList.remove('opacity-0', 'invisible'); + this._targetEl.classList.add('opacity-100', 'visible'); + // Enable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: true }, + ], false) })); }); + // handle click outside + this._setupClickOutsideListener(); + // handle esc keydown + this._setupKeydownListener(); + // Update its position + this._popperInstance.update(); + // set visibility to true + this._visible = true; + // callback function + this._options.onShow(this); + }; + Popover.prototype.hide = function () { + this._targetEl.classList.remove('opacity-100', 'visible'); + this._targetEl.classList.add('opacity-0', 'invisible'); + // Disable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: false }, + ], false) })); }); + // handle click outside + this._removeClickOutsideListener(); + // handle esc keydown + this._removeKeydownListener(); + // set visibility to false + this._visible = false; + // callback function + this._options.onHide(this); + }; + return Popover; +}()); +function initPopovers() { + document.querySelectorAll('[data-popover-target]').forEach(function ($triggerEl) { + var popoverID = $triggerEl.getAttribute('data-popover-target'); + var $popoverEl = document.getElementById(popoverID); + if ($popoverEl) { + var triggerType = $triggerEl.getAttribute('data-popover-trigger'); + var placement = $triggerEl.getAttribute('data-popover-placement'); + var offset = $triggerEl.getAttribute('data-popover-offset'); + new Popover($popoverEl, $triggerEl, { + placement: placement ? placement : Default.placement, + offset: offset ? parseInt(offset) : Default.offset, + triggerType: triggerType + ? triggerType + : Default.triggerType, + }); + } + else { + console.error("The popover element with id \"".concat(popoverID, "\" does not exist. Please check the data-popover-target attribute.")); + } + }); +} +exports.initPopovers = initPopovers; +if (typeof window !== 'undefined') { + window.Popover = Popover; + window.initPopovers = initPopovers; +} +exports["default"] = Popover; + + +/***/ }), + +/***/ 247: +/***/ (function(__unused_webpack_module, exports) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initTabs = void 0; +var Default = { + defaultTabId: null, + activeClasses: 'text-blue-600 hover:text-blue-600 dark:text-blue-500 dark:hover:text-blue-500 border-blue-600 dark:border-blue-500', + inactiveClasses: 'dark:border-transparent text-gray-500 hover:text-gray-600 dark:text-gray-400 border-gray-100 hover:border-gray-300 dark:border-gray-700 dark:hover:text-gray-300', + onShow: function () { }, +}; +var Tabs = /** @class */ (function () { + function Tabs(items, options) { + if (items === void 0) { items = []; } + if (options === void 0) { options = Default; } + this._items = items; + this._activeTab = options ? this.getTab(options.defaultTabId) : null; + this._options = __assign(__assign({}, Default), options); + this._init(); + } + Tabs.prototype._init = function () { + var _this = this; + if (this._items.length) { + // set the first tab as active if not set by explicitly + if (!this._activeTab) { + this._setActiveTab(this._items[0]); + } + // force show the first default tab + this.show(this._activeTab.id, true); + // show tab content based on click + this._items.map(function (tab) { + tab.triggerEl.addEventListener('click', function () { + _this.show(tab.id); + }); + }); + } + }; + Tabs.prototype.getActiveTab = function () { + return this._activeTab; + }; + Tabs.prototype._setActiveTab = function (tab) { + this._activeTab = tab; + }; + Tabs.prototype.getTab = function (id) { + return this._items.filter(function (t) { return t.id === id; })[0]; + }; + Tabs.prototype.show = function (id, forceShow) { + var _a, _b; + var _this = this; + if (forceShow === void 0) { forceShow = false; } + var tab = this.getTab(id); + // don't do anything if already active + if (tab === this._activeTab && !forceShow) { + return; + } + // hide other tabs + this._items.map(function (t) { + var _a, _b; + if (t !== tab) { + (_a = t.triggerEl.classList).remove.apply(_a, _this._options.activeClasses.split(' ')); + (_b = t.triggerEl.classList).add.apply(_b, _this._options.inactiveClasses.split(' ')); + t.targetEl.classList.add('hidden'); + t.triggerEl.setAttribute('aria-selected', 'false'); + } + }); + // show active tab + (_a = tab.triggerEl.classList).add.apply(_a, this._options.activeClasses.split(' ')); + (_b = tab.triggerEl.classList).remove.apply(_b, this._options.inactiveClasses.split(' ')); + tab.triggerEl.setAttribute('aria-selected', 'true'); + tab.targetEl.classList.remove('hidden'); + this._setActiveTab(tab); + // callback function + this._options.onShow(this, tab); + }; + return Tabs; +}()); +function initTabs() { + document.querySelectorAll('[data-tabs-toggle]').forEach(function ($triggerEl) { + var tabItems = []; + var defaultTabId = null; + $triggerEl + .querySelectorAll('[role="tab"]') + .forEach(function ($triggerEl) { + var isActive = $triggerEl.getAttribute('aria-selected') === 'true'; + var tab = { + id: $triggerEl.getAttribute('data-tabs-target'), + triggerEl: $triggerEl, + targetEl: document.querySelector($triggerEl.getAttribute('data-tabs-target')), + }; + tabItems.push(tab); + if (isActive) { + defaultTabId = tab.id; + } + }); + new Tabs(tabItems, { + defaultTabId: defaultTabId, + }); + }); +} +exports.initTabs = initTabs; +if (typeof window !== 'undefined') { + window.Tabs = Tabs; + window.initTabs = initTabs; +} +exports["default"] = Tabs; + + +/***/ }), + +/***/ 671: +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.initTooltips = void 0; +/* eslint-disable @typescript-eslint/no-empty-function */ +var core_1 = __webpack_require__(853); +var Default = { + placement: 'top', + triggerType: 'hover', + onShow: function () { }, + onHide: function () { }, + onToggle: function () { }, +}; +var Tooltip = /** @class */ (function () { + function Tooltip(targetEl, triggerEl, options) { + if (targetEl === void 0) { targetEl = null; } + if (triggerEl === void 0) { triggerEl = null; } + if (options === void 0) { options = Default; } + this._targetEl = targetEl; + this._triggerEl = triggerEl; + this._options = __assign(__assign({}, Default), options); + this._popperInstance = this._createPopperInstance(); + this._visible = false; + this._init(); + } + Tooltip.prototype._init = function () { + if (this._triggerEl) { + this._setupEventListeners(); + } + }; + Tooltip.prototype._setupEventListeners = function () { + var _this = this; + var triggerEvents = this._getTriggerEvents(); + triggerEvents.showEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + _this.show(); + }); + }); + triggerEvents.hideEvents.forEach(function (ev) { + _this._triggerEl.addEventListener(ev, function () { + _this.hide(); + }); + }); + }; + Tooltip.prototype._createPopperInstance = function () { + return (0, core_1.createPopper)(this._triggerEl, this._targetEl, { + placement: this._options.placement, + modifiers: [ + { + name: 'offset', + options: { + offset: [0, 8], + }, + }, + ], + }); + }; + Tooltip.prototype._getTriggerEvents = function () { + switch (this._options.triggerType) { + case 'hover': + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + case 'click': + return { + showEvents: ['click', 'focus'], + hideEvents: ['focusout', 'blur'], + }; + case 'none': + return { + showEvents: [], + hideEvents: [], + }; + default: + return { + showEvents: ['mouseenter', 'focus'], + hideEvents: ['mouseleave', 'blur'], + }; + } + }; + Tooltip.prototype._setupKeydownListener = function () { + var _this = this; + this._keydownEventListener = function (ev) { + if (ev.key === 'Escape') { + _this.hide(); + } + }; + document.body.addEventListener('keydown', this._keydownEventListener, true); + }; + Tooltip.prototype._removeKeydownListener = function () { + document.body.removeEventListener('keydown', this._keydownEventListener, true); + }; + Tooltip.prototype._setupClickOutsideListener = function () { + var _this = this; + this._clickOutsideEventListener = function (ev) { + _this._handleClickOutside(ev, _this._targetEl); + }; + document.body.addEventListener('click', this._clickOutsideEventListener, true); + }; + Tooltip.prototype._removeClickOutsideListener = function () { + document.body.removeEventListener('click', this._clickOutsideEventListener, true); + }; + Tooltip.prototype._handleClickOutside = function (ev, targetEl) { + var clickedEl = ev.target; + if (clickedEl !== targetEl && + !targetEl.contains(clickedEl) && + !this._triggerEl.contains(clickedEl) && + this.isVisible()) { + this.hide(); + } + }; + Tooltip.prototype.isVisible = function () { + return this._visible; + }; + Tooltip.prototype.toggle = function () { + if (this.isVisible()) { + this.hide(); + } + else { + this.show(); + } + }; + Tooltip.prototype.show = function () { + this._targetEl.classList.remove('opacity-0', 'invisible'); + this._targetEl.classList.add('opacity-100', 'visible'); + // Enable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: true }, + ], false) })); }); + // handle click outside + this._setupClickOutsideListener(); + // handle esc keydown + this._setupKeydownListener(); + // Update its position + this._popperInstance.update(); + // set visibility + this._visible = true; + // callback function + this._options.onShow(this); + }; + Tooltip.prototype.hide = function () { + this._targetEl.classList.remove('opacity-100', 'visible'); + this._targetEl.classList.add('opacity-0', 'invisible'); + // Disable the event listeners + this._popperInstance.setOptions(function (options) { return (__assign(__assign({}, options), { modifiers: __spreadArray(__spreadArray([], options.modifiers, true), [ + { name: 'eventListeners', enabled: false }, + ], false) })); }); + // handle click outside + this._removeClickOutsideListener(); + // handle esc keydown + this._removeKeydownListener(); + // set visibility + this._visible = false; + // callback function + this._options.onHide(this); + }; + return Tooltip; +}()); +function initTooltips() { + document.querySelectorAll('[data-tooltip-target]').forEach(function ($triggerEl) { + var tooltipId = $triggerEl.getAttribute('data-tooltip-target'); + var $tooltipEl = document.getElementById(tooltipId); + if ($tooltipEl) { + var triggerType = $triggerEl.getAttribute('data-tooltip-trigger'); + var placement = $triggerEl.getAttribute('data-tooltip-placement'); + new Tooltip($tooltipEl, $triggerEl, { + placement: placement ? placement : Default.placement, + triggerType: triggerType + ? triggerType + : Default.triggerType, + }); + } + else { + console.error("The tooltip element with id \"".concat(tooltipId, "\" does not exist. Please check the data-tooltip-target attribute.")); + } + }); +} +exports.initTooltips = initTooltips; +if (typeof window !== 'undefined') { + window.Tooltip = Tooltip; + window.initTooltips = initTooltips; +} +exports["default"] = Tooltip; + + +/***/ }), + +/***/ 947: +/***/ (function(__unused_webpack_module, exports) { + + +Object.defineProperty(exports, "__esModule", ({ value: true })); +var Events = /** @class */ (function () { + function Events(eventType, eventFunctions) { + if (eventFunctions === void 0) { eventFunctions = []; } + this._eventType = eventType; + this._eventFunctions = eventFunctions; + } + Events.prototype.init = function () { + var _this = this; + this._eventFunctions.forEach(function (eventFunction) { + if (typeof window !== 'undefined') { + window.addEventListener(_this._eventType, eventFunction); + } + }); + }; + return Events; +}()); +exports["default"] = Events; + + +/***/ }) + +/******/ }); +/************************************************************************/ +/******/ // The module cache +/******/ var __webpack_module_cache__ = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ // Check if module is in cache +/******/ var cachedModule = __webpack_module_cache__[moduleId]; +/******/ if (cachedModule !== undefined) { +/******/ return cachedModule.exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = __webpack_module_cache__[moduleId] = { +/******/ // no module.id needed +/******/ // no module.loaded needed +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ __webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/************************************************************************/ +/******/ /* webpack/runtime/define property getters */ +/******/ !function() { +/******/ // define getter functions for harmony exports +/******/ __webpack_require__.d = function(exports, definition) { +/******/ for(var key in definition) { +/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) { +/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] }); +/******/ } +/******/ } +/******/ }; +/******/ }(); +/******/ +/******/ /* webpack/runtime/hasOwnProperty shorthand */ +/******/ !function() { +/******/ __webpack_require__.o = function(obj, prop) { return Object.prototype.hasOwnProperty.call(obj, prop); } +/******/ }(); +/******/ +/******/ /* webpack/runtime/make namespace object */ +/******/ !function() { +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ }(); +/******/ +/************************************************************************/ +var __webpack_exports__ = {}; +// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. +!function() { +var exports = __webpack_exports__; + +Object.defineProperty(exports, "__esModule", ({ value: true })); +__webpack_require__(647); +// core components +var accordion_1 = __webpack_require__(902); +var carousel_1 = __webpack_require__(33); +var collapse_1 = __webpack_require__(922); +var dial_1 = __webpack_require__(556); +var dismiss_1 = __webpack_require__(791); +var drawer_1 = __webpack_require__(340); +var dropdown_1 = __webpack_require__(316); +var modal_1 = __webpack_require__(16); +var popover_1 = __webpack_require__(903); +var tabs_1 = __webpack_require__(247); +var tooltip_1 = __webpack_require__(671); +__webpack_require__(311); +var events_1 = __webpack_require__(947); +var events = new events_1.default('load', [ + accordion_1.initAccordions, + collapse_1.initCollapses, + carousel_1.initCarousels, + dismiss_1.initDismisses, + dropdown_1.initDropdowns, + modal_1.initModals, + drawer_1.initDrawers, + tabs_1.initTabs, + tooltip_1.initTooltips, + popover_1.initPopovers, + dial_1.initDials, +]); +events.init(); +exports["default"] = { + Accordion: accordion_1.default, + Carousel: carousel_1.default, + Collapse: collapse_1.default, + Dial: dial_1.default, + Drawer: drawer_1.default, + Dismiss: dismiss_1.default, + Dropdown: dropdown_1.default, + Modal: modal_1.default, + Popover: popover_1.default, + Tabs: tabs_1.default, + Tooltip: tooltip_1.default, + Events: events_1.default, +}; + +}(); +/******/ return __webpack_exports__; +/******/ })() +; +}); +//# sourceMappingURL=flowbite.js.map From 9999e80cadaf16a8d1d0a6e092229107979f5760 Mon Sep 17 00:00:00 2001 From: Javier Julio Date: Sat, 29 Jul 2023 15:35:38 -0400 Subject: [PATCH 020/379] Prep Tailwind CSS migration part 2 (#8036) * Remove old base, shadows, gradients, print styles * Replace dynamic classes with data attributes * Update Panel and Sidebar Section * Update page base classes and ids * Remove old status_tag styles These have been replaced. * Replace datepicker with date input type * Update Pagination This also updates the locale keys for pagination to be less wordy and long. Will follow up to extract the Tailwind CSS classes. * Footer * Update TitleBar The action items are rendered directly into the container so no need for multiple span wrappers with a component which are undesired anyway. The DSL is meant to easily add what action item you want vs implying it has to be a link and styled a certain way. * Forms and Filters * DropdownMenu updates This now works with Flowbite and has simpler implementation. The item method now takes a block so anything can be added e.g. horizontal divider or other control. We must have coverage through another test, but wouldn't hurt to have a simple unit test for DropdownMenu. This covers the new feature where item now takes an optional block to render any content besides the default link. We can expand this spec further. * Update styles * Global Navigation as drawer menu This is a work in progress. The plan is to have the global navigation always be a vertical drawer menu since the common case is to have many pages. This will allow us to more easily support different viewports as well. * Disable Style/StringLiterals rule * Temporarily disable batch actions steps We already commented out the batch actions feature temporarily as a follow up with migrate over the batch actions form DSL replacement. This is to just appease code coverage for now. --- .rubocop.yml | 3 +- .../stylesheets/active_admin/_base.scss | 52 +-- .../stylesheets/active_admin/_forms.scss | 131 +++---- .../stylesheets/active_admin/_header.scss | 324 +++++++++--------- .../active_admin/components/_pagination.scss | 21 +- .../active_admin/components/_tables.scss | 182 +++++----- .../active_admin/mixins/_gradients.scss | 2 +- .../active_admin/mixins/_shadows.scss | 8 +- .../active_admin/mixins/_typography.scss | 2 +- .../active_admin/_first_page.html.erb | 3 +- .../kaminari/active_admin/_last_page.html.erb | 2 +- .../kaminari/active_admin/_next_page.html.erb | 2 +- .../kaminari/active_admin/_page.html.erb | 8 +- .../kaminari/active_admin/_paginator.html.erb | 2 +- .../kaminari/active_admin/_prev_page.html.erb | 2 +- .../layouts/active_admin_logged_out.html.erb | 2 +- config/locales/en.yml | 15 +- features/belongs_to.feature | 2 +- features/comments/commenting.feature | 3 +- features/index/filters.feature | 20 +- features/index/pagination.feature | 14 +- features/registering_pages.feature | 2 +- features/sidebar_sections.feature | 54 ++- .../step_definitions/action_item_steps.rb | 4 +- .../step_definitions/additional_web_steps.rb | 4 +- .../step_definitions/batch_action_steps.rb | 114 +++--- features/step_definitions/breadcrumb_steps.rb | 2 +- features/step_definitions/footer_steps.rb | 4 +- features/step_definitions/format_steps.rb | 2 +- .../step_definitions/member_link_steps.rb | 4 +- features/step_definitions/pagination_steps.rb | 4 +- features/step_definitions/sidebar_steps.rb | 12 - features/step_definitions/web_steps.rb | 4 + lib/active_admin/filters/active_sidebar.rb | 9 +- .../filters/resource_extension.rb | 4 +- lib/active_admin/inputs/datepicker_input.rb | 3 +- .../filters/base/search_method_select.rb | 10 +- .../inputs/filters/date_range_input.rb | 6 +- lib/active_admin/sidebar_section.rb | 5 - lib/active_admin/view_factory.rb | 1 - lib/active_admin/views/action_items.rb | 18 - .../views/components/dropdown_menu.rb | 27 +- .../views/components/paginated_collection.rb | 6 +- lib/active_admin/views/components/panel.rb | 10 +- .../views/components/sidebar_section.rb | 3 +- lib/active_admin/views/footer.rb | 6 +- lib/active_admin/views/header.rb | 7 +- lib/active_admin/views/pages/base.rb | 24 +- lib/active_admin/views/title_bar.rb | 25 +- plugin.js | 139 +++++++- spec/unit/form_builder_spec.rb | 22 +- spec/unit/view_factory_spec.rb | 1 - .../views/components/dropdown_menu_spec.rb | 25 ++ .../components/paginated_collection_spec.rb | 30 +- spec/unit/views/components/panel_spec.rb | 11 +- .../views/components/sidebar_section_spec.rb | 12 - 56 files changed, 757 insertions(+), 657 deletions(-) delete mode 100644 features/step_definitions/sidebar_steps.rb delete mode 100644 lib/active_admin/views/action_items.rb create mode 100644 spec/unit/views/components/dropdown_menu_spec.rb diff --git a/.rubocop.yml b/.rubocop.yml index 47888430103..eef5565458e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -153,8 +153,7 @@ Naming/PredicateName: - has_many_actions Style/StringLiterals: - Enabled: true - EnforcedStyle: double_quotes + Enabled: false Style/TrailingCommaInArguments: Enabled: true diff --git a/app/assets/stylesheets/active_admin/_base.scss b/app/assets/stylesheets/active_admin/_base.scss index 14086670ae8..bdfb88a993c 100644 --- a/app/assets/stylesheets/active_admin/_base.scss +++ b/app/assets/stylesheets/active_admin/_base.scss @@ -1,54 +1,54 @@ /* Active Admin CSS */ @media screen { // Normalize - @import "./normalize"; + // @import "./normalize"; // Partials - @import "./typography"; + // @import "./typography"; @import "./header"; @import "./forms"; @import "./components/comments"; @import "./components/flash_messages"; - @import "./components/date_picker"; + // @import "./components/date_picker"; @import "./components/tables"; @import "./components/batch_actions"; @import "./components/modal_dialog"; @import "./components/blank_slates"; @import "./components/breadcrumbs"; - @import "./components/dropdown_menu"; + // @import "./components/dropdown_menu"; // @import "./components/buttons"; // @import "./components/links"; @import "./components/pagination"; - @import "./components/panels"; + // @import "./components/panels"; @import "./components/scopes"; - @import "./components/status_tags"; - @import "./components/table_tools"; + // @import "./components/status_tags"; + // @import "./components/table_tools"; @import "./components/index_list"; // @import "./components/tabs"; @import "./pages/logged_out"; - @import "./structure/footer"; + // @import "./structure/footer"; @import "./structure/main_structure"; @import "./structure/title_bar"; - html { - box-sizing: border-box; - } + // html { + // box-sizing: border-box; + // } - *, - *:before, - *:after { - box-sizing: inherit; - } + // *, + // *:before, + // *:after { + // box-sizing: inherit; + // } - body { - @include sans-family; - line-height: 1.5; - font-size: 72%; - background: $body-background-color; - color: $text-color; - } + // body { + // @include sans-family; + // line-height: 1.5; + // font-size: 72%; + // background: $body-background-color; + // color: $text-color; + // } } -@media print { - @import "./print"; -} +// @media print { +// @import "./print"; +// } diff --git a/app/assets/stylesheets/active_admin/_forms.scss b/app/assets/stylesheets/active_admin/_forms.scss index 93eb2d8a8ca..67bdb668cc2 100644 --- a/app/assets/stylesheets/active_admin/_forms.scss +++ b/app/assets/stylesheets/active_admin/_forms.scss @@ -1,15 +1,15 @@ // -------------------------------------- Active Admin Forms form { /* Reset margins & Padding */ - ul, ol, li, fieldset, legend, input, textarea, select, p { margin:0; padding:0; } - ol, ul { list-style: none } + // ul, ol, li, fieldset, legend, input, textarea, select, p { margin:0; padding:0; } + // ol, ul { list-style: none } fieldset { border: 0; padding: 10px 0; margin-bottom: 20px; - &.inputs { @include section-background; } + // &.inputs { @include section-background; } legend { width: 100%; @@ -106,32 +106,32 @@ form { } /* Text Fields */ - input[type=text], - input[type=password], - input[type=email], - input[type=number], - input[type=url], - input[type=tel], - input[type=date], - input[type=time], - textarea { - width: calc(80% - #{$text-input-total-padding}); - border: $border-width solid #c9d0d6; - @include rounded; - font-size: 0.95em; - @include sans-family; - outline: none; - padding: 8px $text-input-horizontal-padding 7px; - - &:focus { - border: $border-width solid #99a2aa; - @include shadow(0,0,4px,#99a2aa); - } - } - - input[type=date] { - width: calc(100% - #{$text-input-total-padding}); - } + // input[type=text], + // input[type=password], + // input[type=email], + // input[type=number], + // input[type=url], + // input[type=tel], + // input[type=date], + // input[type=time], + // textarea { + // width: calc(80% - #{$text-input-total-padding}); + // border: $border-width solid #c9d0d6; + // @include rounded; + // font-size: 0.95em; + // @include sans-family; + // outline: none; + // padding: 8px $text-input-horizontal-padding 7px; + + // &:focus { + // border: $border-width solid #99a2aa; + // @include shadow(0,0,4px,#99a2aa); + // } + // } + + // input[type=date] { + // width: calc(100% - #{$text-input-total-padding}); + // } fieldset > ol > li { @@ -250,42 +250,43 @@ form { // -------------------------------------- Sidebar Forms -.sidebar_section { +// .sidebar_section { - label { - display: block; - text-transform: uppercase; - color: $form-label-color; - font-size: 0.9em; - font-weight: bold; - } +// label { +// display: block; +// text-transform: uppercase; +// margin-bottom: 6px; +// color: $form-label-color; +// font-size: 0.9em; +// font-weight: 600; +// } - select { - width: $sidebar-inner-content-width; - } +// select { +// width: $sidebar-inner-content-width; +// } - input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea { - width: $sidebar-inner-content-width - ($text-input-horizontal-padding * 2); - } +// input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea { +// width: $sidebar-inner-content-width - ($text-input-horizontal-padding * 2); +// } -} +// } // -------------------------------------- Filter Forms form.filter_form { .filter_form_field { - margin-bottom: 10px; - clear: both; - - &.select_and_search { - input[type=text] { - margin-left: $filter-field-seperator-width + 4; - width: $side-by-side-filter-input-width; - } - select { - width: $side-by-side-filter-select-width; - } - } + // margin-bottom: 10px; + // clear: both; + + // &.select_and_search { + // input[type=text] { + // margin-left: $filter-field-seperator-width + 4; + // width: $side-by-side-filter-input-width; + // } + // select { + // width: $side-by-side-filter-select-width; + // } + // } &.filter_check_boxes { label { margin-bottom: 3px; } @@ -302,15 +303,15 @@ form.filter_form { } } - &.filter_date_range { - input[type=text] { - width: $date-range-filter-input-width; + // &.filter_date_range { + // input[type=text] { + // width: $date-range-filter-input-width; - + input { - margin-left: 6px; - } - } - } + // + input { + // margin-left: 6px; + // } + // } + // } } - a.clear_filters_btn { @include light-button; } + // a.clear_filters_btn { @include light-button; } } diff --git a/app/assets/stylesheets/active_admin/_header.scss b/app/assets/stylesheets/active_admin/_header.scss index 466cec5449e..1271d02069b 100644 --- a/app/assets/stylesheets/active_admin/_header.scss +++ b/app/assets/stylesheets/active_admin/_header.scss @@ -1,24 +1,24 @@ // ----------------------------------- Header #header { - @include primary-gradient; - @include shadow; - @include text-shadow(#000); - display: table; - height: 20px; - width: 100%; - overflow: visible; - position: inherit; - padding: 5px 0; - z-index: 900; + // @include primary-gradient; + // @include shadow; + // @include text-shadow(#000); + // display: table; + // height: 20px; + // width: 100%; + // overflow: visible; + // position: inherit; + // padding: 5px 0; + // z-index: 900; h1 { - display: table-cell; - vertical-align: middle; - white-space: nowrap; - color: $page-header-text-color; - margin-right: 20px; - margin-bottom: 0px; - padding: 3px $horizontal-page-margin 0 $horizontal-page-margin; + // display: table-cell; + // vertical-align: middle; + // white-space: nowrap; + // color: $page-header-text-color; + // margin-right: 20px; + // margin-bottom: 0px; + // padding: 3px $horizontal-page-margin 0 $horizontal-page-margin; font-size: 1.3em; font-weight: normal; line-height: 1.2; @@ -39,150 +39,150 @@ a, a:link { color: $page-header-text-color; } - .header-item { - top: 2px; - position: relative; - height: 20px - } - - ul.tabs { - display: table-cell; - vertical-align: middle; - height: 100%; - margin: 0; - padding: 0; - - li { - /* Hover on li, display the ul */ - &:hover > ul { display: block;} - } - - & > li { - display: inline-block; - margin-right: 4px; - margin-top: 5px; - margin-bottom: 5px; - font-size: 1.0em; - position: relative; - - a { - text-decoration: none; - padding: 6px 10px 4px 10px; - position: relative; - @include rounded(10px); - } - - &.current > a { - background: $current-menu-item-background; - color: #fff; - } - - &.has_nested > a { - background: url($menu-arrow-light-icon-url) no-repeat calc(100% - 7px) 50%; - padding-right: 20px; - } - - &.has_nested.current > a { - background: $current-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%; - padding-right: 20px; - } - - &:hover > a { - background: $hover-menu-item-background; - color: #fff; - } - - &.has_nested:hover > a { - @include rounded-top(10px); - border-bottom: 5px solid $hover-menu-item-background; - background: $hover-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%; - z-index: 1020; - } - - - /* Drop down menus */ - ul { - background: $hover-menu-item-background; - @include rounded-all(0,10px,10px,10px); - @include shadow(0, 1px, 3px, #444); - position: absolute; - width: 120%; - min-width: 175px; - max-width: calc(100% + 20px); - margin-top: 5px; - float: left; - display: none; - padding: 3px 0px 5px 0; - list-style: none; - z-index: 1010; - - li { - position: relative; - margin: 0px; - a { - background: none; - display: block; - &:hover { color: #fff; background: none; } - } - - &.current { - a { @include rounded(0) } - } - - &.has_nested > a { - background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%; - padding-right: 20px; - } - - &.has_nested:hover > a { - background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%; - color: #fff; - } - - ul { - @include rounded-all(10px,10px,10px,10px); - margin-top: 0; - top: -3px; - left: 100%; - - /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu - that maintains the hover. This makes it much easier to navigate to submenus in - particular without losing hover accientally, especially near rounded corners. */ - &:after { - content: ""; - display: block; - position: absolute; - top: -8px; - left: -8px; - height: calc(100% + 16px); - width: calc(100% + 16px); - z-index: -2; - } - } - } - } - } - } - - #tabs { - width: 100%; - } - - #utility_nav { - color: #aaa; - display: table-cell; - white-space: nowrap; - margin: 0; - padding: 0; - padding-right: 26px; - text-align: right; - - a { text-decoration: none; } - a:hover { color: #fff; } - - li { - display:inline; - } - } + // .header-item { + // top: 2px; + // position: relative; + // height: 20px + // } + + // ul.tabs { + // display: table-cell; + // vertical-align: middle; + // height: 100%; + // margin: 0; + // padding: 0; + + // li { + // /* Hover on li, display the ul */ + // &:hover > ul { display: block;} + // } + + // & > li { + // display: inline-block; + // margin-right: 4px; + // margin-top: 5px; + // margin-bottom: 5px; + // font-size: 1.0em; + // position: relative; + + // a { + // text-decoration: none; + // padding: 6px 10px 4px 10px; + // position: relative; + // @include rounded(10px); + // } + + // &.current > a { + // background: $current-menu-item-background; + // color: #fff; + // } + + // &.has_nested > a { + // background: url($menu-arrow-light-icon-url) no-repeat calc(100% - 7px) 50%; + // padding-right: 20px; + // } + + // &.has_nested.current > a { + // background: $current-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%; + // padding-right: 20px; + // } + + // &:hover > a { + // background: $hover-menu-item-background; + // color: #fff; + // } + + // &.has_nested:hover > a { + // @include rounded-top(10px); + // border-bottom: 5px solid $hover-menu-item-background; + // background: $hover-menu-item-background url($menu-arrow-dark-icon-url) no-repeat calc(100% - 7px) 50%; + // z-index: 1020; + // } + + + // /* Drop down menus */ + // ul { + // background: $hover-menu-item-background; + // @include rounded-all(0,10px,10px,10px); + // @include shadow(0, 1px, 3px, #444); + // position: absolute; + // width: 120%; + // min-width: 175px; + // max-width: calc(100% + 20px); + // margin-top: 5px; + // float: left; + // display: none; + // padding: 3px 0px 5px 0; + // list-style: none; + // z-index: 1010; + + // li { + // position: relative; + // margin: 0px; + // a { + // background: none; + // display: block; + // &:hover { color: #fff; background: none; } + // } + + // &.current { + // a { @include rounded(0) } + // } + + // &.has_nested > a { + // background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%; + // padding-right: 20px; + // } + + // &.has_nested:hover > a { + // background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%; + // color: #fff; + // } + + // ul { + // @include rounded-all(10px,10px,10px,10px); + // margin-top: 0; + // top: -3px; + // left: 100%; + + // /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu + // that maintains the hover. This makes it much easier to navigate to submenus in + // particular without losing hover accientally, especially near rounded corners. */ + // &:after { + // content: ""; + // display: block; + // position: absolute; + // top: -8px; + // left: -8px; + // height: calc(100% + 16px); + // width: calc(100% + 16px); + // z-index: -2; + // } + // } + // } + // } + // } + // } + + // #tabs { + // width: 100%; + // } + + // #utility_nav { + // color: #aaa; + // display: table-cell; + // white-space: nowrap; + // margin: 0; + // padding: 0; + // padding-right: 26px; + // text-align: right; + + // a { text-decoration: none; } + // a:hover { color: #fff; } + + // li { + // display:inline; + // } + // } } diff --git a/app/assets/stylesheets/active_admin/components/_pagination.scss b/app/assets/stylesheets/active_admin/components/_pagination.scss index bbed72488c5..a1e9daf85b5 100644 --- a/app/assets/stylesheets/active_admin/components/_pagination.scss +++ b/app/assets/stylesheets/active_admin/components/_pagination.scss @@ -23,24 +23,25 @@ } .pagination_information { - float: right; - margin-bottom: 5px; - color: #b3bcc1; - b { color: #5c6469; } + // float: right; + // margin-bottom: 5px; + // color: #b3bcc1; + // b { color: #5c6469; } } .download_links { - float: left; + // float: left; + justify-self: end; } .pagination_per_page { float: right; margin-left: 4px; - select { - @include light-button; - @include rounded(0px); - padding: 1px 5px; - } + // select { + // @include light-button; + // @include rounded(0px); + // padding: 1px 5px; + // } } .comments { diff --git a/app/assets/stylesheets/active_admin/components/_tables.scss b/app/assets/stylesheets/active_admin/components/_tables.scss index 257793d9e64..1906754ffea 100644 --- a/app/assets/stylesheets/active_admin/components/_tables.scss +++ b/app/assets/stylesheets/active_admin/components/_tables.scss @@ -1,112 +1,112 @@ // ----------------------------------- Tables -table tr { - td { - vertical-align: top; - } +// table tr { +// td { +// vertical-align: top; +// } - th { - text-align: left; - } -} +// th { +// text-align: left; +// } +// } // --------- Index Tables -table.index_table { - width: 100%; - margin-bottom: 10px; - border: 0; - border-spacing: 0; +// table.index_table { +// width: 100%; +// margin-bottom: 10px; +// border: 0; +// border-spacing: 0; - th { - @include section-header; - border-right: none; - padding-left: $cell-horizontal-padding; - padding-right: $cell-horizontal-padding; +// th { +// @include section-header; +// border-right: none; +// padding-left: $cell-horizontal-padding; +// padding-right: $cell-horizontal-padding; - a, a:link, a:visited { - color: $section-header-text-color; - text-decoration: none; - display: block; - white-space: nowrap; - } +// a, a:link, a:visited { +// color: $section-header-text-color; +// text-decoration: none; +// display: block; +// white-space: nowrap; +// } - &.sortable a { - background: url($orderable-icon-url) no-repeat 0 4px; padding-left: 13px; - } +// &.sortable a { +// background: url($orderable-icon-url) no-repeat 0 4px; padding-left: 13px; +// } - &.sorted-asc a { background-position: 0 -27px; } - &.sorted-desc a { background-position: 0 -56px;} +// &.sorted-asc a { background-position: 0 -27px; } +// &.sorted-desc a { background-position: 0 -56px;} - &.sorted-asc, &.sorted-desc { - @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%)); - } +// &.sorted-asc, &.sorted-desc { +// @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%)); +// } - &:last-child { - border-right: solid 1px #d4d4d4; - } +// &:last-child { +// border-right: solid 1px #d4d4d4; +// } - } +// } - tr.even td { background: $table-stripe-color; } +// tr.even td { background: $table-stripe-color; } - tr.selected td { - background: $table-selected-color; - } +// tr.selected td { +// background: $table-selected-color; +// } - td { - padding: 10px $cell-horizontal-padding 8px $cell-horizontal-padding; - border-bottom: 1px solid #e8e8e8; - vertical-align: top; - } -} +// td { +// padding: 10px $cell-horizontal-padding 8px $cell-horizontal-padding; +// border-bottom: 1px solid #e8e8e8; +// vertical-align: top; +// } +// } // --------- Tables inside Panels -.panel_contents table { - margin-top: 5px; - th { - padding-top: 10px; - background: none; - color: $primary-color; - @include no-shadow; - @include text-shadow; - text-transform: uppercase; - border-bottom: 1px solid #ccc; - } - tr.odd td { background: darken($table-stripe-color, 3%); } - tr.even td { background: $table-stripe-color; } -} +// .panel-body table { +// margin-top: 5px; +// th { +// padding-top: 10px; +// background: none; +// color: $primary-color; +// @include no-shadow; +// @include text-shadow; +// text-transform: uppercase; +// border-bottom: 1px solid #ccc; +// } +// tr.odd td { background: darken($table-stripe-color, 3%); } +// tr.even td { background: $table-stripe-color; } +// } // -------------------------------------- Resource Attributes Table -.attributes_table { overflow: hidden; } - -.attributes_table table { - col.even { background: $table-stripe-color; } - col.odd { background: darken($table-stripe-color, 3%); } - th, td { - padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding; - vertical-align: top; - border-bottom: 1px solid #e8e8e8; - } - th { - @include no-shadow; - @include no-gradient; - width: 150px; - font-size: 0.9em; - padding-left: 0; - text-transform: uppercase; - color: $primary-color; - @include text-shadow; - } - td { - .empty { - color: #bbb; - font-size: 0.8em; - text-transform: uppercase; - letter-spacing: 0.2em; - } - } -} - -.sidebar_section .attributes_table th { width: 50px; } +// .attributes_table { overflow: hidden; } + +// .attributes_table table { +// col.even { background: $table-stripe-color; } +// col.odd { background: darken($table-stripe-color, 3%); } +// th, td { +// padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding; +// vertical-align: top; +// border-bottom: 1px solid #e8e8e8; +// } +// th { +// @include no-shadow; +// @include no-gradient; +// width: 150px; +// font-size: 0.9em; +// padding-left: 0; +// text-transform: uppercase; +// color: $primary-color; +// @include text-shadow; +// } +// td { +// .empty { +// color: #bbb; +// font-size: 0.8em; +// text-transform: uppercase; +// letter-spacing: 0.2em; +// } +// } +// } + +// .sidebar_section .attributes_table th { width: 50px; } diff --git a/app/assets/stylesheets/active_admin/mixins/_gradients.scss b/app/assets/stylesheets/active_admin/mixins/_gradients.scss index ff25348885d..13ef9aee02a 100644 --- a/app/assets/stylesheets/active_admin/mixins/_gradients.scss +++ b/app/assets/stylesheets/active_admin/mixins/_gradients.scss @@ -3,7 +3,7 @@ $secondary-gradient-stop: #dfe1e2 !default; @mixin gradient($start, $end){ background-color: $start; - background-image: linear-gradient(180deg, $start, $end); + // background-image: linear-gradient(180deg, $start, $end); } @mixin primary-gradient { diff --git a/app/assets/stylesheets/active_admin/mixins/_shadows.scss b/app/assets/stylesheets/active_admin/mixins/_shadows.scss index e366bf0ad46..77fce2861c0 100644 --- a/app/assets/stylesheets/active_admin/mixins/_shadows.scss +++ b/app/assets/stylesheets/active_admin/mixins/_shadows.scss @@ -1,15 +1,15 @@ @mixin shadow($x: 0, $y: 1px, $blur: 2px, $color: rgba(0,0,0,0.37)) { - box-shadow: $x $y $blur $color; + // box-shadow: $x $y $blur $color; } @mixin no-shadow { - box-shadow: none; + // box-shadow: none; } @mixin inset-shadow($x: 0, $y: 1px, $blur: 2px, $color: #aaa) { - box-shadow: inset $x $y $blur $color; + // box-shadow: inset $x $y $blur $color; } @mixin text-shadow($color: #fff, $x: 0, $y: 1px, $blur: 0) { - text-shadow: $color $x $y $blur; + // text-shadow: $color $x $y $blur; } diff --git a/app/assets/stylesheets/active_admin/mixins/_typography.scss b/app/assets/stylesheets/active_admin/mixins/_typography.scss index 8ec668216ff..e24e0869c33 100644 --- a/app/assets/stylesheets/active_admin/mixins/_typography.scss +++ b/app/assets/stylesheets/active_admin/mixins/_typography.scss @@ -1,3 +1,3 @@ @mixin sans-family { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + // font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/app/views/kaminari/active_admin/_first_page.html.erb b/app/views/kaminari/active_admin/_first_page.html.erb index 0cc83b9f1a1..8fba7eaa850 100644 --- a/app/views/kaminari/active_admin/_first_page.html.erb +++ b/app/views/kaminari/active_admin/_first_page.html.erb @@ -6,6 +6,7 @@ per_page: number of items to fetch per page remote: data-remote -%> + - <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %> + <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, class: "flex items-center justify-center px-3 h-8 ml-0 leading-tight text-gray-500 bg-white border border-gray-300 rounded-l-lg hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" %> diff --git a/app/views/kaminari/active_admin/_last_page.html.erb b/app/views/kaminari/active_admin/_last_page.html.erb index bc777b45735..65760b1bb1f 100644 --- a/app/views/kaminari/active_admin/_last_page.html.erb +++ b/app/views/kaminari/active_admin/_last_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote %> + <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, class: "flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" %> diff --git a/app/views/kaminari/active_admin/_next_page.html.erb b/app/views/kaminari/active_admin/_next_page.html.erb index 3b0d0547bee..63625d78d93 100644 --- a/app/views/kaminari/active_admin/_next_page.html.erb +++ b/app/views/kaminari/active_admin/_next_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote %> + <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, rel: 'next', remote: remote, class: "flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" %> diff --git a/app/views/kaminari/active_admin/_page.html.erb b/app/views/kaminari/active_admin/_page.html.erb index 393bfc4b228..b5e4564c7a6 100644 --- a/app/views/kaminari/active_admin/_page.html.erb +++ b/app/views/kaminari/active_admin/_page.html.erb @@ -7,6 +7,10 @@ per_page: number of items to fetch per page remote: data-remote -%> - - <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %> + + <% if page.current? %> + <%= link_to page, url, { remote: remote, rel: page.rel, class: "flex items-center justify-center px-3 h-8 text-blue-600 border border-gray-300 bg-blue-50 hover:bg-blue-100 hover:text-blue-700 dark:border-gray-700 dark:bg-gray-700 dark:text-white" } %> + <% else %> + <%= link_to page, url, { remote: remote, rel: page.rel, class: "flex items-center justify-center px-3 h-8 leading-tight text-gray-500 bg-white border border-gray-300 hover:bg-gray-100 hover:text-gray-700 dark:bg-gray-800 dark:border-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-white" } %> + <% end %> diff --git a/app/views/kaminari/active_admin/_paginator.html.erb b/app/views/kaminari/active_admin/_paginator.html.erb index 26e0ca24c6a..09eec18b44d 100644 --- a/app/views/kaminari/active_admin/_paginator.html.erb +++ b/app/views/kaminari/active_admin/_paginator.html.erb @@ -7,7 +7,7 @@ paginator: the paginator that renders the pagination tags inside -%> <%= paginator.render do -%> -