decidim-decidim_awesome 0.10.3 → 0.11.1

data/app/packs/src/decidim/decidim_awesome/voting/voting_cards.js

@@ -1,63 +1,72 @@
-$(() => {
-  if ($(".voting-voting_cards").length === 0 || $("#VotingCardsModalHelp").length === 0 || $(".sign-out-link").length === 0) {
+document.addEventListener("DOMContentLoaded", () => {
+  const votingCards = document.querySelector(".voting-voting_cards");
+  const modal = document.getElementById("voting-cards-modal-help");
+  const signOutLink = document.querySelector('[href="/users/sign_out"]');
+
+  if (!votingCards || !modal || !signOutLink) {
     return;
   }
 
-  const $modal = $("#VotingCardsModalHelp");
-  const $card = $modal.find(".current-choice .vote-card");
-  const $check = $("#voting_cards-skip_help");
+  const card = modal.querySelector(".current-choice .vote-card");
+  const check = document.getElementById("voting_cards-skip_help");
 
   const storage = () => {
-    return JSON.parse(localStorage.getItem("hideTreeFlagsModalHelp") || "{}")
+    return JSON.parse(localStorage.getItem("awesome_voting_cards_hide_modal") || "{}");
   };
 
   const isChecked = () => {
-    return storage()[$check.val()];
+    return storage()[check.value];
   };
 
   const saveState = (val) => {
     const show = storage();
-    show[$check.val()] = val;
-    localStorage.setItem("hideTreeFlagsModalHelp", JSON.stringify(show))
+    show[check.value] = val;
+    localStorage.setItem("awesome_voting_cards_hide_modal", JSON.stringify(show));
   };
 
   const showModal = () => {
-    if (isChecked()) {
-      return false;
-    }
-    if ($modal.is(":visible")) {
+    if (isChecked() || window.Decidim.currentDialogs[modal.id].isOpen) {
       return false;
     }
     return true;
   };
 
-  $check.on("change", () => {
-    saveState($check.is(":checked"))
-  });
+  const bindVoteActions = () => {
+    document.querySelectorAll(".awesome-voting-card .vote-action").forEach((el) => {
+      el.addEventListener("click", (evt) => {
+        if (showModal()) {
+          evt.stopPropagation();
+          evt.preventDefault();
+          check.checked = isChecked();
+          modal.action = evt.currentTarget;
+          card.classList = evt.currentTarget.classList;
+          if (evt.currentTarget.children.length > 1) {
+            card.innerHTML = `${evt.currentTarget.children[1].outerHTML}<span class="vote-label">${evt.currentTarget.children[1].children[0].textContent}</span>`;
+          } else if (card.classList.contains("button")) {
+            card.classList.remove("button");
+            card.innerHTML = `<span class="vote-label">${evt.currentTarget.title}</span>`;
+          } else {
+            card.innerHTML = `<span class="vote-label">${evt.currentTarget.textContent}</span>`;
+          }
+          window.Decidim.currentDialogs[modal.id].open();
+        } else {
+          evt.currentTarget.closest(".voting-voting_cards").classList.add("loading");
+        }
+      });
+    });
+  };
 
-  $modal.find(".vote-action").on("click", () => {
-    $modal.data("action").click();
-    $modal.foundation("close");
+  check.addEventListener("change", () => {
+    saveState(check.checked);
   });
 
-  $(".button--vote-button .voting-voting_cards").on("click", ".vote-action", (evt) => {
-    if (showModal()) {
-      evt.stopPropagation();
-      evt.preventDefault();
-      $check.prop("checked", isChecked());
-      $modal.data("action", evt.currentTarget);
-      $card[0].classList = evt.currentTarget.classList;
-      if (evt.currentTarget.children.length > 1) {
-        $card.html(`${evt.currentTarget.children[1].outerHTML}<p class="vote-label">${evt.currentTarget.children[1].children[0].textContent}</p>`);
-      } else if ($card[0].classList.contains("button")) {
-        $card[0].classList.remove("button");
-        $card.html(`<p class="vote-label">${evt.currentTarget.title}</p>`);
-      } else {
-        $card.html(`<p class="vote-label">${evt.currentTarget.textContent}</p>`);
-      }
-      $modal.foundation("open");
-    } else {
-      $(evt.currentTarget).closest(".voting-voting_cards").addClass("loading");
-    }
+  modal.querySelector(".vote-action").addEventListener("click", () => {
+    modal.action.click();
+    setTimeout(() => window.Decidim.currentDialogs[modal.id].close());
   });
+
+  bindVoteActions();
+
+  // re-bind vote actions after AJAX events (due the use of Rails helper remote=treu)
+  document.body.addEventListener("ajax:success", () => bindVoteActions());
 });

data/app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss

@@ -1,16 +1,15 @@
-input.awesome-auto-edit {
-  display: inline-block;
-  width: auto;
-  margin: 0 2px;
-  padding: 1px;
-  line-height: 0;
-  height: auto;
+a.awesome-auto-edit {
+  @apply inline-block;
+}
+
+a.awesome-auto-delete {
+  @apply float-right button button__xs button__text-secondary;
+}
+
+.form-defaults input[type="text"].awesome-auto-edit {
+  @apply inline-block m-0 py-[2px] px-[4px] h-auto w-auto leading-none outline-1 text-xs;
 }
 
 span.awesome-auto-edit {
-  padding: 0 4px;
-  background-color: #f0f0f0;
-  border-radius: 5px;
-  margin: 0;
-  font-weight: 600;
+  @apply bg-background-4 px-2 rounded m-0 font-semibold;
 }

data/app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss

@@ -4,6 +4,21 @@
     text-align: left !important;
   }
 
+  th a.check-custom-redirections {
+    color: white;
+  }
+
+  th a.check-custom-redirections.disabled,
+  th a.check-custom-redirections.disabled:hover {
+    color: gray;
+    border: 1px solid gray;
+    background-color: #eee;
+  }
+
+  th a.check-custom-redirections:hover {
+    text-decoration: none;
+  }
+
   td.redirect-status {
     font-family: monospace;
 

data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss

@@ -1,10 +1,15 @@
-@import "codemirror/lib/codemirror.css";
+/* Ensure the sticky save button is over codemirror */
+.item__edit-sticky {
+  z-index: 2;
+}
 
 .awesome-edit-config {
   .scoped_styles_container,
   .proposal_custom_fields_container {
+    @apply bg-background;
+
     &.private {
-      outline: #fca5a5 dotted 2px;
+      @apply outline-2 outline-[#fca5a5] outline-dotted;
     }
 
     .form-error {
@@ -12,21 +17,23 @@
     }
 
     > .CodeMirror {
-      border-top-left-radius: 5px;
-      border-top-right-radius: 5px;
-      border-top: 0.5em solid #e0e0e0;
-      border-right: 0.5em solid #e0e0e0;
-      border-bottom: 0.5em solid #e0e0e0;
-      min-height: 6em;
-      height: 8em;
-      padding: 0;
-      max-height: 40em;
+      border-radius: 4px;
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+      border: 5px solid #eee;
+      border-left: none;
+      min-height: 4em;
+      height: auto;
       resize: vertical;
       overflow: vertical !important;
+      padding: 0;
+      margin: 0;
+      width: 100%;
+      font-size: 0.9rem;
 
       > .CodeMirror-scroll {
         > .CodeMirror-gutters {
-          background: #e0e0e0;
+          background: #eee;
         }
       }
     }

data/app/packs/stylesheets/decidim/decidim_awesome/admin/constraints.scss

@@ -1,8 +1,5 @@
 .constraints-editor {
-  background: #f6f6f6;
-  padding: 1rem;
-  margin: 0.5rem 0 2rem;
-  border-radius: 5px;
+  margin-top: 1rem;
 
   h5 {
     font-weight: 600;
@@ -14,7 +11,7 @@
   .label {
     font-weight: normal;
     font-size: 0.8rem;
-    padding: 0.3rem 0.5rem;
+    padding: 1px 5px;
 
     &.participatory_space_manifest {
       background-color: #f7b230;
@@ -46,48 +43,27 @@
 
   .constraints-list {
     margin: 16px 20px;
-    padding: 0 20px 0 0;
+    padding: 0 20px 14px 33px;
     list-style-type: disc;
 
+    .button__xs {
+      padding: 1px 5px;
+      font-size: 0.8rem;
+    }
+
     li {
       margin: 0 1em 0 0;
       padding: 0;
     }
 
-    button.edit-condition,
-    a.delete-condition {
-      margin-left: 1rem;
-    }
-
-    button.edit-condition {
-      color: $secondary-color;
-      cursor: pointer;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-
     &.inactive {
       .label:not(.constraint-none) {
         filter: saturate(10%);
       }
     }
-
-    &.no-items {
-      margin: 0;
-      padding-bottom: 14px;
-      list-style-type: none;
-    }
   }
 
   .flash[hidden] {
     display: none;
   }
-
-  .add-condition .icon {
-    width: 11px;
-    height: 11px;
-    margin-right: 0.3rem;
-  }
 }

data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss

@@ -1,100 +1,50 @@
-// hide custom-fields inside tabs, an extra (unique) container is used instead
-.color-box {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  margin-left: 1em;
-  vertical-align: middle;
-
-  &:first-child {
-    margin-left: 0;
-  }
+@import "stylesheets/decidim/editor";
 
-  $colors: (
-    "primary": $primary,
-    "secondary": $secondary,
-    "success": $success,
-    "warning": $warning,
-    "alert": $alert,
-    "highlight": $highlight,
-    "highlight_alternative": $highlight_alternative,
-  );
-
-  @each $name, $color in $colors {
-    &.#{$name} {
-      background-color: $color;
-    }
+// hide custom-fields inside tabs, an extra (unique) container is used instead
+.tabs-content {
+  .proposal_custom_field {
+    display: none;
   }
 }
 
 .proposal_custom_fields {
   &_editor {
-    background-color: #e0e0e0;
-    padding: 0.5em 0.5em 1em;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-
     ul.frmb,
     .form-wrap.form-builder .frmb li.form-field,
     .form-wrap.form-builder .stage-wrap.empty {
-      background-color: $body-background;
-      margin-right: 0.5rem;
+      @apply bg-background mr-2;
+    }
 
-      .field-actions {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-      }
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
 
-      .field-actions .btn {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
+    svg {
+      @apply fill-black;
     }
 
-    label {
-      display: inline-block;
-      max-width: 100%;
-      font-weight: $global-weight-bold !important;
+    li > label {
+      line-height: 27px !important;
+      font-size: 16px !important;
     }
 
-    li[type] {
-      display: block;
-      width: 100%;
-      height: inherit;
-      margin: inherit;
-      border: inherit;
-      box-shadow: inherit;
-      font-size: inherit;
-      font-weight: inherit;
-      line-height: inherit;
-      color: inherit;
-    }
+    input.form-control {
+      background-color: #fff;
+      border: 1px solid #ccc !important;
+      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
 
-    .form-group {
-      background-color: inherit;
-      margin: 0;
-      padding: 0;
+      &:focus {
+        outline: 0;
+        box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
+          0 0 8px rgba(102, 175, 233, 0.6) !important;
+      }
     }
 
-    .form-wrap.form-builder .form-group {
-      margin-bottom: 10px !important;
+    .frmb-control li {
+      cursor: cell !important;
     }
-
-    .form-control {
-      color: #555;
-      background-color: #fff;
-      border: 1px solid #ccc;
-      box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-      transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-      margin: 0;
-      padding: 6px 12px;
+    // drag and drop is disabled, let's not show the move cursor
+    .frmb .prev-holder {
+      cursor: default !important;
     }
   }
 }
-
-// Custom fields tuning
-.rendered-form .form-control.ql-container {
-  height: auto !important;
-}

data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_styles.scss

@@ -0,0 +1,48 @@
+.color-box {
+  display: inline-block;
+  height: 1em;
+  width: 1em;
+  margin-left: 1em;
+  vertical-align: middle;
+
+  &:first-child {
+    margin-left: 0;
+  }
+
+  &.primary {
+    background-color: var(--primary);
+  }
+
+  &.secondary {
+    background-color: var(--secondary);
+  }
+
+  &.tertiary {
+    background-color: var(--tertiary);
+  }
+
+  &.alert {
+    background-color: var(--alert);
+  }
+
+  &.warning {
+    background-color: var(--warning);
+  }
+
+  &.success {
+    background-color: var(--success);
+  }
+}
+
+.colors-help {
+  p {
+    @apply block text-sm text-gray-2 font-normal prose-a:text-secondary prose-a:underline;
+
+    margin-bottom: 1em;
+  }
+
+  .colors {
+    white-space: unset;
+    font-size: 0.7rem;
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/admin/intergram_fixes.scss

@@ -0,0 +1,11 @@
+#intergramRoot {
+  bottom: 3.5rem;
+  right: -0.5rem;
+  position: fixed;
+  z-index: 1000;
+  width: 100%;
+
+  > div {
+    position: absolute !important;
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/admin/user_picker.scss

@@ -1,29 +1,20 @@
-@import "select2/dist/css/select2.css";
-@import "stylesheets/vendor/select2-foundation-theme";
+@import "tom-select/dist/scss/tom-select";
 
-.multiusers-select-container {
-  form label {
-    margin-bottom: 1rem;
-  }
+/* overwrite tom-select defaults */
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
 
-  .switch-paddle {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 1em;
-  }
-}
-
-.select2-container--foundation .select2-selection--multiple {
-  .select2-selection__choice {
-    display: inline-block;
-    float: none;
-    font-weight: normal;
+    input {
+      @apply font-normal text-black text-md;
+    }
 
     .is-admin {
       &::before {
         content: "⛔";
         display: inline-block;
         margin-right: 0.3em;
+        text-decoration: none;
       }
 
       text-decoration: line-through;
@@ -31,11 +22,11 @@
     }
   }
 
-  textarea.select2-search__field {
-    resize: none;
-  }
-}
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
 
-.form-conversations-submit {
-  margin-top: 2rem;
+    .active {
+      @apply text-white bg-secondary;
+    }
+  }
 }

data/app/packs/stylesheets/decidim/decidim_awesome/amendments/modal.scss

@@ -0,0 +1,5 @@
+#LimitAmendmentsModal {
+  .instructions {
+    @apply grid gap-4 prose-a:text-secondary;
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin.scss

@@ -1,38 +1,24 @@
-@import "entrypoints/decidim_admin";
 @import "stylesheets/decidim/decidim_awesome/admin/constraints";
+@import "stylesheets/decidim/decidim_awesome/admin/custom_styles";
 @import "stylesheets/decidim/decidim_awesome/admin/custom_fields";
 @import "stylesheets/decidim/decidim_awesome/admin/auto_edits";
 @import "stylesheets/decidim/decidim_awesome/admin/check_redirections";
-@import "stylesheets/decidim/decidim_awesome/editors/markdown_editor";
-@import "stylesheets/decidim/decidim_awesome/editors/quill_editor";
+@import "stylesheets/decidim/decidim_awesome/admin/user_picker";
+@import "stylesheets/decidim/decidim_awesome/admin/codemirror";
+@import "stylesheets/decidim/decidim_awesome/shared/spinner";
+
+// Remove the 20% right column from the item__edit class
+// .item__edit {
+//   @apply grid grid-cols-1 md:grid-cols-[100%_0%] mb-8;
+// }
 
 .pokecode-credits {
   float: right;
   margin: 0 1em 0.5em 0;
-
-  // position: absolute;
-  // bottom: 0;
-  // right: 0;
-  // margin: 1em;
   font-size: 0.8em;
 }
 
 .decidim_awesome {
-  &.modal {
-    .spinner {
-      @include spinner(25px, #aaa, var(--secondary), 800ms);
-
-      vertical-align: middle;
-      display: none;
-    }
-
-    &.loading {
-      .spinner {
-        display: inline-block;
-      }
-    }
-  }
-
   &-form {
     margin-bottom: 2em;
     border-bottom: 1px solid #999;
@@ -48,27 +34,3 @@
     padding-bottom: 0;
   }
 }
-
-// Some global fixes
-.form label {
-  .help-text {
-    display: block;
-    margin-top: -1.5em;
-    font-weight: normal;
-    margin-bottom: 1.5em;
-  }
-}
-
-.form-input-extra-before ~ .form-error {
-  margin-top: -2.5rem;
-}
-
-tbody tr.menu_hack-addition {
-  background: rgb(255, 248, 222);
-}
-
-.secondary-nav {
-  li .icon {
-    margin-right: 0.5rem;
-  }
-}

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin_global.scss

@@ -5,22 +5,13 @@
 .component__show {
   &_private_data {
     &-grid {
-      background-color: $body-background;
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
-      gap: 1rem;
-      margin: 1rem 0;
-      padding: 0.5rem;
+      @apply bg-background grid-cols-2 gap-4 my-4 p-2;
 
       .date_info {
-        font-style: italic;
-        color: $medium-gray;
-        font-size: 0.875rem;
-        margin-top: 1rem;
+        @apply italic text-gray text-sm mt-4;
 
         a {
-          font-style: normal;
-          color: $secondary-color;
+          @apply not-italic text-secondary;
         }
       }
     }

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_application.scss

@@ -1,21 +1,5 @@
-@import "codemirror/lib/codemirror"; // used by inscribemde
-@import "stylesheets/decidim/decidim_awesome/editors/markdown_editor";
-@import "stylesheets/decidim/decidim_awesome/editors/quill_editor";
+@import "stylesheets/decidim/decidim_awesome/voting/voting_cards";
+@import "stylesheets/decidim/decidim_awesome/shared/spinner";
 @import "stylesheets/decidim/decidim_awesome/forms/autosave";
 @import "stylesheets/decidim/decidim_awesome/forms/custom_fields";
-@import "stylesheets/decidim/decidim_awesome/voting/voting_cards";
-
-.decidim_awesome-custom_fields {
-  dd {
-    > div:last-child {
-      margin-bottom: 1rem;
-    }
-
-    &[name="textarea"] {
-      > div > p {
-        margin-top: 1rem;
-        margin-bottom: 0;
-      }
-    }
-  }
-}
+@import "stylesheets/decidim/decidim_awesome/amendments/modal";

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss

@@ -1,4 +1,4 @@
-.wrapper {
+.participatory-space__container {
   .awesome-iframe {
     margin: 0 auto;