rerender topics as reconstruction

.agignore

@@ -1 +0,0 @@
-app/assets/javascripts/metamaps.secret.bundle.js

.codeclimate.yml

@@ -20,8 +20,6 @@ engines:
     enabled: true
   rubocop:
     enabled: true
-    exclude_fingerprints:
-      - 74f18007b920e8d81148d2f6a2756534
 ratings:
   paths:
   - 'Gemfile.lock'

.example-env

@@ -6,7 +6,7 @@ export DB_USERNAME='postgres'
 export DB_PASSWORD='3112'
 export DB_HOST='localhost'
 export DB_PORT='5432'
-export DB_NAME='metamaps'
+export DB_NAME='metamap002'
 
 export REALTIME_SERVER='http://localhost:5000'
 export MAILER_DEFAULT_URL='localhost:3000'

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,5 @@
+
+
+
+============
+100BD/C = (100)(__)(__)/(__)=__

.gitignore

@@ -15,7 +15,6 @@ app/assets/javascripts/webpacked
 
 #secrets and config
 .env
-*.swp
 
 # Ignore bundler config
 .bundle
@@ -23,7 +22,6 @@ app/assets/javascripts/webpacked
 # Ignore all logfiles and tempfiles.
 log/*.log
 tmp
-.tmp
 
 coverage
 
@@ -31,5 +29,3 @@ coverage
 */.DS_Store
 .DS_Store?
 .vagrant
-gentle/
-startserver.sh

.rubocop.yml

@@ -12,18 +12,10 @@ Rails:
   Enabled: true
 
 Metrics/LineLength:
-  Max: 120
+  Max: 100
 
 Metrics/AbcSize:
   Max: 16
 
 Style/Documentation:
   Enabled: false
-
-Style/EmptyMethod:
-  EnforcedStyle: expanded
-
-# I like this cop, but occasionally code is more readable without a guard clause,
-# and I don't want to write rubocop:disable comments every time that happens
-Style/GuardClause:
-  Enabled: false

.travis.yml

@@ -22,4 +22,3 @@ script:
 addons:
   code_climate:
     repo_token: 479d3bf56798fbc7fff3fc8151a5ed09e8ac368fd5af332c437b9e07dbebb44e
-  postgresql: "9.4"

Gemfile

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
-
 source 'https://rubygems.org'
 ruby '2.3.0'
 
 gem 'rails', '~> 5.0.0'
 
 gem 'active_model_serializers'
-gem 'aws-sdk', '~> 2.7.0'
+gem 'aws-sdk'
 gem 'best_in_place'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
+gem 'sucker_punch'
 gem 'devise'
 gem 'doorkeeper'
 gem 'dotenv-rails'
@@ -17,18 +17,15 @@ gem 'exception_notification'
 gem 'httparty'
 gem 'json'
 gem 'kaminari'
-gem 'mailboxer'
 gem 'paperclip'
 gem 'pg'
-gem 'puma'
 gem 'pundit'
 gem 'pundit_extra'
 gem 'rack-attack'
 gem 'rack-cors'
-gem 'redis', '~> 3.3.3'
+gem 'redis'
 gem 'slack-notifier'
 gem 'snorlax'
-gem 'sucker_punch'
 
 # asset stuff
 gem 'jquery-rails'
@@ -37,21 +34,19 @@ gem 'sass-rails'
 gem 'uglifier'
 
 group :test do
-  gem 'brakeman', require: false
+  gem 'factory_girl_rails'
-  gem 'factory_bot_rails'
   gem 'json-schema'
   gem 'rspec-rails'
   gem 'shoulda-matchers'
   gem 'simplecov', require: false
+  gem 'brakeman', require: false
 end
 
 group :development, :test do
   gem 'better_errors'
   gem 'binding_of_caller'
-  gem 'faker'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'rubocop', '~> 0.48.1' # match code climate https://github.com/tootsuite/mastodon/issues/1758
-  gem 'timecop'
   gem 'tunemygc'
+  gem 'rubocop'
 end

Gemfile.lock

@@ -1,297 +1,263 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.5)
+    actioncable (5.0.0.1)
-      actionpack (= 5.0.5)
+      actionpack (= 5.0.0.1)
-      nio4r (>= 1.2, < 3.0)
+      nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.5)
+    actionmailer (5.0.0.1)
-      actionpack (= 5.0.5)
+      actionpack (= 5.0.0.1)
-      actionview (= 5.0.5)
+      actionview (= 5.0.0.1)
-      activejob (= 5.0.5)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.5)
+    actionpack (5.0.0.1)
-      actionview (= 5.0.5)
+      actionview (= 5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.5)
+    actionview (5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    active_model_serializers (0.10.6)
+    active_model_serializers (0.10.2)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
-      case_transform (>= 0.2)
+      jsonapi (~> 0.1.1.beta2)
-      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
+      railties (>= 4.1, < 6)
-    activejob (5.0.5)
+    activejob (5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.5)
+    activemodel (5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
-    activerecord (5.0.5)
+    activerecord (5.0.0.1)
-      activemodel (= 5.0.5)
+      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.5)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.3.8)
-      public_suffix (>= 2.0.2, < 4.0)
+    arel (7.1.2)
-    arel (7.1.4)
     ast (2.3.0)
-    aws-sdk (2.7.0)
+    aws-sdk (2.6.3)
-      aws-sdk-resources (= 2.7.0)
+      aws-sdk-resources (= 2.6.3)
-    aws-sdk-core (2.7.0)
+    aws-sdk-core (2.6.3)
-      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.0)
+    aws-sdk-resources (2.6.3)
-      aws-sdk-core (= 2.7.0)
+      aws-sdk-core (= 2.6.3)
-    aws-sigv4 (1.0.2)
     bcrypt (3.1.11)
-    best_in_place (3.1.1)
+    best_in_place (3.1.0)
       actionpack (>= 3.2)
       railties (>= 3.2)
-    better_errors (2.3.0)
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
+      erubis (>= 2.6.6)
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.7.2)
+    brakeman (3.4.0)
-    builder (3.2.3)
+    builder (3.2.2)
-    byebug (9.1.0)
+    byebug (9.0.5)
-    carrierwave (1.1.0)
+    climate_control (0.0.3)
-      activemodel (>= 4.0.0)
+      activesupport (>= 3.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    case_transform (0.2)
-      activesupport
-    climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.2)
+    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.2)
-    debug_inspector (0.0.3)
+    debug_inspector (0.0.2)
-    delayed_job (4.1.3)
+    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.2)
+      activesupport (>= 3.0, < 5.1)
-    delayed_job_active_record (4.1.2)
+    delayed_job_active_record (4.1.1)
-      activerecord (>= 3.0, < 5.2)
+      activerecord (>= 3.0, < 5.1)
       delayed_job (>= 3.0, < 5)
-    devise (4.3.0)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 5.1)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.3)
+    diff-lcs (1.2.5)
     docile (1.1.5)
-    doorkeeper (4.2.6)
+    doorkeeper (4.2.0)
       railties (>= 4.2)
-    dotenv (2.2.1)
+    dotenv (2.1.1)
-    dotenv-rails (2.2.1)
+    dotenv-rails (2.1.1)
-      dotenv (= 2.2.1)
+      dotenv (= 2.1.1)
-      railties (>= 3.2, < 5.2)
+      railties (>= 4.0, < 5.1)
-    erubi (1.6.1)
     erubis (2.7.0)
-    exception_notification (4.2.2)
+    exception_notification (4.2.1)
       actionmailer (>= 4.0, < 6)
       activesupport (>= 4.0, < 6)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_girl (4.7.0)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
+    factory_girl_rails (4.7.0)
-      factory_bot (~> 4.8.2)
+      factory_girl (~> 4.7.0)
       railties (>= 3.0.0)
-    faker (1.8.4)
+    globalid (0.3.7)
-      i18n (~> 0.5)
+      activesupport (>= 4.1.0)
-    ffi (1.9.18)
+    httparty (0.14.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    httparty (0.15.6)
       multi_xml (>= 0.5.2)
-    i18n (0.9.3)
+    i18n (0.7.0)
-      concurrent-ruby (~> 1.0)
     jmespath (1.3.1)
-    jquery-rails (4.3.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (2.1.0)
+    json (1.8.3)
-    json-schema (2.8.0)
+    json-schema (2.6.2)
-      addressable (>= 2.4)
+      addressable (~> 2.3.8)
-    jsonapi-renderer (0.1.3)
+    jsonapi (0.1.1.beta2)
-    kaminari (1.0.1)
+      json (~> 1.8)
-      activesupport (>= 4.1.0)
+    kaminari (0.17.0)
-      kaminari-actionview (= 1.0.1)
+      actionpack (>= 3.0.0)
-      kaminari-activerecord (= 1.0.1)
+      activesupport (>= 3.0.0)
-      kaminari-core (= 1.0.1)
-    kaminari-actionview (1.0.1)
-      actionview
-      kaminari-core (= 1.0.1)
-    kaminari-activerecord (1.0.1)
-      activerecord
-      kaminari-core (= 1.0.1)
-    kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
+    mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mailboxer (0.15.1)
-      carrierwave (>= 0.5.8)
-      rails (>= 5.0.0)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.1.0)
-    minitest (5.11.1)
+    minitest (5.9.1)
-    multi_xml (0.6.0)
+    multi_xml (0.5.5)
-    nio4r (2.1.0)
+    nio4r (1.2.1)
-    nokogiri (1.8.1)
+    nokogiri (1.6.8)
-      mini_portile2 (~> 2.3.0)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
-    paperclip (5.2.0)
+    paperclip (5.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parser (2.4.0.2)
+    parser (2.3.1.4)
-      ast (~> 2.3)
+      ast (~> 2.2)
-    pg (0.21.0)
+    pg (0.19.0)
+    pkg-config (1.1.7)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.5.0)
+    pry-byebug (3.4.0)
-      byebug (~> 9.1)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    pry-rails (0.3.6)
+    pry-rails (0.3.4)
-      pry (>= 0.10.4)
+      pry (>= 0.9.10)
-    public_suffix (3.0.0)
-    puma (3.10.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
     pundit_extra (0.3.0)
-    rack (2.0.3)
+    rack (2.0.1)
     rack-attack (5.0.1)
       rack
-    rack-cors (1.0.1)
+    rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.5)
+    rails (5.0.0.1)
-      actioncable (= 5.0.5)
+      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.5)
+      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.5)
+      actionpack (= 5.0.0.1)
-      actionview (= 5.0.5)
+      actionview (= 5.0.0.1)
-      activejob (= 5.0.5)
+      activejob (= 5.0.0.1)
-      activemodel (= 5.0.5)
+      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.5)
+      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
-      bundler (>= 1.3.0)
+      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.5)
+      railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
+    rails-dom-testing (2.0.1)
-      activesupport (>= 4.2.0)
+      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (>= 1.6)
+      nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.5)
+    railties (5.0.0.1)
-      actionpack (= 5.0.5)
+      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.5)
+      activesupport (= 5.0.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
+    rainbow (2.1.0)
-      rake
+    rake (11.3.0)
-    rake (12.3.0)
+    redis (3.3.1)
-    rb-fsevent (0.10.2)
+    responders (2.3.0)
-    rb-inotify (0.9.10)
+      railties (>= 4.2.0, < 5.1)
-      ffi (>= 0.5.0, < 2)
+    rspec-core (3.5.3)
-    redis (3.3.3)
+      rspec-support (~> 3.5.0)
-    responders (2.4.0)
+    rspec-expectations (3.5.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.5.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.5.0)
-    rspec-rails (3.6.1)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
+      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.6.0)
+      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.6.0)
+      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.5.0)
-    rspec-support (3.6.0)
+    rspec-support (3.5.0)
-    rubocop (0.48.1)
+    rubocop (0.43.0)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.8.1)
-    sass (3.5.1)
+    sass (3.4.22)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
     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)
-    shoulda-matchers (3.1.2)
+    shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    simplecov (0.15.0)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+    simplecov-html (0.10.0)
-    slack-notifier (2.3.1)
+    slack-notifier (1.5.1)
     slop (3.6.0)
     snorlax (0.1.6)
       rails (> 4.1)
-    sprockets (3.7.1)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sucker_punch (2.0.3)
+    sucker_punch (2.0.2)
       concurrent-ruby (~> 1.0.0)
-    thor (0.20.0)
+    thor (0.19.1)
-    thread_safe (0.3.6)
+    thread_safe (0.3.5)
-    tilt (2.0.8)
+    tilt (2.0.5)
-    timecop (0.9.1)
+    tunemygc (1.0.68)
-    tunemygc (1.0.69)
+    tzinfo (1.2.2)
-    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.1.1)
-    warden (1.2.7)
+    warden (1.2.6)
       rack (>= 1.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
 
@@ -300,7 +266,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers
-  aws-sdk (~> 2.7.0)
+  aws-sdk
   best_in_place
   better_errors
   binding_of_caller
@@ -311,35 +277,31 @@ DEPENDENCIES
   doorkeeper
   dotenv-rails
   exception_notification
-  factory_bot_rails
+  factory_girl_rails
-  faker
   httparty
   jquery-rails
   jquery-ui-rails
   json
   json-schema
   kaminari
-  mailboxer
   paperclip
   pg
   pry-byebug
   pry-rails
-  puma
   pundit
   pundit_extra
   rack-attack
   rack-cors
   rails (~> 5.0.0)
-  redis (~> 3.3.3)
+  redis
   rspec-rails
-  rubocop (~> 0.48.1)
+  rubocop
   sass-rails
   shoulda-matchers
   simplecov
   slack-notifier
   snorlax
   sucker_punch
-  timecop
   tunemygc
   uglifier
 
@@ -347,4 +309,4 @@ RUBY VERSION
    ruby 2.3.0p0
 
 BUNDLED WITH
-   1.16.1
+   1.13.6

Procfile

@@ -1,3 +1,3 @@
-web: bundle exec puma -p $PORT
+web: bundle exec rails server -p $PORT
 worker:  bundle exec rake jobs:work
 

README.md

@@ -2,7 +2,6 @@ Metamaps
 =======
 
 [![Build Status](https://travis-ci.org/metamaps/metamaps.svg?branch=develop)](https://travis-ci.org/metamaps/metamaps)
-[![Code Climate](https://codeclimate.com/github/metamaps/metamaps/badges/gpa.svg)](https://codeclimate.com/github/metamaps/metamaps)
 
 ## What is Metamaps?
 
@@ -17,30 +16,44 @@ Metamaps is developed and maintained by a distributed, nomadic community compris
 - Contact: [team@metamaps.cc](mailto:team@metamaps.cc) or [@metamapps](https://twitter.com/metamapps) on Twitter
 - User Documentation: [docs.metamaps.cc](https://docs.metamaps.cc)
 - User Community: [hylo.com/c/metamaps](https://www.hylo.com/c/metamaps)
-- To see what we're developing, or to weigh in on what you'd like to see developed, see our [Metamaps Feedback and Features](https://trello.com/b/uFOA6a2x/metamaps-feedback-feature-ideas-requests) board on trello
+- Development Roadmap: [github.com/metamaps/metamaps/milestones](https://github.com/metamaps/metamaps/milestones)
-- To follow along with, or contribute,to our design process, see our [Metamaps Design](https://trello.com/b/8HlCikOX/metamaps-design) board on trello
+- To send us a personal message or request an invite to the open beta, get in touch with us via email, Twitter, or Hylo
-- To follow along with, or contribute to, our development process, see our [Github Issues and Pull Requests](https://github.com/metamaps/metamaps/issues)
-- Request an invite to the open beta [here](https://metamaps.cc/request)
-
-<!-- markdown hack to split two lists -->
-
-- To send us a personal message get in touch with us via email, Twitter, or Hylo
 - If you would like to report a bug, please check the [issues][contributing-issues] section in our [contributing instructions][contributing].
 - If you would like to get set up as a developer, that's great! Read on for help getting your development environment set up.
 
-## Installation for local use or development of Metamaps
+## Installation
 
-First off is getting the code downloaded to your computer. You can download a zip file from github, but if you've got `git` you can just run `git clone https://github.com/metamaps/metamaps` in your terminal.
+If you are on Mac or Ubuntu you can use the following instructions to quickly get a local copy of metamaps up and running using a Vagrant virtualbox. Don't be intimidated, it's easy!
+```
+git clone git@github.com:metamaps/metamaps.git
+```
+Now ensure you have VirtualBox and Vagrant installed on your computer
+```
+cd metamaps
+./bin/configure.sh
+```
+This will do all the setup steps to make Metamaps work with a bit of behind the scenes ninja magick.
 
-There are instructions for setup on various platforms, with particular support for Mac and Ubuntu, which can be found here:
+To start servers which will run metamaps you can then run:
-- [Mac Install Walkthrough][mac-installation]
+```
-- [Ubuntu Install Walkthrough][ubuntu-installation]
+./bin/start
+```
+To stop them:
+```
+./bin/stop
+```
+With your webservers running, open a web browser and go to `http://localhost:3000`
 
-If you prefer to isolate your install in a virtual machine, you may find it simpler to setup using Vagrant:
+You can sign in with the default account
-- [Vagrant installation][vagrant-installation]
+email: `user@user.com`
+password: `toolsplusconsciousness`
+OR create a new account at `/join`, and use access code `qwertyui`
 
-We don't promise support for Windows, but at one point we had it running and we've kept those docs available for reference
+Start mapping and programming!
-- [Outdated Windows Walkthrough][windows-installation]
+
+We haven't set up instructions for using Vagrant on Windows, but there are instructions for a manual setup here:
+
+- [For Windows][windows-installation]
 
 ## Licensing information
 
@@ -50,13 +63,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 The license can be read [here][license].
 
-Copyright (c) 2017 Connor Turland
+Copyright (c) 2016 Connor Turland
 
 [site-beta]: http://metamaps.cc
 [license]: https://github.com/metamaps/metamaps/blob/develop/LICENSE
 [contributing]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md
 [contributing-issues]: https://github.com/metamaps/metamaps/blob/develop/doc/CONTRIBUTING.md#reporting-bugs-and-other-issues
-[mac-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/MacInstallation.md
-[ubuntu-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/UbuntuInstallation.md
-[vagrant-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/VagrantInstallation.md
 [windows-installation]: https://github.com/metamaps/metamaps/blob/develop/doc/WindowsInstallation.md

Rakefile

@@ -1,6 +1,5 @@
 #!/usr/bin/env rake
 # 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.
 

Vagrantfile

@@ -37,7 +37,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'trusty64'
   config.vm.box_url = 'http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
   config.vm.network :forwarded_port, guest: 3000, host: 3000
-  config.vm.network :forwarded_port, guest: 5000, host: 5000
+  config.vm.network :forwarded_port, guest: 5001, host: 5001
   config.vm.network 'private_network', ip: '10.0.1.11'
   config.vm.synced_folder '.', '/vagrant', nfs: true
 

app/assets/config/manifest.js

@@ -1,4 +1,3 @@
-// eslint-disable spaced-comment
 // JS and CSS bundles
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css

app/assets/javascripts/Metamaps.ServerData.js.erb

@@ -10,9 +10,6 @@ Metamaps.ServerData['topic_link_signifier.png'] = '<%= asset_path('topic_link_si
 Metamaps.ServerData['synapse16.png'] = '<%= asset_path('synapse16.png') %>'
 Metamaps.ServerData['sounds/MM_sounds.mp3'] = '<%= asset_path 'sounds/MM_sounds.mp3' %>'
 Metamaps.ServerData['sounds/MM_sounds.ogg'] = '<%= asset_path 'sounds/MM_sounds.ogg' %>'
-Metamaps.ServerData['exploremaps_sprite.png'] = '<%= asset_path 'exploremaps_sprite.png' %>'
-Metamaps.ServerData['map_control_sprite.png'] = '<%= asset_path 'map_control_sprite.png' %>'
-Metamaps.ServerData['user_sprite.png'] = '<%= asset_path 'user_sprite.png' %>'
 Metamaps.ServerData.Metacodes = <%= Metacode.all.to_json.gsub(%r[(icon.*?)(\"},)], '\1?purple=stupid\2').html_safe %>
 Metamaps.ServerData.REALTIME_SERVER = '<%= ENV['REALTIME_SERVER'] %>'
 Metamaps.ServerData.RAILS_ENV = '<%= ENV['RAILS_ENV'] %>'

app/assets/javascripts/application-secret.js

@@ -1,23 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-/* eslint-disable spaced-comment */
-//= require jquery
-//= require jquery-ui
-//= require jquery_ujs
-//= require action_cable
-//= require_directory ./lib
-//= require ./cloudcarousel-secret
-//= require ./metamaps.secret.bundle
-//= require ./Metamaps.ServerData
-//= require homepageVimeoFallback
-/* eslint-enable spaced-comment */

app/assets/javascripts/application.js

@@ -1,3 +1,4 @@
+// eslint-disable spaced-comment
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
@@ -9,14 +10,11 @@
 //
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
-//
+//  
-/* eslint-disable spaced-comment */
 //= require jquery
 //= require jquery-ui
 //= require jquery_ujs
-//= require action_cable
 //= require_directory ./lib
 //= require ./webpacked/metamaps.bundle
 //= require ./Metamaps.ServerData
 //= require homepageVimeoFallback
-/* eslint-enable spaced-comment */

app/assets/javascripts/cloudcarousel-secret.js

@@ -1,438 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////
-// CloudCarousel V1.0.5
-// (c) 2011 by R Cecco. <http://www.professorcloud.com>
-// MIT License
-//
-// Reflection code based on plugin by Christophe Beyls <http://www.digitalia.be>
-//
-// Please retain this copyright header in all versions of the software
-//////////////////////////////////////////////////////////////////////////////////
-var matched, browser;
-
-jQuery.uaMatch = function( ua ) {
-    ua = ua.toLowerCase();
-
-    var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-        /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-        /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-        /(msie) ([\w.]+)/.exec( ua ) ||
-        ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-        [];
-
-    return {
-        browser: match[ 1 ] || "",
-        version: match[ 2 ] || "0"
-    };
-};
-
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-    browser[ matched.browser ] = true;
-    browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-    browser.webkit = true;
-} else if ( browser.webkit ) {
-    browser.safari = true;
-}
-
-jQuery.browser = browser;
-
-(function($) {
-
-	// START Reflection object.
-	// Creates a reflection for underneath an image.
-	// IE uses an image with IE specific filter properties, other browsers use the Canvas tag.	
-	// The position and size of the reflection gets updated by updateAll() in Controller.
-	function Reflection(img, reflHeight, opacity) {				
-		
-		var	reflection, cntx, imageWidth = img.width, imageHeight = img.width, gradient, parent;
-	
-		parent = $(img.parentNode);
-		this.element = reflection = parent.append("<canvas class='reflection' style='position:absolute'/>").find(':last')[0];
-        if ( !reflection.getContext &&  $.browser.msie) {
-			this.element = reflection = parent.append("<img class='reflection' style='position:absolute'/>").find(':last')[0];					
-			reflection.src = img.src;			
-			reflection.style.filter = "flipv progid:DXImageTransform.Microsoft.Alpha(opacity=" + (opacity * 100) + ", style=1, finishOpacity=0, startx=0, starty=0, finishx=0, finishy=" + (reflHeight / imageHeight * 100) + ")";	
-			
-        } else {							
-			cntx = reflection.getContext("2d");
-			try {
-				
-				
-				$(reflection).attr({width: imageWidth, height: reflHeight});
-				cntx.save();
-				cntx.translate(0, imageHeight-1);
-				cntx.scale(1, -1);				
-				cntx.drawImage(img, 0, 0, imageWidth, imageHeight);				
-				cntx.restore();
-				cntx.globalCompositeOperation = "destination-out";
-				gradient = cntx.createLinearGradient(0, 0, 0, reflHeight);
-				gradient.addColorStop(0, "rgba(255, 255, 255, " + (1 - opacity) + ")");
-				gradient.addColorStop(1, "rgba(255, 255, 255, 1.0)");
-				cntx.fillStyle = gradient;
-				cntx.fillRect(0, 0, imageWidth, reflHeight);				
-			} catch(e) {			
-				return;
-			}		
-		}
-		// Store a copy of the alt and title attrs into the reflection
-		$(reflection).attr({ 'alt': $(img).attr('alt'), title: $(img).attr('title')} );	
-				
-	}	//END Reflection object
-
-	// START Item object.
-	// A wrapper object for items within the carousel.
-	var	Item = function(imgIn, options)
-	{								
-		this.orgWidth = imgIn.width;			
-		this.orgHeight = imgIn.height;		
-		this.image = imgIn;
-		this.reflection = null;					
-		this.alt = imgIn.alt;
-		this.title = imgIn.title;
-		this.imageOK = false;		
-		this.options = options;				
-						
-		this.imageOK = true;	
-		
-		if (this.options.reflHeight > 0)
-		{													
-			this.reflection = new Reflection(this.image, this.options.reflHeight, this.options.reflOpacity);					
-		}
-		$(this.image).css('position','absolute');	// Bizarre. This seems to reset image width to 0 on webkit!					
-	};// END Item object
-	
-	
-	// Controller object.
-	// This handles moving all the items, dealing with mouse clicks etc.	
-	var Controller = function(container, images, options)
-	{						
-		var	items = [], funcSin = Math.sin, funcCos = Math.cos, ctx=this;
-		this.controlTimer = 0;
-		this.stopped = false;
-		//this.imagesLoaded = 0;
-		this.container = container;
-		this.xRadius = options.xRadius;
-		this.yRadius = options.yRadius;
-		this.showFrontTextTimer = 0;
-		this.autoRotateTimer = 0;
-		if (options.xRadius === 0)
-		{
-			this.xRadius = ($(container).width()/2.3);
-		}
-		if (options.yRadius === 0)
-		{
-			this.yRadius = ($(container).height()/6);
-		}
-
-		this.xCentre = options.xPos;
-		this.yCentre = options.yPos;
-		this.frontIndex = 0;	// Index of the item at the front
-		
-		// Start with the first item at the front.
-		this.rotation = this.destRotation = Math.PI/2;
-		this.timeDelay = 1000/options.FPS;
-								
-		// Turn on the infoBox
-		if(options.altBox !== null)
-		{
-			$(options.altBox).css('display','block');	
-			$(options.titleBox).css('display','block');	
-		}
-		// Turn on relative position for container to allow absolutely positioned elements
-		// within it to work.
-		$(container).css({ position:'relative', overflow:'hidden'} );
-	
-		$(options.buttonLeft).css('display','inline');
-		$(options.buttonRight).css('display','inline');
-		
-		// Setup the buttons.
-		$(options.buttonLeft).bind('mouseup',this,function(event){
-			event.data.rotate(-1);	
-			return false;
-		});
-		$(options.buttonRight).bind('mouseup',this,function(event){
-			event.data.rotate(1);	
-			return false;
-		});
-		
-		// START METAMAPS CODE
-		// Add code that makes tab and shift+tab scroll through metacodes
-		$('.new_topic').bind('keydown',this,function(event){
-            if (event.keyCode == 9 && event.shiftKey) {
-        $(container).show()
-				event.data.rotate(-1);
-                event.preventDefault();
-                event.stopPropagation();
-			} else if (event.keyCode == 9) {
-				$(container).show()
-				event.data.rotate(1);
-                event.preventDefault();
-                event.stopPropagation();
-            }
-		});
-		// END METAMAPS CODE
-		
-		// You will need this plugin for the mousewheel to work: http://plugins.jquery.com/project/mousewheel
-		if (options.mouseWheel)
-		{
-			// START METAMAPS CODE
-			/*$('body').bind('mousewheel',this,function(event, delta) {					 
-					 if (Metamaps.Create.newTopic.beingCreated && 
-					     !Metamaps.Create.isSwitchingSet &&
-					     !Metamaps.Create.newTopic.pinned) {
-					 	event.data.rotate(delta);
-					 	return false;
-					 }
-				 });*/
-			// END METAMAPS CODE
-			// ORIGINAL CODE
-			// $(container).bind('mousewheel',this,function(event, delta) {
-			// 	event.data.rotate(delta);
-			// 	return false;
-			// });
-			//
-		}
-		$(container).unbind('mouseover click').bind('mouseover click',this,function(event){
-			
-			clearInterval(event.data.autoRotateTimer);		// Stop auto rotation if mouse over.
-			var	text = $(event.target).attr('alt');		
-			// If we have moved over a carousel item, then show the alt and title text.
-		
-			if ( text !== undefined && text !== null )
-			{
-					
-				clearTimeout(event.data.showFrontTextTimer);			
-				$(options.altBox).html( ($(event.target).attr('alt') ));
-				//$(options.titleBox).html( ($(event.target).attr('title') ));							
-				if ( options.bringToFront && event.type == 'click' )				
-				{
-					$(options.titleBox).html( ($(event.target).attr('title') ));
-					// START METAMAPS CODE
-					Metamaps.Create.newTopic.metacode = $(event.target).attr('data-id');
-					// END METAMAPS CODE
-					var	idx = $(event.target).data('itemIndex');	
-					var	frontIndex = event.data.frontIndex;
-					//var	diff = idx - frontIndex;                    
-					var diff = (idx - frontIndex) % images.length;
-					if (Math.abs(diff) > images.length / 2) {
-						diff += (diff > 0 ? -images.length : images.length);
-					}
-
-					event.data.rotate(-diff);
-				}
-			}
-		});
-		// START METAMAPS CODE - initialize newTopic.metacode
-		var first = $(this.container).find('img').get(0)
-		Metamaps.Create.newTopic.metacode = $(first).data('id')
-		// END METAMAPS CODE
-
-		// If we have moved out of a carousel item (or the container itself),
-		// restore the text of the front item in 1 second.
-		$(container).bind('mouseout',this,function(event){
-				var	context = event.data;				
-				clearTimeout(context.showFrontTextTimer);				
-				context.showFrontTextTimer = setTimeout( function(){context.showFrontText();},1000);
-				context.autoRotate();	// Start auto rotation.
-		});
-
-		// Prevent items from being selected as mouse is moved and clicked in the container.
-		$(container).bind('mousedown',this,function(event){	
-			
-			event.data.container.focus();
-			return false;
-		});
-		container.onselectstart = function () { return false; };		// For IE.
-
-		this.innerWrapper = $(container).wrapInner('<div style="position:absolute;width:100%;height:100%;"/>').children()[0];
-	
-		// Shows the text from the front most item.
-		this.showFrontText = function()
-		{	
-			if ( items[this.frontIndex] === undefined ) { return; }	// Images might not have loaded yet.
-                        // METAMAPS CODE
-			Metamaps.Create.newTopic.setMetacode($(items[this.frontIndex].image).attr('data-id'))
-			// NOT METAMAPS CODE
-			//$(options.titleBox).html( $(items[this.frontIndex].image).attr('title'));
-			//$(options.altBox).html( $(items[this.frontIndex].image).attr('alt'));				
-		};
-						
-		this.go = function()
-		{				
-			if(this.controlTimer !== 0) { return; }
-			var	context = this;
-			this.controlTimer = setTimeout( function(){context.updateAll();},this.timeDelay);					
-		};
-		
-		this.stop = function()
-		{
-			clearTimeout(this.controlTimer);
-			this.controlTimer = 0;
-			// METAMAPS CODE
-			$(container).hide()
-			// END METAMAPS CODE
-		};
-		
-		
-		// Starts the rotation of the carousel. Direction is the number (+-) of carousel items to rotate by.
-		this.rotate = function(direction)
-		{	
-			this.frontIndex -= direction;
-			if (this.frontIndex == -1) this.frontIndex = items.length - 1;
-			this.frontIndex %= items.length;					 			
-			this.destRotation += ( Math.PI / items.length ) * ( 2*direction );
-			this.showFrontText();
-			this.go();			
-		};
-		
-		
-		this.autoRotate = function()
-		{			
-			if ( options.autoRotate !== 'no' )
-			{
-				var	dir = (options.autoRotate === 'right')? 1 : -1;
-				this.autoRotateTimer = setInterval( function(){ctx.rotate(dir); }, options.autoRotateDelay );
-			}
-		};
-		
-		// This is the main loop function that moves everything.
-		this.updateAll = function()
-		{											
-			var	minScale = options.minScale;	// This is the smallest scale applied to the furthest item.
-			var smallRange = (1-minScale) * 0.5;
-			var	w,h,x,y,scale,item,sinVal;
-			
-			var	change = (this.destRotation - this.rotation);				
-			var	absChange = Math.abs(change);
-	
-			this.rotation += change * options.speed;
-			if ( absChange < 0.001 ) { this.rotation = this.destRotation; }			
-			var	itemsLen = items.length;
-			var	spacing = (Math.PI / itemsLen) * 2; 
-			//var	wrapStyle = null;
-			var	radians = this.rotation;
-			var	isMSIE = $.browser.msie;
-		
-			// Turn off display. This can reduce repaints/reflows when making style and position changes in the loop.
-			// See http://dev.opera.com/articles/view/efficient-javascript/?page=3			
-			this.innerWrapper.style.display = 'none';		
-			
-			var	style;
-			var	px = 'px', reflHeight;	
-			var context = this;
-			for (var i = 0; i<itemsLen ;i++)
-			{
-				item = items[i];
-								
-				sinVal = funcSin(radians);
-				
-				scale = ((sinVal+1) * smallRange) + minScale;
-				
-				x = this.xCentre + (( (funcCos(radians) * this.xRadius) - (item.orgWidth*0.5)) * scale);
-				y = this.yCentre + (( (sinVal * this.yRadius)  ) * scale);		
-		
-        if (item.imageOK)
-				{
-					var	img = item.image;
-          
-          img.style.zIndex = "" + (scale * 100)>>0;	// >>0 = Math.foor(). Firefox doesn't like fractional decimals in z-index.
-          w = img.width = item.orgWidth * scale;					
-					h = img.height = item.orgHeight * scale;
-					img.style.left = x + px ;
-					img.style.top = y + px;
-					if (item.reflection !== null)
-					{																										
-						reflHeight = options.reflHeight * scale;						
-						style = item.reflection.element.style;
-						style.left = x + px;
-						style.top = y + h + options.reflGap * scale + px;
-						style.width = w + px;								
-						if (isMSIE)
-						{											
-							style.filter.finishy = (reflHeight / h * 100);				
-						}else
-						{								
-							style.height = reflHeight + px;															
-						}																													
-					}					
-				}
-				radians += spacing;
-			}
-			// Turn display back on.					
-			this.innerWrapper.style.display = 'block';
-
-			// If we have a preceptable change in rotation then loop again next frame.
-			if ( absChange >= 0.001 )
-			{				
-				this.controlTimer = setTimeout( function(){context.updateAll();},this.timeDelay);		
-			}else
-			{
-				// Otherwise just stop completely.				
-				this.stop();
-			}
-		}; // END updateAll		
-		
-		// Create an Item object for each image	
-//		func = function(){return;ctx.updateAll();} ;
-
-		// Check if images have loaded. We need valid widths and heights for the reflections.
-		this.checkImagesLoaded = function()
-		{
-			var	i;
-			for(i=0;i<images.length;i++) {
-				if ( (images[i].width === undefined) || ( (images[i].complete !== undefined) && (!images[i].complete)  ))
-				{
-					return;					
-				}				
-			}
-			for(i=0;i<images.length;i++) {				
-				 items.push( new Item( images[i], options ) );	
-				 $(images[i]).data('itemIndex',i);
-			}
-			// If all images have valid widths and heights, we can stop checking.			
-			clearInterval(this.tt);
-			// METAMAPS COMMENT this.showFrontText();
-			this.autoRotate();	
-			this.updateAll();
-			
-		};
-
-		this.tt = setInterval( function(){ctx.checkImagesLoaded();},50);	
-	}; // END Controller object
-	
-	// The jQuery plugin part. Iterates through items specified in selector and inits a Controller class for each one.
-	$.fn.CloudCarousel = function(options) {
-			
-		this.each( function() {			
-			
-			options = $.extend({}, {
-							   reflHeight:0,
-							   reflOpacity:0.5,
-							   reflGap:0,
-							   minScale:0.5,
-							   xPos:0,
-							   yPos:0,
-							   xRadius:0,
-							   yRadius:0,
-							   altBox:null,
-							   titleBox:null,
-							   FPS: 30,
-							   autoRotate: 'no',
-							   autoRotateDelay: 1500,
-							   speed:0.2,
-							   mouseWheel: false,
-								 bringToFront: false
-			},options );									
-			// Create a Controller for each carousel.		
-			$(this).data('cloudcarousel', new Controller( this, $('.cloudcarousel',$(this)), options) );
-		});				
-		return this;
-	};
-
-})(jQuery);

app/assets/javascripts/homepageVimeoFallback.js

@@ -1,14 +1,14 @@
 /* global $ */
 
-$(document).ready(function() {
+$(document).ready(function () {
   if (window.location.pathname === '/') {
     $.ajax({
       type: 'GET',
-      url: 'https://i.vimeocdn.com/video/',
+      url: 'https://player.vimeo.com',
-      error: function(e) {
+      error: function (e) {
         $('.homeVideo').hide()
         $('.homeVideo').replaceWith($('<video/>', {
-          poster: '<%= asset_path('metamaps-intro-poster.webp') %>',
+          poster: '/assets/metamaps-intro-poster.webp',
           width: '560',
           height: '315',
           class: 'homeVideo',

app/assets/javascripts/lib/ajaxq.js

@@ -1,161 +0,0 @@
-// AjaxQ jQuery Plugin
-// Copyright (c) 2012 Foliotek Inc.
-// MIT License
-// https://github.com/Foliotek/ajaxq
-// Uses CommonJS, AMD or browser globals to create a jQuery plugin.
-
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        // AMD. Register as an anonymous module.
-        define(['jquery'], factory);
-    } else if (typeof module === 'object' && module.exports) {
-        // Node/CommonJS
-        module.exports = factory(require('jquery'));
-    } else {
-        // Browser globals
-        factory(jQuery);
-    }
-}(function ($) {
-    var queues = {};
-    var activeReqs = {};
-
-    // Register an $.ajaxq function, which follows the $.ajax interface, but allows a queue name which will force only one request per queue to fire.
-    // opts can be the regular $.ajax settings plainObject, or a callback returning the settings object, to be evaluated just prior to the actual call to $.ajax.
-    $.ajaxq = function(qname, opts) {
-
-        if (typeof opts === "undefined") {
-            throw ("AjaxQ: queue name is not provided");
-        }
-
-        // Will return a Deferred promise object extended with success/error/callback, so that this function matches the interface of $.ajax
-        var deferred = $.Deferred(),
-            promise = deferred.promise();
-
-        promise.success = promise.done;
-        promise.error = promise.fail;
-        promise.complete = promise.always;
-
-        // Check whether options are to be evaluated at call time or not.
-        var deferredOpts = typeof opts === 'function';
-        // Create a deep copy of the arguments, and enqueue this request.
-        var clonedOptions = !deferredOpts ? $.extend(true, {}, opts) : null;
-        enqueue(function() {
-            // Send off the ajax request now that the item has been removed from the queue
-            var jqXHR = $.ajax.apply(window, [deferredOpts ? opts() : clonedOptions]);
-
-            // Notify the returned deferred object with the correct context when the jqXHR is done or fails
-            // Note that 'always' will automatically be fired once one of these are called: http://api.jquery.com/category/deferred-object/.
-            jqXHR.done(function() {
-                deferred.resolve.apply(this, arguments);
-            });
-            jqXHR.fail(function() {
-                deferred.reject.apply(this, arguments);
-            });
-
-            jqXHR.always(dequeue); // make sure to dequeue the next request AFTER the done and fail callbacks are fired
-
-            return jqXHR;
-        });
-
-        return promise;
-
-
-        // If there is no queue, create an empty one and instantly process this item.
-        // Otherwise, just add this item onto it for later processing.
-        function enqueue(cb) {
-            if (!queues[qname]) {
-                queues[qname] = [];
-                var xhr = cb();
-                activeReqs[qname] = xhr;
-            }
-            else {
-                queues[qname].push(cb);
-            }
-        }
-
-        // Remove the next callback from the queue and fire it off.
-        // If the queue was empty (this was the last item), delete it from memory so the next one can be instantly processed.
-        function dequeue() {
-            if (!queues[qname]) {
-                return;
-            }
-            var nextCallback = queues[qname].shift();
-            if (nextCallback) {
-                var xhr = nextCallback();
-                activeReqs[qname] = xhr;
-            }
-            else {
-                delete queues[qname];
-                delete activeReqs[qname];
-            }
-        }
-    };
-
-    // Register a $.postq and $.getq method to provide shortcuts for $.get and $.post
-    // Copied from jQuery source to make sure the functions share the same defaults as $.get and $.post.
-    $.each( [ "getq", "postq" ], function( i, method ) {
-        $[ method ] = function( qname, url, data, callback, type ) {
-
-            if ( $.isFunction( data ) ) {
-                type = type || callback;
-                callback = data;
-                data = undefined;
-            }
-
-            return $.ajaxq(qname, {
-                type: method === "postq" ? "post" : "get",
-                url: url,
-                data: data,
-                success: callback,
-                dataType: type
-            });
-        };
-    });
-
-    var isQueueRunning = function(qname) {
-        return (queues.hasOwnProperty(qname) && queues[qname].length > 0) || activeReqs.hasOwnProperty(qname);
-    };
-
-    var isAnyQueueRunning = function() {
-        for (var i in queues) {
-            if (isQueueRunning(i)) return true;
-        }
-        return false;
-    };
-
-    $.ajaxq.isRunning = function(qname) {
-        if (qname) return isQueueRunning(qname);
-        else return isAnyQueueRunning();
-    };
-
-    $.ajaxq.getActiveRequest = function(qname) {
-        if (!qname) throw ("AjaxQ: queue name is required");
-
-        return activeReqs[qname];
-    };
-
-    $.ajaxq.abort = function(qname) {
-        if (!qname) throw ("AjaxQ: queue name is required");
-        
-        var current = $.ajaxq.getActiveRequest(qname);
-        delete queues[qname];
-        delete activeReqs[qname];
-        if (current) current.abort();
-    };
-
-    $.ajaxq.clear = function(qname) {
-        if (!qname) {
-            for (var i in queues) {
-                if (queues.hasOwnProperty(i)) {
-                    queues[i] = [];
-                }
-            }
-        }
-        else {
-            if (queues[qname]) {
-                queues[qname] = [];
-            }
-        }
-    };
-
-}));

app/assets/secret_stylesheets/application-secret.scss.erb

@@ -1,12 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require ./special
-*/

app/assets/secret_stylesheets/special.scss.erb

@@ -1,109 +0,0 @@
-#metacodeSelector {
-  display: none;
-}
-.metacodeSelect {
-  border-top: 1px solid #DDD;
-  padding: 0;
-  background: #FFF;
-    
-  .metacodeFilterInput {
-    width: 100px;
-    outline: none;
-    border: 0;
-    padding: 8px;
-    font-size: 14px;
-    line-height: 14px;
-    color: #424242;
-    font-family: 'din-medium', helvetica, sans-serif;
-  }
-  
-  .metacodeList {
-    list-style: none;
-    background: #FFF;
-    
-    li {
-      padding: 8px;
-      cursor: pointer;
-      
-      &:hover, &.keySelect {
-        background: #4CAF50;
-      }
-    }
-
-    img {
-      width: 24px;
-      height: 24px;
-      display: inline-block;
-      vertical-align: middle;
-      padding-right: 6px;
-    }
-  }
-}
-.selectedMetacode {
-  float: left;
-  background: #FFF;
-  border-top-left-radius: 2px;
-  border-bottom-left-radius: 2px;
-  padding: 5px 10px 5px 6px;
-  vertical-align: top;
-  border-right: 1px solid #DDD;
-  cursor: pointer;
-}
-.selectedMetacode:hover, .selectedMetacode.isBeingSelected {
-  background: #EDEDED;
-}
-.selectedMetacode img {
-  width: 24px;
-  height: 24px;
-  display: inline-block;
-  vertical-align: middle;
-}
-.selectedMetacode span {
-  vertical-align: middle;
-}
-.selectedMetacode .downArrow {
-  display: inline-block;
-  vertical-align: middle;
-  width: 0;
-  height: 0;
-  border-style: solid;
-  border-width: 8px 6px 0 6px;
-  border-color: #777 transparent transparent transparent;
-  margin-left: 2px;
-  margin-top: 4px;
-}
-.new_topic {
-    margin: 0;
-    margin-top: -17px;
-    white-space: nowrap;
-}
-#new_topic .twitter-typeahead {
-     position: relative !important;
-     top: 0;
-     left: 0;
-}
-.new_topic #topic_name,
-.new_topic .tt-hint {
-     border-radius: none;
-     border-top-right-radius: 2px;
-     border-bottom-right-radius: 2px;
-}
-.openMetacodeSwitcher {
-    top: -16px;
-    left: -16px;
-}
-#metacodeImg {
-     height: 120px;
-     width: 380px;
-     display: none;
-     position: absolute !important;
-     top: -30px;
-     z-index: -1;
-}
-#metacodeImgTitle {
-     display: none;
-     float: left;
-     width: 120px;
-     text-align: center;
-     margin-left: 110px;
-}

app/assets/stylesheets/admin.scss.erb

@@ -56,15 +56,16 @@
   }
 
   li.toggledOff {
-    opacity: 0.6;
+    opacity: 0.4;
   }
 }
 
-.centerContent {
+.blackBox {
   width: 760px;
   margin: 0 auto;
   padding: 80px 0 60px 20px;
-  background: rgba(125, 125, 125, 0.4);
+  background: rgba(0, 0, 0, 0.4);
+  color: white;
   overflow: hidden;
   position: relative;
 
@@ -84,10 +85,10 @@
     display: table-row;
   }
   tr:nth-child(odd) {
-    background: rgba(125, 125, 125, 0.2);
+    background: rgba(0, 0, 0, 0.2);
   }
   tr:nth-child(even) {
-    background: rgba(125, 125, 125, 0.3);
+    background: rgba(0, 0, 0, 0.3);
   }
   th,
   td {

app/assets/stylesheets/application.scss.erb

@@ -193,6 +193,10 @@ button.button.btn-no:hover {
     display: block;
     width: 830px;
 }
+.requestInvite {
+    display: block;
+    margin: -720px auto 0;
+}
 .new_session,
 .new_user,
 .edit_user,
@@ -527,12 +531,10 @@ button.button.btn-no:hover {
     left: -1000px;
     display: block;
     position: absolute;
+    width: 340px;
     margin: -40px 0 0 -35px;
     z-index: 1;
 }
-body:not(.action-conversation) .new_topic {
-  width: 340px;
-}
 
 #new_topic .twitter-typeahead {
     position: absolute !important;
@@ -668,21 +670,9 @@ label {
     position: relative;
     /*overflow:hidden; */
 }
-.compressed {
+.main.compressed {
-  .upperRightUI {
+  width: calc(100% - 300px);
-    right: 324px;
-  }
-  .upperRightMapButtons {
-    right: 434px;
-  }
-  .mapControls {
-    right: 324px;
-  }
-  .infoAndHelp {
-    right: 370px;
-  }
 }
-
 #infovis-canvas {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
@@ -783,9 +773,9 @@ label {
 }
 .sidebarAccountIcon img {
     border-radius: 16px;
-    width: 32px;
 }
 .sidebarAccountBox {
+    display: none;
     height: auto;
 }
 .authenticated .sidebarAccountBox {
@@ -826,7 +816,6 @@ label {
     font-size: 14px;
     line-height: 14px;
     color: #757575;
-    cursor: pointer;
 }
 .accountListItem:hover {
     color: #424242;
@@ -837,7 +826,7 @@ label {
     position:absolute;
     pointer-events:none;
     background-repeat:no-repeat;
-    background-image: url(<%= asset_path('user_sprite.png') %>);
+    background-image: url(<%= asset_data_uri('user_sprite.png') %>);
 }
 .accountSettings .accountIcon {
     background-position: 0 0;
@@ -1048,6 +1037,7 @@ label[for="user_remember_me"] {
 }
 
 .sidebarFilterBox {
+    display:none;
     width: 319px;
     padding: 16px 0;
     overflow-y: auto;
@@ -1258,7 +1248,7 @@ h3.filterBox {
     box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24);
 }
 .rightclickmenu .rc-permission:hover > ul,
-.rightclickmenu .rc-metacode:hover #metacodeOptions > ul,
+.rightclickmenu .rc-metacode:hover > ul,
  .rightclickmenu .rc-siblings:hover > ul {
     display: block;
 }
@@ -1287,7 +1277,7 @@ h3.filterBox {
 .rightclickmenu li.toPrivate .rc-perm-icon {
     background-position: -24px 0;
 }
-.rightclickmenu .rc-metacode #metacodeOptions > ul > li,
+.rightclickmenu .rc-metacode > ul > li,
 .rightclickmenu .rc-siblings > ul > li {
     padding: 6px 24px 6px 8px;
     white-space: nowrap;
@@ -1568,7 +1558,6 @@ h3.filterBox {
     box-sizing: border-box;
     margin: 0.75em;
     padding: 0.75em;
-    padding-top: 0.85em;
     height: 3em;
     background-color: #AAB0FB;
     border-radius: 0.3em;
@@ -1915,10 +1904,14 @@ input.collaboratorSearchField {
     background-position: -32px 0;
 }
 .yourMap .mapPermission:hover {
+    background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>);
     cursor: pointer;
+    background-position: -32px 0;
 }
 .yourMap .mapPermission.minimize {
+    background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>) !important;
     cursor: pointer;
+    background-position: 0 0;
 }
 .mapInfoBox .mapPermission .permissionSelect {
     list-style: none;
@@ -2019,7 +2012,6 @@ input.collaboratorSearchField {
     position: relative;
     cursor: pointer;
     display: none;
-    padding: 0 2px;
 }
 .mapInfoShareIcon {
     width: 24px;
@@ -2059,43 +2051,6 @@ and it won't be important on password protected instances */
 .yourMap .mapInfoDelete {
     display: block;
 }
-
-.mapInfoButtonsWrapper .mapInfoThumbnail {
-  display: block;
-  background-image: url(<%= asset_path('screenshot_sprite.png') %>);
-  width: 32px;
-  height: 32px;
-
-  & > span {
-    bottom: -8px;
-    right: 2px;
-    font-size: 12px;
-    color: #e0e0e0;
-
-    &:hover {
-      color: white;
-    }
-  }
-
-  .tooltip {
-    display: none;
-  }
-
-  &:hover {
-    background-position: -32px 0;
-
-    .tooltip {
-      display: block;
-      position: absolute;
-      bottom: 30px;
-      background: black;
-      color: white;
-      border-radius: 2px;
-      padding: 3px 5px 2px 5px;
-    }
-  }
-}
-
 .mapInfoButtonsWrapper span {
     position: absolute;
     width: 100%;
@@ -2315,9 +2270,6 @@ and it won't be important on password protected instances */
 }
 /* switch metacode set */
 
-#switchMetacodes > p {
-    margin: 16px 0 16px 0;
-}
 #metacodeSwitchTabs {
     width: 100%;
     font-size: 17px;
@@ -2325,43 +2277,28 @@ and it won't be important on password protected instances */
     border: none;
     background: none;
     padding: 0;
-
+}
-    .setDesc,
+#metacodeSwitchTabs .setDesc {
-    .selectAll,
+    margin-bottom: 5px;
-    .selectNone {
+    font-family: 'din-medium', helvetica, sans-serif;
-        margin-bottom: 5px;
+    color: #424242;
-        font-family: 'din-medium', helvetica, sans-serif;
+    font-size: 14px;
-        color: #424242;
+    text-align: justify;
-        font-size: 14px;
+    padding-right: 16px;
-        text-align: justify;
+}
-        padding-right: 16px;
+#switchMetacodes > p {
-        display: inline-block;
+    margin: 16px 0 16px 0;
-    }
+}
-
+#metacodeSwitchTabs > ul {
-    .selectAll,
+    width: 130px;
-    .selectNone {
+}
-      float: right;
+#metacodeSwitchTabs > ul li {
-      cursor: pointer;
+    font-size: 14px;
-
+    text-transform: uppercase;
-      &:hover,
+}
-      &.selected {
+#metacodeSwitchTabs li.ui-state-active a {
-        color: #00bcd4;
+    color: #00BCD4;
-      }
+    cursor: pointer;
-    }
-
-    & > ul {
-        width: 130px;
-
-        li {
-            font-size: 14px;
-            text-transform: uppercase;
-        }
-    }
-
-    li.ui-state-active a {
-        color: #00BCD4;
-        cursor: pointer;
-    }
 }
 .metacodeSwitchTab {
     max-height: 300px;
@@ -2930,18 +2867,146 @@ and it won't be important on password protected instances */
     color: #424242;
 }
 
+/* Admin Pages */
+
+.blackBox {
+    width: 760px;
+    margin: 0 auto;
+    padding: 20px 0 60px 20px;
+    background: rgba(0, 0, 0, 0.4);
+    color: white;
+    overflow: hidden;
+    position: relative;
+}
+.blackBox .metacodeSetsDescription {
+    width: 314px;
+}
+.blackBox td.metacodeSetDesc {
+    width: 314px;
+    word-wrap: break-word;
+}
+.blackBox .metacodeSetImage {
+    width: 36px;
+    height: 36px;
+    float: left;
+}
+.blackBox tr {
+    display: table-row;
+}
+.blackBox tr:nth-child(odd) {
+    background: rgba(0, 0, 0, 0.2);
+}
+.blackBox tr:nth-child(even) {
+    background: rgba(0, 0, 0, 0.3);
+}
+.blackBox th,
+.blackBox td {
+    padding: 10px;
+}
+.blackBox td.iconURL {
+    max-width: 415px;
+    word-wrap: break-word;
+}
+.blackBox td.iconColor {
+
+}
+.blackBox .field {
+    margin: 15px 0 5px;
+}
+.blackBox label {
+    float: left;
+    width: 100px;
+    margin-right: 15px;
+}
+.blackBox input[type="text"] {
+    width: 336px;
+    height: 32px;
+    font-size: 15px;
+    direction: ltr;
+    -webkit-appearance: none;
+    appearance: none;
+    display: inline-block;
+    margin: 0;
+    padding: 0 8px;
+    background: #fff;
+    border: 1px solid #d9d9d9;
+    border-top: 1px solid #c0c0c0;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    -webkit-border-radius: 1px;
+    -moz-border-radius: 1px;
+    border-radius: 1px;
+    font: -webkit-small-control;
+    color: initial;
+    letter-spacing: normal;
+    word-spacing: normal;
+    text-transform: none;
+    text-indent: 0px;
+    text-shadow: none;
+    display: inline-block;
+    text-align: start;
+    font-family: arial;
+}
+.blackBox input[type="text"]:hover,
+.blackBox textarea:hover {
+    border: 1px solid #b9b9b9;
+    border-top: 1px solid #a0a0a0;
+    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+.blackBox textarea {
+    padding: 8px;
+    border: 1px solid #d9d9d9;
+    border-top: 1px solid #c0c0c0;
+    resize: none;
+    font: -webkit-small-control;
+    letter-spacing: normal;
+    word-spacing: normal;
+    text-transform: none;
+    text-indent: 0px;
+    text-shadow: none;
+    text-align: start;
+    font-family: arial;
+    font-size: 15px;
+    line-height: 17px;
+    width: 318px;
+}
+.blackBox .allMetacodes {
+    padding: 5px 0;
+}
+.blackBox a.button {
+    margin-right: 20px;
+    line-height: 40px;
+}
+.blackBox a.button,
+.blackBox input.add {
+    float: left;
+    margin-top: 5px;
+    height: 40px;
+    font-size: 17px;
+    width: auto;
+    padding: 0 30px;
+    cursor: pointer;
+    font-weight: normal;
+}
+.blackBox a.button:hover,
+.blackBox input.add:hover {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
 /* request */
 
-.requestInvite {
+#wrapper .requestInvite {
     width: 700px;
+    margin: 0 auto;
+    padding: 0 0 60px 0;
     background: #FFFFFF;
     color: white;
-    height: calc(100% - 52px);
+    height: 100%;
-    z-index: 1;
+    overflow: hidden;
-    position: relative;
-    left: 50%;
-    margin-left: -350px;
-    margin-top: 52px;
 }
 
 .home_bg {
@@ -3011,21 +3076,3 @@ script.data-gratipay-username {
     display: inline;
     float: left;
 }
-
-.inline {
-  display: inline-block;
-}
-
-.topicFollow {
-    height: 24px;
-    line-height: 24px;
-    cursor: pointer;
-    font-family: helvetica, sans-serif;
-    float: left;
-    width: 72px;
-    text-align: right;
-    padding: 12px 0;
-    color: #4fb5c0;
-    font-size: 13px;
-    font-weight: bold;
-}

app/assets/stylesheets/apps.css.erb

@@ -1,14 +1,17 @@
 .centerContent {
   position: relative;
-  margin: 0 auto;
+  margin: 92px auto 0 auto;
-  width: auto;
+  padding: 20px 0 60px 20px;
-  max-width: 800px;
+  width: 760px;
   overflow: hidden;
   box-shadow: 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);
   background: #fff;
-  box-sizing: border-box;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  border: 1px solid #dcdcdc;
+  margin-bottom: 10px;
   padding: 15px;
-  font-family: 'din-regular', sans-serif;
 }
 
 .centerContent .page-header {
@@ -126,9 +129,3 @@
     box-sizing: border-box;
     border-radius: 2px;
 }
-
-.centerContent.withPadding {
-  margin-top: 1em;
-  margin-bottom: 1em;
-}
-

app/assets/stylesheets/base.scss.erb

@@ -1,19 +1,11 @@
-$mid-gray: #8A8A8A;
-$mid-gray-opacity: rgba(66, 66, 66, 0.6);
-
 .nameCounter {
   position: absolute;
   bottom: 1px;
   right: 2px;
   font-size: 11px;
-  font-family: helvetica, sans-serif;
+  font-family: helvetica;
   color: #727272;
   line-height: 11px;
-  display: none;
-}
-
-.riek-editing + .nameCounter {
-  display: block;
 }
 
 .nameCounter.forMap {
@@ -22,20 +14,21 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 }
 
 .nameCounter.forTopic {
-
+  
 }
 
 #center-container {
   position:relative;
 	height:100%;
 	width:100%;
-
+  
   /* background-color:#031924; */
   color:#444;
 }
 
 .showcard {
     position:absolute;
+    display:none;
     top:100px;
     left:100px;
     width:300px;
@@ -45,7 +38,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 	  z-index:2;
     color: #424242;
     border-radius:2px;
-    box-shadow: 2px 3px 3px rgba(125, 125, 125, 0.23), -2px -1px 3px rgba(125, 125, 125, 0.16);
+    box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
 }
 
 .text {
@@ -56,6 +49,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
   width:100%;
   height:100%;
   position: absolute;
+  display: none;
 }
 
 .showcard .permission {
@@ -67,6 +61,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
   display:block;
   position:relative;
   width:100%;
+  min-height:360px;
   z-index: 25;
 }
 .CardOnGraph.hasAttachment {
@@ -75,10 +70,11 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 
 .CardOnGraph .title {
   word-break: break-word;
-  font-size: 20px;
+  font-size: 18px;
-  line-height: 24px;
+  line-height: 22px;
   display: table;
-  padding: 20px 0;
+  padding: 8px 0 16px;
+  height: 80px;
   text-align: center;
   font-family: 'din-regular', sans-serif;
   width: 300px;
@@ -97,11 +93,12 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
   cursor: text;
 }
 
-.showcard .title .riek-editing {
+.showcard .best_in_place_name textarea, .showcard .best_in_place_name input {
   font-family: 'din-regular', sans-serif;
   color: #424242;
-  font-size: 20px;
+  font-size: 18px;
-  line-height: 24px;
+  line-height: 22px;
+  height: 15px;
   padding: 5px 0;
   width: 100%;
   margin: 0;
@@ -115,40 +112,30 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 .CardOnGraph .scroll {
    display:block;
    padding: 8px 0 8px 16px;
+   height: 152px;
    font-size: 13px;
    line-height:15px;
    font-family: helvetica, sans-serif;
    overflow-y: auto;
-
-  p.emptyDesc {
-    color: $mid-gray-opacity;
-  }
-
-  a.mdSupport {
-    color: #4fb5c0;
-    font-size: 11px;
-    display: none;
-  }
-  .riek-editing + .mdSupport {
-    display: block;
-  }
 }
 .CardOnGraph.hasAttachment .scroll {
   height: auto;
 }
 
-.CardOnGraph .desc .riek-editing {
+.CardOnGraph .best_in_place_desc textarea {
   font-size: 13px;
   line-height:15px;
   font-family: helvetica, sans-serif;
   color: #424242;
   padding: 0;
-  width: 258px;
+  width: 100%;
   margin: 0;
   border: 0;
   outline: none;
+  font-size: 12px;
+  line-height: 15px;
   background: none;
-  overflow-y: scroll;
+  resize: none;
 }
 
 /*
@@ -180,11 +167,13 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
  * End Markdown styling
  */
 
-.CardOnGraph .riek_desc {
+.CardOnGraph .best_in_place_desc {
   display:block;
-  padding-right: 26px;
+  margin-top:2px;	
+  padding-right: 18px;
+  margin-right: 8px;
 }
-.canEdit .CardOnGraph .riek_desc:not(.riek-editing):hover {
+.canEdit .CardOnGraph .best_in_place_desc:hover {
   background-image: url(<%= asset_data_uri('edit.png') %>);
   background-position: top right;
   background-repeat: no-repeat;
@@ -196,215 +185,155 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 }
 
 .CardOnGraph .links {
-  position: relative;
+  position:relative;
-  z-index: 2;
+  border-bottom: 1px solid #BDBDBD;
-
+  border-top: 1px solid #BDBDBD;
-  .linkItem {
+  background-color: #e0e0e0;
-    float: left;
-    z-index: 1;
-    position: relative;
-    color: #424242;
-    font-size: 14px;
-    line-height: 14px;
-
-    a {
-      color: #424242;
-    }
-  }
-
-  .icon {
-    padding: 0;
-    height: 48px;
-    margin-right: 10px;
-
-    .metacodeImage {
-      cursor: move;
-      position: absolute;
-      left: -18px;
-      top: 6px;
-      width: 36px;
-      height: 36px;
-      background-size:36px 36px;
-      background-position:0 0;
-      background-repeat:no-repeat;
-    }
-  }
 }
 
-.CardOnGraph .info {
+.linkItem {
+  float:left;
+  height:46px;
+  z-index: 1;
   position: relative;
+  color: #424242;
+  font-size: 14px;
+  line-height:14px;
+  height:12px;
+  padding:17px 0;
+}
+.linkItem a {
+  color: #424242;
+}
 
-  .linkItem {
+.CardOnGraph .icon {
-    float: left;
+  position:absolute;
-    z-index: 1;
+  width:100%;
-    position: relative;
+  z-index:1;
-    color: $mid-gray-opacity;
+  padding: 0;
-    font-size: 14px;
+  height: 48px;
-    line-height: 14px;
+}
+.linkItem.contributor {
+  margin-left:40px;
+  z-index:1;
+  padding:17px 16px 17px 30px;
+  position: relative;
+}
+.contributor .contributorIcon {
+  position: absolute;
+  top: 8px;
+  left: 0;
+  border-radius: 16px;
+}
 
-    a {
+.contributor:hover .contributorName {
-      color: $mid-gray-opacity;
+  display: block;
-    }
+}
-  }
 
-  .contributor {
+.contributorName {
-    bottom: 7px;
+  display: none;
-    margin-left: 16px;
+  position: absolute;
+  background: black;
+  text-align: center;
+  color: white;
+  border-radius: 2px;
+  font-family: din-regular;
+  line-height: 15px;
+  font-size: 12px;
+  padding: 3px 5px 2px;
+  white-space: nowrap;
+  margin-top: 36px;
+  margin-left: -32px;
+}
 
-    .contributorIcon {
+.contributor div:before {
-      position: relative;
+  content: '';
-      display: inline-block;
+  position: absolute;
-      vertical-align: middle;
+  top: 128%;
-      border-radius: 16px;
+  left: 13px;
-      margin: 5px 5px 5px 0;
+  margin-top: -30px;
-      top: 11px;
+  width: 0;
-      left: 0;
+  height: 0;
-    }
+  border-bottom: 4px solid #000000;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+}
 
-    span {
+.linkItem.mapCount {
-      font-family: 'din-regular', sans-serif;
+  margin-left: 12px;
-      font-size: 14px;
+  width: 24px;
-    }
+  padding:17px 0 17px 36px;
+}
+.linkItem.mapCount .mapCountIcon {
+  position: absolute;
+  top: 8px;
+  left: 0;
+  width: 32px;
+  height: 32px;
+  background-image: url(<%= asset_data_uri('map32_sprite.png') %>);
+  background-repeat: no-repeat;
+  background-position: 0 0;
+  cursor: pointer;
+}
+.linkItem.mapCount:hover .mapCountIcon {
+  background-position: 0 -32px;
+}
 
-    .contributorName {
+.linkItem.mapCount:hover .hoverTip {
-      font-family: din-regular;
+  display: block;
-      margin-top: 20px;
+}
-      display: inline-block;
+.CardOnGraph .mapCount .tip, .CardonGraph .mapCount .hoverTip {
-      vertical-align: middle;
+  top: 44px;
-      width: 97px;
+  left: 0px;
-      padding: 0 8px 0 4px;
+  font-size: 12px !important;
-      white-space: nowrap;
+}
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
 
-  .mapCount {
+.hoverTip {
-    padding:17px 38px 17px 0;
+  white-space: nowrap;
-    width: 22px;
+  font-family: 'din-regular';
-    text-align: right;
+  top: 44px;
+  left: 0px;
+  font-size: 12px !important;
+  display: none;
+  position: absolute;
+  background: black;
+  color: white;
+  border-radius: 4px;
+  line-height: 17px;
+  padding: 3px 5px 2px;
+  z-index: 100;
+}
 
-    .mapCountIcon {
-      position: absolute;
-      top: 8px;
-      right: 0;
-      width: 32px;
-      height: 32px;
-      background-image: url(<%= asset_data_uri('map32_sprite.png') %>);
-      background-repeat: no-repeat;
-      background-position: 0 0;
-      cursor: pointer;
-      opacity: 0.6;
-    }
 
-    &:hover .mapCountIcon {
+.CardOnGraph .mapCount .tip:before, .CardOnGraph .mapCount .hoverTip:before {
-      background-position: 0 -32px;
+  content: '';
-    }
+  position: absolute;
+  top: 26px;
+  left: 10px;
+  margin-top: -30px;
+  width: 0;
+  height: 0;
+  border-bottom: 4px solid #000000;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+}
 
-    .tip, .hoverTip {
+.CardOnGraph .mapCount .tip li {
-      top: 44px;
+  list-style-type: none;
-      right: 0px;
+  white-space: nowrap;
-      font-size: 12px !important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 6px 10px;
+  display: block;
+  height: 14px;
+  font-family: 'din-regular', helvetica, sans-serif;
+  font-size: 14px;
+  line-height: 14px;
+  position: relative;
+}
 
-      &:before {
+.CardOnGraph .mapCount li.hideExtra {
-        content: '';
+  display: none;
-        position: absolute;
-        top: 26px;
-        right: 10px;
-        margin-top: -30px;
-        width: 0;
-        height: 0;
-        border-bottom: 4px solid $mid-gray;
-        border-left: 5px solid transparent;
-        border-right: 5px solid transparent;
-      }
-    }
-
-    .hoverTip {
-      white-space: nowrap;
-      font-family: 'din-regular';
-      top: 44px;
-      font-size: 12px !important;
-      position: absolute;
-      background: $mid-gray;
-      color: white;
-      border-radius: 4px;
-      line-height: 17px;
-      padding: 3px 5px 2px;
-      z-index: 100;
-    }
-
-    .tip a {
-      color: white;
-    }
-
-    .tip a:hover {
-      color: #757575;
-    }
-
-    .tip li {
-      list-style-type: none;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      padding: 6px 10px;
-      display: block;
-      height: 14px;
-      font-family: 'din-regular', helvetica, sans-serif;
-      font-size: 14px;
-      line-height: 14px;
-      position: relative;
-    }
-  }
-
-  .synapseCount {
-    width: 22px;
-    padding:17px 38px 17px 0;
-    text-align: right;
-    margin-right: 4px;
-
-    .synapseCountIcon {
-      position: absolute;
-      top: 8px;
-      right: 0;
-      width: 32px;
-      height: 32px;
-      background-image: url(<%= asset_data_uri('synapse32_sprite.png') %>);
-      background-repeat: no-repeat;
-      background-position: 0 0;
-      opacity: 0.6;
-    }
-    hover .synapseCountIcon {
-      background-position: 0 -32px;
-    }
-    .tip {
-      position: absolute;
-      background: $mid-gray;
-      width: auto;
-      top: 44px;
-      right: 0px;
-      color: white;
-      white-space: nowrap;
-      border-radius: 2px;
-      font-size: 12px !important;
-      font-family: 'din-regular';
-      line-height: 12px;
-      padding: 4px 4px 4px;
-      z-index: 100;
-    }
-
-    .tip:before {
-      content: '';
-      position: absolute;
-      margin-top: -8px;
-      right: 12px;
-      width: 0;
-      height: 0;
-      border-bottom: 4px solid $mid-gray;
-      border-left: 5px solid transparent;
-      border-right: 5px solid transparent;
-    }
-  }
 }
 
 .showMore {
@@ -412,10 +341,66 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
   color: #4FC059;
 }
 
-.linkItem.mapPerm {
+.mapCount .tip a {
-  margin-right: 8px;
+  color: white;
 }
 
+.mapCount .tip a:hover {
+  color: #757575;
+}
+
+
+.linkItem.synapseCount {
+  margin-left: 2px;
+  width: 24px;
+  padding:17px 0 17px 32px;
+}
+.linkItem.synapseCount .synapseCountIcon {
+  position: absolute;
+  top: 8px;
+  left: 0;
+  width: 32px;
+  height: 32px;
+  background-image: url(<%= asset_data_uri('synapse32_sprite.png') %>);
+  background-repeat: no-repeat;
+  background-position: 0 0;
+}
+.linkItem.synapseCount:hover .synapseCountIcon {
+  background-position: 0 -32px;
+}
+
+.CardOnGraph .synapseCount .tip {
+  position: absolute;
+  background: black;
+  width: auto;
+  top: 44px;
+  color: white;
+  white-space: nowrap;
+  border-radius: 2px;
+  font-size: 12px !important;
+  font-family: 'din-regular';
+  line-height: 12px;
+  padding: 4px 4px 4px;
+  z-index: 100;
+}
+
+.CardOnGraph .synapseCount:hover .tip {
+  display: block;
+}
+
+.CardOnGraph .synapseCount .tip:before {
+  content: '';
+  position: absolute;
+  margin-top: -8px;
+  margin-left: 6px;
+  width: 0;
+  height: 0;
+  border-bottom: 4px solid black;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+}
+
+
 .mapPerm {
   width: 32px;
   height: 32px;
@@ -437,10 +422,14 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 }
 
 .yourTopic .mapPerm:hover, .yourEdge .mapPerm:hover {
+  background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>);
+  background-position: -32px 0;
   cursor:pointer;
 }
 .yourTopic .mapPerm.minimize, .yourEdge .mapPerm.minimize {
-  cursor: pointer;
+ background-image: url(<%= asset_data_uri('arrowperms_sprite.png') %>) !important;
+background-position: 0 0;
+cursor: pointer;
 }
 .mapPerm .permissionSelect {
   list-style: none;
@@ -476,55 +465,63 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
 }
 
 .CardOnGraph .metacodeTitle {
-  font-family: 'din-regular';
+  font-style: italic;
+  font-family: 'vinyl';
+  text-transform: uppercase;
+  position: absolute;
   line-height: 24px;
-  height: 26px;
+  height:24px;
-  font-size: 18px;
+  font-size: 24px;
-  padding: 13px 24px 9px 24px;
+  display: none;
+  width: 90%;
+  padding: 13px 0 9px 10%;
+  background-color: #E0E0E0;
   color: #424242;
-  width: 120px;
-  max-width: 120px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
 }
 .permission.canEdit .metacodeTitle {
   cursor:pointer;
 }
 
 .permission.canEdit .expandMetacodeSelect {
-  position: relative;
+  position: absolute;
-  top: 2px;
+  top: 16px;
-  left: 4px;
+  right: 16px;
   width: 16px;
   height: 16px;
   background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
   background-repeat: no-repeat;
   background-position: 0 -32px;
-  display: inline-block;
-  -webkit-transform: rotate(90deg);
-  transform: rotate(90deg);
 }
 .permission.canEdit .minimize .expandMetacodeSelect {
-
+  
 }
 
-.CardOnGraph .metacodeName {
+.CardOnGraph .metacodeImage {
-  display: inline-block;
+  cursor:move;
+  width:46px;
+  height:46px;
+  position:absolute;
+  left:-23px;
+  top:0;
+  background-size:46px 46px;
+  background-position:0 0;
+  background-repeat:no-repeat;
 }
 
+#metacodeOptions {
+  display:none;
+}
 .CardOnGraph .metacodeSelect {
   display:none;
   width:auto;
   z-index: 2;
-  background: #EAEAEA;
-  white-space: nowrap;
   position: absolute;
-  top: 48px;
+  background: #EAEAEA;
-  box-shadow: 2px 2px 2px rgba(125, 125, 125, 0.23), -2px -1px 3px rgba(125, 125, 125, 0.16);
+  left: 300px;
+  white-space: nowrap;
 }
 .CardOnGraph .metacodeSelect ul {
-  position: relative;
+  position: relative; 
   line-height: 14px;
   font-size: 14px;
   font-family: helvetica, sans-serif;
@@ -613,10 +610,11 @@ background-color: #E0E0E0;
   display:block;
 }
 .CardOnGraph .tip {
+ display:none;
  position: absolute;
- background: $mid-gray;
+ background: black;
  top: 35px;
- right: 0;
+ left: 0;
  color: white;
  border-radius: 4px;
  font-size:15px !important;
@@ -625,23 +623,26 @@ background-color: #E0E0E0;
  z-index:100;
 }
 
+#embedlyLink {
+  display: none;
+}
 #embedlyLinkLoader {
   margin: 0 auto;
   width: 28px;
 }
 
-.CardOnGraph .link-adder {
+.CardOnGraph .attachments {
+  border-top: 1px solid #BDBDBD;
   width:100%;
   height:47px;
-  position: relative;
 }
 
-.link-adder a {
+.attachments a {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   display: block;
-  margin-left: 40px;
+  margin-left: 40px; 
   padding-top:9px;
   font-size: 16px;
   line-height: 16px;
@@ -651,7 +652,7 @@ background-color: #E0E0E0;
   display: inline-block;
   width: 102px;
   height: 12px;
-  text-align: left;
+  text-align: left; 
   padding: 18px 0 18px 48px;
   font-size: 12px;
   color: #9e9e9e;
@@ -695,9 +696,9 @@ background-color: #E0E0E0;
 }
 
 #addLinkInput input{
-padding: 9px 27px 9px 31px;
+padding: 9px 7px 9px 31px;
 height: 12px;
-width: 210px;
+width: 198px;
 margin: 0 0 0 0;
 border: none;
 outline: none;
@@ -751,6 +752,7 @@ font-family: 'din-regular', helvetica, sans-serif;
   -moz-border-radius-bottomright: 8px;
   -webkit-border-bottom-right-radius: 8px;
   border-bottom-right-radius: 8px;
+  display: none;
   margin: 8px;
 }
 
@@ -837,10 +839,10 @@ font-family: 'din-regular', helvetica, sans-serif;
   line-height: 16px;
 }
 
-.canEdit span.titleWrapper:hover {
+.canEdit #edit_synapse_desc:hover {
   background-image: url(<%= asset_data_uri('edit.png') %>);
   background-repeat: no-repeat;
-  background-position: 95% 95%;
+  background-position: 164px center;
   cursor: text;
 }
 
@@ -948,11 +950,11 @@ font-family: 'din-regular', helvetica, sans-serif;
 }
 #edit_synapse_right {
   background-image: url(<%= asset_data_uri('synapsedirectionright_sprite.png') %>);
-  right: 16px;
+  right: 16px; 
 }
 #edit_synapse_left {
   background-image: url(<%= asset_data_uri('synapsedirectionleft_sprite.png') %>);
-  right: 56px;
+  right: 56px; 
 }
 #edit_synapse_left.checked, #edit_synapse_right.checked {
   background-position: 0 -48px;

app/assets/stylesheets/clean.css.erb

@@ -28,9 +28,6 @@
   position: absolute;
   width: 100%;
   height: 100%;
-  box-sizing: border-box;
-  padding-top: 92px;
-  overflow-y: auto;
 }
 
 /*.animations {
@@ -47,9 +44,26 @@
   transition-timing-function: ease-in-out;
 }*/
 
+.mapElement {
+	display: none;
+}
+.mapPage .mapElement,
+.topicPage .mapElement {
+	display: block;
+}
+.mapPage .mapElementHidden,
+.topicPage .mapElement.mapInfoBox,
+.topicPage .mapElement.importDialog {
+  display:none;
+}
+.topicPage .starMap {
+  display: none;
+}
+
 /* loading */
 
 #loading {
+  display: none;
 	width: 28px;
 	height: 28px;
 	position: fixed;
@@ -168,14 +182,10 @@
 }
 
 .upperRightMapButtons {
-  right: 138px;
+	top: -42px; /* puts it just offscreen */
-  padding-right: 7px;
-  border-right: 1px solid #747474;
 }
-.unauthenticated .upperRightMapButtons {
+.mapPage .upperRightMapButtons, .topicPage .upperRightMapButtons {
-  right: 115px;
+	top: 0;
-  padding-right: 0;
-  border-right: none;
 }
 
 .upperRightIcon {
@@ -185,7 +195,13 @@
     background-repeat: no-repeat;
     cursor: pointer;
 }
-
+.mapPage .mapElement .importDialog {
+    display: none;
+    background-position: 0 0;
+}
+.mapPage.canEditMap .mapElement .importDialog {
+  display: block;
+}
 .sidebarFilterIcon {
     background-position: -32px 0;
 }
@@ -194,13 +210,7 @@
 }
 .addMap {
     background-position: -96px 0;
-}
+    margin-right:10px;
-.notificationsIcon {
-    background-position: -128px 0;
-    margin-right: 10px; // make it look more natural next to the account menu icon
-}
-.notificationsIcon:hover {
-    background-position: -128px -32px;
 }
 .importDialog:hover {
     background-position: 0 -32px;
@@ -213,19 +223,12 @@
 }
 .addMap:hover {
     background-position: -96px -32px;
+    margin-right:10px;
 }
 
 
 /* end upperRightUI */
 
-/* map wrapper */
-.mapWrapper {
-  position:absolute;
-  width: 100%;
-  height: 100%;
-}
-
-/* end map wrapper */
 
 /* yield */
 
@@ -346,15 +349,22 @@
 
 /* infoAndHelp */
 
-.openCheatsheet .tooltipsAbove {
+.mapPage .infoAndHelp, .topicPage .infoAndHelp {
+    right: 70px;
+}
+.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheet .tooltipsAbove {
   right: 1px;
   left: auto;
 }
 
+.unauthenticated .homePage .infoAndHelp {
+    display:none;
+}
+
 .infoAndHelp {
     position: absolute;
     bottom: 20px;
-    right: 70px;
+    right: 20px;
     z-index: 3;
     width: auto;
     font-style: italic;
@@ -375,12 +385,16 @@
 }
 .mapInfoIcon {
 	position: relative;
-  background-image: url(<%= asset_path('mapinfo_sprite.png') %>);
+	top: 56px; /* puts it just offscreen */
-  background-repeat:no-repeat;
+    background-image: url(<%= asset_path('mapinfo_sprite.png') %>);
+    background-repeat:no-repeat;
 }
 .mapInfoIcon:hover {
     background-position: 0 -32px;
 }
+.mapPage .mapInfoIcon {
+	top: 0;
+}
 
 .starMap {
   background-image: url(<%= asset_path('starmap_sprite.png') %>);
@@ -398,6 +412,9 @@
   background-position: 0 0;
 }
 
+.unauthenticated .mapPage .starMap {
+  display: none;
+}
 /* end infoAndHelp */
 
 
@@ -406,17 +423,24 @@
 .mapControls {
 	position: absolute;
 	bottom: 24px;
-	right:24px;
+	right:-32px; /* puts it just offscreen */
 	width:32px;
 	z-index: 3;
 }
+.mapPage .mapControls, .topicPage .mapControls {
+	right: 24px;
+}
+
+.topicPage .zoomExtents {
+    display: none;
+}
 
 .mapControl {
 	width:32px;
 	height:32px;
 	background-color: #424242;
-  background-repeat: no-repeat;
+    background-repeat: no-repeat;
-  background-position: 0 0;
+    background-position: 0 0;
 	cursor:pointer;
 }
 
@@ -424,6 +448,19 @@
     z-index: 4;
 }
 
+.takeScreenshot {
+    margin-bottom: 5px;
+    border-radius: 2px;
+    background-image: url(<%= asset_path 'screenshot_sprite.png' %>);
+    display: none;
+}
+.takeScreenshot:hover {
+    background-position: -32px 0;
+}
+.canEditMap .takeScreenshot {
+    display: block;
+}
+
 .zoomExtents {
     margin-bottom:5px;
     border-radius: 2px;
@@ -434,7 +471,7 @@
     background-position: -32px 0;
 }
 
-.zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .notificationsIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder,
+.zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder,
  .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove, .chat-button:hover .tooltips, .importDialog:hover .tooltipsUnder, .starMap:hover .tooltipsAbove, .openMetacodeSwitcher:hover .tooltipsAbove, .pinCarousel:not(.isPinned):hover .tooltipsAbove.helpPin, .pinCarousel.isPinned:hover .tooltipsAbove.helpUnpin  {
     display: block;
 }
@@ -498,9 +535,6 @@
 .sidebarFilterIcon .tooltipsUnder {
     margin-left: -4px;
 }
-.notificationsIcon .tooltipsUnder {
-  left: -20px;
-}
 
 .sidebarForkIcon .tooltipsUnder {
     margin-left: -34px;
@@ -556,12 +590,16 @@
     left: -8px;
 }
 
+.openCheatsheet .tooltipsAbove {
+    left: -4px;
+}
+
 .sidebarAccountIcon .tooltipsUnder {
     margin-left: -12px;
     margin-top: 40px;
 }
 
-.zoomExtents div::after, .zoomIn div::after, .zoomOut div::after, .chat-button div.tooltips::after {
+.zoomExtents div::after, .zoomIn div::after, .zoomOut div::after, .takeScreenshot div:after, .chat-button div.tooltips::after {
     content: '';
     position: absolute;
     top: 57%;
@@ -574,12 +612,7 @@
     border-bottom: 5px solid transparent;
 }
 
-.addMap div:after,
+.importDialog div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after {
-.importDialog div:after,
-.sidebarForkIcon div:after,
-.sidebarFilterIcon div:after,
-.notificationsIcon div:after,
-.sidebarAccountIcon .tooltipsUnder:after {
     content: '';
     position: absolute;
     right: 40%;
@@ -590,15 +623,9 @@
     border-left: 5px solid transparent;
     border-right: 5px solid transparent;
 }
-.notificationsIcon .unread-notifications-dot:after {
-    content: none;
-}
 .sidebarFilterIcon div:after {
     right: 37% !important;
 }
-.notificationsIcon div:after {
-  right: 46% !important;
-}
 
 .mapInfoIcon div:after, .openCheatsheet div:after, .starMap div:after, .openMetacodeSwitcher div:after, .pinCarousel div:after {
    content: '';
@@ -636,11 +663,8 @@
 
 /* explore maps */
 
-#react-app {
+#explore {
-  position: absolute;
+  display: none;
-  height: 100%;
-  width: 100%;
-  overflow-y: auto;
 }
 
 #exploreMaps {
@@ -659,28 +683,23 @@
   display: block;
 }
 
-.requestInviteHeader {
+.appsPage #exploreMapsHeader {
-  position: absolute;
+  display: block;
-  width: 100%;
-  z-index:2;
-  background-color:#FAFAFA;
-  height: 52px;
-  box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
 }
 
-#navBar {
+#exploreMapsHeader {
   position: absolute;
   width: 100%;
 }
 
-.navBarContainer {
+.exploreMapsBar {
   z-index:2;
   background-color:#FAFAFA;
   height: 42px;
   padding-top: 52px;
 }
 
-.navBarMenu {
+.exploreMapsMenu {
   display: block;
   width: 100%;
   height:42px;
@@ -689,29 +708,30 @@
   text-align: center;
 }
 
-.navBarCenter {
+.exploreMapsCenter {
    display: block;
 }
 
-.navBarButton {
+.exploreMapsButton {
-  color: #757575;
+    color: #757575;
 	cursor: default;
 	font-weight: normal;
 	font-family: 'din-medium';
 	font-size: 14px;
-	padding: 0 8px;
+	height: 14px;
-  border-bottom: 2px solid rgba(0,0,0,0);
+	padding: 14px 8px 12px 40px;
+    border-bottom: 2px solid rgba(0,0,0,0);
 	display: inline-block;
-  cursor: pointer;
+    cursor: pointer;
-  position:relative;
+    position:relative;
 }
-.navBarButton:hover, .navBarButton.active {
+.exploreMapsButton:hover, .exploreMapsButton.active {
   text-decoration: none;
   color: #424242;
   border-bottom: 2px solid #00BCD4;
 }
 
-.navBarButton.mapperButton {
+.exploreMapsButton.mapperButton {
     height: 40px;
     padding: 0;
 }
@@ -728,71 +748,57 @@
 }
 
 
-.navBarButton .navBarIcon {
+.exploreMapsButton .exploreMapsIcon {
     background-repeat: no-repeat;
     width:32px;
     height:32px;
-    margin-top:5px;
+    position:absolute;
-    margin-left:5px;
+    top:5px;
-    margin-right: 5px;
+    left:5px;
-    display: inline-block;
-    vertical-align: top;
 }
 
-.navBarLinkText {
+.exploreMapsCenter .authedApps .exploreMapsIcon {
-  padding: 11px 0 12px 0;
+    background-image: url(<%= asset_data_uri('user_sprite.png') %>);
-  display: inline-block;
-}
-
-.navBarCenter .authedApps .navBarIcon {
-    background-image: url(<%= asset_path('user_sprite.png') %>);
     background-position: 0 -32px;
 }
-.navBarCenter .myMaps .navBarIcon {
+.exploreMapsCenter .myMaps .exploreMapsIcon {
     background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
     background-position: -32px 0;
 }
-.navBarCenter .sharedMaps .navBarIcon {
+.exploreMapsCenter .sharedMaps .exploreMapsIcon {
     background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
     background-position: -128px 0;
 }
-.navBarCenter .activeMaps .navBarIcon {
+.exploreMapsCenter .activeMaps .exploreMapsIcon {
     background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
     background-position: 0 0;
 }
-.navBarCenter .featuredMaps .navBarIcon {
+.exploreMapsCenter .featuredMaps .exploreMapsIcon {
     background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
     background-position: -96px 0;
 }
-.navBarCenter .starredMaps .navBarIcon {
+.exploreMapsCenter .starredMaps .exploreMapsIcon {
     background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
     background-position: -96px 0;
 }
-.navBarCenter .notificationsLink .navBarIcon {
+.authedApps:hover .exploreMapsIcon, .authedApps.active .exploreMapsIcon {
-    background-image: url(<%= asset_path 'topright_sprite.png' %>);
-    background-position: -128px 0;
-}
-.authedApps:hover .navBarIcon, .authedApps.active .navBarIcon {
     background-position-x: -32px;
 }
-.myMaps:hover .navBarIcon, .myMaps.active .navBarIcon {
+.myMaps:hover .exploreMapsIcon, .myMaps.active .exploreMapsIcon {
     background-position: -32px -32px;
 }
-.activeMaps:hover .navBarIcon, .activeMaps.active .navBarIcon {
+.activeMaps:hover .exploreMapsIcon, .activeMaps.active .exploreMapsIcon {
     background-position: 0 -32px;
 }
-.featuredMaps:hover .navBarIcon, .featuredMaps.active .navBarIcon {
+.featuredMaps:hover .exploreMapsIcon, .featuredMaps.active .exploreMapsIcon {
     background-position: -96px -32px;
 }
-.starredMaps:hover .navBarIcon, .starredMaps.active .navBarIcon {
+.starredMaps:hover .exploreMapsIcon, .starredMaps.active .exploreMapsIcon {
     background-position: -96px -32px;
 }
-.sharedMaps:hover .navBarIcon, .sharedMaps.active .navBarIcon {
+.sharedMaps:hover .exploreMapsIcon, .sharedMaps.active .exploreMapsIcon {
     background-position: -128px -32px;
 }
-.notificationsLink:hover .navBarIcon, .notificationsLink.active .navBarIcon {
-    background-position-y: -32px;
-}
 
 .mapsWrapper {
 	/*overflow-y: auto; */
@@ -808,6 +814,7 @@
   height: 80px;
   font-family: 'din-regular', helvetica, sans-serif;
   font-size: 32px;
+  display: none;
   text-align: center;
   color: #999999;
   z-index: 0;
@@ -823,6 +830,7 @@
 /* toast */
 
 .toast {
+    display: none;
     position: fixed;
     bottom: 20px;
     left: 20px;

app/assets/stylesheets/emoji-mart-0.3.5.css

@@ -1,263 +0,0 @@
-.emoji-mart,
-.emoji-mart * {
-  box-sizing: border-box;
-  line-height: 1.15;
-}
-
-.emoji-mart {
-  font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", sans-serif;
-  font-size: 16px;
-  display: inline-block;
-  color: #222427;
-  border: 1px solid #d9d9d9;
-  border-radius: 5px;
-  background: #fff;
-}
-
-.emoji-mart .emoji-mart-emoji {
-  padding: 6px;
-}
-
-.emoji-mart-bar:first-child {
-  border-top-left-radius: 5px;
-  border-top-right-radius: 5px;
-}
-.emoji-mart-bar:last-child {
-  border-bottom-left-radius: 5px;
-  border-bottom-right-radius: 5px;
-}
-
-.emoji-mart-anchors {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 6px;
-  color: #858585;
-  line-height: 0;
-}
-
-.emoji-mart-anchor {
-  position: relative;
-  flex: 1;
-  text-align: center;
-  padding: 12px 4px;
-  overflow: hidden;
-  transition: color .1s ease-out;
-}
-.emoji-mart-anchor:hover,
-.emoji-mart-anchor-selected {
-  color: #464646;
-}
-
-.emoji-mart-anchor-selected .emoji-mart-anchor-bar {
-  bottom: 0;
-}
-
-.emoji-mart-anchor-bar {
-  position: absolute;
-  bottom: -3px; left: 0;
-  width: 100%; height: 3px;
-  background-color: #464646;
-}
-
-.emoji-mart-anchors i {
-  display: inline-block;
-  width: 100%;
-  max-width: 22px;
-}
-
-.emoji-mart-anchors svg {
-  fill: currentColor;
-}
-
-.emoji-mart-scroll {
-  overflow-y: scroll;
-  height: 270px;
-  padding: 0 6px 6px 6px;
-  border: solid #d9d9d9;
-  border-width: 1px 0;
-}
-
-.emoji-mart-search {
-  font-size: 16px;
-  display: block;
-  width: 100%;
-  padding: .2em .6em;
-  margin-top: 6px;
-  border-radius: 25px;
-  border: 1px solid #d9d9d9;
-  outline: 0;
-}
-
-.emoji-mart-category .emoji-mart-emoji span {
-  z-index: 1;
-  position: relative;
-}
-
-.emoji-mart-category .emoji-mart-emoji:hover:before {
-  z-index: 0;
-  content: "";
-  position: absolute;
-  top: 0; left: 0;
-  width: 100%; height: 100%;
-  background-color: #f4f4f4;
-  border-radius: 100%;
-}
-
-.emoji-mart-category-label {
-  z-index: 2;
-  position: relative;
-  position: -webkit-sticky;
-  top: 0;
-}
-
-.emoji-mart-category-label span {
-  display: block;
-  width: 100%;
-  font-weight: 500;
-  padding: 5px 6px;
-  background-color: #fff;
-  background-color: rgba(255, 255, 255, .95);
-}
-
-.emoji-mart-emoji {
-  position: relative;
-  display: inline-block;
-  font-size: 0;
-}
-
-.emoji-mart-no-results {
-  font-size: 14px;
-  text-align: center;
-  padding-top: 70px;
-  color: #858585;
-}
-.emoji-mart-no-results span {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.emoji-mart-preview {
-  position: relative;
-  height: 70px;
-}
-
-.emoji-mart-preview-emoji,
-.emoji-mart-preview-data,
-.emoji-mart-preview-skins {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.emoji-mart-preview-emoji {
-  left: 12px;
-}
-
-.emoji-mart-preview-data {
-  left: 68px; right: 12px;
-  word-break: break-word;
-}
-
-.emoji-mart-preview-skins {
-  right: 30px;
-  text-align: right;
-}
-
-.emoji-mart-preview-name {
-  font-size: 14px;
-}
-
-.emoji-mart-preview-shortname {
-  font-size: 12px;
-  color: #888;
-}
-.emoji-mart-preview-shortname + .emoji-mart-preview-shortname,
-.emoji-mart-preview-shortname + .emoji-mart-preview-emoticon,
-.emoji-mart-preview-emoticon + .emoji-mart-preview-emoticon {
-  margin-left: .5em;
-}
-
-.emoji-mart-preview-emoticon {
-  font-size: 11px;
-  color: #bbb;
-}
-
-.emoji-mart-title span {
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.emoji-mart-title .emoji-mart-emoji {
-  padding: 0;
-}
-
-.emoji-mart-title-label {
-  color: #999A9C;
-  font-size: 26px;
-  font-weight: 300;
-}
-
-.emoji-mart-skin-swatches {
-  font-size: 0;
-  padding: 2px 0;
-  border: 1px solid #d9d9d9;
-  border-radius: 12px;
-  background-color: #fff;
-}
-
-.emoji-mart-skin-swatches-opened .emoji-mart-skin-swatch {
-  width: 16px;
-  padding: 0 2px;
-}
-
-.emoji-mart-skin-swatches-opened .emoji-mart-skin-swatch-selected:after {
-  opacity: .75;
-}
-
-.emoji-mart-skin-swatch {
-  display: inline-block;
-  width: 0;
-  vertical-align: middle;
-  transition-property: width, padding;
-  transition-duration: .125s;
-  transition-timing-function: ease-out;
-}
-
-.emoji-mart-skin-swatch:nth-child(1) { transition-delay: 0 }
-.emoji-mart-skin-swatch:nth-child(2) { transition-delay: .03s }
-.emoji-mart-skin-swatch:nth-child(3) { transition-delay: .06s }
-.emoji-mart-skin-swatch:nth-child(4) { transition-delay: .09s }
-.emoji-mart-skin-swatch:nth-child(5) { transition-delay: .12s }
-.emoji-mart-skin-swatch:nth-child(6) { transition-delay: .15s }
-
-.emoji-mart-skin-swatch-selected {
-  position: relative;
-  width: 16px;
-  padding: 0 2px;
-}
-.emoji-mart-skin-swatch-selected:after {
-  content: "";
-  position: absolute;
-  top: 50%; left: 50%;
-  width: 4px; height: 4px;
-  margin: -2px 0 0 -2px;
-  background-color: #fff;
-  border-radius: 100%;
-  pointer-events: none;
-  opacity: 0;
-  transition: opacity .2s ease-out;
-}
-
-.emoji-mart-skin {
-  display: inline-block;
-  width: 100%; padding-top: 100%;
-  max-width: 12px;
-  border-radius: 100%;
-}
-
-.emoji-mart-skin-tone-1 { background-color: #ffc93a }
-.emoji-mart-skin-tone-2 { background-color: #fadcbc }
-.emoji-mart-skin-tone-3 { background-color: #e0bb95 }
-.emoji-mart-skin-tone-4 { background-color: #bf8f68 }
-.emoji-mart-skin-tone-5 { background-color: #9b643d }
-.emoji-mart-skin-tone-6 { background-color: #594539 }

app/assets/stylesheets/junto.css.erb

@@ -0,0 +1,348 @@
+.collaborator-video {
+  z-index: 1;
+  position: absolute;
+  width: 150px;
+  height: 150px;
+  cursor: default;
+  color: #FFF;
+}
+.collaborator-video .video-receive {
+    position: absolute;
+    width: 160px;
+    padding: 20px 20px 20px 170px;
+    background: #424242;
+    height: 110px;
+    border-top-left-radius: 75px;
+    border-bottom-left-radius: 75px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+.collaborator-video .video-receive .video-statement {
+    margin-bottom: 10px;
+}
+.collaborator-video .video-receive .btn-group .btn-yes {
+    margin-right: 10px;
+}
+.collaborator-video .video-receive .btn-group .btn-no {
+    background-color: #c04f4f;
+}
+.collaborator-video .video-receive .btn-group .btn-no:hover {
+    background-color: #A54242;
+}
+.collaborator-video .video-cutoff {
+  width: 150px;
+  height: 150px;
+  overflow: hidden;
+  border-radius: 75px;
+  z-index: 0;
+  position: relative;
+  -webkit-box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
+  -moz-box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
+  box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
+}
+.collaborator-video .video-cutoff video {
+  height: 150px;
+  margin-left: -25px;
+}
+.collaborator-video .video-cutoff .collaborator-video-avatar {
+  position: absolute;
+  top: 0;
+  left: 0;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  -webkit-user-drag: none;
+  display: none;
+}
+.collaborator-video .video-audio {
+  position: absolute;
+  width: 24px;
+  height: 24px;
+  top: 85%;
+  right: 0px;
+  cursor: pointer;
+  background: url(<%= asset_path 'audio_sprite.png' %>) no-repeat;
+}
+.collaborator-video .video-audio:hover {
+  background-position-x: -24px;
+}
+.collaborator-video .video-audio.active {
+  background-position-y: -24px;
+}
+.collaborator-video .video-video {
+  position: absolute;
+  width: 24px;
+  height: 24px;
+  top: 85%;
+  left: 0px;
+  cursor: pointer;
+  background: url(<%= asset_path 'camera_sprite.png' %>) no-repeat;
+}
+.collaborator-video .video-video:hover {
+  background-position-x: -24px;
+}
+.collaborator-video .video-video.active {
+  background-position-y: -24px;
+}
+.collaborator-video.my-video {
+  left: 30px;
+  top: 72px;
+}
+.chat-box {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  z-index: 1;
+  width: 300px;
+  float: right;
+  height: 100%;
+  background: #424242;
+  box-shadow: -8px 0px 16px 2px rgba(0, 0, 0, 0.23);
+}
+.chat-box .chat-button {
+  position: absolute;
+  top: 50%;
+  left: -36px;
+  width: 36px;
+  height: 49px;
+  background: url(<%= asset_path 'junto.png' %>) no-repeat 2px 9px, url(<%= asset_path 'tray_tab.png' %>) no-repeat;
+  cursor: pointer;
+}
+.chat-box .chat-button.active {
+  background: url(<%= asset_path 'junto_spinner_dark.gif' %>) no-repeat 2px 8px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
+}
+.chat-box .chat-button .chat-unread {
+  display: none;
+  background: #DAB539;
+  position: absolute;
+  top: -3px;
+  left: -11px;
+  width: 20px;
+  height: 20px;
+  border-radius: 11px;
+  border: 2px solid #424242;
+  color: #424242;
+  text-align: center;
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 20px;
+}
+.chat-box .junto-header {
+  width: 276px;
+  padding: 16px 8px 16px 16px;
+  font-size: 16px;
+  text-align: left;
+  font-weight: bold;
+  background-color: #000000;
+  color: #f5f5f5;
+  box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
+}
+.chat-box .junto-header .cursor-toggle {
+  width: 32px;
+  height: 32px;
+  margin-right: 8px;
+  margin-top: -8px;
+  float: right;
+  background: url(<%= asset_path 'cursor_sprite.png' %>) no-repeat;
+}
+.chat-box .junto-header .cursor-toggle:hover {
+  background-position-x: -32px;
+}
+.chat-box .junto-header .cursor-toggle.active {
+  background-position-y: -32px;
+}
+.chat-box .junto-header .video-toggle {
+  width: 32px;
+  height: 32px;
+  margin-right: 10px;
+  margin-top: -8px;
+  float: right;
+  background: url(<%= asset_path 'video_sprite.png' %>) no-repeat;
+}
+.chat-box .junto-header .video-toggle:hover {
+  background-position-x: -32px;
+}
+.chat-box .junto-header .video-toggle.active {
+  background-position-y: -32px;
+}
+.chat-box .participants {
+  width: 100%;
+  min-height: 150px;
+  padding: 16px 0px 16px 0px;
+  text-align: left;
+  color: #f5f5f5;
+  overflow-y: auto;
+}
+.chat-box .participants .conversation-live {
+  display: none;
+  padding: 5px 10px 5px 10px;
+  background: #c04f4f;
+  margin: 5px 10px;
+  border-radius: 2px;
+}
+.chat-box .participants .conversation-live .call-action {
+  float: right;
+  cursor: pointer;
+  color: #EBFF00;
+}
+.chat-box .participants .conversation-live .leave {
+  display: none;
+}
+.chat-box .participants.is-participating .conversation-live .leave {
+  display: block;
+}
+.chat-box .participants.is-participating .conversation-live .join {
+  display: none;
+}
+.chat-box .participants .participant {
+  width: 89%;
+  padding: 8px 8px 2px 8px;
+  color: #f5f5f5;
+  font-family: arial, sans-serif;
+  font-size: 13px;
+  line-height: 14px;
+}
+.chat-box .participants .participant .chat-participant-image {
+  width: 15%;
+  float: left;
+  overflow: hidden;
+  color: #BBB;
+  padding-top: 2px;
+}
+.chat-box .participants .participant .chat-participant-image img {
+  width: 32px;
+  height: 32px;
+  border-radius: 18px;
+}
+.chat-box .participants .participant .chat-participant-name {
+  width: 53%;
+  float: left;
+  font-size: 13px;
+  font-weight: bold;
+  margin-top: 12px;
+  padding: 2px 8px 0;
+  text-align: left;
+}
+.chat-box .participants .participant.is-self .chat-participant-invite-call,
+.chat-box .participants .participant.is-self .chat-participant-invite-join {
+  display: none !important;
+}
+.chat-box .participants.is-live .participant .chat-participant-invite-call {
+  display: none;
+}
+.chat-box .participants .participant .chat-participant-invite-join {
+  display: none;
+}
+.chat-box .participants.is-live.is-participating .participant:not(.active) .chat-participant-invite-join {
+  display: block;
+}
+.chat-box .participants .participant .chat-participant-invite-call,
+.chat-box .participants .participant .chat-participant-invite-join
+ {
+  float: right;
+  background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
+}
+.chat-box .participants .participant.pending .chat-participant-invite-call,
+.chat-box .participants .participant.pending .chat-participant-invite-join {
+    background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center;
+}
+.chat-box .participants .participant .chat-participant-participating {
+  float: right;
+  display: none;
+  margin-top: 14px;
+}
+.chat-box .participants .participant .chat-participant-participating .green-dot {
+  background: #4fc059;
+  width: 12px;
+  height: 12px;
+  border-radius: 6px;
+}
+.chat-box .participants .participant.active .chat-participant-participating {
+  display: block;
+}
+.chat-box .chat-header {
+  width: 276px;
+  padding: 16px 8px 16px 16px;
+  font-size: 16px;
+  text-align: left;
+  font-weight: bold;
+  background-color: #000000;
+  color: #f5f5f5;
+  box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
+}
+.chat-box .chat-header .sound-toggle {
+  width: 24px;
+  height: 24px;
+  margin-right: 10px;
+  margin-top: -2px;
+  float: right;
+  background: url(<%= asset_path 'sound_sprite.png' %>) no-repeat;
+}
+.chat-box .chat-header .sound-toggle:hover {
+  background-position-x: -24px;
+}
+.chat-box .chat-header .sound-toggle.active {
+  background-position-y: -24px;
+}
+.chat-box .chat-input {
+  min-height: 80px;
+  width: 94%;
+  padding: 8px 3% 8px 3%;
+  font-size: 13px;
+  outline: none;
+  resize: none;
+}
+.chat-box .chat-messages {
+  width: 100%;
+  padding: 16px 0px 0px 0px;
+  overflow-y: auto;
+  flex-grow: 1;
+}
+.chat-box .chat-messages .chat-message {
+  width: 89%;
+  padding: 8px 8px 2px 8px;
+  color: #f5f5f5;
+  font-family: arial, sans-serif;
+  font-size: 13px;
+  line-height: 14px;
+}
+.chat-box .chat-messages .chat-message a:link {
+  color: #4fb5c0;
+  text-decoration: underline;
+}
+.chat-box .chat-messages .chat-message a:visited {
+  color: #aea9fd;
+  text-decoration: underline;
+}
+.chat-box .chat-messages .chat-message a:hover {
+  color: #dab539;
+  text-decoration: underline;
+}
+.chat-box .chat-messages .chat-message .chat-message-user {
+  width: 15%;
+  float: left;
+  overflow: hidden;
+  color: #BBB;
+  padding-top: 2px;
+}
+.chat-box .chat-messages .chat-message .chat-message-user img {
+  border: 2px solid #424242;
+  width: 32px;
+  height: 32px;
+  border-radius: 18px;
+}
+.chat-box .chat-messages .chat-message .chat-message-text {
+  width: 73%;
+  float: left;
+  margin-top: 12px;
+  padding: 2px 8px 0;
+  text-align: left;
+  word-wrap: break-word;
+}
+.chat-box .chat-messages .chat-message .chat-message-time {
+  float: right;
+  font-size: 10px;
+  color: #757575;
+}

app/assets/stylesheets/junto.scss.erb

@@ -1,375 +0,0 @@
-.collaborator-video {
-  z-index: 1;
-  position: absolute;
-  width: 150px;
-  height: 150px;
-  cursor: default;
-  color: #FFF;
-
-  .video-receive {
-    position: absolute;
-    width: 160px;
-    padding: 20px 20px 20px 170px;
-    background: #424242;
-    height: 110px;
-    border-top-left-radius: 75px;
-    border-bottom-left-radius: 75px;
-    border-top-right-radius: 2px;
-    border-bottom-right-radius: 2px;
-
-    .video-statement {
-      margin-bottom: 10px;
-    }
-    .btn-group {
-      .btn-yes {
-        margin-right: 10px;
-      }
-      .btn-no {
-        background-color: #c04f4f;
-        &:hover {
-          background-color: #A54242;
-        }
-      }
-    }
-  }
-
-  .video-cutoff {
-    width: 150px;
-    height: 150px;
-    overflow: hidden;
-    border-radius: 75px;
-    z-index: 0;
-    position: relative;
-    -webkit-box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
-    -moz-box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
-    box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19);
-
-    video {
-      height: 150px;
-      margin-left: -25px;
-    }
-    .collaborator-video-avatar {
-      position: absolute;
-      top: 0;
-      left: 0;
-      -webkit-user-select: none;
-      -khtml-user-select: none;
-      -moz-user-select: none;
-      -o-user-select: none;
-      user-select: none;
-      -webkit-user-drag: none;
-      display: none;
-    }
-  }
-  .video-audio {
-    position: absolute;
-    width: 24px;
-    height: 24px;
-    top: 85%;
-    right: 0px;
-    cursor: pointer;
-    background: url(<%= asset_path 'audio_sprite.png' %>) no-repeat;
-  }
-  .video-audio:hover {
-    background-position-x: -24px;
-  }
-  .video-audio.active {
-    background-position-y: -24px;
-  }
-  .video-video {
-    position: absolute;
-    width: 24px;
-    height: 24px;
-    top: 85%;
-    left: 0px;
-    cursor: pointer;
-    background: url(<%= asset_path 'camera_sprite.png' %>) no-repeat;
-  }
-  .video-video:hover {
-    background-position-x: -24px;
-  }
-  .video-video.active {
-    background-position-y: -24px;
-  }
-}
-
-.collaborator-video.my-video {
-  left: 30px;
-  top: 72px;
-}
-
-.chat-box {
-  position: absolute;
-  right: 0;
-  z-index: 1;
-  height: 100%;
-  background: #424242;
-  box-shadow: -8px 0px 16px 2px rgba(0, 0, 0, 0.23);
-
-  .chat-panel {
-    width: 300px;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-  }
-
-  .chat-button {
-    position: absolute;
-    top: 50%;
-    left: -36px;
-    width: 36px;
-    height: 49px;
-    background: url(<%= asset_path 'junto.png' %>) no-repeat 2px 9px, url(<%= asset_path 'tray_tab.png' %>) no-repeat;
-    cursor: pointer;
-
-    &.active {
-      background: url(<%= asset_path 'junto_spinner_dark.gif' %>) no-repeat 2px 8px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
-    }
-    .chat-unread {
-      background: #DAB539;
-      position: absolute;
-      top: -3px;
-      left: -11px;
-      width: 20px;
-      height: 20px;
-      border-radius: 11px;
-      border: 2px solid #424242;
-      color: #424242;
-      text-align: center;
-      font-size: 12px;
-      font-weight: bold;
-      line-height: 20px;
-    }
-  }
-
-  .junto-header {
-    width: 276px;
-    padding: 16px 8px 16px 16px;
-    font-size: 16px;
-    text-align: left;
-    font-weight: bold;
-    background-color: #000000;
-    color: #f5f5f5;
-    box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
-
-    .cursor-toggle {
-      width: 32px;
-      height: 32px;
-      margin-right: 8px;
-      margin-top: -8px;
-      float: right;
-      background: url(<%= asset_path 'cursor_sprite.png' %>) no-repeat;
-    }
-    .cursor-toggle:hover {
-      background-position-x: -32px;
-    }
-    .cursor-toggle.active {
-      background-position-y: -32px;
-    }
-    .video-toggle {
-      width: 32px;
-      height: 32px;
-      margin-right: 10px;
-      margin-top: -8px;
-      float: right;
-      background: url(<%= asset_path 'video_sprite.png' %>) no-repeat;
-    }
-    .video-toggle:hover {
-      background-position-x: -32px;
-    }
-    .video-toggle.active {
-      background-position-y: -32px;
-    }
-  }
-
-  .participants {
-    width: 100%;
-    min-height: 150px;
-    padding: 16px 0px 16px 0px;
-    text-align: left;
-    color: #f5f5f5;
-    overflow-y: auto;
-
-    .conversation-live {
-      padding: 5px 10px 5px 10px;
-      background: #c04f4f;
-      margin: 5px 10px;
-      border-radius: 2px;
-    }
-    .conversation-live .call-action {
-      float: right;
-      cursor: pointer;
-      color: #EBFF00;
-    }
-    .participant {
-      width: 89%;
-      padding: 8px 8px 2px 8px;
-      color: #f5f5f5;
-      font-family: arial, sans-serif;
-      font-size: 13px;
-      line-height: 14px;
-
-      .chat-participant-image {
-        width: 15%;
-        float: left;
-        overflow: hidden;
-        color: #BBB;
-        padding-top: 2px;
-      }
-      .chat-participant-image img {
-        width: 32px;
-        height: 32px;
-        border-radius: 18px;
-      }
-      .chat-participant-name {
-        width: 53%;
-        float: left;
-        font-size: 13px;
-        font-weight: bold;
-        margin-top: 12px;
-        padding: 2px 8px 0;
-        text-align: left;
-      }
-      .chat-participant-invite-call,
-      .chat-participant-invite-join
-       {
-        float: right;
-        background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
-      }
-      .chat-participant-invite-call.pending,
-      .chat-participant-invite-join.pending {
-          background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center;
-      }
-      .chat-participant-participating {
-        float: right;
-        margin-top: 14px;
-      }
-      .chat-participant-participating .green-dot {
-        background: #4fc059;
-        width: 12px;
-        height: 12px;
-        border-radius: 6px;
-      }
-    }
-  }
-
-  .chat-header {
-    width: 276px;
-    padding: 16px 8px 16px 16px;
-    font-size: 16px;
-    text-align: left;
-    font-weight: bold;
-    background-color: #000000;
-    color: #f5f5f5;
-    box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23);
-
-    .sound-toggle {
-      width: 24px;
-      height: 24px;
-      margin-right: 10px;
-      margin-top: -2px;
-      float: right;
-      background: url(<%= asset_path 'sound_sprite.png' %>) no-repeat;
-    }
-    .sound-toggle:hover {
-      background-position-x: -24px;
-    }
-    .sound-toggle.active {
-      background-position-y: -24px;
-    }
-  }
-
-  $chat_font_size: 16px;
-
-  .chat-input {
-    min-height: 80px;
-    width: 88%;
-    padding: 8px 9% 8px 3%;
-    font-size: $chat_font_size;
-    outline: none;
-    resize: none;
-  }
-
-  .chat-messages {
-    width: 100%;
-    padding: 16px 0px;
-    overflow-y: auto;
-    flex-grow: 1;
-
-    .chat-message {
-      width: 89%;
-      padding: 8px 8px 2px 8px;
-      color: #f5f5f5;
-      font-family: arial, sans-serif;
-      font-size: $chat_font_size;
-      line-height: $chat_font_size + 1px;
-
-      a:link {
-        color: #4fb5c0;
-        text-decoration: underline;
-      }
-      a:visited {
-        color: #aea9fd;
-        text-decoration: underline;
-      }
-      a:hover {
-        color: #dab539;
-        text-decoration: underline;
-      }
-      .chat-message-user {
-        width: 12%;
-        float: left;
-        overflow: hidden;
-        color: #BBB;
-        padding-top: 2px;
-      }
-      .chat-message-user img {
-        border: 2px solid #424242;
-        width: 28px;
-        height: 28px;
-        border-radius: 16px;
-      }
-      .chat-message-meta {
-        padding: 0 8px;
-        float: left;
-      }
-      .chat-message-username {
-        color: #4fc059;
-      }
-      .chat-message-text {
-        width: 80%;
-        float: left;
-        padding: 2px 8px 0;
-        text-align: left;
-        word-wrap: break-word;
-      }
-      .chat-message-time {
-        font-size: 12px;
-        color: #757575;
-      }
-    }
-  }
-
-  .new-message-area {
-    position: relative;
-
-    .emoji-mart {
-      position: absolute;
-      bottom: 98px;
-    }
-
-    .extra-message-options {
-      height: 20px;
-      position: absolute;
-      right: 2px;
-      bottom: 74px;
-    
-      .emoji-picker-button {
-        font-size: 16px;
-        line-height: 20px;
-        cursor: pointer;
-        padding: 4px;
-      }
-    }
-  }
-}

app/assets/stylesheets/mapcard.scss.erb

@@ -211,16 +211,6 @@
 
     span.creatorName {
       margin-left: 8px;
-      max-width: 162px;
-      display: inline-block;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      vertical-align: middle;
-    }
-
-    .creatorAndPerm.cardHasViewOnly span.creatorName {
-      max-width: 95px;
     }
 
     .cardViewOnly {

app/assets/stylesheets/mobile.scss.erb

@@ -1,13 +1,10 @@
-@media only screen and (max-width : 752px) and (min-width : 504px) {
+#mobile_header {
-  .sidebarSearch .tt-hint, .sidebarSearch .sidebarSearchField {
+  display: none;
-    width: 160px !important;
-  }
 }
 
-/* when this switches to two lines */
+@media only screen and (max-width : 720px) and (min-width : 504px) {
-@media only screen and (max-width : 728px) {
+  .sidebarSearch .tt-hint, .sidebarSearch .sidebarSearchField {
-  .controller-notifications .notificationsPage .notification .notification-read-unread a {
+    width: 160px !important;
-    margin-top: -20px !important;
   }
 }
 
@@ -21,30 +18,15 @@
     width: 390px;
   }
 }
-/* 800 is the max-width for centerContent */
-@media only screen and (max-width : 800px) {
-  .centerContent.withPadding {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-}
-
 
 /* Smartphones (portrait and landscape) ----------- the minimum space that two map cards can fit side by side */
 @media only screen and (max-width : 504px) {
-  .upperLeftUI, .upperRightUI, .openCheatsheet, .mapInfoIcon, .feedback-icon, .chat-box, #navBar {
+  .upperLeftUI, .upperRightUI, .openCheatsheet, .mapInfoIcon, .feedback-icon, .chat-box, #exploreMapsHeader {
     display: none !important;
   }
 
-  .notificationsPage .page-header {
+  #mobile_header {
-    display: none;
+    display: block;
-  }
-
-  .controller-notifications .notificationsPage .notification .notification-read-unread {
-    display: block !important;
-  }
-  .controller-notifications .notificationsPage .notification .notification-date {
-    display: none;
   }
 
   .homeWrapper {
@@ -64,7 +46,7 @@
     height: auto;
   }
   .homeVideo {
-    width: 100% !important;
+    width: 100%;
     height: auto;
   }
   .fullWidthWrapper.withPartners {
@@ -75,7 +57,7 @@
   }
 
   #yield {
-    padding-top: 50px;
+    height: 100%;
   }
 
   .new_session, .new_user, .edit_user, .login, .forgotPassword {
@@ -84,7 +66,7 @@
     left: auto;
     width: 78%;
     padding: 16px 10%;
-    margin: 0 auto;
+    margin: 50px auto 0 auto;
   }
 
   .centerGreyForm input[type="text"], .centerGreyForm input[type="email"], .centerGreyForm input[type="password"] {
@@ -100,23 +82,15 @@
     max-width: 360px;
   }
 
-  .requestInviteHeader {
+  #wrapper .requestInvite {
-    display: none;
-  }
-  .requestInvite {
     width: 100%;
-    height: calc(100% - 50px);
+    padding: 0;
-    z-index: 1;
-    position: relative;
-    left: 0;
-    margin-left: 0px;
-    margin-top: 50px;
   }
 
   #exploreMaps > div {
     margin-top: 70px;
   }
-
+  
   .mapper {
     width: 100%;
     margin: 0 0 30px 0;
@@ -217,7 +191,6 @@
   width: 100%;
   box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
   position: fixed;
-  z-index: 1;
 }
 
 #menu_icon {
@@ -240,16 +213,8 @@
   line-height: 50px;
 }
 
-#mobile_header #menu_icon .unread-notifications-dot {
-  top: 5px;
-  left: 29px;
-  width: 12px;
-  height: 12px;
-  border: 3px solid #eee;
-  border-radius: 9px;
-}
-
 #mobile_menu {
+ display: none;
   background: #EEE;
   position: fixed;
   top: 50px;
@@ -257,29 +222,20 @@
   padding: 10px;
   width: 200px;
   box-shadow: 3px 3px 3px rgba(0,0,0,0.23), 3px 3px 3px rgba(0,0,0,0.16);
-  z-index: 2;
+}
 
-  li {
+#mobile_menu li {
-    padding: 7px 10px;
+  padding: 10px;
-    list-style: none;
+  list-style: none;
-    font-family: 'din-regular', arial, sans-serif;
+}
 
-    .sprite {
+/*
-      margin-right: 6px;
+ * the mobile menu, even if it's been opened by a user, should
-      margin-top: -2px;
+ * not show up if they resize their browser back to full size
-      display: inline-block;
+ */
-      vertical-align: middle;
+@media only screen and (max-width : 504px) {
-    }
+  #mobile_menu.visible {
-
+    display: block;
-    &.notifications {
-      position: relative;
-
-      .unread-notifications-dot {
-        top: 50%;
-        left: 0px;
-        margin-top: -4px;
-      }
-    }
   }
 }
 

app/assets/stylesheets/notifications.scss.erb

@@ -1,237 +0,0 @@
-$notifications-border-color: #DDDDDD;
-$notifications-hover-color: #F6F6F6;
-$unread_notifications_dot_size: 8px;
-
-.unread-notifications-dot {
-  width: $unread_notifications_dot_size;
-  height: $unread_notifications_dot_size;
-  background-color: #e22;
-  border-radius: $unread_notifications_dot_size / 2;
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.upperRightUI {
-  .notificationsIcon {
-    position: relative;
-  }
-
-  .notificationsBox {
-    position: absolute;
-    background: #FFFFFF;
-    border-radius: 2px;
-    width: 350px;
-    right: 0;
-    top: 50px;
-    box-shadow: 0 3px 6px rgba(0,0,0,0.16);
-    border: 1px solid $notifications-border-color;
-
-    .notificationsBoxTriangle {
-      min-width: 0 !important;
-      display: block;
-      position: absolute;
-      right: 48px;
-      width: 20px !important;
-      height: 20px !important;
-      margin-left: -10px;
-      top: -11px;
-      border-left: 1px solid $notifications-border-color;
-      border-top: 1px solid $notifications-border-color;
-      border-bottom: 0 !important;
-      border-right: 0 !important;
-      background-color: #fff;
-      transform: rotate(45deg);
-      -webkit-transform: rotate(45deg);
-      -ms-transform: rotate(45deg);
-    }
-
-    ul.notifications {
-      max-height: 500px;
-      overflow-y: auto;
-
-      .notification {
-        font-size: 13px;
-
-        .notification-body {
-          border-bottom: 1px solid $notifications-border-color;
-        }
-      }
-
-      .notificationsEmpty {
-        font-family: din-regular, helvetica, sans-serif;
-        margin: 50px 10px;
-        text-align: center;
-      }
-    }
-
-    .notificationsBoxSeeAll {
-      display: block;
-      width: 100%;
-      text-align: center;
-      padding: 6px 0;
-      font-family: din-regular, helvetica, sans-serif;
-      border-top: 1px solid rgba(0, 0, 0, 0.1);
-
-      &:hover {
-        color: #333;
-        background: $notifications-hover-color;
-      }
-    }
-  }
-}
-
-.controller-notifications {
-  .notificationPage,
-  .notificationsPage {
-    font-family: 'din-regular', Sans-Serif;
-
-    & a:hover {
-      text-decoration: none;
-    }
-
-    & > .notification-title {
-      border-bottom: 1px solid #eee;
-      padding-bottom: 0.25em;
-      margin-bottom: 0.5em;
-    }
-
-    .back {
-      margin-top: 1em;
-    }
-  }
-
-  .notificationsPage {
-    header {
-      margin-bottom: 0;
-    }
-
-    .emptyInbox {
-      padding-top: 15px;
-    }
-  }
-
-
-
-  .notificationPage {
-    .thirty-two-avatar {
-      display: inline-block;
-      width: 32px;
-      height: 32px;
-      border-radius: 16px;
-      vertical-align: middle;
-    }
-
-    .button {
-      line-height: 32px;
-
-      img {
-        margin-top: 8px;
-      }
-
-      &.decline {
-        background: #DB5D5D;
-        &:hover {
-          background: #DC4B4B;
-        }
-      }
-    }
-
-    .notification-body {
-      p, div {
-        margin: 1em auto;
-        line-height: 20px;
-      }
-    }
-  }
-}
-
-ul.notifications {
-  list-style: none;
-
-  li:nth-last-child(2) {
-    .notification-body {
-      border-bottom: none !important;
-    }
-  }
-}
-
-.notification {
-  padding: 10px 10px 0 10px;
-  position: relative;
-  font-family: 'din-regular', Sans-Serif;
-
-  &.unread {
-    background: #EEE;
-  }
-
-  &:hover {
-    background: $notifications-hover-color;
-
-    .notification-read-unread {
-      display:block;
-    }
-
-    .notification-date {
-      display: none;
-    }
-  }
-
-  & > a {
-    float: left;
-    width: 85%;
-    box-sizing: border-box;
-    padding-right: 10px;
-  }
-
-  .notification-actor {
-    float: left;
-
-    img {
-      width: 32px;
-      height: 32px;
-      border-radius: 16px;
-    }
-  }
-
-  .notification-body {
-    margin-left: 50px;
-    line-height: 20px;
-    padding-bottom: 10px;
-
-    .in-bold {
-      font-family: 'din-medium', Sans-Serif;
-    }
-
-    .action {
-      background: #4fb5c0;
-      color: #FFF;
-      padding: 2px 6px;
-      border-radius: 3px;
-      display: inline-block;
-      margin: 5px 0;
-    }
-  }
-
-  .notification-date {
-    position: absolute;
-    top: 50%;
-    right: 10px;
-    color: #607d8b;
-    margin-top: -6px;
-  }
-
-  .notification-read-unread {
-    display: none;
-    float: left;
-    width: 15%;
-
-    a, div {
-      position: absolute;
-      top: 50%;
-      margin-top: -10px;
-      text-align: center;
-      cursor: pointer;
-    }
-  }
-}

app/assets/stylesheets/request_access.scss.erb

@@ -1,6 +1,7 @@
 .viewOnly {
   float: left;
   margin-left: 16px;
+  display: none;
   height: 32px;
   border: 1px solid #BDBDBD;
   border-radius: 2px;
@@ -22,7 +23,7 @@
   }
 
   .requestNotice {
-    display: inline-block;
+    display: none;
     padding: 0 8px;
   }
 
@@ -41,6 +42,16 @@
   .requestNotAccepted {
     background-color: #c04f4f;
   }
+
+  &.sendRequest .requestAccess {
+    display: inline-block;
+  }
+  &.sentRequest .requestPending {
+    display: inline-block;
+  }
+  &.requestDenied .requestNotAccepted {
+    display: inline-block;
+  }
 }
 
 .request_access {

app/assets/stylesheets/search.scss.erb

@@ -93,7 +93,7 @@
 
   .sidebarSearchField {
     float: left;
-    width: 379px;
+    width: 380px;
     padding: 7px 10px 3px 10px;
     height: 20px;
     border-top: 1px solid #BDBDBD;

app/channels/application_cable/channel.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module ApplicationCable
-  class Channel < ActionCable::Channel::Base
-  end
-end

app/channels/application_cable/connection.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module ApplicationCable
-  class Connection < ActionCable::Connection::Base
-    identified_by :current_user
-
-    def connect
-      self.current_user = find_verified_user
-      logger.add_tags 'ActionCable', current_user.name
-    end
-
-    protected
-
-    def find_verified_user
-      verified_user = User.find_by(id: cookies.signed['user.id'])
-      if verified_user && cookies.signed['user.expires_at'] > Time.now.getlocal
-        verified_user
-      else
-        reject_unauthorized_connection
-      end
-    end
-  end
-end

app/channels/map_channel.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class MapChannel < ApplicationCable::Channel
-  # Called when the consumer has successfully
-  # become a subscriber of this channel.
-  def subscribed
-    map = Map.find(params[:id])
-    return unless Pundit.policy(current_user, map).show?
-    stream_from "map_#{params[:id]}"
-    Events::UserPresentOnMap.publish!(map, current_user)
-  end
-
-  def unsubscribed
-    map = Map.find(params[:id])
-    return unless Pundit.policy(current_user, map).show?
-    Events::UserNotPresentOnMap.publish!(map, current_user)
-  end
-end

app/controllers/access_controller.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
-
 class AccessController < ApplicationController
-  before_action :require_user, only: %i[access access_request
+  before_action :require_user, only: [:access, :access_request, :approve_access, :approve_access_post,
-                                        approve_access approve_access_post
+                                      :deny_access, :deny_access_post, :request_access]
-                                        deny_access deny_access_post request_access]
+  before_action :set_map, only: [:access, :access_request, :approve_access, :approve_access_post,
-  before_action :set_map, only: %i[access access_request
+                                 :deny_access, :deny_access_post, :request_access]
-                                   approve_access approve_access_post
-                                   deny_access deny_access_post request_access]
   after_action :verify_authorized
 
+
   # GET maps/:id/request_access
   def request_access
     @map = nil
@@ -21,9 +19,14 @@ class AccessController < ApplicationController
 
   # POST maps/:id/access_request
   def access_request
-    AccessRequest.create(user: current_user, map: @map)
+    request = AccessRequest.create(user: current_user, map: @map)
+    # what about push notification to map owner?
+    MapMailer.access_request_email(request, @map).deliver_later
+
     respond_to do |format|
-      format.json { head :ok }
+      format.json do
+        head :ok
+      end
     end
   end
 
@@ -31,18 +34,24 @@ class AccessController < ApplicationController
   def access
     user_ids = params[:access].to_a.map(&:to_i) || []
 
-    @map.add_new_collaborators(user_ids)
+    @map.add_new_collaborators(user_ids).each do |user_id|
+      # add_new_collaborators returns array of added users,
+      # who we then send an email to
+      MapMailer.invite_to_edit_email(@map, current_user, User.find(user_id)).deliver_later
+    end
     @map.remove_old_collaborators(user_ids)
 
     respond_to do |format|
-      format.json { head :ok }
+      format.json do
+        head :ok
+      end
     end
   end
 
   # GET maps/:id/approve_access/:request_id
   def approve_access
     request = AccessRequest.find(params[:request_id])
-    request.approve # also marks mailboxer notification as read
+    request.approve()
     respond_to do |format|
       format.html { redirect_to map_path(@map), notice: 'Request was approved' }
     end
@@ -51,7 +60,7 @@ class AccessController < ApplicationController
   # GET maps/:id/deny_access/:request_id
   def deny_access
     request = AccessRequest.find(params[:request_id])
-    request.deny # also marks mailboxer notification as read
+    request.deny()
     respond_to do |format|
       format.html { redirect_to map_path(@map), notice: 'Request was turned down' }
     end
@@ -60,9 +69,8 @@ class AccessController < ApplicationController
   # POST maps/:id/approve_access/:request_id
   def approve_access_post
     request = AccessRequest.find(params[:request_id])
-    request.approve
+    request.approve()
     respond_to do |format|
-      format.js
       format.json do
         head :ok
       end
@@ -72,9 +80,8 @@ class AccessController < ApplicationController
   # POST maps/:id/deny_access/:request_id
   def deny_access_post
     request = AccessRequest.find(params[:request_id])
-    request.deny
+    request.deny()
     respond_to do |format|
-      format.js
       format.json do
         head :ok
       end
@@ -87,4 +94,5 @@ class AccessController < ApplicationController
     @map = Map.find(params[:id])
     authorize @map
   end
+
 end

app/controllers/api/v1/deprecated_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Api
   module V1
     class DeprecatedController < ApplicationController

app/controllers/api/v2/mappings_controller.rb

@@ -1,11 +1,27 @@
 # frozen_string_literal: true
-
 module Api
   module V2
-    class MappingsController < WithUpdatesController
+    class MappingsController < RestfulController
       def searchable_columns
         []
       end
+
+      def update
+        # hack: set the user temporarily so the model hook can reference it, then set it back
+        temp = resource.user
+        resource.user = current_user
+        update_action
+        respond_with_resource
+        resourse.user = temp
+        update_action
+      end
+
+      def destroy
+        # this is done so that the model hooks can use the mapping user to determine who took this action
+        resource.user = current_user if current_user.present? # current_user should always be present
+        destroy_action
+        head :no_content
+      end
     end
   end
 end

app/controllers/api/v2/maps_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-
 module Api
   module V2
-    class MapsController < WithUpdatesController
+    class MapsController < RestfulController
       def searchable_columns
-        %i[name desc]
+        [:name, :desc]
       end
 
       def apply_filters(collection)

app/controllers/api/v2/metacodes_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class MetacodesController < RestfulController

app/controllers/api/v2/restful_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class RestfulController < ActionController::Base
@@ -8,7 +7,7 @@ module Api
 
       snorlax_used_rest!
 
-      before_action :load_resource, only: %i[show update destroy]
+      before_action :load_resource, only: [:show, :update, :destroy]
       after_action :verify_authorized
 
       def index
@@ -46,7 +45,7 @@ module Api
       end
 
       def current_user
-        token_user || doorkeeper_user
+        token_user || doorkeeper_user || super
       end
 
       def load_resource
@@ -87,12 +86,12 @@ module Api
 
       def token_user
         token = params[:access_token]
-        access_token = Token.find_by(token: token)
+        access_token = Token.find_by_token(token)
         @token_user ||= access_token.user if access_token
       end
 
       def doorkeeper_user
-        return if doorkeeper_token.blank?
+        return unless doorkeeper_token.present?
         doorkeeper_render_error unless valid_doorkeeper_token?
         @doorkeeper_user ||= User.find(doorkeeper_token.resource_owner_id)
       end
@@ -150,30 +149,19 @@ module Api
 
       # override this method to explicitly set searchable columns
       def searchable_columns
-        return @searchable_columns unless @searchable_columns.nil?
-
         columns = resource_class.columns.select do |column|
           column.type == :text || column.type == :string
         end
-        @searchable_columns = columns.map(&:name)
+        columns.map(&:name)
-      end
-
-      # e.g. ?q=test&searchfields=name,desc
-      def searchfields
-        return searchable_columns if params[:searchfields].blank?
-
-        searchfields = params[:searchfields].split(',')
-        searchfields.select! { |f| searchable_columns.include?(f.to_sym) }
-        searchfields.empty? ? searchable_columns : searchfields
       end
 
       # thanks to http://stackoverflow.com/questions/4430578
       def search_by_q(collection)
         table = resource_class.arel_table
         safe_query = "%#{params[:q].gsub(/[%_]/, '\\\\\0')}%"
-        search_column = ->(column) { table[column].matches(safe_query) }
+        search_column = -> (column) { table[column].matches(safe_query) }
 
-        condition = searchfields.reduce(nil) do |prev, column|
+        condition = searchable_columns.reduce(nil) do |prev, column|
           next search_column.call(column) if prev.nil?
           search_column.call(column).or(prev)
         end

app/controllers/api/v2/sessions_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class SessionsController < ApplicationController

app/controllers/api/v2/stars_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class StarsController < RestfulController

app/controllers/api/v2/synapses_controller.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-
 module Api
   module V2
-    class SynapsesController < WithUpdatesController
+    class SynapsesController < RestfulController
       def searchable_columns
         [:desc]
       end

app/controllers/api/v2/tokens_controller.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class TokensController < RestfulController
-      protect_from_forgery
-
       def searchable_columns
         [:description]
       end
@@ -21,12 +18,6 @@ module Api
         create_action
         respond_with_resource
       end
-
-      private
-
-      def current_user
-        token_user || doorkeeper_user || method(:current_user).super_method.super_method.call
-      end
     end
   end
 end

app/controllers/api/v2/topics_controller.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-
 module Api
   module V2
-    class TopicsController < WithUpdatesController
+    class TopicsController < RestfulController
       def searchable_columns
-        %i[name desc link]
+        [:name, :desc, :link]
       end
     end
   end

app/controllers/api/v2/users_controller.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
-
 module Api
   module V2
     class UsersController < RestfulController
       def current
-        raise Pundit::NotAuthorizedError if current_user.nil?
         @user = current_user
         authorize @user
         show # delegate to the normal show function

app/controllers/api/v2/with_updates_controller.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Api
-  module V2
-    class WithUpdatesController < RestfulController
-      def create
-        instantiate_resource
-        resource.user = current_user if current_user.present?
-        resource.updated_by = current_user if current_user.present?
-        authorize resource
-        create_action
-        respond_with_resource
-      end
-
-      def update
-        resource.updated_by = current_user if current_user.present?
-        update_action
-        respond_with_resource
-      end
-
-      def destroy
-        resource.updated_by = current_user if current_user.present?
-        destroy_action
-        head :no_content
-      end
-    end
-  end
-end

app/controllers/application_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class ApplicationController < ActionController::Base
   include ApplicationHelper
   include Pundit
@@ -23,7 +22,7 @@ class ApplicationController < ActionController::Base
   helper_method :admin?
 
   def handle_unauthorized
-    if authenticated? && (params[:controller] == 'maps') && (params[:action] == 'show')
+    if authenticated? and params[:controller] == 'maps' and params[:action] == 'show'
       redirect_to request_access_map_path(params[:id])
     elsif authenticated?
       redirect_to root_path, notice: "You don't have permission to see that page."
@@ -42,13 +41,13 @@ class ApplicationController < ActionController::Base
   def require_no_user
     return true unless authenticated?
     redirect_to edit_user_path(user), notice: 'You must be logged out.'
-    false
+    return false
   end
 
   def require_user
     return true if authenticated?
     redirect_to sign_in_path, notice: 'You must be logged in.'
-    false
+    return false
   end
 
   def require_admin

app/controllers/explore_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-
 class ExploreController < ApplicationController
-  before_action :require_authentication, only: %i[mine shared starred]
+  before_action :require_authentication, only: [:mine, :shared, :starred]
   before_action :authorize_explore
   after_action :verify_authorized
   after_action :verify_policy_scoped

app/controllers/hacks_controller.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-
 # bad code that should be checked over before entering one of the
 # nice files from the right side of this repo
 class HacksController < ApplicationController
   include ActionView::Helpers::TextHelper # string truncate method
 
   # rate limited by rack-attack - currently 5r/s
+  # TODO: what else can we do to make get_with_redirects safer?
   def load_url_title
     authorize :Hack
     url = params[:url]

app/controllers/main_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class MainController < ApplicationController
   before_action :authorize_main
   after_action :verify_authorized

app/controllers/mappings_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-
 class MappingsController < ApplicationController
-  before_action :require_user, only: %i[create update destroy]
+  before_action :require_user, only: [:create, :update, :destroy]
   after_action :verify_authorized, except: :index
   after_action :verify_policy_scoped, only: :index
 
@@ -20,7 +19,6 @@ class MappingsController < ApplicationController
     @mapping = Mapping.new(mapping_params)
     authorize @mapping
     @mapping.user = current_user
-    @mapping.updated_by = current_user
 
     if @mapping.save
       render json: @mapping, status: :created
@@ -33,8 +31,9 @@ class MappingsController < ApplicationController
   def update
     @mapping = Mapping.find(params[:id])
     authorize @mapping
-    @mapping.updated_by = current_user
+    # hack: set the user temporarily so that the model hook can reference it, and then set it back
-    @mapping.map.updated_by = current_user
+    temp = @mapping.user 
+    @mapping.user = current_user
     @mapping.assign_attributes(mapping_params)
 
     if @mapping.save
@@ -42,14 +41,17 @@ class MappingsController < ApplicationController
     else
       render json: @mapping.errors, status: :unprocessable_entity
     end
+    # restore the original mapping creator
+    @mapping.user = temp
+    @mapping.save
   end
 
   # DELETE /mappings/1.json
   def destroy
     @mapping = Mapping.find(params[:id])
     authorize @mapping
-    @mapping.updated_by = current_user
+    # hack: set the user temporarily so that the model hook can reference this user who is taking the action
-    @mapping.map.updated_by = current_user
+    @mapping.user = current_user
     @mapping.destroy
 
     head :no_content

app/controllers/maps_controller.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
-
 class MapsController < ApplicationController
-  before_action :require_user, only: %i[create update destroy events follow unfollow]
+  before_action :require_user, only: [:create, :update, :destroy, :events]
-  before_action :set_map, only: %i[show conversation update destroy
+  before_action :set_map, only: [:show, :update, :destroy, :contains, :events, :export]
-                                   contains events export
-                                   follow unfollow unfollow_from_email]
   after_action :verify_authorized
 
   # GET maps/:id
   def show
     respond_to do |format|
       format.html do
-        UserMap.where(map: @map, user: current_user).map(&:mark_invite_notifications_as_read)
         @allmappers = @map.contributors
         @allcollaborators = @map.editors
         @alltopics = policy_scope(@map.topics)
@@ -20,27 +16,10 @@ class MapsController < ApplicationController
         @allmessages = @map.messages.sort_by(&:created_at)
         @allstars = @map.stars
         @allrequests = @map.access_requests
+        @allevents = @map.events
       end
       format.json { render json: @map }
       format.csv { redirect_to action: :export, format: :csv }
-      format.ttl { redirect_to action: :export, format: :ttl }
-    end
-  end
-
-  # GET maps/:id/conversation
-  def conversation
-    respond_to do |format|
-      format.html do
-        UserMap.where(map: @map, user: current_user).map(&:mark_invite_notifications_as_read)
-        @allmappers = @map.contributors
-        @allcollaborators = @map.editors
-        @alltopics = policy_scope(@map.topics)
-        @allsynapses = policy_scope(@map.synapses)
-        @allmappings = policy_scope(@map.mappings)
-        @allmessages = @map.messages.sort_by(&:created_at)
-        @allstars = @map.stars
-        @allrequests = @map.access_requests
-      end
     end
   end
 
@@ -62,7 +41,6 @@ class MapsController < ApplicationController
   def create
     @map = Map.new(create_map_params)
     @map.user = current_user
-    @map.updated_by = current_user
     @map.arranged = false
     authorize @map
 
@@ -83,11 +61,8 @@ class MapsController < ApplicationController
 
   # PUT maps/:id
   def update
-    @map.updated_by = current_user
-    @map.assign_attributes(update_map_params)
-
     respond_to do |format|
-      if @map.save
+      if @map.update_attributes(update_map_params)
         format.json { head :no_content }
       else
         format.json { render json: @map.errors, status: :unprocessable_entity }
@@ -97,8 +72,7 @@ class MapsController < ApplicationController
 
   # DELETE maps/:id
   def destroy
-    @map.updated_by = current_user
+    @map.delete
-    @map.destroy
 
     respond_to do |format|
       format.json do
@@ -116,12 +90,10 @@ class MapsController < ApplicationController
 
   # GET maps/:id/export
   def export
-    exporter = MapExportService.new(current_user, @map, base_url: request.base_url)
+    exporter = MapExportService.new(current_user, @map)
-
     respond_to do |format|
       format.json { render json: exporter.json }
       format.csv { send_data exporter.csv }
-      format.ttl { render text: exporter.rdf }
     end
   end
 
@@ -131,6 +103,9 @@ class MapsController < ApplicationController
     if params[:event] == 'conversation'
       Events::ConversationStartedOnMap.publish!(@map, current_user)
       valid_event = true
+    elsif params[:event] == 'user_presence'
+      Events::UserPresentOnMap.publish!(@map, current_user)
+      valid_event = true
     end
 
     respond_to do |format|
@@ -141,43 +116,6 @@ class MapsController < ApplicationController
     end
   end
 
-  # POST maps/:id/follow
-  def follow
-    follow = FollowService.follow(@map, current_user, 'followed')
-
-    respond_to do |format|
-      format.json do
-        if follow
-          head :ok
-        else
-          head :bad_request
-        end
-      end
-    end
-  end
-
-  # POST maps/:id/unfollow
-  def unfollow
-    FollowService.unfollow(@map, current_user)
-
-    respond_to do |format|
-      format.json do
-        head :ok
-      end
-    end
-  end
-
-  # GET maps/:id/unfollow_from_email
-  def unfollow_from_email
-    FollowService.unfollow(@map, current_user)
-
-    respond_to do |format|
-      format.html do
-        redirect_to map_path(@map), notice: 'You are no longer following this map'
-      end
-    end
-  end
-
   private
 
   def set_map
@@ -186,7 +124,7 @@ class MapsController < ApplicationController
   end
 
   def create_map_params
-    params.permit(:name, :desc, :permission, :source_id)
+    params.permit(:name, :desc, :permission)
   end
 
   def update_map_params

app/controllers/messages_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class MessagesController < ApplicationController
   before_action :require_user, except: [:show]
   after_action :verify_authorized

app/controllers/metacode_sets_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class MetacodeSetsController < ApplicationController
   before_action :require_admin
 
@@ -56,13 +55,8 @@ class MetacodeSetsController < ApplicationController
         @metacodes.each do |m|
           InMetacodeSet.create(metacode_id: m, metacode_set_id: @metacode_set.id)
         end
-        format.html do
+        format.html { redirect_to metacode_sets_url, notice: 'Metacode set was successfully created.' }
-          redirect_to metacode_sets_url,
+        format.json { render json: @metacode_set, status: :created, location: metacode_sets_url }
-                      notice: 'Metacode set was successfully created.'
-        end
-        format.json do
-          render json: @metacode_set, status: :created, location: metacode_sets_url
-        end
       else
         format.html { render action: 'new' }
         format.json { render json: @metacode_set.errors, status: :unprocessable_entity }
@@ -79,20 +73,20 @@ class MetacodeSetsController < ApplicationController
       if @metacode_set.update_attributes(metacode_set_params)
 
         # build an array of the IDs of the metacodes currently in the set
-        current_metacodes = @metacode_set.metacodes.map { |m| m.id.to_s }
+        @currentMetacodes = @metacode_set.metacodes.map { |m| m.id.to_s }
         # get the list of desired metacodes for the set from the user input and build an array out of it
-        new_metacodes = params[:metacodes][:value].split(',')
+        @newMetacodes = params[:metacodes][:value].split(',')
 
         # remove the metacodes that were in it, but now aren't
-        removed_metacodes = current_metacodes - new_metacodes
+        @removedMetacodes = @currentMetacodes - @newMetacodes
-        removed_metacodes.each do |m|
+        @removedMetacodes.each do |m|
-          inmetacodeset = InMetacodeSet.find_by(metacode_id: m, metacode_set_id: @metacode_set.id)
+          @inmetacodeset = InMetacodeSet.find_by_metacode_id_and_metacode_set_id(m, @metacode_set.id)
-          inmetacodeset.destroy
+          @inmetacodeset.destroy
         end
 
         # add the new metacodes
-        added_metacodes = new_metacodes - current_metacodes
+        @addedMetacodes = @newMetacodes - @currentMetacodes
-        added_metacodes.each do |m|
+        @addedMetacodes.each do |m|
           InMetacodeSet.create(metacode_id: m, metacode_set_id: @metacode_set.id)
         end
 

app/controllers/metacodes_controller.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-
 class MetacodesController < ApplicationController
-  before_action :require_admin, except: %i[index show]
+  before_action :require_admin, except: [:index, :show]
-  before_action :set_metacode, only: %i[edit update]
+  before_action :set_metacode, only: [:edit, :update]
 
   # GET /metacodes
   # GET /metacodes.json

app/controllers/notifications_controller.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-class NotificationsController < ApplicationController
-  before_action :set_receipts, only: %i[index show mark_read mark_unread]
-  before_action :set_notification, only: %i[show mark_read mark_unread]
-  before_action :set_receipt, only: %i[show mark_read mark_unread]
-
-  def index
-    @notifications = current_user.mailbox.notifications.page(params[:page]).per(25)
-    respond_to do |format|
-      format.html
-      format.json do
-        notifications = @notifications.map do |notification|
-          receipt = @receipts.find_by(notification_id: notification.id)
-          NotificationDecorator.decorate(notification, receipt)
-        end
-        if !notifications.empty?
-          render json: notifications
-        else
-          render json: [].to_json
-        end
-      end
-    end
-  end
-
-  def show
-    @receipt.update(is_read: true)
-    respond_to do |format|
-      format.html do
-        case @notification.notification_code
-        when MAP_ACCESS_APPROVED, MAP_INVITE_TO_EDIT
-          redirect_to map_path(@notification.notified_object.map)
-        when TOPIC_ADDED_TO_MAP
-          redirect_to map_path(@notification.notified_object.map)
-        when TOPIC_CONNECTED_1
-          redirect_to topic_path(@notification.notified_object.topic1)
-        when TOPIC_CONNECTED_2
-          redirect_to topic_path(@notification.notified_object.topic2)
-        end
-      end
-      format.json do
-        render json: NotificationDecorator.decorate(@notification, @receipt)
-      end
-    end
-  end
-
-  def mark_read
-    @receipt.update(is_read: true)
-    respond_to do |format|
-      format.js
-      format.json do
-        render json: NotificationDecorator.decorate(@notification, @receipt)
-      end
-    end
-  end
-
-  def mark_unread
-    @receipt.update(is_read: false)
-    respond_to do |format|
-      format.js
-      format.json do
-        render json: NotificationDecorator.decorate(@notification, @receipt)
-      end
-    end
-  end
-
-  def unsubscribe
-    unsubscribe_redirect_if_logged_out!
-    check_if_already_unsubscribed!
-    return if performed? # if one of these checks already redirected, we're done
-
-    if current_user.update(emails_allowed: false)
-      redirect_to edit_user_path(current_user),
-                  notice: 'You will no longer receive emails from Metamaps.'
-    else
-      flash[:alert] = 'Sorry, something went wrong. You have not been unsubscribed from emails.'
-      redirect_to edit_user_path(current_user)
-    end
-  end
-
-  private
-
-  def unsubscribe_redirect_if_logged_out!
-    return if current_user.present?
-
-    flash[:notice] = 'Continue to unsubscribe from emails by logging in.'
-    redirect_to "#{sign_in_path}?redirect_to=#{unsubscribe_notifications_path}"
-  end
-
-  def check_if_already_unsubscribed!
-    return if current_user.emails_allowed
-
-    redirect_to edit_user_path(current_user), notice: 'You were already unsubscribed from emails.'
-  end
-
-  def set_receipts
-    @receipts = current_user.mailboxer_notification_receipts
-  end
-
-  def set_notification
-    @notification = current_user.mailbox.notifications.find_by(id: params[:id])
-  end
-
-  def set_receipt
-    @receipt = @receipts.find_by(notification_id: params[:id])
-  end
-end

app/controllers/search_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class SearchController < ApplicationController
   include TopicsHelper
   include MapsHelper
@@ -8,15 +7,14 @@ class SearchController < ApplicationController
 
   before_action :authorize_search
   after_action :verify_authorized
-  after_action :verify_policy_scoped, only: %i[maps mappers synapses topics]
+  after_action :verify_policy_scoped, only: [:maps, :mappers, :synapses, :topics]
 
   # get /search/topics?term=SOMETERM
   def topics
     term = params[:term]
     user = params[:user] ? params[:user] : false
 
-    if term.present? && term.downcase[0..3] != 'map:' &&
+    if term && !term.empty? && term.downcase[0..3] != 'map:' && term.downcase[0..6] != 'mapper:' && !term.casecmp('topic:').zero?
-       term.downcase[0..6] != 'mapper:' && !term.casecmp('topic:').zero?
 
       # remove "topic:" if appended at beginning
       term = term[6..-1] if term.downcase[0..5] == 'topic:'
@@ -36,28 +34,28 @@ class SearchController < ApplicationController
       end
 
       # check whether there's a filter by metacode as part of the query
-      filter_by_metacode = false
+      filterByMetacode = false
       Metacode.all.each do |m|
-        length_one = m.name.length + 1
+        lOne = m.name.length + 1
-        length_two = m.name.length
+        lTwo = m.name.length
 
-        if term.downcase[0..length_two] == m.name.downcase + ':'
+        if term.downcase[0..lTwo] == m.name.downcase + ':'
-          term = term[length_one..-1]
+          term = term[lOne..-1]
-          filter_by_metacode = m
+          filterByMetacode = m
         end
       end
 
       search = '%' + term.downcase.strip + '%'
       builder = policy_scope(Topic)
 
-      if filter_by_metacode
+      if filterByMetacode
         if term == ''
           builder = builder.none
         else
           builder = builder.where('LOWER("name") like ? OR
                                    LOWER("desc") like ? OR
                                    LOWER("link") like ?', search, search, search)
-          builder = builder.where(metacode_id: filter_by_metacode.id)
+          builder = builder.where(metacode_id: filterByMetacode.id)
         end
       elsif desc
         builder = builder.where('LOWER("desc") like ?', search)
@@ -84,8 +82,7 @@ class SearchController < ApplicationController
     term = params[:term]
     user = params[:user] ? params[:user] : nil
 
-    if term.present? && term.downcase[0..5] != 'topic:' &&
+    if term && !term.empty? && term.downcase[0..5] != 'topic:' && term.downcase[0..6] != 'mapper:' && !term.casecmp('map:').zero?
-       term.downcase[0..6] != 'mapper:' && !term.casecmp('map:').zero?
 
       # remove "map:" if appended at beginning
       term = term[4..-1] if term.downcase[0..3] == 'map:'
@@ -118,8 +115,7 @@ class SearchController < ApplicationController
   # get /search/mappers?term=SOMETERM
   def mappers
     term = params[:term]
-    if term.present? && term.downcase[0..3] != 'map:' &&
+    if term && !term.empty? && term.downcase[0..3] != 'map:' && term.downcase[0..5] != 'topic:' && !term.casecmp('mapper:').zero?
-       term.downcase[0..5] != 'topic:' && !term.casecmp('mapper:').zero?
 
       # remove "mapper:" if appended at beginning
       term = term[7..-1] if term.downcase[0..6] == 'mapper:'
@@ -141,16 +137,14 @@ class SearchController < ApplicationController
     topic1id = params[:topic1id]
     topic2id = params[:topic2id]
 
-    if term.present?
+    if term && !term.empty?
-      @synapses = policy_scope(Synapse)
+      @synapses = policy_scope(Synapse).where('LOWER("desc") like ?', '%' + term.downcase.strip + '%').order('"desc"')
-                  .where('LOWER("desc") like ?', '%' + term.downcase.strip + '%')
-                  .order('"desc"')
 
       @synapses = @synapses.uniq(&:desc)
-    elsif topic1id.present?
+    elsif topic1id && !topic1id.empty?
-      one = policy_scope(Synapse).where(topic1_id: topic1id, topic2_id: topic2id)
+      @one = policy_scope(Synapse).where(topic1_id: topic1id, topic2_id: topic2id)
-      two = policy_scope(Synapse).where(topic2_id: topic1id, topic1_id: topic2id)
+      @two = policy_scope(Synapse).where(topic2_id: topic1id, topic1_id: topic2id)
-      @synapses = one + two
+      @synapses = @one + @two
       @synapses.sort! { |s1, s2| s1.desc <=> s2.desc }.to_a
     else
       skip_policy_scope

app/controllers/stars_controller.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class StarsController < ApplicationController
   before_action :require_user
   before_action :set_map

app/controllers/synapses_controller.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
-
 class SynapsesController < ApplicationController
   include TopicsHelper
 
-  before_action :require_user, only: %i[create update destroy]
+  before_action :require_user, only: [:create, :update, :destroy]
   after_action :verify_authorized, except: :index
   after_action :verify_policy_scoped, only: :index
 
@@ -23,8 +22,6 @@ class SynapsesController < ApplicationController
     @synapse = Synapse.new(synapse_params)
     @synapse.desc = '' if @synapse.desc.nil?
     @synapse.desc.strip! # no trailing/leading whitespace
-    @synapse.user = current_user
-    @synapse.updated_by = current_user
 
     # we want invalid params to return :unprocessable_entity
     # so we have to authorize AFTER saving. But if authorize
@@ -50,11 +47,9 @@ class SynapsesController < ApplicationController
     @synapse = Synapse.find(params[:id])
     @synapse.desc = '' if @synapse.desc.nil?
     authorize @synapse
-    @synapse.updated_by = current_user
-    @synapse.assign_attributes(synapse_params)
 
     respond_to do |format|
-      if @synapse.save
+      if @synapse.update_attributes(synapse_params)
         format.json { head :no_content }
       else
         format.json { render json: @synapse.errors, status: :unprocessable_entity }
@@ -66,7 +61,6 @@ class SynapsesController < ApplicationController
   def destroy
     @synapse = Synapse.find(params[:id])
     authorize @synapse
-    @synapse.updated_by = current_user
     @synapse.destroy
 
     respond_to do |format|
@@ -77,8 +71,6 @@ class SynapsesController < ApplicationController
   private
 
   def synapse_params
-    params.require(:synapse).permit(
+    params.require(:synapse).permit(:id, :desc, :category, :weight, :permission, :topic1_id, :topic2_id, :user_id)
-      :id, :desc, :category, :weight, :permission, :topic1_id, :topic2_id
-    )
   end
 end

app/controllers/tokens_controller.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class TokensController < ApplicationController
-  before_action :require_user, only: [:new]
-
-  def new
-    @token = Token.new(user: current_user)
-    render :new, layout: false
-  end
-end

app/controllers/topics_controller.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
-
 class TopicsController < ApplicationController
   include TopicsHelper
 
-  before_action :require_user, only: %i[create update destroy follow unfollow]
+  before_action :require_user, only: [:create, :update, :destroy]
-  before_action :set_topic, only: %i[show update relative_numbers
-                                     relatives network destroy
-                                     follow unfollow unfollow_from_email]
   after_action :verify_authorized, except: :autocomplete_topic
 
   respond_to :html, :js, :json
@@ -14,27 +10,26 @@ class TopicsController < ApplicationController
   # GET /topics/autocomplete_topic
   def autocomplete_topic
     term = params[:term]
-    if term.present?
+    if term && !term.empty?
-      topics = policy_scope(Topic)
+      @topics = policy_scope(Topic).where('LOWER("name") like ?', term.downcase + '%').order('"name"')
-               .where('LOWER("name") like ?', term.downcase + '%')
+      @mapTopics = @topics.select { |t| t&.metacode&.name == 'Metamap' }
-               .order('"name"')
-      map_topics = topics.select { |t| t&.metacode&.name == 'Metamap' }
       # prioritize topics which point to maps, over maps
-      exclude = map_topics.length.positive? ? map_topics.map(&:name) : ['']
+      @exclude = @mapTopics.length > 0 ? @mapTopics.map(&:name) : ['']
-      maps = policy_scope(Map)
+      @maps = policy_scope(Map).where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', @exclude).order('"name"')
-             .where('LOWER("name") like ? AND name NOT IN (?)', term.downcase + '%', exclude)
-             .order('"name"')
     else
-      topics = []
+      @topics = []
-      maps = []
+      @maps = []
     end
-    @all = topics.to_a.concat(maps.to_a).sort_by(&:name)
+    @all= @topics.to_a.concat(@maps.to_a).sort { |a, b| a.name <=> b.name }
-
+    
     render json: autocomplete_array_json(@all).to_json
   end
 
   # GET topics/:id
   def show
+    @topic = Topic.find(params[:id])
+    authorize @topic
+
     respond_to do |format|
       format.html do
         @alltopics = [@topic].concat(policy_scope(Topic.relatives(@topic.id, current_user)).to_a)
@@ -50,6 +45,9 @@ class TopicsController < ApplicationController
 
   # GET topics/:id/network
   def network
+    @topic = Topic.find(params[:id])
+    authorize @topic
+
     @alltopics = [@topic].concat(policy_scope(Topic.relatives(@topic.id, current_user)).to_a)
     @allsynapses = policy_scope(Synapse.for_topic(@topic.id))
 
@@ -69,13 +67,16 @@ class TopicsController < ApplicationController
 
   # GET topics/:id/relative_numbers
   def relative_numbers
-    topics_already_has = params[:network] ? params[:network].split(',').map(&:to_i) : []
+    @topic = Topic.find(params[:id])
+    authorize @topic
+
+    topicsAlreadyHas = params[:network] ? params[:network].split(',').map(&:to_i) : []
 
     alltopics = policy_scope(Topic.relatives(@topic.id, current_user)).to_a
-    if params[:metacode].present?
+    alltopics.delete_if { |topic| topic.metacode_id != params[:metacode].to_i } if params[:metacode].present?
-      alltopics.delete_if { |topic| topic.metacode_id != params[:metacode].to_i }
+    alltopics.delete_if do |topic|
+      !topicsAlreadyHas.index(topic.id).nil?
     end
-    alltopics.delete_if { |topic| !topics_already_has.index(topic.id).nil? }
 
     @json = Hash.new(0)
     alltopics.each do |t|
@@ -89,14 +90,15 @@ class TopicsController < ApplicationController
 
   # GET topics/:id/relatives
   def relatives
-    topics_already_has = params[:network] ? params[:network].split(',').map(&:to_i) : []
+    @topic = Topic.find(params[:id])
+    authorize @topic
+
+    topicsAlreadyHas = params[:network] ? params[:network].split(',').map(&:to_i) : []
 
     alltopics = policy_scope(Topic.relatives(@topic.id, current_user)).to_a
-    if params[:metacode].present?
+    alltopics.delete_if { |topic| topic.metacode_id != params[:metacode].to_i } if params[:metacode].present?
-      alltopics.delete_if { |topic| topic.metacode_id != params[:metacode].to_i }
-    end
     alltopics.delete_if do |topic|
-      !topics_already_has.index(topic.id.to_s).nil?
+      !topicsAlreadyHas.index(topic.id.to_s).nil?
     end
 
     # find synapses between topics in alltopics array
@@ -106,9 +108,9 @@ class TopicsController < ApplicationController
       !synapse_ids.index(synapse.id).nil?
     end
 
-    creators_already_has = params[:creators] ? params[:creators].split(',').map(&:to_i) : []
+    creatorsAlreadyHas = params[:creators] ? params[:creators].split(',').map(&:to_i) : []
     allcreators = (alltopics.map(&:user) + allsynapses.map(&:user)).uniq.delete_if do |user|
-      !creators_already_has.index(user.id).nil?
+      !creatorsAlreadyHas.index(user.id).nil?
     end
 
     @json = {}
@@ -126,8 +128,6 @@ class TopicsController < ApplicationController
   def create
     @topic = Topic.new(topic_params)
     authorize @topic
-    @topic.user = current_user
-    @topic.updated_by = current_user
 
     respond_to do |format|
       if @topic.save
@@ -141,11 +141,11 @@ class TopicsController < ApplicationController
   # PUT /topics/1
   # PUT /topics/1.json
   def update
-    @topic.updated_by = current_user
+    @topic = Topic.find(params[:id])
-    @topic.assign_attributes(topic_params)
+    authorize @topic
 
     respond_to do |format|
-      if @topic.save
+      if @topic.update_attributes(topic_params)
         format.json { head :no_content }
       else
         format.json { render json: @topic.errors, status: :unprocessable_entity }
@@ -155,58 +155,18 @@ class TopicsController < ApplicationController
 
   # DELETE topics/:id
   def destroy
-    @topic.updated_by = current_user
+    @topic = Topic.find(params[:id])
+    authorize @topic
+
     @topic.destroy
     respond_to do |format|
       format.json { head :no_content }
     end
   end
 
-  # POST topics/:id/follow
-  def follow
-    follow = FollowService.follow(@topic, current_user, 'followed')
-
-    respond_to do |format|
-      format.json do
-        if follow
-          head :ok
-        else
-          head :bad_request
-        end
-      end
-    end
-  end
-
-  # POST topics/:id/unfollow
-  def unfollow
-    FollowService.unfollow(@topic, current_user)
-
-    respond_to do |format|
-      format.json do
-        head :ok
-      end
-    end
-  end
-
-  # GET topics/:id/unfollow_from_email
-  def unfollow_from_email
-    FollowService.unfollow(@topic, current_user)
-
-    respond_to do |format|
-      format.html do
-        redirect_to topic_path(@topic), notice: 'You are no longer following this topic'
-      end
-    end
-  end
-
   private
 
-  def set_topic
-    @topic = Topic.find(params[:id])
-    authorize @topic
-  end
-
   def topic_params
-    params.require(:topic).permit(:id, :name, :desc, :link, :permission, :metacode_id, :defer_to_map_id)
+    params.require(:topic).permit(:id, :name, :desc, :link, :permission, :user_id, :metacode_id, :defer_to_map_id)
   end
 end

app/controllers/users/passwords_controller.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
+class Users::PasswordsController < Devise::PasswordsController
+  protected
 
-module Users
+  def after_resetting_password_path_for(resource)
-  class PasswordsController < Devise::PasswordsController
+    signed_in_root_path(resource)
-    protected
+  end
 
-    def after_resetting_password_path_for(resource)
+  def after_sending_reset_password_instructions_path_for(_resource_name)
-      signed_in_root_path(resource)
+    sign_in_path if is_navigational_format?
-    end
-
-    def after_sending_reset_password_instructions_path_for(_resource_name)
-      sign_in_path if is_navigational_format?
-    end
   end
 end

app/controllers/users/registrations_controller.rb

@@ -1,40 +1,40 @@
 # frozen_string_literal: true
+class Users::RegistrationsController < Devise::RegistrationsController
+  before_action :configure_sign_up_params, only: [:create]
+  before_action :configure_account_update_params, only: [:update]
+  after_action :store_location, only: [:new]
 
-module Users
+  protected
-  class RegistrationsController < Devise::RegistrationsController
-    before_action :configure_sign_up_params, only: [:create]
-    before_action :configure_account_update_params, only: [:update]
-    after_action :store_location, only: [:new]
 
-    protected
+  def after_update_path_for(resource)
+    signed_in_root_path(resource)
+  end
 
-    def after_update_path_for(resource)
+  def after_sign_in_path_for(resource)
-      signed_in_root_path(resource)
+    stored = stored_location_for(User)
-    end
+    return stored if stored
 
-    def after_sign_in_path_for(resource)
+    if request.referer&.match(sign_in_url) || request.referer&.match(sign_up_url)
-      stored = stored_location_for(User)
+      super
-      return stored if stored
+    else
-
+      request.referer || root_path
-      if request.referer&.match(sign_in_url) || request.referer&.match(sign_up_url)
-        super
-      else
-        request.referer || root_path
-      end
-    end
-
-    private
-
-    def store_location
-      store_location_for(User, params[:redirect_to]) if params[:redirect_to]
-    end
-
-    def configure_sign_up_params
-      devise_parameter_sanitizer.permit(:sign_up, keys: %i[name joinedwithcode])
-    end
-
-    def configure_account_update_params
-      devise_parameter_sanitizer.permit(:account_update, keys: [:image])
     end
   end
+
+
+  private
+
+  def store_location
+    if params[:redirect_to]
+      store_location_for(User, params[:redirect_to])    
+    end
+  end
+
+  def configure_sign_up_params
+    devise_parameter_sanitizer.permit(:sign_up, keys: [:name, :joinedwithcode])
+  end
+
+  def configure_account_update_params
+    devise_parameter_sanitizer.permit(:account_update, keys: [:image])
+  end
 end

app/controllers/users/sessions_controller.rb

@@ -1,26 +1,14 @@
-# frozen_string_literal: true
+class Users::SessionsController < Devise::SessionsController
+  protected
 
-module Users
+  def after_sign_in_path_for(resource)
-  class SessionsController < Devise::SessionsController
+    stored = stored_location_for(User)
-    after_action :store_location, only: [:new]
+    return stored if stored
 
-    protected
+    if request.referer&.match(sign_in_url) || request.referer&.match(sign_up_url)
-
+      super
-    def after_sign_in_path_for(resource)
+    else
-      stored = stored_location_for(User)
+      request.referer || root_path
-      return stored if stored
-
-      if request.referer&.match(sign_in_url) || request.referer&.match(sign_up_url)
-        super
-      else
-        request.referer || root_path
-      end
-    end
-
-    private
-
-    def store_location
-      store_location_for(User, params[:redirect_to]) if params[:redirect_to]
     end
   end
 end

app/controllers/users_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-
 class UsersController < ApplicationController
-  before_action :require_user, only: %i[edit update updatemetacodes update_metacode_focus]
+  before_action :require_user, only: [:edit, :update, :updatemetacodes]
 
   respond_to :html, :json
 
@@ -14,25 +13,25 @@ class UsersController < ApplicationController
 
   # GET /users/:id/edit
   def edit
-    @user = User.find(current_user.id)
+    @user = current_user
+    respond_with(@user)
   end
 
   # PUT /users/:id
   def update
-    @user = User.find(current_user.id)
+    @user = current_user
 
     if user_params[:password] == '' && user_params[:password_confirmation] == ''
       # not trying to change the password
       if @user.update_attributes(user_params.except(:password, :password_confirmation))
-        update_follow_settings(@user, params[:settings])
         @user.image = nil if params[:remove_image] == '1'
         @user.save
-        bypass_sign_in(@user)
+        sign_in(@user, bypass: true)
         respond_to do |format|
-          format.html { redirect_to root_url, notice: 'Settings updated' }
+          format.html { redirect_to root_url, notice: 'Account updated!' }
         end
       else
-        bypass_sign_in(@user)
+        sign_in(@user, bypass: true)
         respond_to do |format|
           format.html { redirect_to edit_user_path(@user), notice: @user.errors.to_a[0] }
         end
@@ -42,12 +41,11 @@ class UsersController < ApplicationController
       correct_pass = @user.valid_password?(params[:current_password])
 
       if correct_pass && @user.update_attributes(user_params)
-        update_follow_settings(@user, params[:settings])
         @user.image = nil if params[:remove_image] == '1'
         @user.save
         sign_in(@user, bypass: true)
         respond_to do |format|
-          format.html { redirect_to root_url, notice: 'Settings updated' }
+          format.html { redirect_to root_url, notice: 'Account updated!' }
         end
       else
         respond_to do |format|
@@ -95,28 +93,9 @@ class UsersController < ApplicationController
     end
   end
 
-  # PUT /user/update_metacode_focus
-  def update_metacode_focus
-    @user = current_user
-    @user.settings.metacode_focus = params[:value]
-    @user.save
-    respond_to do |format|
-      format.json { render json: { success: 'success' } }
-    end
-  end
-
   private
 
-  def update_follow_settings(user, settings)
-    user.settings.follow_topic_on_created = settings[:follow_topic_on_created]
-    user.settings.follow_topic_on_contributed = settings[:follow_topic_on_contributed]
-    user.settings.follow_map_on_created = settings[:follow_map_on_created]
-    user.settings.follow_map_on_contributed = settings[:follow_map_on_contributed]
-  end
-
   def user_params
-    params.require(:user).permit(
+    params.require(:user).permit(:name, :email, :image, :password, :password_confirmation)
-      :name, :email, :image, :password, :password_confirmation, :emails_allowed, :settings
-    )
   end
 end

app/decorators/notification_decorator.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-class NotificationDecorator
-  class << self
-    def decorate(notification, receipt)
-      result = {
-        id: notification.id,
-        type: notification.notification_code,
-        subject: notification.subject,
-        is_read: receipt.is_read,
-        created_at: notification.created_at,
-        actor: notification.sender,
-        data: {
-          object: notification.notified_object
-        }
-      }
-
-      case notification.notification_code
-      when MAP_ACCESS_APPROVED, MAP_ACCESS_REQUEST, MAP_INVITE_TO_EDIT
-        map = notification.notified_object&.map
-        result[:data][:map] = {
-          id: map&.id,
-          name: map&.name
-        }
-      when TOPIC_ADDED_TO_MAP
-        topic = notification.notified_object&.eventable
-        map = notification.notified_object&.map
-        result[:data][:topic] = {
-          id: topic&.id,
-          name: topic&.name
-        }
-        result[:data][:map] = {
-          id: map&.id,
-          name: map&.name
-        }
-      when TOPIC_CONNECTED_1, TOPIC_CONNECTED_2
-        topic1 = notification.notified_object&.topic1
-        topic2 = notification.notified_object&.topic2
-        result[:data][:topic1] = {
-          id: topic1&.id,
-          name: topic1&.name
-        }
-        result[:data][:topic2] = {
-          id: topic2&.id,
-          name: topic2&.name
-        }
-      end
-      result
-    end
-  end
-end

app/helpers/application_helper.rb

@@ -1,14 +1,40 @@
 # frozen_string_literal: true
-
 module ApplicationHelper
+  def metacodeset
+    metacodes = current_user.settings.metacodes
+    return false unless metacodes[0].include?('metacodeset')
+    if metacodes[0].sub('metacodeset-', '') == 'Most'
+      return 'Most'
+    elsif metacodes[0].sub('metacodeset-', '') == 'Recent'
+      return 'Recent'
+    end
+    MetacodeSet.find(metacodes[0].sub('metacodeset-', '').to_i)
+  end
+
+  def user_metacodes
+    @m = current_user.settings.metacodes
+    set = metacodeset
+    @metacodes = if set && set == 'Most'
+                   Metacode.where(id: current_user.most_used_metacodes).to_a
+                 elsif set && set == 'Recent'
+                   Metacode.where(id: current_user.recent_metacodes).to_a
+                 elsif set
+                   set.metacodes.to_a
+                 else
+                   Metacode.where(id: @m).to_a
+                 end
+    @metacodes.sort! { |m1, m2| m2.name.downcase <=> m1.name.downcase }.rotate!(-1)
+  end
+
+  def user_most_used_metacodes
+    @metacodes = current_user.most_used_metacodes.map { |id| Metacode.find(id) }
+  end
+
+  def user_recent_metacodes
+    @metacodes = current_user.recent_metacodes.map { |id| Metacode.find(id) }
+  end
+
   def invite_link
     "#{request.base_url}/join" + (current_user ? "?code=#{current_user.code}" : '')
   end
-
-  def user_unread_notification_count
-    return 0 if current_user.nil?
-    @uunc ||= current_user.mailboxer_notification_receipts.reduce(0) do |total, receipt|
-      receipt.is_read ? total : total + 1
-    end
-  end
 end

app/helpers/content_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module ContentHelper
   def resource_name
     :user

app/helpers/devise_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module DeviseHelper
   def devise_error_messages!
     resource.errors.to_a[0]

app/helpers/in_metacode_sets_helper.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
-
 module InMetacodeSetsHelper
 end

app/helpers/main_helper.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
-
 module MainHelper
 end

app/helpers/map_mailer_helper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module MapMailerHelper
-  def access_approved_subject(map)
-    map.name + ' - access approved'
-  end
-
-  def access_request_subject(map)
-    map.name + ' - request to edit'
-  end
-
-  def invite_to_edit_subject(map)
-    map.name + ' - invited to edit'
-  end
-end

app/helpers/mapping_helper.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
-
 module MappingHelper
 end

app/helpers/maps_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module MapsHelper
   # JSON autocomplete format for typeahead
   def autocomplete_map_array_json(maps)

app/helpers/metacode_sets_helper.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+module MetacodeSetsHelper
+end

app/helpers/metacodes_helper.rb

@@ -1,79 +1,3 @@
 # frozen_string_literal: true
-
 module MetacodesHelper
-  def metacodeset
-    metacodes = current_user.settings.metacodes
-
-    return false unless metacodes[0].include?('metacodeset')
-    return 'Most' if metacodes[0].sub('metacodeset-', '') == 'Most'
-    return 'Recent' if metacodes[0].sub('metacodeset-', '') == 'Recent'
-
-    MetacodeSet.find(metacodes[0].sub('metacodeset-', '').to_i)
-  end
-
-  def user_metacodes
-    @m = current_user.settings.metacodes
-    set = metacodeset
-    @metacodes = if set && set == 'Most'
-                   Metacode.where(id: current_user.most_used_metacodes).to_a
-                 elsif set && set == 'Recent'
-                   Metacode.where(id: current_user.recent_metacodes).to_a
-                 elsif set
-                   set.metacodes.to_a
-                 else
-                   Metacode.where(id: @m).to_a
-                 end
-
-    focus_code = user_metacode
-    if !focus_code.nil? && @metacodes.index { |m| m.id == focus_code.id }.nil?
-      @metacodes.push(focus_code)
-    end
-
-    @metacodes.sort! { |m1, m2| m2.name.downcase <=> m1.name.downcase }
-
-    if !focus_code.nil?
-      @metacodes.rotate!(@metacodes.index { |m| m.id == focus_code.id })
-    else
-      @metacodes.rotate!(-1)
-    end
-  end
-
-  def user_metacode
-    current_user.settings.metacode_focus ? Metacode.find(current_user.settings.metacode_focus.to_i) : nil
-  end
-
-  def user_most_used_metacodes
-    @metacodes = current_user.most_used_metacodes.map { |id| Metacode.find(id) }
-  end
-
-  def user_recent_metacodes
-    @metacodes = current_user.recent_metacodes.map { |id| Metacode.find(id) }
-  end
-
-  def metacode_sets_json
-    metacode_sets = []
-    metacode_sets << {
-      name: 'Recently Used',
-      metacodes: user_recent_metacodes
-                     .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
-    }
-    metacode_sets << {
-      name: 'Most Used',
-      metacodes: user_most_used_metacodes
-                     .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
-    }
-    metacode_sets += MetacodeSet.order('name').all.map do |set|
-      {
-        name: set.name,
-        metacodes: set.metacodes.order('name')
-                      .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
-      }
-    end
-    metacode_sets << {
-      name: 'All',
-      metacodes: Metacode.order('name').all
-                         .map { |m| { id: m.id, icon_path: asset_path(m.icon), name: m.name } }
-    }
-    metacode_sets.to_json
-  end
 end

app/helpers/synapses_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module SynapsesHelper
   ## this one is for building our custom JSON autocomplete format for typeahead
   def autocomplete_synapse_generic_json(unique)

app/helpers/topic_mailer_helper.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module TopicMailerHelper
-  def added_to_map_subject(topic, map)
-    topic.name + ' was added to map ' + map.name
-  end
-
-  def connected_subject(topic)
-    'new synapse to topic ' + topic.name
-  end
-end

app/helpers/topics_helper.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
-
 module TopicsHelper
   ## this one is for building our custom JSON autocomplete format for typeahead
   def autocomplete_array_json(topics)
     topics.map do |t|
       is_map = t.is_a?(Map)
-      metamap_metacode = Metacode.find_by(name: 'Metamap')
+      metamapMetacode = Metacode.find_by_name('Metamap')
       {
         id: t.id,
         label: t.name,
@@ -17,11 +16,11 @@ module TopicsHelper
 
         rtype: is_map ? 'map' : 'topic',
         inmaps: is_map ? [] : t.inmaps(current_user),
-        inmapsLinks: is_map ? [] : t.inmaps_links(current_user),
+        inmapsLinks: is_map ? [] : t.inmapsLinks(current_user),
-        type: is_map ? metamap_metacode.name : t.metacode.name,
+        type: is_map ? metamapMetacode.name : t.metacode.name,
-        typeImageURL: is_map ? metamap_metacode.icon : t.metacode.icon,
+        typeImageURL: is_map ? metamapMetacode.icon : t.metacode.icon,
         mapCount: is_map ? 0 : t.maps.count,
-        synapseCount: is_map ? 0 : t.synapses.count
+        synapseCount: is_map ? 0 : t.synapses.count,
       }
     end
   end

app/helpers/users_helper.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module UsersHelper
   # build custom json autocomplete for typeahead
   def autocomplete_user_array_json(users)

app/mailers/application_mailer.rb

@@ -1,31 +1,5 @@
 # frozen_string_literal: true
-
 class ApplicationMailer < ActionMailer::Base
   default from: 'team@metamaps.cc'
   layout 'mailer'
-
-  class << self
-    def mail_for_notification(notification)
-      case notification.notification_code
-      when MAP_ACCESS_REQUEST
-        request = notification.notified_object
-        MapMailer.access_request(request)
-      when MAP_ACCESS_APPROVED
-        request = notification.notified_object
-        MapMailer.access_approved(request)
-      when MAP_INVITE_TO_EDIT
-        user_map = notification.notified_object
-        MapMailer.invite_to_edit(user_map)
-      when TOPIC_ADDED_TO_MAP
-        event = notification.notified_object
-        TopicMailer.added_to_map(event, notification.recipients[0])
-      when TOPIC_CONNECTED_1
-        synapse = notification.notified_object
-        TopicMailer.connected(synapse, synapse.topic1, notification.recipients[0])
-      when TOPIC_CONNECTED_2
-        synapse = notification.notified_object
-        TopicMailer.connected(synapse, synapse.topic2, notification.recipients[0])
-      end
-    end
-  end
 end

app/mailers/map_activity_mailer.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class MapActivityMailer < ApplicationMailer
-  default from: 'team@metamaps.cc'
-
-  def daily_summary(user, map, summary_data)
-    @user = user
-    @map = map
-    @summary_data = summary_data
-    mail(to: user.email, subject: MapActivityService.subject_line(map))
-  end
-end

app/mailers/map_mailer.rb

@@ -1,24 +1,18 @@
 # frozen_string_literal: true
-
 class MapMailer < ApplicationMailer
-  include MapMailerHelper
   default from: 'team@metamaps.cc'
 
-  def access_approved(request)
+  def access_request_email(request, map)
     @request = request
-    @map = request.map
+    @map = map
-    mail(to: request.user.email, subject: access_approved_subject(@map))
+    subject = @map.name + ' - request to edit'
+    mail(to: @map.user.email, subject: subject)
   end
 
-  def access_request(request)
+  def invite_to_edit_email(map, inviter, invitee)
-    @request = request
+    @inviter = inviter
-    @map = request.map
+    @map = map
-    mail(to: @map.user.email, subject: access_request_subject(@map))
+    subject = @map.name + ' - invitation to edit'
-  end
+    mail(to: invitee.email, subject: subject)
-
-  def invite_to_edit(user_map)
-    @inviter = user_map.map.user
-    @map = user_map.map
-    mail(to: user_map.user.email, subject: invite_to_edit_subject(@map))
   end
 end

app/mailers/topic_mailer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class TopicMailer < ApplicationMailer
-  include TopicMailerHelper
-  default from: 'team@metamaps.cc'
-
-  def added_to_map(event, user)
-    @entity = event.eventable
-    @event = event
-    mail(to: user.email, subject: added_to_map_subject(@entity, event.map))
-  end
-
-  def connected(synapse, topic, user)
-    @entity = topic
-    @event = synapse
-    mail(to: user.email, subject: connected_subject(topic))
-  end
-end

app/models/access_request.rb

@@ -1,38 +1,18 @@
-# frozen_string_literal: true
-
 class AccessRequest < ApplicationRecord
   belongs_to :user
   belongs_to :map
-  has_one    :user_map
-
-  after_create :after_created_async
 
   def approve
     self.approved = true
     self.answered = true
-    save
+    self.save
-
+    UserMap.create(user: self.user, map: self.map)
-    Mailboxer::Notification.where(notified_object: self).find_each do |notification|
+    MapMailer.invite_to_edit_email(self.map, self.map.user, self.user).deliver_later
-      Mailboxer::Receipt.where(notification: notification).update_all(is_read: true)
-    end
-
-    UserMap.create(user: user, map: map, access_request: self)
   end
 
   def deny
     self.approved = false
     self.answered = true
-    save
+    self.save
-
-    Mailboxer::Notification.where(notified_object: self).find_each do |notification|
-      Mailboxer::Receipt.where(notification: notification).update_all(is_read: true)
-    end
   end
-
-  protected
-
-  def after_created_async
-    NotificationService.access_request(self)
-  end
-  handle_asynchronously :after_created_async
 end

app/models/application_record.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

app/models/attachment.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class Attachment < ApplicationRecord
-  belongs_to :attachable, polymorphic: true
-
-  has_attached_file :file,
-                    styles: lambda { |a|
-                      if a.instance.image?
-                        {
-                          thumb: 'x128#',
-                          medium: 'x320>'
-                        }
-                      else
-                        {}
-                      end
-                    }
-
-  validates_attachment_content_type :file, content_type: Attachable.allowed_types
-
-  def image?
-    Attachable.image_types.include?(file.instance.file_content_type)
-  end
-
-  def audio?
-    Attachable.audio_types.include?(file.instance.file_content_type)
-  end
-
-  def text?
-    Attachable.text_types.include?(file.instance.file_content_type)
-  end
-
-  def pdf?
-    Attachable.pdf_types.include?(file.instance.file_content_type)
-  end
-
-  def document?
-    text? || pdf?
-  end
-end

app/models/concerns/attachable.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Attachable
-  extend ActiveSupport::Concern
-
-  included do
-    has_many :attachments, as: :attachable, dependent: :destroy
-  end
-
-  def images
-    attachments.where(file_content_type: image_types)
-  end
-
-  def audios
-    attachments.where(file_content_type: audio_types)
-  end
-
-  def texts
-    attachments.where(file_content_type: text_types)
-  end
-
-  def pdfs
-    attachments.where(file_content_type: pdf_types)
-  end
-
-  def documents
-    attachments.where(file_content_type: text_types + pdf_types)
-  end
-
-  class << self
-    def image_types
-      ['image/png', 'image/gif', 'image/jpeg']
-    end
-
-    def audio_types
-      ['audio/ogg', 'audio/mp3']
-    end
-
-    def text_types
-      ['text/plain']
-    end
-
-    def pdf_types
-      ['application/pdf']
-    end
-
-    def allowed_types
-      image_types + audio_types + text_types + pdf_types
-    end
-  end
-end

app/models/concerns/routing.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Routing
   extend ActiveSupport::Concern
   include Rails.application.routes.url_helpers

app/models/event.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
-
 class Event < ApplicationRecord
-  KINDS = %w[user_present_on_map user_not_present_on_map
+  KINDS = %w(user_present_on_map conversation_started_on_map 
-             conversation_started_on_map
+               topic_added_to_map topic_moved_on_map topic_removed_from_map
-             topic_added_to_map topic_moved_on_map topic_removed_from_map
+               synapse_added_to_map synapse_removed_from_map
-             synapse_added_to_map synapse_removed_from_map
+               topic_updated synapse_updated).freeze
-             topic_updated synapse_updated].freeze
 
   belongs_to :eventable, polymorphic: true
   belongs_to :map
   belongs_to :user
 
-  scope :chronologically, (-> { order('created_at asc') })
+  scope :chronologically, -> { order('created_at asc') }
 
   after_create :notify_webhooks!, if: :map