decidim-core 0.0.2 → 0.0.3

data/app/assets/stylesheets/decidim/modules/_list-docs.scss

@@ -27,4 +27,4 @@
   .list-check__ko &{
     color: $alert;
   }
-}
+}

data/app/assets/stylesheets/decidim/modules/_margins.scss

@@ -0,0 +1,15 @@
+$margin-s: 1rem;
+$margin-m: 3rem;
+$margin-l: 5rem;
+
+//Sections
+.section{
+  margin-bottom: $margin-m;
+  @include breakpoint(large){
+    margin-bottom: $margin-l;
+  }
+}
+
+.m-bottom{
+  margin-bottom: $margin-s;
+}

data/app/assets/stylesheets/decidim/modules/_modules.scss

@@ -0,0 +1,56 @@
+//Basic modules
+@import "margins";
+@import "typography";
+@import "title-action";
+@import "buttons";
+@import "forms";
+@import "icons";
+@import "video";
+
+//Foundation overrides
+@import "reveal";
+
+//Layout
+@import "layout";
+@import "navbar";
+@import "main-container";
+@import "footer";
+@import "static-pages";
+
+//Cards and containers
+@import "card-grid";
+@import "cards";
+@import "extra";
+@import "definition-data";
+@import "callout";
+
+//Shared modules
+@import "comments";
+@import "opinion-toggle";
+@import "flag";
+@import "author-avatar";
+@import "address";
+@import "order-by";
+@import "tags";
+@import "list-docs";
+
+//Process elements
+@import "process-header";
+@import "process-info";
+@import "process-nav";
+@import "process-phase";
+@import "timeline";
+@import "filter-tags";
+@import "filters";
+@import "reference";
+@import "status-labels";
+
+//User interface
+@import "user-form";
+@import "signup";
+
+//Additional elements
+@import "share";
+@import "help";
+@import "cookie-bar";
+@import "map";

data/app/assets/stylesheets/decidim/modules/_opinion-toggle.scss

@@ -1,16 +1,22 @@
 .opinion-toggle{
   margin: 2rem 0;
+  display: flex;
+  text-align: center;
 }
 
-.button-group .opinion-toggle--ok,
-.button-group .opinion-toggle--ko{
-  @include breakpoint(small down){
-    margin-bottom: 2px;  
+.opinion-toggle--ok,
+.opinion-toggle--ko,
+.opinion-toggle--meh{
+  &.is-inactive{
+    opacity: .3;
   }
 }
 
 .opinion-toggle--ok{
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
   &:hover,
+  &:focus,
   &.is-active{
     background-color: $success;
   }
@@ -20,11 +26,25 @@
 }
 
 .opinion-toggle--ko{
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
   &:hover,
+  &:focus,
   &.is-active{
     background-color: $alert;
   }
   .icon{
     vertical-align: middle;
   }
-}
+}
+
+.opinion-toggle--meh{
+  border-radius: 0;
+  padding-left: .5em;
+  padding-right: .5em;
+  &:hover,
+  &:focus,
+  &.is-active{
+    background-color: $secondary;
+  }
+}

data/app/assets/stylesheets/decidim/modules/_order-by.scss

@@ -63,3 +63,4 @@ $order-border: $border;
     border-left: none;
   }
 }
+

data/app/assets/stylesheets/decidim/modules/_process-header.scss

@@ -51,7 +51,8 @@
     margin-bottom: 0;
     color: $white;
     border-color: $white;
-    &:hover{
+    &:hover,
+    &.is-active{
       color: $primary;
       border-color: $primary;
     }

data/app/assets/stylesheets/decidim/modules/_process-phase.scss

@@ -1,7 +1,3 @@
-.wrapper.steps {
-  padding-top: 0;
-}
-
 .phase-title{
   display: block;
   font-weight: 600;

data/app/assets/stylesheets/decidim/modules/_status-labels.scss

@@ -1,6 +1,12 @@
 .label--basic{
   background-color: lighten($dark-gray, 60);
 }
+.label--highlight{
+  background-color: $secondary;
+}
+.label--admin{
+  background-color: $primary;
+}
 
 .proposal-status{
   float: left;
@@ -11,4 +17,4 @@
 .label--small{
   margin: .2rem .2rem .2rem 0;
   padding: .2rem .3rem;
-}
+}

data/app/assets/stylesheets/decidim/modules/_typography.scss

@@ -72,6 +72,23 @@ hr{
   }
 }
 
+.mini-title{
+  color: $muted;
+  text-transform: uppercase;
+  font-size: .9rem;
+  letter-spacing: .01em;
+  font-weight: 600;
+  margin-bottom: 0;
+  &__strong{
+    color: $body-font-color;
+    font-size: 1.2rem;
+    font-weight: 800;
+  }
+  &__strong--highlight{
+    font-size: 1.4rem;
+  }
+}
+
 .page-title{
   margin-bottom: 3rem;
 }

data/app/assets/stylesheets/decidim/utils/_fontface.scss

@@ -3,7 +3,7 @@
 	font-style: normal;
 	font-weight: 400;
 	src:
-    font-url('decidim/Source_Sans_Pro_400.woff2') format('woff2'),
+    asset-data-url('decidim/Source_Sans_Pro_400.woff2') format('woff2'),
     font-url('decidim/Source_Sans_Pro_400.woff') format('woff'),
 		font-url('decidim/Source_Sans_Pro_400.ttf') format('truetype');
 }
@@ -12,7 +12,7 @@
 	font-style: normal;
 	font-weight: 600;
 	src:
-    font-url('decidim/Source_Sans_Pro_600.woff2') format('woff2'),
+    asset-data-url('decidim/Source_Sans_Pro_600.woff2') format('woff2'),
 		font-url('decidim/Source_Sans_Pro_600.woff') format('woff'),
 		font-url('decidim/Source_Sans_Pro_600.ttf') format('truetype');
 }
@@ -21,7 +21,7 @@
 	font-style: normal;
 	font-weight: 900;
 	src:
-    font-url('decidim/Source_Sans_Pro_900.woff2') format('woff2'),
+    asset-data-url('decidim/Source_Sans_Pro_900.woff2') format('woff2'),
 		font-url('decidim/Source_Sans_Pro_900.woff') format('woff'),
 		font-url('decidim/Source_Sans_Pro_900.ttf') format('truetype');
 }

data/app/assets/stylesheets/decidim/utils/_settings.scss

@@ -42,7 +42,6 @@
 
 @import 'util/util';
 
-
 // 1. Global
 // ---------
 
@@ -50,19 +49,21 @@ $global-font-size: 100%;
 $global-width: rem-calc(1200);
 $global-lineheight: 1.5;
 $foundation-palette: (
-  primary: #ef604d,
-  secondary: #599aa6,
-  success: #57d685,
-  warning: #ffae00,
-  alert: #ec5840,
+  primary: $primary,
+  secondary: $secondary,
+  success: $success,
+  warning: $warning,
+  alert: $alert,
 );
 $light-gray: #fafafa;
 $medium-gray: #e8e8e8;
 $dark-gray: #2c2930;
 $black: #1a181d;
 $white: #fff;
+$light-gray-dark: darken($light-gray, 2.5) !default;
 $body-background: $light-gray;
 $body-font-color: #3D393C;
+$muted: lighten($body-font-color, 30) !default;
 $body-font-family: 'Source Sans Pro', Helvetica, Roboto, Arial, sans-serif;
 $body-antialiased: true;
 $global-margin: 1rem;
@@ -74,6 +75,8 @@ $global-text-direction: ltr;
 $global-flexbox: false;
 $print-transparent-backgrounds: true;
 
+$border: 1px solid $medium-gray !default;
+
 @include add-foundation-colors;
 
 // 2. Breakpoints
@@ -436,7 +439,7 @@ $pagination-item-color: $body-font-color;
 $pagination-item-padding: rem-calc(3 10);
 $pagination-item-spacing: rem-calc(1);
 $pagination-radius: $global-radius;
-$pagination-item-background-hover: $white;
+$pagination-item-background-hover: $medium-gray;
 $pagination-item-background-current: $secondary-color;
 $pagination-item-color-current: $white;
 $pagination-item-color-disabled: lighten($body-font-color, 30);

data/app/commands/decidim/invite_user.rb

@@ -18,7 +18,7 @@ module Decidim
         invite_user
       end
 
-      broadcast(:ok)
+      broadcast(:ok, user)
     end
 
     private
@@ -35,7 +35,7 @@ module Decidim
     end
 
     def invite_user
-      Decidim::User.invite!(
+      @user = Decidim::User.invite!(
         {
           name: form.name,
           email: form.email.downcase,

data/app/commands/decidim/update_account.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module Decidim
+  # This command updates the user's account.
+  class UpdateAccount < Rectify::Command
+    # Updates a user's account.
+    #
+    # user - The user to be updated.
+    # form - The form with the data.
+    def initialize(user, form)
+      @user = user
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) unless @form.valid?
+
+      update_personal_data
+      update_avatar
+      update_password
+      @user.save!
+
+      @form.remove_avatar = false
+      broadcast(:ok, @user.unconfirmed_email.present?)
+    end
+
+    private
+
+    def update_personal_data
+      @user.name = @form.name
+      @user.email = @form.email
+    end
+
+    def update_avatar
+      if @form.avatar
+        @user.avatar = @form.avatar
+      elsif @form.remove_avatar
+        @user.remove_avatar = true
+      end
+    end
+
+    def update_password
+      return unless @form.password.present?
+
+      @user.password = @form.password
+      @user.password_confirmation = @form.password_confirmation
+    end
+  end
+end

data/app/controllers/concerns/decidim/form_factory.rb

@@ -43,7 +43,7 @@ module Decidim
           #
           # extra_context - A Hash with optional extra context data.
           def instance(extra_context = {})
-            @klass.new(context.merge(extra_context))
+            @klass.new.with_context(context.merge(extra_context))
           end
 
           # Initializes a form object from a model. Delegates the functionality

data/app/controllers/concerns/decidim/needs_authorization.rb

@@ -17,7 +17,18 @@ module Decidim
       # Overwrites `cancancan`'s method to point to the correct ability class,
       # since the gem expects the ability class to be in the root namespace.
       def current_ability
-        @current_ability ||= Decidim::Ability.new(current_user)
+        @current_ability ||= current_ability_klass.new(current_user, ability_context)
+      end
+
+      def current_ability_klass
+        Decidim::Ability
+      end
+
+      def ability_context
+        {
+          current_organization: try(:current_organization),
+          current_feature: try(:current_feature)
+        }
       end
 
       # Handles the case when a user visits a path that is not allowed to them.

data/app/controllers/concerns/decidim/user_profile.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require "active_support/concern"
+
+module Decidim
+  # The UserProfile concern must be included in all the controllers
+  # that are shown in the user's profile settings. It adds the
+  # proper layout, as well as helper methods that help render the
+  # side menu, amongst others.
+  module UserProfile
+    extend ActiveSupport::Concern
+    include FormFactory
+
+    delegate :user_groups, to: :current_user, prefix: false
+
+    included do
+      layout "layouts/decidim/user_profile"
+
+      helper_method :available_authorization_handlers,
+                    :user_groups
+
+      authorize_resource :current_user
+    end
+
+    # Public: Available authorization handlers in order to conditionally
+    # show the menu element.
+    def available_authorization_handlers
+      Decidim.authorization_handlers
+    end
+  end
+end

data/app/controllers/decidim/account_controller.rb

@@ -4,23 +4,41 @@ require_dependency "decidim/application_controller"
 module Decidim
   # The controller to handle the user's account page.
   class AccountController < ApplicationController
-    helper_method :authorizations, :handlers
-    authorize_resource :user_account, class: false
+    helper_method :authorizations
+    include Decidim::UserProfile
 
-    private
+    def show
+      authorize! :show, current_user
+      @account = form(AccountForm).from_model(current_user)
+    end
+
+    def update
+      authorize! :update, current_user
+      @account = form(AccountForm).from_params(params)
+
+      UpdateAccount.call(current_user, @account) do
+        on(:ok) do |_account, unconfirmed_email|
+          flash.now[:notice] = if unconfirmed_email
+                                 t("account.update.success_with_email_confirmation", scope: "decidim")
+                               else
+                                 t("account.update.success", scope: "decidim")
+                               end
+
+          bypass_sign_in(current_user)
+        end
 
-    def handlers
-      @handlers ||= Decidim.authorization_handlers.reject do |handler|
-        authorized_handlers.include?(handler.handler_name)
+        on(:invalid) do
+          flash.now[:alert] = t("account.update.error", scope: "decidim")
+        end
       end
+
+      render action: :show
     end
 
+    private
+
     def authorizations
       @authorizations ||= current_user.authorizations
     end
-
-    def authorized_handlers
-      authorizations.map(&:name)
-    end
   end
 end