diff --git a/.gitignore b/.gitignore index cc3dcc5..9751143 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ capybara-*.html debug.png scripts coderwall.com-* + +public/assets diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 197c4d5..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.4.0 diff --git a/Gemfile b/Gemfile index 583f228..90eefbc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,21 +1,21 @@ source 'https://rubygems.org' -ruby "2.4.0" +ruby "2.7.8" -gem 'active_model_serializers', '~> 0.9.4' -gem 'bcrypt', '~> 3.1.7' +gem 'active_model_serializers' +gem 'bcrypt' gem 'browser' gem 'bugsnag' gem 'capybara' gem 'carrierwave-aws' gem 'carrierwave_backgrounder' gem 'clearance' -gem 'coffee-rails', '~> 4.1.0' +gem 'coffee-rails' gem 'connection_pool' gem 'dalli' gem 'excon' gem 'faraday' gem 'friendly_id' -gem 'green_monkey' +# gem 'green_monkey' gem 'haml-rails' gem 'icalendar' gem 'invisible_captcha' @@ -28,8 +28,8 @@ gem 'mailgun-ruby' gem 'meta-tags' gem 'mini_magick' gem 'mini_racer' -gem 'nokogiri', '~> 1.10.8' -gem 'pg', '~> 0.15' +gem 'nokogiri' +gem 'pg', '~> 0.18' gem 'poltergeist' gem 'puma' gem 'puma_worker_killer' @@ -38,20 +38,20 @@ gem 'rack-cors' gem 'rack-mini-profiler', require: false gem 'rack-ssl-enforcer' # gem 'rack-timeout' # causing memory issues -gem 'rails', '~> 5.0.2' +gem 'rails', '~> 5.0.7.2' gem 'rails_stdout_logging', group: [:development, :production] -gem 'react_on_rails' -gem 'redcarpet', ">=3.3.4" -gem 'sass-rails', '~> 5.0' -gem 'skylight' +# gem 'react_on_rails' +gem 'redcarpet' #, ">=3.3.4" +# gem 'sass-rails', '~> 5.0' +# gem 'sassc-ruby' +gem "sassc-rails" +# gem 'skylight' gem 'stripe' gem 'turbolinks' -gem 'uglifier', '>= 1.3.0' +gem 'uglifier' #, '>= 1.3.0' # Legacy gems needed for porting, can remove soon -gem 'sequel' gem 'redis' -gem 'reverse_markdown' group :development, :test do gem 'byebug' @@ -78,6 +78,3 @@ group :development do gem 'web-console' end -group :production do - gem 'rails_12factor' -end diff --git a/Gemfile.lock b/Gemfile.lock index 63ba1e4..968b47a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,153 +1,177 @@ GEM remote: https://rubygems.org/ specs: - acme-client (0.3.7) + acme-client (0.6.3) faraday (~> 0.9, >= 0.9.1) - json-jwt (~> 1.2, >= 1.2.3) - actioncable (5.0.7) - actionpack (= 5.0.7) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7) - actionview (= 5.0.7) - activesupport (= 5.0.7) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7) - activesupport (= 5.0.7) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.9.4) - activemodel (>= 3.2) - activejob (5.0.7) - activesupport (= 5.0.7) + active_model_serializers (0.10.14) + actionpack (>= 4.1) + activemodel (>= 4.1) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) globalid (>= 0.3.6) - activemodel (5.0.7) - activesupport (= 5.0.7) - activerecord (5.0.7) - activemodel (= 5.0.7) - activesupport (= 5.0.7) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) arel (~> 7.0) - activesupport (5.0.7) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) - aes_key_wrap (1.0.1) + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) arel (7.1.4) - ast (2.3.0) - aws-sdk (2.9.28) - aws-sdk-resources (= 2.9.28) - aws-sdk-core (2.9.28) - aws-sigv4 (~> 1.0) - jmespath (~> 1.0) - aws-sdk-resources (2.9.28) - aws-sdk-core (= 2.9.28) - aws-sigv4 (1.0.0) - bcrypt (3.1.11) - benchmark-ips (2.7.2) - bindata (2.4.4) - bindex (0.5.0) - blankslate (3.1.3) - browser (2.4.0) - bugsnag (5.3.2) + argon2 (2.3.0) + ffi (~> 1.15) + ffi-compiler (~> 1.0) + ast (2.4.2) + aws-eventstream (1.3.0) + aws-partitions (1.885.0) + aws-sdk-core (3.191.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.2.0) + bcrypt (3.1.20) + benchmark-ips (2.13.0) + bindex (0.8.1) + browser (5.3.1) + bugsnag (6.26.3) + concurrent-ruby (~> 1.0) builder (3.2.4) - byebug (9.0.6) - capybara (2.14.0) + byebug (11.1.3) + capybara (3.39.2) addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - carrierwave (0.11.2) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) - mime-types (>= 1.16) + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + carrierwave (2.1.1) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) mimemagic (>= 0.3.0) - carrierwave-aws (1.1.0) - aws-sdk (~> 2.0) - carrierwave (>= 0.7, < 2.0) - carrierwave_backgrounder (0.4.2) - carrierwave (~> 0.5) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - clearance (1.16.1) - bcrypt - email_validator (~> 1.4) - rails (>= 3.1) + mini_mime (>= 0.1.3) + ssrf_filter (~> 1.0) + carrierwave-aws (1.6.0) + aws-sdk-s3 (~> 1.0) + carrierwave (>= 2.0, < 4) + carrierwave_backgrounder (0.4.3) + carrierwave (>= 0.5, < 2.2) + case_transform (0.2) + activesupport + clearance (2.6.2) + actionmailer (>= 5.0) + activemodel (>= 5.0) + activerecord (>= 5.0) + argon2 (~> 2.0, >= 2.0.2) + bcrypt (>= 3.1.1) + email_validator (~> 2.0) + railties (>= 5.0) cliver (0.3.2) - coffee-rails (4.1.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.6) - connection_pool (2.2.1) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) crass (1.0.6) - dalli (2.7.6) + dalli (3.2.7) + base64 + date (3.3.4) + dead_end (4.0.0) derailed (0.1.0) derailed_benchmarks - derailed_benchmarks (1.6.0) + derailed_benchmarks (2.1.2) benchmark-ips (~> 2) + dead_end get_process_mem (~> 0) heapy (~> 0) - memory_profiler (~> 0) + memory_profiler (>= 0, < 2) + mini_histogram (>= 0.3.0) rack (>= 1) + rack-test rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) - domain_name (0.5.20170404) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.1) - dotenv-rails (2.2.1) - dotenv (= 2.2.1) - railties (>= 3.2, < 5.2) - email_validator (1.6.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) + railties (>= 3.2) + email_validator (2.2.4) activemodel erubis (2.7.0) - excon (0.71.0) - execjs (2.7.0) - fabrication (2.16.1) + excon (0.109.0) + execjs (2.9.1) + fabrication (2.30.0) fabrication-rails (0.0.1) fabrication railties (>= 3.0) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) - faker (1.7.3) - i18n (~> 0.5) - faraday (0.12.1) + faker (3.2.3) + i18n (>= 1.8.11, < 2) + faraday (0.17.6) multipart-post (>= 1.2, < 3) - ffi (1.12.2) - friendly_id (5.2.1) + ffi (1.16.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + friendly_id (5.5.1) activerecord (>= 4.0.0) - get_process_mem (0.2.5) + get_process_mem (0.2.7) ffi (~> 1.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - green_monkey (0.3.0) - chronic_duration - haml (>= 3.1.0) - mida_vocabulary (>= 0.2.2) - haml (5.0.1) + globalid (1.1.0) + activesupport (>= 5.0) + haml (5.2.2) temple (>= 0.8.0) tilt haml-rails (1.0.0) @@ -156,219 +180,242 @@ GEM haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - heapy (0.1.4) - html2haml (2.2.0) + heapy (0.2.0) + thor + html2haml (2.3.0) erubis (~> 2.7.0) - haml (>= 4.0, < 6) + haml (>= 4.0) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-cookie (1.0.3) + http-accept (1.7.0) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (0.9.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) - icalendar (2.4.1) - invisible_captcha (0.9.2) - rails (>= 3.2.0) - jbuilder (2.6.4) - activesupport (>= 3.0.0) - multi_json (>= 1.2) - jmespath (1.3.1) - json (2.1.0) - json-jwt (1.11.0) - activesupport (>= 4.2) - aes_key_wrap - bindata - kaminari (1.2.1) + icalendar (2.10.1) + ice_cube (~> 0.16) + ice_cube (0.16.4) + image_processing (1.12.2) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) + invisible_captcha (2.0.0) + rails (>= 5.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) + activesupport (>= 5.0.0) + jmespath (1.6.2) + json (2.7.1) + jsonapi-renderer (0.2.2) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + 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.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) - launchy (2.4.3) - addressable (~> 2.3) - letsencrypt_plugin (0.0.9) - acme-client (~> 0.3.0) - rails (>= 4.2, < 5.1) - letter_opener (1.4.1) - launchy (~> 2.2) - libv8 (6.7.288.46.1) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + language_server-protocol (3.17.0.3) + launchy (2.5.2) + addressable (~> 2.8) + letsencrypt_plugin (0.0.12) + acme-client (~> 0.6.2) + rails (>= 4.2) + letter_opener (1.8.1) + launchy (>= 2.2, < 3) + libv8-node (16.19.0.1) license-list (1.0.1) rails (>= 3.2) - lograge (0.5.1) - actionpack (>= 4, < 5.2) - activesupport (>= 4, < 5.2) - railties (>= 4, < 5.2) - loofah (2.5.0) + lograge (0.14.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - mailgun-ruby (1.1.6) - rest-client (~> 2.0) - memory_profiler (0.9.14) - meta-tags (2.4.1) - actionpack (>= 3.2.0, < 5.2) - method_source (0.9.2) - mida_vocabulary (0.2.2) - blankslate (~> 3.1) - mime-types (3.1) + net-imap + net-pop + net-smtp + mailgun-ruby (1.2.13) + rest-client (>= 2.0.2) + matrix (0.4.2) + memory_profiler (1.0.1) + meta-tags (2.19.0) + actionpack (>= 3.2.0, < 7.2) + method_source (1.0.0) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_magick (4.7.0) - mini_mime (1.0.0) - mini_portile2 (2.4.0) - mini_racer (0.2.0) - libv8 (>= 6.3) - minitest (5.14.1) - multi_json (1.14.1) - multipart-post (2.0.0) + mime-types-data (3.2023.1205) + mimemagic (0.4.3) + nokogiri (~> 1) + rake + mini_histogram (0.3.1) + mini_magick (4.12.0) + mini_mime (1.1.5) + mini_portile2 (2.8.5) + mini_racer (0.6.4) + libv8-node (~> 16.19.0.0) + minitest (5.21.2) + multi_json (1.15.0) + multipart-post (2.3.0) + net-imap (0.4.9.1) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0.1) + net-protocol netrc (0.11.0) - nio4r (2.3.1) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) - numerizer (0.1.1) - parallel (1.11.2) - parser (2.4.0.0) - ast (~> 2.2) - pg (0.20.0) - poltergeist (1.15.0) - capybara (~> 2.1) + nio4r (2.7.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + parallel (1.24.0) + parser (3.3.0.5) + ast (~> 2.4.1) + racc + pg (0.21.0) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.1) - public_suffix (2.0.5) - puma (3.12.4) - puma_worker_killer (0.1.0) + public_suffix (5.0.4) + puma (6.4.2) + nio4r (~> 2.0) + puma_worker_killer (0.3.1) get_process_mem (~> 0.2) - puma (>= 2.7, < 4) - pusher (1.3.1) - httpclient (~> 2.7) - multi_json (~> 1.0) + puma (>= 2.7) + pusher (2.0.3) + httpclient (~> 2.8) + multi_json (~> 1.15) pusher-signature (~> 0.1.8) pusher-signature (0.1.8) - rack (2.2.2) - rack-cors (1.0.5) - rack (>= 1.6.0) - rack-mini-profiler (0.10.5) + racc (1.7.3) + rack (2.2.8) + rack-cors (2.0.1) + rack (>= 2.0.0) + rack-mini-profiler (3.3.0) rack (>= 1.2.0) rack-ssl-enforcer (0.2.9) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.7) - actioncable (= 5.0.7) - actionmailer (= 5.0.7) - actionpack (= 5.0.7) - actionview (= 5.0.7) - activejob (= 5.0.7) - activemodel (= 5.0.7) - activerecord (= 5.0.7) - activesupport (= 5.0.7) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) bundler (>= 1.3.0) - railties (= 5.0.7) + railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - rails_12factor (0.0.3) - rails_serve_static_assets - rails_stdout_logging - rails_serve_static_assets (0.0.5) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails_stdout_logging (0.0.5) - railties (5.0.7) - actionpack (= 5.0.7) - activesupport (= 5.0.7) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake - rake (13.0.1) - react_on_rails (8.0.1) - addressable + rainbow (3.1.1) + rake (13.1.0) + redcarpet (3.6.0) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.1) connection_pool - execjs (~> 2.5) - rails (>= 3.2) - rainbow (~> 2.1) - redcarpet (3.4.0) - redis (3.3.3) - rest-client (2.0.2) + regexp_parser (2.9.0) + request_store (1.5.1) + rack (>= 1.4) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (1.0.3) - nokogiri - rubocop (0.49.1) + rexml (3.2.6) + rubocop (1.60.2) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - ruby-statistics (2.1.1) - ruby_parser (3.9.0) - sexp_processor (~> 4.1) - sass (3.4.24) - 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) - sequel (4.47.0) - sexp_processor (4.9.0) - shoulda (3.5.0) - shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (>= 1.4.1, < 3.0) - shoulda-context (1.2.2) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - skylight (1.5.1) - activesupport (>= 3.0.0) - spring (2.0.2) - activesupport (>= 4.2) - sprockets (3.7.2) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) + ruby-statistics (3.0.2) + ruby-vips (2.2.0) + ffi (~> 1.12) + ruby_parser (3.21.0) + racc (~> 1.5) + sexp_processor (~> 4.16) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + sexp_processor (4.17.1) + shoulda (4.0.0) + shoulda-context (~> 2.0) + shoulda-matchers (~> 4.0) + shoulda-context (2.0.0) + shoulda-matchers (4.5.1) + activesupport (>= 4.2.0) + spring (4.1.3) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) + rack (>= 2.2.4, < 4) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - stripe (2.11.0) - faraday (~> 0.9) - temple (0.8.0) - thor (1.0.1) + ssrf_filter (1.1.2) + stripe (10.6.0) + temple (0.10.3) + thor (1.3.0) thread_safe (0.3.6) - tilt (2.0.7) - timecop (0.8.1) - traceroute (0.5.0) + tilt (2.3.0) + timecop (0.9.8) + timeout (0.4.1) + traceroute (0.8.1) rails (>= 3.0.0) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.7) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.11) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.4) - unicode-display_width (1.2.1) - web-console (3.5.1) + unicode-display_width (2.5.0) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) @@ -376,15 +423,15 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - active_model_serializers (~> 0.9.4) - bcrypt (~> 3.1.7) + active_model_serializers + bcrypt browser bugsnag byebug @@ -392,7 +439,7 @@ DEPENDENCIES carrierwave-aws carrierwave_backgrounder clearance - coffee-rails (~> 4.1.0) + coffee-rails connection_pool dalli derailed @@ -403,7 +450,6 @@ DEPENDENCIES faker faraday friendly_id - green_monkey haml-rails icalendar invisible_captcha @@ -417,8 +463,8 @@ DEPENDENCIES meta-tags mini_magick mini_racer - nokogiri (~> 1.10.8) - pg (~> 0.15) + nokogiri + pg (~> 0.18) poltergeist puma puma_worker_killer @@ -426,30 +472,25 @@ DEPENDENCIES rack-cors rack-mini-profiler rack-ssl-enforcer - rails (~> 5.0.2) + rails (~> 5.0.7.2) rails-controller-testing - rails_12factor rails_stdout_logging - react_on_rails - redcarpet (>= 3.3.4) + redcarpet redis - reverse_markdown rubocop - sass-rails (~> 5.0) - sequel + sassc-rails shoulda shoulda-matchers - skylight spring stripe timecop traceroute turbolinks - uglifier (>= 1.3.0) + uglifier web-console RUBY VERSION - ruby 2.4.0p0 + ruby 2.7.8p225 BUNDLED WITH - 1.16.3 + 2.4.22 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/javascripts/application_static.js b/app/assets/javascripts/application_static.js index 8af488d..d14178f 100644 --- a/app/assets/javascripts/application_static.js +++ b/app/assets/javascripts/application_static.js @@ -5,8 +5,5 @@ // These assets are located in app/assets/webpack directory -//= require vendor-bundle -//= require app-bundle - // Non-webpack assets incl turbolinks //= require application_non_webpack diff --git a/app/assets/stylesheets/basscss/_btn.scss b/app/assets/stylesheets/basscss/_btn.scss index 88fc3c8..6ec05f5 100644 --- a/app/assets/stylesheets/basscss/_btn.scss +++ b/app/assets/stylesheets/basscss/_btn.scss @@ -56,7 +56,6 @@ $border-radius: 3px !default; $border-color: $darken-2 !default; $button-font-family: inherit !default; $button-font-size: inherit !default; -$button-font-weight: $bold-font-weight /* Fallback value: bold */ !default; $button-line-height: 1.125rem !default; $button-padding-y: .5rem !default; $button-padding-x: 1rem !default; diff --git a/app/assets/stylesheets/content.scss b/app/assets/stylesheets/content.scss index 892b7a8..f3f593b 100644 --- a/app/assets/stylesheets/content.scss +++ b/app/assets/stylesheets/content.scss @@ -1,15 +1,11 @@ .content{ - font-size: $font-lg; line-height: 25px; &.small{ - font-size: $body-font-size !important; - line-height: $line-height !important; } a { word-break: break-all; - color: $blue !important; } img{ @@ -17,8 +13,6 @@ display: block; margin: 0 auto; text-align: center; - padding-top: $space-1; - padding-bottom: $space-3; } strong { @@ -26,10 +20,8 @@ } hr { - margin-bottom: $space-2; border: 0; height: 2px; - background-color: $border-color; } em { @@ -39,9 +31,6 @@ pre { background-color: rgba(250,250,250,0.7); - margin-left: -$space-2; - margin-right: -$space-2; - padding: $space-2; code{ font-size: 13px; @@ -52,12 +41,10 @@ code { // white-space:nowrap; a { - color: $black; } } p { - margin-bottom: $space-2; &:last-child { margin-bottom: 0; @@ -65,24 +52,17 @@ } h1, h2, h3, h4 { - padding-top: $space-3; - margin-top: $space-1; - margin-bottom: $space-2; &:first-child { padding-top: 0; margin-top: 0; } - font-size: $font-lg; a { - color: $black; } } blockquote { - padding-left: $space-1; - margin-bottom: $space-2; p { margin: 0; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b7d90d1..654218f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base - include ReactOnRails::Controller + # include ReactOnRails::Controller include Clearance::Controller # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. diff --git a/app/models/article.rb b/app/models/article.rb index d4b7673..16a30e1 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -7,7 +7,6 @@ class Article < ApplicationRecord friendly_id :slug_format, :use => :slugged paginates_per 40 - html_schema_type :TechArticle BIG_BANG = Time.parse("05/07/2012").to_i #date protips were launched before_update :cache_calculated_score! diff --git a/app/models/comment.rb b/app/models/comment.rb index 5b61e42..a478cff 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,7 +1,6 @@ class Comment < ApplicationRecord include TimeAgoInWordsCacheBuster paginates_per 10 - html_schema_type :Comment VIDEO_LAG = 25.seconds # TODO: measure the real lag value diff --git a/app/models/user.rb b/app/models/user.rb index debe875..38f7e2a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,7 +1,6 @@ class User < ApplicationRecord include Clearance::User - html_schema_type :Person mount_uploader :avatar, AvatarUploader before_create :generate_unique_color diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 99b0d62..095361e 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -1,8 +1,6 @@ - cache ['v3', comment, current_user_can_edit?(comment)] do - style ||= :large .inline-block.py1.mb1[comment]{class: ('border-top' if style != :small), style: 'width: 100%'} - .hide= time_tag comment.created_at, itemprop: "datePublished" - .hide[:name]= comment.id .left.mt1.mr2.avatar.small{style:"background-color: #{comment.user.color};"} =avatar_url_tag(comment.user) @@ -19,7 +17,3 @@ · = button_to comment_path(comment), method: :delete, data: { confirm: "Are you sure you want to delete your comment?" }, form_class: "inline plain" do = icon('trash') - · - = react_component 'HeartButton', props: { heartableId: comment.dom_id, - href: comment_likes_path(comment), labels: ['',''] }, - html_options: { style: "display:inline-block" } diff --git a/app/views/job_subscriptions/new.html.haml b/app/views/job_subscriptions/new.html.haml index f7c12ac..4912ac4 100644 --- a/app/views/job_subscriptions/new.html.haml +++ b/app/views/job_subscriptions/new.html.haml @@ -20,8 +20,6 @@ -@subscription.errors.full_messages.each do |error| %p.red.bold=error - = react_component 'NewJobSubscription', props: { stripePublishable: ENV['STRIPE_PUBLISHABLE_KEY'], cost: JobSubscription::CENTS_PER_MONTH } - .mt2.diminish Coderwall securely accepts all major credit cards. diff --git a/app/views/jobs/new.html.haml b/app/views/jobs/new.html.haml index 30048be..606a8f6 100644 --- a/app/views/jobs/new.html.haml +++ b/app/views/jobs/new.html.haml @@ -16,8 +16,6 @@ -@job.errors.full_messages.each do |error| %p.red.bold=error - = react_component 'NewJob', props: { stripePublishable: ENV['STRIPE_PUBLISHABLE_KEY'], cost: Job::CENTS_PER_MONTH } - .mt2.diminish Coderwall securely accepts all major credit cards. diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ed8f2fe..56850f9 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -4,9 +4,8 @@ %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"} %meta{property: 'current_user:id', content: current_user.try(:id)} = display_meta_tags(default_meta_tags) - = env_stylesheet_link_tag(static: 'application_static', hot: 'application_non_webpack', media: 'all', 'data-turbolinks-track' => 'reload') - = env_javascript_include_tag(hot: ['http://localhost:3500/vendor-bundle.js', 'http://localhost:3500/app-bundle.js']) - = env_javascript_include_tag(static: 'application_static', hot: 'application_non_webpack', 'data-turbolinks-track' => 'reload') + = stylesheet_link_tag('application_static', media: 'all', 'data-turbolinks-track' => 'reload') + = javascript_include_tag('application_static', 'data-turbolinks-track' => 'reload') = javascript_include_tag 'https://content.jwplatform.com/libraries/pEaCoeG7.js' = csrf_meta_tags = render 'shared/analytics' @@ -39,5 +38,5 @@ %a.inline-block.mr1{href: tos_path} Terms %p.inline-block.diminish.inline.mr1="Copyright #{Time.now.strftime('%Y')}" - = redux_store("store", props: store_data) if store_data + -# = redux_store("store", props: store_data) if store_data -# gdpr disabled render 'shared/tracking' diff --git a/app/views/pages/styleguide.html.erb b/app/views/pages/styleguide.html.erb index 95952f2..cc8f666 100644 --- a/app/views/pages/styleguide.html.erb +++ b/app/views/pages/styleguide.html.erb @@ -1,12 +1,8 @@