decidim-core 0.0.1 → 0.0.2

data/config/locales/en.yml

@@ -1,5 +1,11 @@
 ---
 en:
+  activemodel:
+    attributes:
+      user:
+        user_group_document_number: Organization document number
+        user_group_name: Organization name
+        user_group_phone: Organization phone
   activerecord:
     attributes:
       decidim/user:
@@ -27,6 +33,8 @@ en:
         title: My account
     authorization_handlers:
       decidim/dummy_authorization_handler: Example authorization
+      errors:
+        duplicate_authorization: A user is already authorized with the same data.
     authorizations:
       create:
         error: There was an error creating the authorization.
@@ -47,11 +55,22 @@ en:
       actions:
         unauthorized: You are not authorized to perform this action
     devise:
+      omniauth_registrations:
+        create:
+          email_already_exists: Another account is using the same email address
+        new:
+          complete_profile: Complete profile
+          sign_up: Complete your profile
+          subtitle: Please fill in the following form in order to complete the sign up
       registrations:
         new:
           already_have_an_account?: Already have an account?
           sign_in: Log in
           sign_up: Sign up
+          sign_up_as:
+            legend: Sign up as
+            user: Individual
+            user_group: Organization/Collective
           subtitle: Sign up to participate in discussions and support proposals.
           terms: the terms and conditions of use
           tos_agreement: By signing up you agree to %{link}.
@@ -60,30 +79,45 @@ en:
         new:
           are_you_new?: New to the platform?
           register: Create an account
+      shared:
+        omniauth_buttons:
+          or: Or
     menu:
       home: Home
       processes: Processes
+    participatory_process_steps:
+      index:
+        process_steps: Process steps
+      participatory_process_step:
+        info: Information
     participatory_processes:
       documents:
         related_documents: Related documents
       photos:
         related_photos: Related photos
+    shared:
+      login_modal:
+        please_sign_in: Please sign in
+        sign_up: Sign up
   devise:
     mailer:
       invitation_instructions:
         accept: Accept invitation
         accept_until: This invitation will be due in %{due_date}.
-        hello: Hello %{email}
+        hello: Hello %{email},
         ignore: |-
           If you don't want to accept the invitation, please ignore this email.<br />
           Your account won't be created until you access the link above and set your password.
+        invited_you_as_admin: "%{invited_by} has invited you as an admin of %{application}, you can accept it through the link below."
         someone_invited_you: Someone has invited you to %{application}, you can accept it through the link below.
+      invite_admin:
+        subject: You've been invited to manage %{organization}
       organization_admin_invitation_instructions:
-        subject: You've been invited to admin %{organization}
+        subject: You've been invited to manage %{organization}
       password_change:
         greeting: Hello %{recipient}!
         message: We're contacting you to notify you that your password has been changed.
-        subject: Password Changed
+        subject: Password changed
   errors:
     messages:
       file_size_is_less_than_or_equal_to: file size must be less than or equal to %{count}
@@ -115,6 +149,10 @@ en:
           active_step: 'Current step:'
           more_info: More info
           take_part: Take part
+      process_header:
+        process_menu_item: The process
+      process_header_steps:
+        view_steps: View steps
       user_menu:
         profile: My account
         sign_out: Sign out
@@ -143,6 +181,10 @@ en:
       proposals_explanation: Open space for citizen proposals about what kind of city we want to live in.
       register: Register
       see_all_processes: See all processes
+      stats:
+        headline: Current state of %{organization}
+        processes: Processes
+        users: Users
       welcome: Welcome to %{organization}!
   views:
     pagination:

data/config/locales/es.yml

@@ -1,4 +1,10 @@
 es:
+  activemodel:
+    attributes:
+      user:
+        user_group_document_number: Número de documento acreditativo
+        user_group_name: Nombre de la Organización
+        user_group_phone: Teléfono de la organización
   activerecord:
     attributes:
       decidim/user:
@@ -26,6 +32,8 @@ es:
         title: Mi cuenta
     authorization_handlers:
       decidim/dummy_authorization_handler: Autorización de ejemplo
+      errors:
+        duplicate_authorization: Un usuario ya está autorizado con los mismos datos.
     authorizations:
       create:
         error: Se ha producido un error al crear la autorización.
@@ -46,11 +54,22 @@ es:
       actions:
         unauthorized: No tienes permiso para realizar esta acción.
     devise:
+      omniauth_registrations:
+        create:
+          email_already_exists: Otra cuenta utiliza la misma dirección de correo electrónico
+        new:
+          complete_profile: Completar perfil
+          sign_up: Complete su perfil
+          subtitle: Por favor, rellene el siguiente formulario con el fin de completar la inscripción
       registrations:
         new:
           already_have_an_account?: '¿Ya tienes una cuenta?'
           sign_in: Entra
           sign_up: Regístrate
+          sign_up_as:
+            legend: Inscribirse como
+            user: Individual
+            user_group: Organización/Colectivo
           subtitle: Crea una cuenta para poder participar en los debates y apoyar las propuestas.
           terms: los términos y condiciones de uso
           tos_agreement: Al registrarte aceptas %{link}.
@@ -59,30 +78,45 @@ es:
         new:
           are_you_new?: '¿Eres nuevo en la plataforma?'
           register: Créate una cuenta
+      shared:
+        omniauth_buttons:
+          or: O
     menu:
       home: Inicio
       processes: Procesos
+    participatory_process_steps:
+      index:
+        process_steps: Las fases de proceso
+      participatory_process_step:
+        info: Información
     participatory_processes:
       documents:
         related_documents: Documentos relacionados
       photos:
         related_photos: Fotos relacionadas
+    shared:
+      login_modal:
+        please_sign_in: Por favor, regístrese
+        sign_up: Regístrese
   devise:
     mailer:
       invitation_instructions:
         accept: Aceptar invitación
         accept_until: Esta invitación caducará el día %{due_date}.
-        hello: Hola %{email}
+        hello: Hola %{email},
         ignore: |-
           Si no quieres aceptar la invitación ignora este correo.<br />
           Tu cuenta no se creará hasta que accedas al enlance de abajo y escojas tu contraseña.
+        invited_you_as_admin: "%{invited_by} te ha invitado como administrador de %{application}, puedes aceptar a través del siguiente enlace."
         someone_invited_you: Alguien te ha invitado a %{application}, puedes aceptar la invitación con el enlace a continuación.
+      invite_admin:
+        subject: Has sido invitado para gestionar %{organization}
       organization_admin_invitation_instructions:
-        subject: Te han invitado a administrar %{organization}
+        subject: Has sido invitado para gestionar %{organization}
       password_change:
         greeting: '¡Hola %{recipient}!'
         message: Nos ponemos en contacto contigo para notificarte que tu contraseña ha sido cambiada correctamente.
-        subject: Contraseña cambiada
+        subject: Contraseña modificada
   errors:
     messages:
       file_size_is_less_than_or_equal_to: el tamaño del archivo debe ser menor que o igual a %{count}
@@ -114,6 +148,10 @@ es:
           active_step: 'Fase actual:'
           more_info: Más información
           take_part: Participa
+      process_header:
+        process_menu_item: El proceso
+      process_header_steps:
+        view_steps: Ver las fases
       user_menu:
         profile: Mi cuenta
         sign_out: Sal
@@ -142,6 +180,10 @@ es:
       proposals_explanation: Espacio abierto de propuestas de los ciudadanos sobre en qué tipo de ciudad queremos vivir.
       register: Regístrate
       see_all_processes: Ver todos los procesos
+      stats:
+        headline: Estado actual de %{organization}
+        processes: Procesos
+        users: Usuarios
       welcome: Bienvenido/da %{organization}!
   views:
     pagination:

data/config/routes.rb

@@ -11,11 +11,18 @@ Decidim::Core::Engine.routes.draw do
                sessions: "decidim/devise/sessions",
                confirmations: "decidim/devise/confirmations",
                registrations: "decidim/devise/registrations",
-               passwords: "decidim/devise/passwords"
+               passwords: "decidim/devise/passwords",
+               omniauth_callbacks: "decidim/devise/omniauth_registrations"
              }
 
+  devise_scope :user do
+    post "omniauth_registrations" => "devise/omniauth_registrations#create"
+  end
+
   resource :locale, only: [:create]
-  resources :participatory_processes, only: [:index, :show]
+  resources :participatory_processes, only: [:index, :show] do
+    resources :participatory_process_steps, only: [:index]
+  end
 
   scope "/participatory_processes/:participatory_process_id/features/:feature_id" do
     Decidim.feature_manifests.each do |manifest|

data/config/secrets.yml

@@ -0,0 +1,36 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rails secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+default: &default
+  omniauth:
+    facebook:
+      enabled: true
+      app_id: <%= ENV["OMNIAUTH_FACEBOOK_APP_ID"] %>
+      app_secret: <%= ENV["OMNIAUTH_FACEBOOK_APP_SECRET"] %>
+    twitter:
+      enabled: true
+      api_key: <%= ENV["OMNIAUTH_TWITTER_API_KEY"] %>
+      api_secret: <%= ENV["OMNIAUTH_TWITTER_API_SECRET"] %>
+
+development:
+  <<: *default
+  secret_key_base: 40d3a76fcae6d7298712dd2d403a3820cc37e0e82d56f5e26f7aba255a023c801d20e7e1472e1616da61308bcc74f4a2710a94b2382ca2aa21e4b0840767fd08
+
+test:
+  <<: *default
+  secret_key_base: 0d21437a814053102ecc4c8905ec8eb990c86b65c8ecfdddbadfdb3c75fe0fd3ab88368896237b0984694f9a7bc747e9d92642e01caab31942abb4ce94b5ff1a
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  <<: *default
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/db/migrate/20170110133113_add_configuration_to_features.rb

@@ -0,0 +1,7 @@
+class AddConfigurationToFeatures < ActiveRecord::Migration[5.0]
+  def change
+    change_table :decidim_features do |t|
+      t.jsonb :settings, default: {}
+    end
+  end
+end

data/db/migrate/20170110153807_add_handler_to_organization.rb

@@ -0,0 +1,5 @@
+class AddHandlerToOrganization < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_organizations, :twitter_handler, :string
+  end
+end

data/db/migrate/20170116110851_create_identities.rb

@@ -0,0 +1,11 @@
+class CreateIdentities < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_identities do |t|
+      t.string :provider, null: false
+      t.string :uid, null: false
+      t.references :decidim_user, null: false, index: true
+    end
+
+    add_index :decidim_identities, [:provider, :uid], unique: true
+  end
+end

data/db/migrate/20170116135237_loosen_step_requirements.rb

@@ -0,0 +1,6 @@
+class LoosenStepRequirements < ActiveRecord::Migration[5.0]
+  def change
+    change_column_null(:decidim_participatory_process_steps, :short_description, true)
+    change_column_null(:decidim_participatory_process_steps, :description, true)
+  end
+end

data/db/migrate/20170117142904_add_uniqueness_field_to_authorizations.rb

@@ -0,0 +1,7 @@
+class AddUniquenessFieldToAuthorizations < ActiveRecord::Migration[5.0]
+  def change
+    change_table :decidim_authorizations do |t|
+      t.string :unique_id, null: true
+    end
+  end
+end

data/db/migrate/20170119145359_create_user_groups.rb

@@ -0,0 +1,11 @@
+class CreateUserGroups < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_user_groups do |t|
+      t.string :name, null: false
+      t.string :document_number, null: false
+      t.string :phone, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20170119150255_create_user_group_memberships.rb

@@ -0,0 +1,12 @@
+class CreateUserGroupMemberships < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_user_group_memberships do |t|
+      t.references :decidim_user, null: false, index: true
+      t.references :decidim_user_group, null: false, index: true
+
+      t.timestamps
+    end
+
+    add_index :decidim_user_group_memberships, [:decidim_user_id, :decidim_user_group_id], unique: true, name: "decidim_user_group_memberships_unique_user_and_group_ids"
+  end
+end

data/db/migrate/20170119150649_add_show_statistics_to_organization.rb

@@ -0,0 +1,5 @@
+class AddShowStatisticsToOrganization < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_organizations, :show_statistics, :boolean, default: true
+  end 
+end

data/db/migrate/20170120120733_add_user_groups_verified.rb

@@ -0,0 +1,5 @@
+class AddUserGroupsVerified < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_user_groups, :verified, :boolean, default: false
+  end
+end

data/db/seeds.rb

@@ -2,8 +2,9 @@
 if !Rails.env.production? || ENV["SEED"]
   require "decidim/faker/localized"
 
-  staging_organization = Decidim::Organization.create!(
+  organization = Decidim::Organization.create!(
     name: Faker::Company.name,
+    twitter_handler: Faker::Hipster.word,
     host: ENV["DECIDIM_HOST"] || "localhost",
     welcome_text: Decidim::Faker::Localized.sentence(5),
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -14,12 +15,19 @@ if !Rails.env.production? || ENV["SEED"]
     available_locales: Decidim.available_locales
   )
 
+  3.times.each do |index|
+    Decidim::Scope.create!(
+      name: Faker::Address.unique.state,
+      organization: organization
+    )
+  end
+
   Decidim::User.create!(
     name: Faker::Name.name,
     email: "admin@decidim.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
-    organization: staging_organization,
+    organization: organization,
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     roles: ["admin"],
@@ -33,87 +41,45 @@ if !Rails.env.production? || ENV["SEED"]
     password_confirmation: "decidim123456",
     confirmed_at: Time.current,
     locale: I18n.default_locale,
-    organization: staging_organization,
+    organization: organization,
     tos_agreement: true
   )
 
-  participatory_process1 = Decidim::ParticipatoryProcess.create!(
-    title: Decidim::Faker::Localized.sentence(5),
-    slug: Faker::Internet.slug(nil, "-"),
-    subtitle: Decidim::Faker::Localized.sentence(2),
-    hashtag: "##{Faker::Lorem.word}",
-    short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(3)
-    end,
-    description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
-    end,
-    hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
-    banner_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city2.jpeg")),
-    promoted: true,
-    published_at: 2.weeks.ago,
-    organization: staging_organization
-  )
-
-  Decidim::ParticipatoryProcess.create!(
-    title: Decidim::Faker::Localized.sentence(5),
-    slug: Faker::Internet.slug(nil, "-"),
-    subtitle: Decidim::Faker::Localized.sentence(2),
-    hashtag: "##{Faker::Lorem.word}",
-    short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(3)
-    end,
-    description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
-    end,
-    hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city2.jpeg")),
-    banner_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city3.jpeg")),
-    published_at: 1.week.ago,
-    organization: staging_organization
-  )
-
-  Decidim::ParticipatoryProcess.create!(
-    title: Decidim::Faker::Localized.sentence(5),
-    slug: Faker::Internet.slug(nil, "-"),
-    subtitle: Decidim::Faker::Localized.sentence(2),
-    hashtag: "##{Faker::Lorem.word}",
-    short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(3)
-    end,
-    description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
-    end,
-    hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city3.jpeg")),
-    banner_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city2.jpeg")),
-    organization: staging_organization
-  )
-
-  Decidim::ParticipatoryProcessStep.create!(
-    title: Decidim::Faker::Localized.sentence(5),
-    short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(3)
-    end,
-    description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
-    end,
-    active: true,
-    start_date: 1.month.ago.at_midnight,
-    end_date: 2.months.from_now.at_midnight,
-    participatory_process: participatory_process1
-  )
+  3.times do
+    Decidim::ParticipatoryProcess.create!(
+      title: Decidim::Faker::Localized.sentence(5),
+      slug: Faker::Internet.unique.slug(nil, "-"),
+      subtitle: Decidim::Faker::Localized.sentence(2),
+      hashtag: "##{Faker::Lorem.word}",
+      short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.sentence(3)
+      end,
+      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      hero_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city.jpeg")),
+      banner_image: File.new(File.join(File.dirname(__FILE__), "seeds", "city2.jpeg")),
+      promoted: true,
+      published_at: 2.weeks.ago,
+      organization: organization
+    )
+  end
 
-  Decidim::ParticipatoryProcessStep.create!(
-    title: Decidim::Faker::Localized.sentence(5),
-    short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.sentence(3)
-    end,
-    description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-      Decidim::Faker::Localized.paragraph(3)
-    end,
-    start_date: 2.months.from_now.at_midnight,
-    end_date: 3.months.from_now.at_midnight,
-    participatory_process: participatory_process1
-  )
+  Decidim::ParticipatoryProcess.find_each do |process|
+    Decidim::ParticipatoryProcessStep.create!(
+      title: Decidim::Faker::Localized.sentence(5),
+      short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.sentence(3)
+      end,
+      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        Decidim::Faker::Localized.paragraph(3)
+      end,
+      active: true,
+      start_date: 1.month.ago.at_midnight,
+      end_date: 2.months.from_now.at_midnight,
+      participatory_process: process
+    )
+  end
 
   Decidim::ParticipatoryProcess.find_each do |process|
     Decidim::ParticipatoryProcessAttachment.create!(