Translations, design and content

Added supporter model and send email with the password
initialize devise
2017-03-31 14:42:37 +02:00 · 2017-03-30 21:03:59 +02:00 · 2017-03-28 01:14:45 +02:00 · 2017-03-28 00:39:28 +02:00 · 2017-03-28 00:37:39 +02:00 · 2017-03-28 00:25:41 +02:00
42 changed files with 858 additions and 152 deletions
@@ -7,6 +7,7 @@ AllCops:
    - config/**/*
    - spec/**/*
    - spec/dummy/config/initializers/secret_token.rb
+    - lib/mail_chimp_batch_update.rb
 Documentation:
  Enabled: false
 LineLength:
@@ -14,3 +15,5 @@ LineLength:
  Max: 160
 AbcSize:
  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
@@ -1,6 +1,6 @@
 services: mongodb
 language: ruby
 rvm:
-  - 2.2
+  - 2.3.1
 cache: bundler

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-
+ruby '2.3.1'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 4.2'
 # Use SCSS for stylesheets
@@ -13,18 +13,30 @@ gem 'coffee-rails', '~> 4.1.0'

 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0', group: :doc

+# Easily generate a Twitter Bootstrap navbar in your Rails app
 gem 'rails_bootstrap_navbar'

+# Kaminari Mongoid adapter.
+gem 'kaminari-mongoid'
+
 # This gem hooks up your Rails application with Roadie to help you generate HTML emails.
 gem 'roadie-rails', '~> 1.0'

+# Devise is a flexible authentication solution for Rails based on Warden.
+gem 'devise' 
+
+# Translations for devise
+gem 'devise-i18n'
+
+# Simulate data
+gem 'faker'
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'

@@ -1,56 +1,57 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
      rack (~> 1.6)
      rack-test (~> 0.6.2)
      rails-dom-testing (~> 1.0, >= 1.0.5)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
      builder (~> 3.1)
      erubis (~> 2.7.0)
      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
      globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
      arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.8)
      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.3)
-    autoprefixer-rails (6.3.6.2)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    autoprefixer-rails (6.7.7.1)
      execjs
+    bcrypt (3.1.11)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
    bootstrap-navbar (2.4.0)
      gem_config (~> 0.3)
-    bootstrap-sass (3.3.6)
+    bootstrap-sass (3.3.7)
      autoprefixer-rails (>= 5.2.1)
      sass (>= 3.3.4)
-    bson (4.1.1)
-    builder (3.2.2)
-    byebug (9.0.5)
-    capybara (2.7.1)
+    bson (4.2.1)
+    builder (3.2.3)
+    byebug (9.0.6)
+    capybara (2.13.0)
      addressable
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
@@ -64,41 +65,54 @@ GEM
    coffee-script (2.4.1)
      coffee-script-source
      execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
-    css_parser (1.4.8)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    css_parser (1.4.10)
      addressable
    debug_inspector (0.0.2)
-    diff-lcs (1.2.5)
-    dotenv (2.1.1)
-    dotenv-rails (2.1.1)
-      dotenv (= 2.1.1)
-      railties (>= 4.0, < 5.1)
+    devise (4.2.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.1)
+      responders
+      warden (~> 1.2.3)
+    devise-i18n (1.1.2)
+    diff-lcs (1.3)
+    dotenv (2.2.0)
+    dotenv-rails (2.2.0)
+      dotenv (= 2.2.0)
+      railties (>= 3.2, < 5.1)
    erubis (2.7.0)
-    excon (0.49.0)
+    excon (0.55.0)
    execjs (2.7.0)
-    font-awesome-rails (4.6.3.0)
+    faker (1.7.2)
+      i18n (~> 0.5)
+    font-awesome-rails (4.7.0.1)
      railties (>= 3.2, < 5.1)
    gem_config (0.3.1)
-    geocoder (1.3.7)
-    globalid (0.3.6)
+    geocoder (1.4.3)
+    globalid (0.3.7)
      activesupport (>= 4.1.0)
    haml (4.0.7)
      tilt
-    i18n (0.7.0)
-    jbuilder (2.5.0)
-      activesupport (>= 3.0.0, < 5.1)
+    i18n (0.8.1)
+    jbuilder (2.6.3)
+      activesupport (>= 3.0.0, < 5.2)
      multi_json (~> 1.2)
-    jquery-rails (4.1.1)
+    jquery-rails (4.3.1)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (5.0.5)
      railties (>= 3.2.16)
-    json (1.8.3)
+    json (1.8.6)
    kaminari (0.17.0)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
+    kaminari-core (1.0.1)
+    kaminari-mongoid (1.0.1)
+      kaminari-core (~> 1.0)
+      mongoid
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
    mail (2.6.4)
@@ -111,15 +125,15 @@ GEM
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
    mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    mongo (2.2.5)
-      bson (~> 4.0)
+    minitest (5.10.1)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
    mongoid (5.0.2)
      activemodel (~> 4.0)
      mongo (~> 2.1)
      origin (~> 2.1)
      tzinfo (>= 0.3.37)
-    mongoid-compatibility (0.4.0)
+    mongoid-compatibility (0.4.1)
      activesupport
      mongoid (>= 2.0)
    mongoid-rspec (3.0.0)
@@ -131,50 +145,50 @@ GEM
      mongoid-compatibility
    multi_json (1.12.1)
    nested_form (0.3.2)
-    nokogiri (1.6.8)
+    nokogiri (1.7.1)
      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    origin (2.2.0)
-    pkg-config (1.1.7)
-    pry (0.10.3)
+    origin (2.3.0)
+    orm_adapter (0.5.0)
+    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
-    pry-rails (0.3.4)
-      pry (>= 0.9.10)
-    puma (3.4.0)
-    rack (1.6.4)
-    rack-pjax (0.8.0)
+    pry-rails (0.3.6)
+      pry (>= 0.10.4)
+    public_suffix (2.0.5)
+    puma (3.8.2)
+    rack (1.6.5)
+    rack-pjax (1.0.0)
      nokogiri (~> 1.5)
-      rack (~> 1.1)
+      rack (>= 1.1)
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.8)
      sprockets-rails
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
      rails-deprecated_sanitizer (>= 1.0.1)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
-    rails-i18n (4.0.8)
+    rails-i18n (4.0.9)
      i18n (~> 0.7)
      railties (~> 4.0)
    rails_12factor (0.0.3)
      rails_serve_static_assets
      rails_stdout_logging
-    rails_admin (0.8.1)
+    rails_admin (1.1.1)
      builder (~> 3.1)
      coffee-rails (~> 4.0)
      font-awesome-rails (>= 3.0, < 5)
@@ -183,91 +197,90 @@ GEM
      jquery-ui-rails (~> 5.0)
      kaminari (~> 0.14)
      nested_form (~> 0.3)
-      rack-pjax (~> 0.7)
-      rails (~> 4.0)
-      remotipart (~> 1.0)
-      safe_yaml (~> 1.0)
+      rack-pjax (>= 0.7)
+      rails (>= 4.0, < 6)
+      remotipart (~> 1.3)
      sass-rails (>= 4.0, < 6)
    rails_bootstrap_navbar (2.0.1)
      bootstrap-navbar (~> 2.0)
      rails (>= 3.0.0)
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    remotipart (1.2.1)
+    rake (12.0.0)
+    rdoc (4.3.0)
+    remotipart (1.3.1)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
    roadie (3.2.1)
      css_parser (~> 1.4.5)
      nokogiri (>= 1.5.0, < 1.8.0)
    roadie-rails (1.1.1)
      railties (>= 3.0, < 5.1)
      roadie (~> 3.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    safe_yaml (1.0.4)
-    sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
      sprockets (>= 2.8, < 4.0)
      sprockets-rails (>= 2.0, < 4.0)
      tilt (>= 1.1, < 3)
-    sdoc (0.4.1)
+    sdoc (0.4.2)
      json (~> 1.7, >= 1.7.7)
      rdoc (~> 4.0)
-    simple_form (3.2.1)
+    simple_form (3.4.0)
      actionpack (> 4, < 5.1)
      activemodel (> 4, < 5.1)
    slim (3.0.7)
      temple (~> 0.7.6)
      tilt (>= 1.3.3, < 2.1)
-    slim-rails (3.1.0)
+    slim-rails (3.1.2)
      actionpack (>= 3.1)
      railties (>= 3.1)
      slim (~> 3.0)
    slop (3.6.0)
-    sprockets (3.6.1)
+    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    temple (0.7.7)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    turbolinks (2.5.3)
-      coffee-rails
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
      thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.1.10)
      execjs (>= 0.3.0, < 3)
+    warden (1.2.7)
+      rack (>= 1.0)
    web-console (2.3.0)
      activemodel (>= 4.0)
      binding_of_caller (>= 0.7.2)
@@ -284,10 +297,14 @@ DEPENDENCIES
  byebug
  capybara
  coffee-rails (~> 4.1.0)
+  devise
+  devise-i18n
  dotenv-rails
+  faker
  geocoder
  jbuilder (~> 2.0)
  jquery-rails
+  kaminari-mongoid
  mailchimp-api
  mongoid (~> 5.0.0)
  mongoid-rspec (= 3.0.0)
@@ -306,9 +323,11 @@ DEPENDENCIES
  simple_form
  slim
  slim-rails
-  turbolinks
  uglifier (>= 1.3.0)
  web-console (~> 2.0)

+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
   1.14.6
@@ -12,7 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
 //= require bootstrap-sprockets
 //= require typeahead.bundle
 //= require markerclusterer_compiled
@@ -21,18 +21,24 @@ $font-size-base: 14px
 $navbar-padding-horizontal: none
 $navbar-default-link-color: #66903F
 $navbar-default-link-active-bg: #FFF
-$font-size-h1: floor($font-size-base * 2)
-$font-size-h2: floor($font-size-base * 1.8)
-$font-size-h3: floor($font-size-base * 1.5)
+$font-size-h1: floor($font-size-base * 1.8)
+$font-size-h2: floor($font-size-base * 1.5)
+$font-size-h3: floor($font-size-base * 1.2)

@import "bootstrap-sprockets"
@import "bootstrap"
@import "typeaheadjs"

+.alert-alert
+  @extend .alert-danger
+
+.alert-notice
+  @extend .alert-info
+
 body
  > .container
    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
-    padding-top: 20px
+    padding: 20px
  
  header
    h1
@@ -1,3 +1,5 @@
-class Admin::ApplicationController < ApplicationController
-  http_basic_authenticate_with name: 'admin', password: ENV['ADMIN_PASSWORD'] unless Rails.env.development?
+module Admin
+  class ApplicationController < ::ApplicationController
+    http_basic_authenticate_with name: 'admin', password: ENV['ADMIN_PASSWORD'] unless Rails.env.development?
+  end
 end
@@ -1,5 +1,7 @@
-class Admin::PagesController < Admin::ApplicationController
-  def map
-    @supporters = Supporter.where(:coordinates.ne => nil).only(:coordinates, :support)
+module Admin
+  class PagesController < Admin::ApplicationController
+    def map
+      @supporters = Supporter.where(:coordinates.ne => nil).only(:coordinates, :support)
+    end
  end
 end
@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
  protect_from_forgery with: :exception

  before_action :set_locale
+  before_action :configure_permitted_parameters, if: :devise_controller?

  INPUT_TIMEOUT = 2.seconds # We estimate that a user needs more then x seconds to enter some informations

@@ -27,4 +28,10 @@ class ApplicationController < ActionController::Base
  def default_url_options(options = {})
    options.merge locale: I18n.locale
  end
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.permit(:account_update, keys: [:first_name, :last_name, :street, :city, :zip, :support, :language, :age_category, :unsubscribed])
+  end
 end
@@ -7,8 +7,9 @@ class SupportersController < ApplicationController

  def create
    @supporter = Supporter.new supporter_form_params.merge(language: I18n.locale)
+    @supporter.password = random_password = SecureRandom.hex(5)
    if !input_to_fast? && @supporter.save
-      # SupporterMailer.welcome_email(@supporter).deliver_now
+      SupporterMailer.welcome_email(@supporter, random_password).deliver_now
      mailchimp_registration
      redirect_to thanks_path
    else
@@ -1,8 +1,9 @@
 class SupporterMailer < ApplicationMailer
  include Roadie::Rails::Automatic

-  def welcome_email(supporter)
+  def welcome_email(supporter, random_password)
    @supporter = supporter
+    @password = random_password
    mail(to: @supporter.email, subject: I18n.t('welcome_email.subject'))
  end
 end
@@ -1,5 +1,38 @@
 class Supporter
  include Mongoid::Document
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  ## Database authenticatable
+  field :email,              type: String, default: ''
+  field :encrypted_password, type: String, default: ''
+
+  ## Recoverable
+  field :reset_password_token,   type: String
+  field :reset_password_sent_at, type: Time
+
+  ## Rememberable
+  field :remember_created_at, type: Time
+
+  ## Trackable
+  field :sign_in_count,      type: Integer, default: 0
+  field :current_sign_in_at, type: Time
+  field :last_sign_in_at,    type: Time
+  field :current_sign_in_ip, type: String
+  field :last_sign_in_ip,    type: String
+
+  ## Confirmable
+  # field :confirmation_token,   type: String
+  # field :confirmed_at,         type: Time
+  # field :confirmation_sent_at, type: Time
+  # field :unconfirmed_email,    type: String # Only if using reconfirmable
+
+  ## Lockable
+  # field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
+  # field :unlock_token,    type: String # Only if unlock strategy is :email or :both
+  # field :locked_at,       type: Time
  include Mongoid::Timestamps
  include Mongoid::Paranoia
  include Geocoder::Model::Mongoid
@@ -14,7 +47,6 @@ class Supporter
  field :street,        type: String
  field :zip,           type: Integer
  field :city,          type: String
-  field :email,         type: String
  field :support,       type: String # Indicates the type of support
  field :li_membership, type: Boolean, default: false
  field :age_category,  type: String
@@ -4,8 +4,8 @@ html lang="#{I18n.locale}"
      - flash.each do |type, message|
        = message
      |  #CH420 - #{content_for(:title)}
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
-    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
    = csrf_meta_tags
    link href="/apple-icon-57x57.png" rel="apple-touch-icon" sizes="57x57" /
    link href="/apple-icon-60x60.png" rel="apple-touch-icon" sizes="60x60" /
@@ -37,7 +37,7 @@ html lang="#{I18n.locale}"

    / = console if Rails.env.development?
    .container
+      = render 'shared/flashes'
      = render 'shared/header'
      = render 'shared/topnavigation'
-      = render 'shared/flashes'
      = yield
@@ -26,4 +26,3 @@ h3 Weitere Informationen zur Initiative findest du hier:
 ul
  li = link_to 'Initiativ-Seite', 'https://www.hanflegal.ch/initiative'
  li = link_to 'Onlineformular', root_path
-  li = link_to 'Initiativ-Forum', 'https://forum.hanflegal.ch'
@@ -4,3 +4,5 @@
    = navbar_group  id: 'topnav' do
      = navbar_item "Home", "/#{I18n.locale}"
      = navbar_item t('.donation'), spenden_path
+      = navbar_item t('.sign_in'), new_supporter_session_path unless supporter_signed_in?
+      = navbar_item t('.sign_out'), destroy_supporter_session_path, nil, 'data-method' => :delete  if supporter_signed_in?
@@ -1,5 +1,14 @@
 p Hallo #{@supporter.first_name}, du bist nun ein Teil der Bewegung!

+p 
+  | Um deine Angaben anzupassen kannst dich unter #{link_to new_supporter_session_url, new_supporter_session_url} mit folgenden Daten anmelden:
+
+  dl.dl-horizontal
+    dt E-Mail
+    dd= @supporter.email
+    dt Passwort
+    dd= @password
+
 p Wir informieren dich per E-Mail über die nächsten Schritte und kommen aktiv auf dich zu. Auf <a href="https://www.hanflegal.ch/initiative">https://www.hanflegal.ch/initiative</a> informieren wir über laufende Aktivitäten.

 p 
@@ -1,9 +1,15 @@
 p Salut #{@supporter.first_name}, Tu fais maintenant partie du mouvement!

-
-
 p Nous allons t’envoyer par e-mail les informations sur les prochaines étapes. Sur <a href="https://www.hanflegal.ch/initiative">https://www.hanflegal.ch/initiative</a>  initiative nous informons des activités en cours.

+p 
+  | Pour régler vos données peut vous inscrire à  #{link_to new_supporter_session_url, new_supporter_session_url} avec les données suivantes:
+
+  dl.dl-horizontal
+    dt E-Mail
+    dd= @supporter.email
+    dt Mot de passe
+    dd= @password
 p 
  | Que peux-tu faire?
  ul
@@ -2,6 +2,14 @@ p Ciao #{@supporter.first_name}, ora sei una parte del movimento!

 p Vi informeremo via e-mail circa i prossimi passi e diventare attivo. Su <a href="https://www.hanflegal.ch/initiative">https://www.hanflegal.ch/initiative</a> può informarsi sulle attività in corso.

+p 
+  | Per regolare i dati possono iscriversi a #{link_to new_supporter_session_url, new_supporter_session_url} i seguenti dati:
+
+  dl.dl-horizontal
+    dt E-Mail
+    dd= @supporter.email
+    dt Password
+    dd= @password
 p 
  | Che cosa puoi fare?
  ul
@@ -0,0 +1,10 @@
+h2
+  = t(".resend_confirmation_instructions")
+= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  = f.full_error :confirmation_token
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t(".resend_confirmation_instructions")
+= render "supporters/shared/links"
@@ -0,0 +1,7 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.instruction')
+p
+  = link_to t('.action'), confirmation_url(@resource, confirmation_token: (Devise::VERSION.start_with?('3.') ? @token : @resource.confirmation_token))
@@ -0,0 +1,14 @@
+p
+  | Hello 
+  = @email
+  | !
+- if @resource.try(:unconfirmed_email?)
+  p
+    | We're contacting you to notify you that your email is being changed to 
+    = @resource.unconfirmed_email
+    | .
+- else
+  p
+    | We're contacting you to notify you that your email has been changed to 
+    = @resource.email
+    | .
@@ -0,0 +1,5 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.message')
@@ -0,0 +1,11 @@
+- require 'devise/version'
+p
+  = t('devise.mailer.reset_password_instructions.greeting', recipient: "#{@resource.first_name} #{@resource.last_name}")
+p
+  = t('devise.mailer.reset_password_instructions.instruction')
+p
+  = link_to t('devise.mailer.reset_password_instructions..action'), edit_password_url(@resource, reset_password_token: (Devise::VERSION.start_with?('3.', '4.') ? @token : @resource.reset_password_token), locale: I18n.locale)
+p
+  = t('devise.mailer.reset_password_instructions.instruction_2')
+p
+  = t('devise.mailer.reset_password_instructions.instruction_3')
@@ -0,0 +1,9 @@
+- require 'devise/version'
+p
+  = t('.greeting', recipient: @resource.email)
+p
+  = t('.message')
+p
+  = t('.instruction')
+p
+  = link_to t('.action'), unlock_url(@resource, unlock_token: (Devise::VERSION.start_with?('3.') ? @token :@resource.unlock_token))
@@ -1,2 +1,38 @@
-= render 'form'
+- if supporter_signed_in?
+  h1.sr-only = title t('.title', name: current_supporter.first_name)
+  .row
+    .col-xs-12.col-md-7
+      .panel.panel-default
+        .panel-heading
+          h2.panel-title = t '.my_data'
+        .panel-body 
+          dl.dl-horizontal
+            dt = Supporter.human_attribute_name(:email)
+            dd = current_supporter.email
+            dt = Supporter.human_attribute_name(:first_name)
+            dd = current_supporter.first_name
+            dt = Supporter.human_attribute_name(:last_name)
+            dd = current_supporter.last_name
+            dt = Supporter.human_attribute_name(:street)
+            dd = current_supporter.street
+            dt = Supporter.human_attribute_name(:city)
+            dd = "#{current_supporter.zip} #{current_supporter.city}"
+            dt = Supporter.human_attribute_name(:support)
+            dd == t("support_type.#{current_supporter.support}")
+            dt = Supporter.human_attribute_name(:age_category)
+            dd == t("age_category.#{current_supporter.age_category}")
+            dt = Supporter.human_attribute_name(:language)
+            dd = t("languages.#{current_supporter.language}")
+            dt = Supporter.human_attribute_name(:unsubscribed)
+            dd = current_supporter.unsubscribed? ?  t('shared.yes') : t('shared.no')
+      
+          p
+            = link_to t('.edit'), edit_supporter_registration_path(), class: 'pull-right'
+  
+    
+    aside.col-md-5.col-xs-12
+      = render 'right_side'
+
+- else
+ = render 'form' 
  
@@ -0,0 +1,11 @@
+h2
+  = t("devise.passwords.edit.change_your_password")
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+  = f.input :reset_password_token, as: :hidden
+  = f.full_error :reset_password_token
+  .form-inputs
+    = f.input :password, label: t("devise.passwords.edit.new_password"), required: true, autofocus: true
+    = f.input :password_confirmation, label: t("devise.passwords.edit.confirm_new_password"), required: true
+  .form-actions
+    = f.button :submit, t("devise.passwords.edit.change_my_password")
+= render "supporters/shared/links"
@@ -0,0 +1,8 @@
+h1= title t("devise.passwords.new.forgot_your_password")
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t("devise.passwords.new.send_me_reset_password_instructions")
+= render "supporters/shared/links"
@@ -0,0 +1,28 @@
+.panel.panel-default
+  .panel-heading
+      h1.panel-title = title t("devise.registrations.edit.title", resource: resource_class.model_name.human)
+  .panel-body
+    = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+      .form-inputs
+        = f.input :current_password, hint: t("devise.registrations.edit.we_need_your_current_password_to_confirm_your_changes"), required: true
+        = f.input :email, required: true, autofocus: true
+        - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+          p
+            = t(".currently_waiting_confirmation_for_email", email: resource.unconfirmed_email)
+        = f.input :password, autocomplete: "off", hint: t("devise.registrations.edit.leave_blank_if_you_don_t_want_to_change_it"), required: false
+        = f.input :password_confirmation, required: false
+        = f.input :first_name
+        = f.input :last_name
+        = f.input :street
+        = f.input :city
+        = f.input :zip
+        = f.input :support, as: :radio_buttons, collection: t('support_type').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
+        = f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first
+        = f.input :language, as: :radio_buttons, collection: t('languages').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
+        = f.input :unsubscribed, as: :boolean 
+      .form-actions
+        = f.button :submit, t("devise.registrations.edit.update"), class: 'btn btn-primary'
+    p = link_to t("devise.shared.links.back"), :back
+hr
+p = link_to t("devise.registrations.edit.cancel_my_account"), registration_path(resource_name), data: { confirm: t("devise.registrations.edit.are_you_sure") }, method: :delete, class: 'btn btn-danger btn-sm pull-right'
+
@@ -0,0 +1,11 @@
+h2
+  = t(".sign_up")
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = f.error_notification
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+    = f.input :password, required: true
+    = f.input :password_confirmation, required: true
+  .form-actions
+    = f.button :submit, t(".sign_up")
+= render "supporters/shared/links"
@@ -0,0 +1,9 @@
+h1= title t(".sign_in")
+= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  .form-inputs
+    = f.input :email, required: false, autofocus: true
+    = f.input :password, required: false
+    = f.input :remember_me, as: :boolean if devise_mapping.rememberable?
+  .form-actions
+    = f.button :submit, t("devise.sessions.new.sign_in")
+= render "supporters/shared/links"
@@ -0,0 +1,20 @@
+- if controller_name != 'sessions'
+  = link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
+  br
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  /= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name)
+  = link_to t("devise.shared.links.sign_up"), new_supporter_path
+  br
+- if devise_mapping.recoverable? && controller_name != 'passwords'
+  = link_to t("devise.shared.links.forgot_your_password"), new_password_path(resource_name)
+  br
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+  = link_to t('devise.shared.links.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name)
+  br
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+  = link_to t('devise.shared.links.didn_t_receive_unlock_instructions'), new_unlock_path(resource_name)
+  br
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to t('devise.shared.links.sign_in_with_provider', provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)
+    br
@@ -0,0 +1,10 @@
+h2
+  = t(".resend_unlock_instructions")
+= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+  = f.error_notification
+  = f.full_error :unlock_token
+  .form-inputs
+    = f.input :email, required: true, autofocus: true
+  .form-actions
+    = f.button :submit, t(".resend_unlock_instructions")
+= render "supporters/shared/links"
@@ -37,6 +37,7 @@ Rails.application.configure do
  # config.action_view.raise_on_missing_translations = true

  config.action_mailer.default_url_options = { host: 'localhost:3000' }
+  config.action_mailer.asset_host = 'http://localhost:3000'

  config.action_mailer.delivery_method = :smtp
  config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }
@@ -75,6 +75,7 @@ Rails.application.configure do
  config.log_formatter = ::Logger::Formatter.new

  config.action_mailer.default_url_options = { host: 'ch420.herokuapp.com' }
+  config.action_mailer.asset_host = 'https://ch420.herokuapp.com'

  config.action_mailer.delivery_method = :smtp
  config.action_mailer.smtp_settings = {
@@ -39,4 +39,6 @@ Rails.application.configure do

  # Raises error for missing translations
  # config.action_view.raise_on_missing_translations = true
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
+  config.action_mailer.asset_host = 'http://localhost:3000'
 end
@@ -0,0 +1,277 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # Devise will use the `secret_key_base` as its `secret_key`
+  # by default. You can change it below and use your own secret key.
+  # config.secret_key = '74788f2e184b0cce8fe7f12fc4db99abd79cf37d0ad882488d12f1ebba1a3eb314f456c2a1f1fafd4224ccec193a3f0dd563245a37c1de167796e76d75dd33c4'
+
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # Configure the parent class responsible to send e-mails.
+  # config.parent_mailer = 'ActionMailer::Base'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/mongoid'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [:email]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:email]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:email]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If 401 status code should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # When false, Devise will not attempt to reload routes on eager load.
+  # This can reduce the time taken to boot the app but if your application
+  # requires the Devise mappings to be loaded during boot time the application
+  # won't boot properly.
+  # config.reload_routes = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 11. If
+  # using other algorithms, it sets how many times you want the password to be hashed.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # algorithm), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+  config.stretches = Rails.env.test? ? 1 : 11
+
+  # Set up a pepper to generate the hashed password.
+  # config.pepper = '23025fe3eb3b19839d84282ce1aecd5143e57258e4b245326a056e01e066d0bd48f2e28ad0f46abb1f5fe99eb17c254ea3b4ba24e317dee93fd1e1c8e5eb1b82'
+
+  # Send a notification to the original email when the user's email is changed.
+  # config.send_email_changed_notification = false
+
+  # Send a notification email when the user's password is changed.
+  # config.send_password_change_notification = false
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # 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
+
+  # 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
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [:email]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # secure: true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length.
+  config.password_length = 4..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [:email]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [:email]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # When set to false, does not sign a user in automatically after their password is
+  # reset. Defaults to true, so a user is signed in automatically after a reset.
+  # config.sign_in_after_reset_password = true
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+  # You can use :sha1, :sha512 or algorithms from others authentication tools as
+  # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+  # for default behavior) and :restful_authentication_sha1 (then you should set
+  # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  config.scoped_views = true
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+end
@@ -1,10 +1,14 @@
 de:
  shared:
+    "yes": Ja
+    "no": Nein
    header:
      logo: Logo der Initiative
      title_html: Ja, ich will <strong class="text-success">Cannabis</strong> in der Schweiz <strong class="text-success">legalisieren</strong>
    topnavigation:
      donation: Spenden
+      sign_in: Anmelden
+      sign_out: Abmelden
    counter:
      supporters: "Unterstützer:"
      amount_of_supporters: Zurzeit haben wir %{amount} Unterstützer.
@@ -25,6 +29,11 @@ de:
    young: Ich bin 18 bis 30 Jahre alt
    middle: Ich bin 30 bis 64 Jahre alt
    retired: Ich bin über 64 Jahre alt
+
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
    
  supporters:
    form:
@@ -44,13 +53,20 @@ de:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
+    
+    new:
+      title: Hallo %{name}
+      edit: Meine Daten bearbeiten...
+      my_data: Meine Daten
  
  pages:
    thanks:
      title: Besten Dank für deine Unterstützung!

  mongoid:
-   attributes:
+    models:
+      supporter: Konto
+    attributes:
      supporter:
        first_name: Vorname
        last_name: Nachname
@@ -62,3 +78,9 @@ de:
        age_category: Alterskategorie
        li_membership: Ich bin interessiert an einer Mitgliedschaft beim Verein Legalize it! (50 Franken pro Jahr)
        comments: Kommentar / Feedback (optional)
+        remember_me: Angemeldet bleiben
+        password: Passwort
+        language: Sprache
+        unsubscribed: Kein Newsletter
+        password_confirmation: Passwort bestätigen
+        current_password: Aktuelles Passwort
@@ -0,0 +1,64 @@
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+
+en:
+  devise:
+    confirmations:
+      confirmed: "Your email address has been successfully confirmed."
+      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "Your account is not activated yet."
+      invalid: "Invalid %{authentication_keys} or password."
+      locked: "Your account is locked."
+      last_attempt: "You have one more attempt before your account is locked."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      confirmation_instructions:
+        subject: "Confirmation instructions"
+      reset_password_instructions:
+        subject: "Reset password instructions"
+      unlock_instructions:
+        subject: "Unlock instructions"
+      email_changed:
+        subject: "Email Changed"
+      password_change:
+        subject: "Password Changed"
+    omniauth_callbacks:
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords:
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password has been changed successfully. You are now signed in."
+      updated_not_active: "Your password has been changed successfully."
+    registrations:
+      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
+      updated: "Your account has been updated successfully."
+    sessions:
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+      already_signed_out: "Signed out successfully."
+    unlocks:
+      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors:
+    messages:
+      already_confirmed: "was already confirmed, please try signing in"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      expired: "has expired, please request a new one"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved:
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
@@ -2,6 +2,8 @@ fr:
  input_error: Vos entrées ne peuvent pas être enregistrées. Vérifiez les entrées.

  shared:
+    "yes": Oui
+    "no": Non
    counter:
      supporters: "Militant:"
      amount_of_supporters: Nous avons actuellement %{amount} supporters.
@@ -10,6 +12,8 @@ fr:
      title_html: Oui, je veux  <strong class="text-success">légaliser le cannabis</strong> en Suisse.
    topnavigation:
      donation: Donation
+      sign_out: déconnecter
+      sign_in: Connexion
      
  welcome_email:
    subject: Merci beaucoup pour ton soutien!
@@ -25,7 +29,12 @@ fr:
    young: J’ai entre 18 et 30 ans
    middle: J’ai entre 30 et 64 ans
    retired: J’ai plus que 64 ans
-    
+ 
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
+
  supporters:
    form:
      form: Formulaire
@@ -42,13 +51,20 @@ fr:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
-  
+    
+    new:
+      title: Salut %{name}
+      edit: Modifier mes données ...
+      my_data: Mes données
+
  pages:
    thanks:
      title: Merci beaucoup pour ton soutien!
  
  mongoid:
-   attributes:
+    models:
+      supporter: compte
+    attributes:
      supporter:
        first_name: Prénom
        last_name: Nom
@@ -60,3 +76,9 @@ fr:
        age_category: Catégorie d’âge
        li_membership: Je suis intéressé à joindre l'association Legalize It! (50 francs par an).
        comments: Commentaires / Feedback (facultatif)
+        remember_me: Se souvenir de moi
+        password: mot de passe
+        language: Langue
+        unsubscribed: pas de newslettre
+        password_confirmation: confirmer le mot de passe
+        current_password: Mot de passe actuel
@@ -2,11 +2,15 @@ it:
  input_error: I dati immessi non potevano essere salvati. Verificare i dati immessi.

  shared:
+    "yes": Si
+    "No": No
    header:
      logo: Logo dell'iniziativa
      title_html: Si, voglio  <strong class="text-success">legalizzare</strong> la  <strong class="text-success">cannabis in Svizzera</strong>
    topnavigation:
      donation: Donazione
+      sign_out: Disconnettersi
+      sign_in: Registro
    counter:
      supporters: "Sostenitore:"
      amount_of_supporters: Al momento abbiamo %{amount} sostenitori.
@@ -26,6 +30,11 @@ it:
    young: Ho tra 18 e 30 anni
    middle: Ho tra i 30 ed i 64 anni
    retired: Ho più di 64 anni
+  
+  languages:
+    de: Deutsch
+    fr: Français
+    it: Italiano
    
  supporters:
    form:
@@ -44,7 +53,12 @@ it:
      
    create:
      timeout: Ihre Eingabe war zu schnell.
-  
+    
+    new:
+      title: Ciao %{name}
+      edit: Modifica i miei dati ...
+      my_data: Miei dati
+
  pages:
    thanks:
      title: Grazie mille per il tuo sostegno!
@@ -62,3 +76,9 @@ it:
        age_category: Categoria Età 
        li_membership: Sono interessato a diventare membro attivo di Verein Legalize It (50 franchi annuali di tassa).
        comments: Commenti / Feedback (opzionale)
+        remember_me: Ricordati di mel
+        password: Password
+        language: Lingua
+        unsubscribed: No Newsletter
+        password_confirmation: conferma password
+        current_password: Password corrente
@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
-  root to: redirect("/#{I18n.default_locale}")
+  devise_for :supporters
+  root to: 'supporters#new' 

  namespace :admin do
    get '/map', to: 'pages#map', as: :map
@@ -11,7 +12,6 @@ Rails.application.routes.draw do
  scope '/:locale' do
    get '/', to: 'supporters#new'
    resources :supporters
-
    get '/thanks', to: 'pages#thanks', as: :thanks
    get '/spenden', to: 'pages#spenden', as: :spenden
    get '/terms_and_conditions', to: 'pages#terms_and_conditions', as: :terms_and_conditions
@@ -1,7 +1,7 @@
 # Preview all emails at http://localhost:3000/rails/mailers/supporter_mailer
 class SupporterMailerPreview < ActionMailer::Preview
  def welcome
-    I18n.locale = :fr
-    SupporterMailer.welcome_email(Supporter.first)
+    I18n.locale = :de
+    SupporterMailer.welcome_email(Supporter.first, SecureRandom.hex(5))
  end
 end
Author	SHA1	Message	Date
gurix	c3bfeed620	Translations, design and content	2017-03-31 14:42:37 +02:00
gurix	cfc1fbfd9f	Added supporter model and send email with the password	2017-03-30 21:03:59 +02:00
gurix	175c9bea4f	initialize devise	2017-03-28 01:14:45 +02:00
gurix	5660d9d3d2	fixed travis	2017-03-28 00:39:28 +02:00
gurix	171f1780d2	bump to ruby 2.3.1	2017-03-28 00:37:39 +02:00
gurix	9484a4cbd4	bundle update	2017-03-28 00:25:41 +02:00
gurix	86e62ccda3	makeup	2017-03-28 00:06:53 +02:00