decidim-core 0.0.2 → 0.0.3

data/app/models/decidim/participatory_process.rb

@@ -6,6 +6,8 @@ module Decidim
   # steps that get enabled or disabled depending on which step is currently
   # active.
   class ParticipatoryProcess < ApplicationRecord
+    include Decidim::HasAttachments
+
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: Decidim::Organization,
@@ -22,11 +24,6 @@ module Decidim
             class_name: Decidim::ParticipatoryProcessStep,
             dependent: :destroy,
             inverse_of: :participatory_process
-    has_many :attachments,
-             foreign_key: "decidim_participatory_process_id",
-             class_name: Decidim::ParticipatoryProcessAttachment,
-             dependent: :destroy,
-             inverse_of: :participatory_process
     has_many :categories,
              foreign_key: "decidim_participatory_process_id",
              class_name: Decidim::Category,

data/app/models/decidim/resource_link.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Decidim
+  # A ResourceLink allows linking resources (other entities in Decidim) between
+  # them without them having to know each other.
+  #
+  # In order to group the relations between resources you need to specify a name.
+  #
+  # Some examples could be: proposals that have been created in a meeting or
+  # projects that are a result of merging diffrent proposals.
+  class ResourceLink < ApplicationRecord
+    belongs_to :from, polymorphic: true
+    belongs_to :to, polymorphic: true
+
+    validates :from, :to, :name, presence: true
+    validates :name, uniqueness: { scope: [:from, :to] }
+
+    validate :same_organization
+
+    private
+
+    def same_organization
+      return if from.try(:organization) == to.try(:organization)
+
+      errors.add(:from, :invalid)
+      errors.add(:to, :invalid)
+    end
+  end
+end

data/app/models/decidim/user.rb

@@ -11,6 +11,8 @@ module Decidim
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: Decidim::Organization
     has_many :authorizations, foreign_key: "decidim_user_id", class_name: Decidim::Authorization, inverse_of: :user
     has_many :identities, foreign_key: "decidim_user_id", class_name: Decidim::Identity
+    has_many :user_groups, through: :memberships, class_name: Decidim::UserGroup, foreign_key: :decidim_user_group_id
+    has_many :memberships, class_name: Decidim::UserGroupMembership, foreign_key: :decidim_user_id
 
     ROLES = %w(admin moderator official).freeze
 
@@ -44,6 +46,10 @@ module Decidim
       roles.include?(role.to_s)
     end
 
+    def name
+      super || I18n.t("decidim.anonymous_user")
+    end
+
     private
 
     def all_roles_are_valid

data/app/models/decidim/user_group.rb

@@ -9,10 +9,19 @@ module Decidim
     validates :name, presence: true
     validates :document_number, presence: true
     validates :phone, presence: true
+    validates :avatar, file_size: { less_than_or_equal_to: 5.megabytes }
+    mount_uploader :avatar, Decidim::AvatarUploader
+
+    scope :verified, -> { where.not(verified_at: nil) }
 
     # Public: Mark the user group as verified
     def verify!
-      update_attribute(:verified, true)
+      update_attribute(:verified_at, Time.current)
+    end
+
+    # Public: Checks if the user group is verified.
+    def verified?
+      verified_at.present?
     end
   end
 end

data/app/services/decidim/resource_search.rb

@@ -20,10 +20,7 @@ module Decidim
       # raise order_start_time.inspect
       raise "Missing feature" unless feature
 
-      @scope
-        .page(options[:page] || 1)
-        .per(options[:per_page] || 12)
-        .where(feature: feature)
+      @scope.where(feature: feature)
     end
 
     # Handle the category_id filter

data/app/types/decidim/session_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Decidim
+  # This type represents the current user session.
+  SessionType = GraphQL::ObjectType.define do
+    name "Session"
+    description "The current session"
+
+    field :user, UserType, "The current user" do
+      resolve ->(obj, _args, _ctx) { obj }
+    end
+
+    field :verifiedUserGroups, !types[UserGroupType], "The current user verified user groups" do
+      resolve ->(obj, _args, _ctx) { obj.user_groups.verified }
+    end
+  end
+end

data/app/types/decidim/user_group_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Decidim
+  # This type represents a UserGroup
+  UserGroupType = GraphQL::ObjectType.define do
+    name "UserGroup"
+    description "A user group"
+
+    interfaces [
+      Decidim::Api::AuthorInterface
+    ]
+
+    field :id, !types.ID, "The user group's id"
+
+    field :name, !types.String, "The user group's name"
+
+    field :avatarUrl, !types.String, "The user's avatar url" do
+      resolve ->(obj, _args, _ctx) { obj.avatar.url }
+    end
+  end
+end

data/app/types/decidim/user_type.rb

@@ -5,7 +5,11 @@ module Decidim
     name "User"
     description "A user"
 
-    field :name, types.String, "The user's name"
+    interfaces [
+      Decidim::Api::AuthorInterface
+    ]
+
+    field :name, !types.String, "The user's name"
 
     field :avatarUrl, !types.String, "The user's avatar url" do
       resolve ->(obj, _args, _ctx) { obj.avatar.url }

data/app/uploaders/decidim/attachment_uploader.rb

@@ -7,9 +7,11 @@ module Decidim
 
     process :set_content_type_and_size_in_model
     process :validate_dimensions
+
     version :thumbnail, if: :image? do
       process resize_to_fit: [nil, 237]
     end
+
     version :big, if: :image? do
       process resize_to_limit: [nil, 1000]
     end
@@ -39,7 +41,8 @@ module Decidim
     #
     # Returns a Boolean.
     def image?(new_file)
-      new_file.content_type.start_with? "image"
+      content_type = model.try(:content_type) || new_file.content_type
+      content_type.to_s.start_with? "image"
     end
 
     # Copies the content type and file size to the model where this is mounted.

data/app/uploaders/decidim/avatar_uploader.rb

@@ -7,6 +7,14 @@ module Decidim
 
     process :validate_dimensions
 
+    version :big do
+      process resize_to_fill: [500, 500]
+    end
+
+    version :thumb do
+      process resize_to_fill: [100, 100]
+    end
+
     def default_url(*)
       ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
     end

data/app/uploaders/decidim/banner_image_uploader.rb

@@ -2,5 +2,6 @@
 module Decidim
   # This class deals with uploading banner images to ParticipatoryProcesses.
   class BannerImageUploader < ImageUploader
+    process resize_to_limit: [1000, 200]
   end
 end

data/app/uploaders/decidim/hero_image_uploader.rb

@@ -2,5 +2,6 @@
 module Decidim
   # This class deals with uploading hero images to ParticipatoryProcesses.
   class HeroImageUploader < ImageUploader
+    process resize_to_limit: [1000, 1000]
   end
 end

data/app/uploaders/decidim/homepage_image_uploader.rb

@@ -5,7 +5,11 @@ module Decidim
     include CarrierWave::MiniMagick
 
     version :big do
-      process resize_to_limit: [nil, 2000]
+      process resize_to_fill: [1920, 666]
+    end
+
+    def max_image_height_or_width
+      8000
     end
   end
 end

data/app/uploaders/decidim/image_uploader.rb

@@ -33,7 +33,7 @@ module Decidim
     end
 
     def max_image_height_or_width
-      8000
+      2000
     end
 
     private

data/app/uploaders/decidim/organization_favicon_uploader.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module Decidim
+  # This class deals with uploading an organization's favicon.
+  class OrganizationFaviconUploader < ImageUploader
+    SIZES = {
+      big: 152,
+      medium: 64,
+      small: 32
+    }.freeze
+
+    SIZES.each do |name, size|
+      version name do
+        process resize_and_pad: [size, size]
+      end
+    end
+  end
+end

data/app/uploaders/decidim/organization_logo_uploader.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module Decidim
-  # This class deals with uploading hero images to ParticipatoryProcesses.
+  # This class deals with uploading the organization's logo.
   class OrganizationLogoUploader < ImageUploader
     version :medium do
-      process resize_to_limit: [500, 500]
+      process resize_to_limit: [600, 160]
     end
   end
 end

data/app/validators/feature_validator.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+# A custom validator to make sure features are correctly assigned to a model.
+#
+# Adds a presence validation and checks that the manifest is the correct one.
+class FeatureValidator < ActiveModel::EachValidator
+  # Validates the arguiments passed to the validator.
+  def check_validity!
+    raise ArgumentError, "You must include a `manifest` option with the name of the manifest to validate when validating a feature" unless options[:manifest].present?
+  end
+
+  # The actual validator method. It is called when ActiveRecord iterates
+  # over all the validators.
+  def validate_each(record, attribute, feature)
+    unless feature
+      record.errors[attribute] << :blank
+      return
+    end
+
+    manifest_name = options[:manifest].respond_to?(:call) ? options[:manifest].call : options[:manifest].to_s
+
+    record.errors[attribute] << :invalid if feature.manifest_name.to_s != manifest_name
+  end
+end

data/app/views/decidim/account/_password_fields.html.erb

@@ -0,0 +1,2 @@
+<%= form.password_field :password, value: form.object.password %>
+<%= form.password_field :password_confirmation, value: form.object.password_confirmation %>

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

@@ -1,32 +1,27 @@
-<main class="wrapper">
-<div class="row collapse">
-  <div class="columns">
-    <h1 class="heading1 user-header"><%= t(".title") %></h1>
-  </div>
-</div>
-<div class="row collapse">
-  <div class="main-container">
-    <div class="row collapse main-container--side-panel">
-      <div class="columns medium-4 large-3">
-        <div class="side-panel">
-          <ul class="tabs vertical side-panel__tabs" id="user-settings-tabs"
-            data-tabs>
-            <% if handlers.any? || authorizations.any? %>
-              <li class="tabs-title">
-                <a href="#authorizations"><%= t(".authorizations") %></a>
-              </li>
-            <% end %>
-          </ul>
-        </div>
-      </div>
-      <div class="columns medium-8 large-9">
-        <div class="main-container__content">
-          <div class="tabs-content vertical" data-tabs-content="user-settings-tabs">
-            <%= render partial: "authorizations" %>
-          </div>
-        </div>
-      </div>
+<div class="row">
+  <%= form_for(@account, url: account_path, method: :put, class: "user-form") do |f| %>
+    <div class="columns large-4">
+      <%= image_tag current_user.avatar.big.url, width: "100%" %>
+      <%= f.file_field :avatar, label: false %>
+      <%= f.check_box :remove_avatar %>
     </div>
+
+    <div class="columns large-8 end">
+      <%= f.text_field :name %>
+      <%= f.email_field :email %>
+
+      <% if @account.errors[:password].any? || @account.errors[:password_confirmation].any? %>
+        <%= render partial: "password_fields", locals: { form: f } %>
+      <% else %>
+        <p>
+          <a data-toggle="passwordChange" class="change-password"><%= t ".change_password" %></a>
+        </p>
+        <div id="passwordChange" class="toggle-show" data-toggler=".is-expanded">
+          <%= render partial: "password_fields", locals: { form: f } %>
+        </div>
+      <% end %>
+
+      <%= f.submit t(".update_account"), disable_with: true %>
+    <% end %>
   </div>
 </div>
-</main>

data/app/views/decidim/application/_attachments.html.erb

@@ -0,0 +1,8 @@
+<% if attached_to.attachments.any? %>
+  <div class="row attachments">
+    <div class="columns large-8">
+      <%= render partial: "documents", locals: { documents: attached_to.documents } %>
+      <%= render partial: "photos", locals: { photos: attached_to.photos } %>
+    </div>
+  </div>
+<% end %>

data/app/views/decidim/authorizations/first_login.html.erb

@@ -0,0 +1,22 @@
+<main class="wrapper">
+  <div class="row collapse">
+    <div class="row collapse">
+      <div class="columns large-8 large-centered text-center">
+        <h1 class="heading1 page-title"><%= t(".title") %></h1>
+        <p class="heading5"><%= t(".verify_with_these_options") %></p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="columns medium-7 large-5 medium-centered">
+        <div class="card">
+          <div class="card__content">
+            <% handlers.each do |handler| %>
+              <%= link_to t(handler.handler_name, scope: "decidim.authorizations.first_login.actions"), new_authorization_path(handler: handler.handler_name), class: "button expanded" %>
+            <% end %>
+            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), participatory_processes_path).html_safe).html_safe %>.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</main>

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

@@ -1,22 +1,49 @@
-<main class="wrapper">
-  <div class="row collapse">
-    <div class="row collapse">
-      <div class="columns large-8 large-centered text-center">
-        <h1 class="heading1 page-title"><%= t(".title") %></h1>
-        <p class="heading5"><%= t(".verify_with_these_options") %></p>
+<div class="row column authorizations-list">
+  <% if @authorizations.any? %>
+    <section class="section">
+      <div class="card card--list">
+        <% @authorizations.each do |authorization| %>
+          <div class="card--list__item">
+            <div class="card--list__text">
+              <%= icon "lock-unlocked", class: "card--list__icon" %>
+              <div>
+                <h5 class="card--list__heading">
+                  <%= t(authorization.name, scope: "decidim.authorization_handlers") %>
+                </h5>
+                <span class="text-small"><%= l(authorization.created_at, format: :long) %></span>
+              </div>
+            </div>
+            <div class="card--list__data">
+              <%= link_to authorization, method: :delete, class: "card--list__data__icon", data: { confirm: t(".authorization_confirm_destroy") } do %>
+                <%= icon "circle-x" %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
       </div>
-    </div>
-    <div class="row">
-      <div class="columns medium-7 large-5 medium-centered">
-        <div class="card">
-          <div class="card__content">
-            <% handlers.each do |handler| %>
-              <%= link_to t(handler.handler_name, scope: "decidim.authorizations.index.actions"), new_authorization_path(handler: handler.handler_name), class: "button expanded" %>
-            <% end %>
-            <p class="text-center skip"><%= t("decidim.authorizations.skip_verification", link: link_to(t("decidim.authorizations.current_participatory_processes"), participatory_processes_path).html_safe).html_safe %>.</p>
+    <% end %>
+    <% if handlers.any? %>
+      <div class="card card--list">
+        <% handlers.each do |handler| %>
+          <div class="card--list__item">
+            <div class="card--list__text">
+              <a href="#">
+                <%= icon "lock-locked", class: "card--list__icon" %>
+              </a>
+              <div>
+                <h5 class="card--list__heading">
+                  <%= link_to t(handler.handler_name, scope: "decidim.authorization_handlers"), new_authorization_path(handler: handler.handler_name) %>
+                </h5>
+              </div>
+            </div>
+            <div class="card--list__data">
+              <%= link_to new_authorization_path(handler: handler.handler_name), class: "card--list__data__icon" do %>
+                <%= icon "chevron-right" %>
+              <% end %>
+            </div>
           </div>
-        </div>
+        <% end %>
       </div>
-    </div>
-  </div>
-</main>
+    </section>
+  <% end %>
+</div>