Misc. fixes:

- Comments in .rbenv-vars-sample
- Setting for serving static files in staging
- Gem babel-transpiler for jsx file
- Make mailgun work in production
- Make js compression work in production
- Fix db seeding

.rbenv-vars-sample

@@ -1,12 +1,19 @@
+# Parameters for sending mail
 MAILGUN_DOMAIN=
 MAILGUN_API_KEY=
-
 MAIL_FROM_ADDRESS=
 
+# To be used in link construction
 AARDBEI_HOSTNAME=
 
+SECRET_KEY_BASE=
+# ['production', 'development']
 RAILS_ENV=
 
+# Set to '1' if in staging and/or not running a 'real' server or assets won't work
+RAILS_SERVE_STATIC_FILES=
+
+# Database credentials
 DB_NAME=
 DB_USER=
 DB_PASS=

Gemfile

@@ -7,7 +7,8 @@ gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
 gem 'puma', '~> 3.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
+# Use Uglifier as compressor for JavaScript assets, babel for ES6
+gem 'babel-transpiler'
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 4.2'

Gemfile.lock

@@ -41,6 +41,10 @@ GEM
     arel (7.1.4)
     autoprefixer-rails (6.7.7.2)
       execjs
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     bcrypt (3.1.11)
     bindex (0.5.0)
     bootstrap-sass (3.3.7)
@@ -188,6 +192,7 @@ PLATFORMS
 
 DEPENDENCIES
   autoprefixer-rails
+  babel-transpiler
   bcrypt (~> 3.1.7)
   bootstrap-sass (~> 3.3.6)
   byebug

app/assets/javascripts/application.js

@@ -17,4 +17,4 @@
 //= require editable/bootstrap-editable
 //= require editable/rails
 //= require_tree .
-
+//= require_self

config/environments/production.rb

@@ -19,7 +19,7 @@ Rails.application.configure do
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new({harmony: true})
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
@@ -83,4 +83,10 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  config.action_mailer.delivery_method = :mailgun
+  config.action_mailer.mailgun_settings = {
+        api_key: ENV['MAILGUN_API_KEY'],
+        domain: ENV['MAILGUN_DOMAIN']
+  }
 end

db/seeds.rb

@@ -5,18 +5,19 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
+require 'byebug'
 
 p = Person.create!(
   first_name: 'Maarten',
   infix: 'van den',
   last_name: 'Berg',
   birth_date: (Faker::Date.between(21.years.ago, Date.today)),
-  email: 'maarten@maartenberg.nl.eu.org',
+  email: 'maarten@maartenberg.nl',
   is_admin: true
 )
 
 u = User.create!(
-  email: 'maarten@maartenberg.nl.eu.org',
+  email: 'maarten@maartenberg.nl',
   person: p,
   password: 'aardbei123',
   password_confirmation: 'aardbei123'
@@ -26,7 +27,7 @@ p2 = Person.create!(
   first_name: 'Henkie',
   last_name: 'Gekke',
   birth_date: (Faker::Date.between(21.years.ago, Date.today)),
-  email: 'gekkehenkie@maartenberg.nl.eu.org'
+  email: 'gekkehenkie@maartenberg.nl'
 )
 
 g = Group.create!(
@@ -45,7 +46,7 @@ end
     first_name: (Faker::Name.first_name),
     last_name:  (Faker::Name.last_name),
     birth_date: (Faker::Date.between(21.years.ago, Date.today)),
-    email: "testuser#{i}@maartenberg.nl.eu.org"
+    email: "testuser#{i}@maartenberg.nl"
   )
 end
 
@@ -72,9 +73,6 @@ Group.all.each do |g|
     starttime = Faker::Time.between(DateTime.now, 1.years.since, :morning)
     endtime   = Faker::Time.between(1.hours.since(starttime), 1.days.since(starttime), :afternoon)
     deadline  = 5.days.ago(starttime)
-    puts starttime
-    puts endtime
-    puts deadline
 
     act = Activity.create!(
       public_name: Faker::Hacker.ingverb,
@@ -105,9 +103,12 @@ Person.all.each do |p|
           notes = nil
         end
 
-        part = Participant.create!(
+        # Participants are created on adding to group!
+        part = Participant.find_by(
           activity: a,
-          person:   p,
+          person: p
+        )
+        part.update!(
           is_organizer: Faker::Boolean.boolean(0.1),
           attending: [true, false, nil].sample,
           notes:    notes