Merge branch 'release-1.2' into master

.rubocop.yml

@@ -1,11 +1,9 @@
-Rails:
-  Enabled: true
-
 AllCops:
   Exclude:
   - 'bin/*'
   - 'node_modules/**/*'
   - 'db/schema.rb'
+  - 'app/models/achievements/**/*'
 
 Metrics/MethodLength:
   Exclude:
@@ -14,13 +12,18 @@ Metrics/AbcSize:
   Exclude:
   - 'db/migrate/*'
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/RegexpLiteral:
-  EnforcedStyle: slashes
+Rails:
+  Enabled: true
+Rails/InverseOf:
+  Enabled: true
+
 Style/Documentation:
   Exclude:
     - 'db/migrate/*'
-
-Rails/InverseOf:
-  Enabled: true
+    - 'app/controllers/*'
+Style/RegexpLiteral:
+  Enabled: true
+  EnforcedStyle: slashes
+Style/ClassAndModuleChildren:
+  Enabled: true
+  EnforcedStyle: compact

.travis.yml

@@ -2,12 +2,6 @@ language: ruby
 rvm:
   - 2.4.4
 
-# We need Ubuntu 14 (Trusty) to use Postgres 9.6
-dist: trusty
-
-addons:
-  postgresql: 9.6
-
 cache:
   directories:
     - vendor/bundle

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# Contributing to riverrats.com.au
+
+Thanks for taking the time to contribute to the River Rats official website! Help is always appreciated.
+
+
+
+## Branches
+
+We follow the branching model outlined in the article [A successful Git branching model](https://nvie.com/posts/a-successful-git-branching-model/). If you can't be bothered to read all that, here's the important bits.
+
+There are two main branches:
+
+ 1. `master`: The current production version of the website.
+ 2. `develop`: Where future releases are under construction. Unless you're writing a bug fix you'll likely want to start here.
+
+Then there are three types of supporting branches:
+
+ * `feature-*`: A branch which introduces a new feature. e.g. `feature-player-nicknames`.
+ * `release-*`: A branch devoted to polishing up the project for a new release. e.g. `release-1.2.1`. Note that only project maintainers will create this kind of branch.
+ * `hotfix-*`: For fixing bugs in production.
+
+
+
+## Redis
+
+To run the development server you'll need to have an instance of Redis up and running. Jobs are managed by `sidekiq`, so you'll also need to start `sidekiq`. Once Redis is running you can achieve this with the command (from the root project directory):
+
+```
+$ bundle exec sidekiq -C config/sidekiq.yml
+```
+
+
+## Elasticsearch
+
+If you want to use searching functionality you'll also need to install elasticsearch on your machine.

Gemfile

@@ -35,8 +35,6 @@ gem 'jbuilder', '~> 2.8'
 gem 'bcrypt', platform: :ruby
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger
-  # console
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   # Adds support for Capybara system testing and selenium driver
   gem 'capybara', '~> 3.12'
@@ -45,7 +43,7 @@ end
 
 group :development do
   gem 'capistrano', '~> 3.11.0', require: false
-  gem 'capistrano-bundler', '~> 1.3', require: false
+  gem 'capistrano-bundler', '~> 1.4', require: false
   gem 'capistrano-passenger', require: false
   gem 'capistrano-rails', '~> 1.3', require: false
   gem 'capistrano-rvm', require: false
@@ -68,9 +66,10 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 gem 'autoprefixer-rails'
 gem 'bootsnap', require: false
 gem 'connection_pool'
+gem 'coveralls', require: false
 gem 'devise'
 gem 'elasticsearch'
-gem 'friendly_id', '~> 5.1.0'
+gem 'friendly_id', '~> 5.2.4'
 gem 'ice_cube'
 gem 'js-routes'
 gem 'kaminari'

Gemfile.lock

@@ -48,7 +48,7 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (9.1.4)
+    autoprefixer-rails (9.3.1)
       execjs
     bcrypt (3.1.12)
     bindex (0.5.0)
@@ -61,7 +61,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.3.0)
+    capistrano-bundler (1.4.0)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
     capistrano-passenger (0.2.0)
@@ -92,13 +92,22 @@ GEM
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.3)
     connection_pool (2.2.2)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crass (1.0.4)
     devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
+    docile (1.3.1)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
     elasticsearch (6.1.0)
       elasticsearch-api (= 6.1.0)
       elasticsearch-transport (= 6.1.0)
@@ -112,11 +121,13 @@ GEM
     faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
-    friendly_id (5.1.0)
+    friendly_id (5.2.4)
       activerecord (>= 4.0.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     ice_cube (0.16.3)
@@ -127,6 +138,7 @@ GEM
     js-routes (1.4.4)
       railties (>= 3.2)
       sprockets-rails
+    json (2.1.0)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.1.1)
@@ -170,6 +182,7 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (5.0.2)
+    netrc (0.11.0)
     nio4r (2.3.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -181,7 +194,7 @@ GEM
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     pg (1.1.3)
     powerpack (0.1.2)
@@ -229,14 +242,18 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rubocop (0.59.2)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
@@ -258,13 +275,18 @@ GEM
       activemodel (>= 4.2)
       elasticsearch (>= 5)
       hashie
-    selenium-webdriver (3.14.0)
+    selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.2)
+      rubyzip (~> 1.2, >= 1.2.2)
     sidekiq (5.2.3)
       connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     spring (2.0.2)
       activesupport (>= 4.2)
     spring-watcher-listen (2.0.1)
@@ -277,21 +299,27 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.17.0)
+    sshkit (1.18.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
+    tins (1.16.3)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     unicorn (5.4.1)
       kgio (~> 2.6)
@@ -322,16 +350,17 @@ DEPENDENCIES
   bootsnap
   byebug
   capistrano (~> 3.11.0)
-  capistrano-bundler (~> 1.3)
+  capistrano-bundler (~> 1.4)
   capistrano-passenger
   capistrano-rails (~> 1.3)
   capistrano-rvm
   capybara (~> 3.12)
   coffee-rails (~> 4.2)
   connection_pool
+  coveralls
   devise
   elasticsearch
-  friendly_id (~> 5.1.0)
+  friendly_id (~> 5.2.4)
   ice_cube
   jbuilder (~> 2.8)
   js-routes

README.md

@@ -1,7 +1,22 @@
-# riverrats.com.au
+# River Rats Poker League
 
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=sean0x42/riverrats.com.au&identifier=126777895)](https://dependabot.com)
+[![Coverage Status](https://coveralls.io/repos/github/sean0x42/riverrats.com.au/badge.svg?branch=master)](https://coveralls.io/github/sean0x42/riverrats.com.au?branch=master)
 [![Build Status](https://travis-ci.com/sean0x42/riverrats.com.au.svg?token=y4PzktMpXpMzBmaZHNGq&branch=develop)](https://travis-ci.com/sean0x42/riverrats.com.au)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a5bd9fd7908c4e838dd9824ed347b559)](https://www.codacy.com/app/sean_19/riverrats.com.au?utm_source=github.com&utm_medium=referral&utm_content=sean0x42/riverrats.com.au&utm_campaign=Badge_Grade)  
+[![GitLicense](https://gitlicense.com/badge/sean0x42/riverrats.com.au)](https://gitlicense.com/license/sean0x42/riverrats.com.au)
 
-This is a commissioned Rails webapp for the River Rats Poker League, operating throughout the Mid-North Coast (Australia).
+This is a commissioned Rails webapp for the River Rats Poker League, operating
+throughout the Mid-North Coast (Australia).
+
+## Contributing
+
+Contributions are welcome, and encouraged!
+
+ * If you have a feature request, or bug report, please [create an issue](https://github.com/sean0x42/riverrats.com.au/issues/new).
+ * If you would like to make a suggestion, you may fork the repository, or use inline suggestions on GitHub.
+ * For more complex contributions, please check out our [contribution guide](https://github.com/sean0x42/riverrats.com.au/blob/master/CONTRIBUTING.md). This will explain our approach to branching, as well as some helpful advice to get your development environment up and running.
+
+## Author
+
+This website is designed, developed, and maintained by
+[Sean Bailey](https://www.seanbailey.io).

Rakefile

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+# for example lib/tasks/capistrano.rake, and they will automatically be
+# available to Rake.
 
 require_relative 'config/application'
 

app/assets/javascripts/application.js

@@ -13,4 +13,4 @@
 //= require rails-ujs
 //= require turbolinks
 //= require local-time
-//= require js-routes
+//= require js-routes

app/assets/stylesheets/components/_achievements.scss

@@ -22,7 +22,7 @@
     }
 
     .title {
-      font-weight: bold;
+      font-weight: 500;
     }
   }
 }

app/assets/stylesheets/components/_button.scss

@@ -98,9 +98,9 @@
 }
 
 .button-tertiary {
-  background: $grey-light;
-  color: lighten($text, 20%);
-  fill: lighten($text, 20%);
+  background: $grey;
+  color: lighten($text, 15%);
+  fill: lighten($text, 15%);
   margin: 0.5rem -0.25rem;
 
   &:hover {