User activity logging

.env.example

@@ -1,7 +1,10 @@
 TOPSEKRIT_AUTHORISATION_SETTING='open'
 TOPSEKRIT_AUTHORISED_DOMAIN='reinteractive.net'
 GOOGLE_OAUTH_CALLBACK_PATH='/auth/google_oauth2/callback'
-GOOGLE_CLIENT_ID='<client_id>'
-GOOGLE_CLIENT_SECRET='<client_secret>'
+GOOGLE_OAUTH_CLIENT_ID='<client_id>'
+GOOGLE_OAUTH_CLIENT_SECRET='<client_secret>'
 BASE_URL='http://localhost:3000'
-TOPSEKRIT_EXPIRY_DAYS='14'
+TOPSEKRIT_EXPIRY_DAYS='14'
+RECAPTCHA_SITE_KEY='<site_key>'
+RECAPTCHA_SECRET_KEY='<secret_key>'
+2FA_KEY='<two_factor_encryption_key>'

Gemfile

@@ -25,6 +25,12 @@ gem "bugsnag"
 gem "okcomputer"
 gem "skylight"
 gem 'rails_12factor', group: :production
+gem "devise"
+gem "devise-two-factor"
+gem "rqrcode-rails3"
+gem "mini_magick"
+gem "local_time"
+gem "trix"
 
 gem 'sdoc', '~> 0.4.0', group: :doc
 
@@ -41,14 +47,16 @@ group :test do
   gem "capybara"
   gem "poltergeist"
   gem "rspec-rails"
-  gem "factory_girl_rails"
+  gem "factory_bot_rails"
   gem "database_cleaner"
   gem "faker"
   gem "launchy"
   gem "show_me_the_cookies", "~> 3.1.0"
+  gem "timecop"
 end
 
 group :development, :test do
   gem "byebug"
   gem "dotenv-rails"
+  gem 'pry'
 end

Gemfile.lock

@@ -43,6 +43,7 @@ GEM
       encryptor (~> 3.0.0)
     autoprefixer-rails (6.7.7.1)
       execjs
+    bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -66,11 +67,24 @@ GEM
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
+    chunky_png (1.3.11)
     cliver (0.3.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
+    devise (4.4.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.2)
+      responders
+      warden (~> 1.2.3)
+    devise-two-factor (3.0.3)
+      activesupport (< 5.3)
+      attr_encrypted (>= 1.3, < 4, != 2)
+      devise (~> 4.0)
+      railties (< 5.3)
+      rotp (~> 2.0)
     diff-lcs (1.3)
     dotenv (2.2.0)
     dotenv-rails (2.2.0)
@@ -81,11 +95,11 @@ GEM
     encryptor (3.0.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_girl (4.8.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
-      railties (>= 3.0.0)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.2)
+      factory_bot (~> 5.0.2)
+      railties (>= 4.2.0)
     faker (1.7.3)
       i18n (~> 0.5)
     faraday (0.11.0)
@@ -106,6 +120,7 @@ GEM
     kgio (2.11.0)
     launchy (2.4.3)
       addressable (~> 2.3)
+    local_time (2.1.0)
     logstash-event (1.2.02)
     logstasher (0.6.5)
       logstash-event (~> 1.2.0)
@@ -114,9 +129,11 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.9.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_magick (4.9.3)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
@@ -142,6 +159,7 @@ GEM
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
+    orm_adapter (0.5.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.20.0)
@@ -152,6 +170,9 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     public_suffix (2.0.5)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
@@ -194,6 +215,14 @@ GEM
     recaptcha (4.10.0)
       json
     request_store (1.3.2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rotp (2.1.2)
+    rqrcode (0.10.1)
+      chunky_png (~> 1.0)
+    rqrcode-rails3 (0.1.7)
+      rqrcode (>= 0.4.2)
     rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
@@ -245,6 +274,9 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
+    timecop (0.9.1)
+    trix (0.11.1)
+      rails (> 4.1, < 5.2)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
@@ -256,6 +288,8 @@ GEM
     unicorn-rails (2.2.1)
       rack
       unicorn
+    warden (1.2.7)
+      rack (>= 1.0)
     web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
@@ -280,30 +314,38 @@ DEPENDENCIES
   capybara
   carrierwave
   database_cleaner
+  devise
+  devise-two-factor
   dotenv-rails
   email_validator
-  factory_girl_rails
+  factory_bot_rails
   faker
   jbuilder (~> 2.0)
   jquery-rails
   launchy
+  local_time
   logstasher (~> 0.6.5)
+  mini_magick
   okcomputer
   omniauth-google-oauth2
   pg
   pickadate-rails
   poltergeist
+  pry
   quiet_assets
   rails (~> 4.2.8)
   rails_12factor
   recaptcha
+  rqrcode-rails3
   rspec-rails
   rubocop
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   show_me_the_cookies (~> 3.1.0)
   simple_form
   skylight
+  timecop
+  trix
   uglifier (>= 1.3.0)
   unicorn
   unicorn-rails

README.md

@@ -145,4 +145,3 @@ Some helpful commands:
 
     heroku restart -a rei-secretlink-production
     heroku logs --tail -a rei-secretlink-production
-

app/assets/javascripts/application.js

@@ -10,8 +10,17 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //= require jquery
+//= require jquery_ujs
 //= require pickadate/picker
 //= require pickadate/picker.date
 //= require bootstrap-sprockets
 //= require topsekrit
 //= require ui-functions
+//= require local-time
+//= require trix
+
+// Components
+//= require components/header
+//= require components/secret-item
+//= require components/two-factor-fields
+//= require components/new-secret-form

app/assets/javascripts/components/header.js

@@ -0,0 +1,25 @@
+$(function() {
+  // Add smooth scrolling to all header links
+  $('.main-nav__links a[href^="/home#"], .footer-links a[href^="/home#"]').on('click', function(event) {
+    smoothScrolling(event);
+  });
+});
+
+function smoothScrolling(event) {
+  var link = event.target;
+
+  if (link.hash !== "") {
+    var hash    = link.hash;
+    var target  = $(hash).length > 0;
+
+    // Scroll a little higher to account for the sticky header
+    var headerHeight = 50;
+    var yValue = $(hash).offset().top - headerHeight;
+
+    if (target) {
+      $('html, body').animate({
+        scrollTop: yValue
+      }, 800);
+    }
+  }
+}

app/assets/javascripts/components/new-secret-form.js

@@ -0,0 +1,32 @@
+$(function() {
+  function NewSecretForm(rootDom) {
+    this.$root = $(rootDom);
+    this.$noEmailToggle = this.$root.find('.no-email-toggle');
+    this.$fromEmailField = this.$root.find('.secret_from_email');
+    this.$toEmailField = this.$root.find('.secret_to_email');
+    this.$toEmailInput = this.$root.find("input[name='secret[to_email]']")
+    this.init();
+  }
+
+  NewSecretForm.prototype.init = function () {
+    this.$noEmailToggle.change(function() {
+      this.toggleEmailFields(!this.withoutEmail());
+    }.bind(this));
+  }
+
+  NewSecretForm.prototype.toggleEmailFields = function (showField) {
+    this.$fromEmailField.toggle(showField);
+    this.$toEmailField.toggle(showField);
+    this.$toEmailInput.val('');
+  }
+
+  NewSecretForm.prototype.withoutEmail = function () {
+    return this.$noEmailToggle.is(':checked');
+  }
+
+  //Intialization code
+  const $newSecretForm = $(this).find(".js-new-secret-form");
+  $newSecretForm.each(function () {
+    new NewSecretForm(this)
+  })
+});

app/assets/javascripts/components/secret-item.js

@@ -0,0 +1,22 @@
+$(function() {
+  function SecretItem(rootDom) {
+    this.$root = $(rootDom);
+    this.$notes = this.$root.find('.notes');
+    this.init();
+  }
+
+  SecretItem.prototype.init = function () {
+    this.$seeNoteBtn = this.$root.find('.notes-trigger');
+    this.$seeNoteBtn.on('click', this.toggleNote.bind(this));
+  }
+
+  SecretItem.prototype.toggleNote = function () {
+    this.$notes.toggle('fast');
+  }
+
+  //Intialization code
+  const $secretItems = $(this).find(".secret-item");
+  $secretItems.each(function () {
+    new SecretItem(this)
+  })
+});