2820 discussion forums

Gemfile

@@ -14,7 +14,7 @@ gem 'jquery-ui-sass-rails'
 gem 'savon', '~> 2.12.0'
 gem 'mysql2'
 gem 'text'
-
+gem 'thredded', '~> 1.0'
 gem "recaptcha", require: "recaptcha/rails"
 
 gem 'acts_as_list'

Gemfile.lock

@@ -84,6 +84,8 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
+    active_record_union (1.3.0)
+      activerecord (>= 4.0)
     activejob (6.0.3.2)
       activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
@@ -122,6 +124,10 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     awesome_print (1.9.2)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     bcrypt (3.1.18)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
@@ -191,6 +197,8 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
+    db_text_search (1.0.0)
+      activerecord (>= 4.1.15)
     debug_inspector (1.1.0)
     deprecation (1.1.0)
       activesupport
@@ -244,7 +252,11 @@ GEM
     hashie (5.0.0)
     highline (2.0.3)
     hodel_3000_compliant_logger (0.1.1)
+    html-pipeline (2.14.2)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
     html_tokenizer (0.0.7)
+    htmlentities (4.3.4)
     http_accept_language (2.1.1)
     httpi (2.5.0)
       rack
@@ -254,6 +266,9 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    inline_svg (1.8.0)
+      activesupport (>= 3.0)
+      nokogiri (>= 1.6)
     intercom (3.9.5)
     iso-639 (0.3.5)
     jquery-rails (4.5.0)
@@ -269,6 +284,22 @@ GEM
       railties (>= 3.1.0)
     json (2.6.2)
     jwt (2.4.1)
+    kaminari (1.2.2)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
+      actionview
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
+      activerecord
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.7.1)
@@ -297,6 +328,7 @@ GEM
     msgpack (1.5.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
+    mustache (1.1.1)
     mysql2 (0.5.4)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -332,6 +364,13 @@ GEM
     omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
+    onebox (2.2.19)
+      addressable (~> 2.8.0)
+      htmlentities (~> 4.3)
+      multi_json (~> 1.11)
+      mustache
+      nokogiri (~> 1.7)
+      sanitize
     open3 (0.1.1)
     orm_adapter (0.5.0)
     parser (3.1.2.1)
@@ -348,6 +387,8 @@ GEM
     public_suffix (4.0.7)
     puma (5.6.4)
       nio4r (~> 2.0)
+    pundit (2.2.0)
+      activesupport (>= 3.0.0)
     racc (1.6.0)
     rack (2.2.4)
     rack-contrib (2.3.0)
@@ -384,6 +425,8 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
+    rails_gravatar (1.0.4)
+      actionview
     railties (6.0.3.2)
       actionpack (= 6.0.3.2)
       activesupport (= 6.0.3.2)
@@ -402,6 +445,7 @@ GEM
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
+    rinku (2.0.6)
     rmagick (4.2.6)
     roman (0.2.0)
     rspec-core (3.11.0)
@@ -434,6 +478,9 @@ GEM
       sshkit (>= 1.2)
     safely_block (0.3.0)
       errbase (>= 0.1.1)
+    sanitize (6.0.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -474,6 +521,10 @@ GEM
     sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    sprockets-es6 (0.9.2)
+      babel-source (>= 5.8.11)
+      babel-transpiler
+      sprockets (>= 3.0.0)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -493,7 +544,29 @@ GEM
     thor (1.2.1)
     thread (0.2.2)
     thread_safe (0.3.6)
+    thredded (1.0.1)
+      active_record_union (>= 1.3.0)
+      autoprefixer-rails
+      db_text_search
+      friendly_id
+      html-pipeline
+      htmlentities
+      inline_svg (>= 1.6.0)
+      kaminari
+      kramdown (>= 2.0.0)
+      kramdown-parser-gfm
+      nokogiri
+      onebox (>= 1.8.99)
+      pundit (>= 1.1.0)
+      rails (>= 5.2.0, != 6.0.0.rc2)
+      rails_gravatar
+      rinku
+      sanitize
+      sassc-rails (>= 2.0.0)
+      sprockets-es6
+      timeago_js (>= 3.0.2.2)
     tilt (2.0.11)
+    timeago_js (3.0.2.2)
     tins (1.31.1)
       sync
     tzinfo (1.2.10)
@@ -600,6 +673,7 @@ DEPENDENCIES
   slim
   stackprof
   text
+  thredded (~> 1.0)
   uglifier
   user_agent_parser
   vcr

app/assets/javascripts/application.js

@@ -11,12 +11,12 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
-//= require jquery_ujs
 //= require jquery.ui.all
 //= require_tree ./plugins
 //= require user.js
 //= require handsontable.full.min
 //= require datatables.min
+//= require thredded
 
 ;(function($, window, document, undefined) {
 

app/assets/stylesheets/application.scss

@@ -1,5 +1,7 @@
 @import "base/ftp_color_scheme";
 
+
+
 // ---------------------------
 // TYPOGRAPHY
 // ---------------------------
@@ -134,6 +136,125 @@ $gapSize:                   20px;
   margin-top: 10px;
 }
 
+
+$thredded-base-font-family: $fontFamily;
+$thredded-heading-font-family: $fontFamilyHead;
+
+$thredded-base-font-size: $fontSize;
+$thredded-font-size-small: $fontSizeSmall;
+$thredded-base-line-height: $lineHeight;
+
+$thredded-heading-line-height: $lineHeight;
+
+// $widthMax was in px
+$thredded-grid-container-max-width: 90rem;
+
+
+$thredded-button-background: $btnBackground;
+$thredded-button-color: $btnColor;
+$thredded-button-hover-background: darken($thredded-button-background, 15%) !default;
+$thredded-button-hover-color: $thredded-button-color !default;
+
+$thredded-button-light-background: lighten($thredded-button-background, 35%) !default;
+$thredded-button-light-color: darken($thredded-button-background, 15%) !default;
+$thredded-button-light-hover-background: darken($thredded-button-light-background, 15%) !default;
+$thredded-button-light-hover-color: darken($thredded-button-light-color, 15%) !default;
+
+
+$thredded-button-border-radius: $btnBorderRadius;
+$thredded-button-font-family: $btnFontFamily;
+$thredded-button-font-size: $btnFontSize;
+$thredded-button-font-weight: $btnFontWeight;
+$thredded-button-line-height: 1 !default;
+
+$thredded-messageboards-grid-item-border-color: rgba(#000, 0.15);
+
+$thredded-messageboard-title-font-size: $fontSize;
+$thredded-topic-header-font-size: $fontSize;
+$thredded-topic-header-font-size-tablet-and-up: $fontSize;
+
+
+@import "thredded";
+
+// ---------------------------
+// Thredded Overrides
+// ---------------------------
+
+
+
+.thredded--main-container {
+  // The padding and max-width are handled by the app's container.
+  max-width: none;
+  padding: 0;
+  @include thredded-media-tablet-and-up {
+    padding: 0;
+  }
+}
+
+
+.thredded--post--content {
+  font-size: $fontSize;
+  line-height: $lineHeight;
+  // TODO?
+  word-break: break-word;
+  a {
+    @extend %thredded--link;
+  }
+  p {
+    @extend %thredded--paragraph;
+  }
+  hr {
+    @extend %thredded--hr;
+  }
+  img {
+    max-width: 100%;
+    height: auto;
+  }
+  table {
+    @extend %thredded--table;
+  }
+  blockquote {
+    @extend %thredded--blockquote;
+  }
+  pre {
+    overflow-x: auto;
+  }
+}
+
+.thredded--topic-header--follow-info {
+  @include thredded-media-desktop-and-up {
+    max-width: 35rem;
+  }
+}
+
+
+.thredded--topics--title {
+  @extend %thredded--heading;
+  display: inline;
+  font-size: $fontSize;
+  line-height: $lineHeight;
+}
+
+
+.thredded--main-navigation { 
+//  display: none; 
+}
+
+
+
+// our h3 are h1 in Thredded
+h1, .thredded--topic-header--title {
+  color: $fgH3;
+  font-size: $fontSizeH3;
+}
+
+// our h5 are h3 in Thredded
+h3, .thredded--post-form--title {
+  color: $fgH5;
+  font-size: $fontSizeH5;
+}
+
+
 @import "datepicker/datepicker";
 @import "jquery.ui.all";
 @import "handsontable.min"

app/assets/stylesheets/components/shared.scss

@@ -1085,6 +1085,10 @@ button, .button, .dropdown dd a {
   }
 }
 
+.comment-bubble {
+  display: flow-root;
+  width: 70%;
+}
 
 // ---------------------------
 // VERSION COMPARE

app/controllers/admin_controller.rb

@@ -274,6 +274,10 @@ def downgrade
     redirect_back fallback_location: { action: 'user_list' }, notice: t('.user_downgraded_successfully')
   end
 
+  def moderation
+    @collections = Collection.where(messageboards_enabled:true)
+  end
+
   private
 
   def user_params