decidim-core 0.14.4 → 0.15.0

data/app/services/decidim/resource_search.rb

@@ -18,7 +18,6 @@ module Decidim
     # Creates the SearchLight base query.
     # Check if the option component was provided.
     def base_query
-      # raise order_start_time.inspect
       raise "Missing component" unless component
 
       @scope.where(component: component)

data/app/types/decidim/core/metric_history_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    MetricHistoryType = GraphQL::ObjectType.define do
+      name "MetricHistory"
+
+      field :key, !types.String, "The key value" do
+        resolve ->(obj, _args, _ctx) { MetricObjectPresenter.new(obj).attr_date(0) }
+      end
+
+      field :value, !types.Int, "The value for each key" do
+        resolve ->(obj, _args, _ctx) { MetricObjectPresenter.new(obj).attr_int(1) }
+      end
+    end
+  end
+end

data/app/types/decidim/core/metric_type.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    MetricType = GraphQL::ObjectType.define do
+      name "MetricType"
+      description "Metric data"
+
+      field :name, !types.String, "The name of the metric"
+      field :count, !types.Int, "The last value of the metric"
+      field :history, !types[MetricHistoryType], "The historic values for this metric"
+    end
+  end
+end

data/app/types/decidim/core/session_type.rb

@@ -12,7 +12,7 @@ module Decidim
       end
 
       field :verifiedUserGroups, !types[!UserGroupType], "The current user verified user groups" do
-        resolve ->(obj, _args, _ctx) { obj.user_groups.verified }
+        resolve ->(obj, _args, _ctx) { Decidim::UserGroups::ManageableUserGroups.for(obj).verified }
       end
     end
   end

data/app/types/decidim/core/user_group_type.rb

@@ -15,7 +15,7 @@ module Decidim
 
       field :name, !types.String, "The user group's name"
 
-      field :nickname, !types.String, "User groups have no nickname" do
+      field :nickname, !types.String, "The user group nickname" do
         resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).nickname }
       end
 
@@ -23,7 +23,7 @@ module Decidim
         resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).avatar_url }
       end
 
-      field :profilePath, !types.String, "The user's profile url" do
+      field :profilePath, !types.String, "The user group's profile url" do
         resolve ->(obj, _args, _ctx) { UserGroupPresenter.new(obj).profile_path }
       end
 

data/app/views/decidim/authorization_modals/show.html.erb

@@ -1,32 +1,45 @@
-<button class="close-button" data-close aria-label="Close modal"
-        type="button">
+<button class="close-button" data-close aria-label="Close modal" type="button">
   <span aria-hidden="true">&times;</span>
 </button>
-<div class="reveal__header <%= status.code %>-authorization">
-  <h3 class="reveal__title"><%= t ".#{status.code}.title" %></h3>
-</div>
-<p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
-<% if status.data[:extra_explanation] %>
-<p><%= t status.data[:extra_explanation][:key], **status.data[:extra_explanation][:params] %></p>
-<% end %>
-<% if status.data[:fields] %>
-<ul>
-  <% status.data[:fields].each do |field, value| %>
-    <li><strong><%= t ".#{status.code}.invalid_field", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers"), value: value ? "(#{value})" : "" %></strong></li>
+
+<% if current_user && !current_user.verifiable? %>
+  <div class="reveal__header missing-confirmation">
+    <h3 class="reveal__title"><%= t ".unconfirmed.title" %></h3>
+  </div>
+  <p><%= t ".unconfirmed.explanation_html", email: current_user.email %></p>
+  <p><%= t ".unconfirmed.confirmation_instructions" %></p>
+  <div class="row">
+    <div class="columns medium-8 medium-offset-2">
+      <%= link_to t(".unconfirmed.request_confirmation_instructions"), new_confirmation_path(Decidim::User), class: "button expanded" %>
+    </div>
+  </div>
+<% else %>
+  <div class="reveal__header <%= status.code %>-authorization">
+    <h3 class="reveal__title"><%= t ".#{status.code}.title" %></h3>
+  </div>
+  <p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+  <% if status.data[:extra_explanation] %>
+    <p><%= t status.data[:extra_explanation][:key], **status.data[:extra_explanation][:params] %></p>
   <% end %>
-</ul>
-<% end %>
-<div class="row">
-  <div class="columns medium-8 medium-offset-2">
-    <% if status.data[:action].present? %>
-      <%= link_to t(".#{status.code}.#{status.data[:action]}", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path, class: "button expanded" %>
-    <% else %>
-      <button class="button expanded" data-close><%= t ".#{status.code}.ok" %></button>
-    <% end %>
+  <% if status.data[:fields] %>
+    <ul>
+      <% status.data[:fields].each do |field, value| %>
+        <li><strong><%= t ".#{status.code}.invalid_field", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers"), value: value ? "(#{value})" : "" %></strong></li>
+      <% end %>
+    </ul>
+  <% end %>
+  <div class="row">
+    <div class="columns medium-8 medium-offset-2">
+      <% if status.data[:action].present? %>
+        <%= link_to t(".#{status.code}.#{status.data[:action]}", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path, class: "button expanded" %>
+      <% else %>
+        <button class="button expanded" data-close><%= t ".#{status.code}.ok" %></button>
+      <% end %>
+    </div>
   </div>
-</div>
-<% if status.data[:cancel] %>
-<div class="text-center">
-  <button class="link" data-close><%= t ".#{status.code}.cancel" %></button>
-</div>
+  <% if status.data[:cancel] %>
+    <div class="text-center">
+      <button class="link" data-close><%= t ".#{status.code}.cancel" %></button>
+    </div>
+  <% end %>
 <% end %>

data/app/views/decidim/devise/registrations/new.html.erb

@@ -26,11 +26,6 @@
         <%= invisible_captcha %>
         <div class="card">
           <div class="card__content">
-            <fieldset class="text-center">
-              <legend><%= t(".sign_up_as.legend") %></legend>
-              <%= f.collection_radio_buttons :sign_up_as, [["user", t(".sign_up_as.user")], ["user_group", t(".sign_up_as.user_group") ]], :first, :last %>
-            </fieldset>
-
             <div class="user-person">
               <div class="field">
                 <%= f.text_field :name, help_text: t(".username_help") %>
@@ -54,20 +49,6 @@
             <div class="field">
               <%= f.password_field :password_confirmation %>
             </div>
-
-            <div class="user-group-fields">
-              <div class="field">
-                <%= f.text_field :user_group_name %>
-              </div>
-
-              <div class="field">
-                <%= f.text_field :user_group_document_number %>
-              </div>
-
-              <div class="field">
-                <%= f.text_field :user_group_phone %>
-              </div>
-            </div>
           </div>
         </div>
 

data/app/views/decidim/gamification/badges/index.html.erb

@@ -0,0 +1,42 @@
+<main class="wrapper">
+  <div class="row column mb-m">
+    <h1><%= t ".title" %></h1>
+    <p>
+      <%= t ".page_description" %>
+    </p>
+  </div>
+  <% @badges.each do |badge| %>
+    <div class="row column mb-m">
+      <div class="column medium-2">
+        <article class="card card--badge absolutes">
+          <div class="card__content">
+            <div class="card__header">
+              <div class="badge-container">
+                <%= image_tag badge.image %>
+              </div>
+            </div>
+            <div class="card__text text-center">
+              <strong><%= badge.translated_name %></strong>
+            </div>
+          </div>
+        </article>
+      </div>
+      <div class="column medium-10">
+        <h6>
+          <strong><%= t ".badge_title", name: badge.translated_name %></strong>
+        </h6>
+        <p><%= badge.description(current_organization.name) %></p>
+        <h6>
+          <strong><%= t ".how" %></strong>
+        </h6>
+        <p>
+          <ol>
+            <% badge.conditions.each do |condition| %>
+              <li><%= condition %></li>
+            <% end %>
+          </ol>
+        </p>
+      </div>
+    </div>
+  <% end %>
+</main>

data/app/views/decidim/group_admins/index.html.erb

@@ -0,0 +1,18 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns medium-9 medium-offset-3">
+      <h5><%= t(".manage_admins") %></h5>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-3">
+      <%= cell "decidim/profile_sidebar", user_group %>
+    </div>
+    <div class="columns medium-9">
+      <section class="section">
+        <p><%= t(".current_admins") %></p>
+        <%= cell "decidim/members", user_group, role: "admin", from_admin: true %>
+      </section>
+    </div>
+  </div>
+</main>

data/app/views/decidim/group_invites/index.html.erb

@@ -0,0 +1,27 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns medium-9 medium-offset-3">
+      <h5><%= t(".invite_user") %></h5>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-3">
+      <%= cell "decidim/profile_sidebar", user_group %>
+    </div>
+    <div class="columns medium-9">
+      <%= decidim_form_for(@form, url: group_invites_path(@user_group.nickname)) do |f| %>
+        <div class="card">
+          <div class="card__content">
+            <div class="field">
+              <%= f.text_field :nickname %>
+            </div>
+
+            <div class="actions">
+              <%= f.submit t(".invite"), class: "button expanded" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</main>

data/app/views/decidim/group_members/index.html.erb

@@ -0,0 +1,19 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="columns medium-9 medium-offset-3">
+      <h5><%= t(".manage_members") %></h5>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns medium-3">
+      <%= cell "decidim/profile_sidebar", user_group %>
+    </div>
+    <div class="columns medium-9">
+      <%= cell "decidim/user_group_pending_requests_list", user_group, context: { current_user: current_user } %>
+      <section class="section">
+        <p><%= t(".current_members_without_admins") %></p>
+        <%= cell "decidim/members", user_group, role: "member", from_admin: true %>
+      </section>
+    </div>
+  </div>
+</main>

data/app/views/decidim/groups/_form.html.erb

@@ -0,0 +1,23 @@
+<div class="user-group-fields">
+  <div class="field">
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.text_field :nickname %>
+  </div>
+  <div class="field">
+    <%= f.text_field :email %>
+  </div>
+    <div class="field">
+    <%= f.text_field :document_number %>
+  </div>
+  <div class="field">
+    <%= f.text_field :phone %>
+  </div>
+  <div class="field">
+    <%= f.upload :avatar %>
+  </div>
+  <div class="field">
+    <%= f.text_area :about, rows: 5 %>
+  </div>
+</div>

data/app/views/decidim/groups/edit.html.erb

@@ -0,0 +1,26 @@
+<main class="wrapper">
+<div class="row collapse">
+  <div class="row collapse">
+    <div class="columns large-8 large-centered text-center page-title">
+      <h1><%= t(".edit_user_group") %></h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form, url: group_path(@user_group.nickname), method: :patch, html: { id: "edit-group" }) do |f| %>
+        <div class="card">
+          <div class="card__content">
+            <%= render partial: "form", locals: { f: f } %>
+
+            <div class="actions">
+              <%= f.submit t(".update_user_group"), class: "button expanded" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</main>

data/app/views/decidim/groups/new.html.erb

@@ -0,0 +1,26 @@
+<main class="wrapper">
+<div class="row collapse">
+  <div class="row collapse">
+    <div class="columns large-8 large-centered text-center page-title">
+      <h1><%= t(".new_user_group") %></h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form) do |f| %>
+        <div class="card">
+          <div class="card__content">
+            <%= render partial: "form", locals: { f: f } %>
+
+            <div class="actions">
+              <%= f.submit t(".create_user_group"), class: "button expanded" %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</main>

data/app/views/decidim/last_activities/_activities.html.erb

@@ -0,0 +1,13 @@
+<% if activities.length == 0 %>
+  <div class="callout warning">
+    <%= t ".no_activities_warning" %>
+  </div>
+<% else %>
+  <%= render partial: "decidim/shared/results_per_page" %>
+
+  <div class="row">
+    <%= cell "decidim/activities", activities %>
+  </div>
+
+  <%= decidim_paginate activities, resource_type: params[:resource_type] %>
+<% end %>

data/app/views/decidim/last_activities/index.html.erb

@@ -0,0 +1,18 @@
+<div class="wrapper">
+  <div class="row">
+    <h1 class="section-heading"><%= t(".last_activity") %></h1>
+
+    <div class="columns mediumlarge-4 large-3">
+      <div class="card card--secondary show-for-mediumlarge">
+        <%= filter_form_for filter, last_activities_path do |form| %>
+          <%= form.collection_radio_buttons :resource_type, resource_types, :first, :last, legend_title: t(".resource_type") %>
+        <% end %>
+      </div>
+    </div>
+    <div id="activities" class="columns mediumlarge-8 large-9">
+      <%= render partial: "activities" %>
+    </div>
+  </div>
+</div>
+
+<%= javascript_include_tag("decidim/filters") %>

data/app/views/decidim/last_activities/index.js.erb

@@ -0,0 +1,6 @@
+var $activities = $('#activities');
+
+$activities.html('<%= j(render partial: "activities").strip.html_safe %>');
+
+var $dropdownMenu = $('.dropdown.menu', $activities);
+$dropdownMenu.foundation();

data/app/views/decidim/profiles/show.html.erb

@@ -1 +1 @@
-<%= cell "decidim/profile", user, context: { content_cell: @content_cell } %>
+<%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell, current_user: current_user } %>

data/app/views/layouts/decidim/_user_menu.html.erb

@@ -4,7 +4,6 @@
 <% end %>
 <li><%= link_to t(".notifications"), decidim.notifications_path %></li>
 <li><%= link_to t(".conversations"), decidim.conversations_path %></li>
-<li><%= link_to t(".invite_friends"), decidim.account_invitations_path %></li>
 <% if allowed_to? :read, :admin_dashboard %>
   <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
 <% end %>

data/app/views/layouts/decidim/_wrapper.html.erb

@@ -1,5 +1,5 @@
 <%
-if respond_to?(:current_component) && current_component
+if respond_to?(:current_component) && current_component && can_be_managed?(current_component)
   edit_link(
     manage_component_path(current_component),
     :read,

data/config/initializers/devise.rb

@@ -172,7 +172,7 @@ Devise.setup do |config|
   # able to access the website for two days without confirming their account,
   # access will be blocked just in the third day. Default is 0.days, meaning
   # the user cannot access the website without confirming their account.
-  # config.allow_unconfirmed_access_for = 2.days
+  config.allow_unconfirmed_access_for = Decidim.unconfirmed_access_for
 
   # A period that the user is allowed to confirm their account before their
   # token becomes invalid. For example, if set to 3.days, the user can confirm