Changes to gems and syntax

Author: AlyHKafoury

Gemfile

@@ -13,8 +13,9 @@ gem 'json'
 gem 'jbuilder'
 gem 'bcrypt-ruby', '~> 3.1.2'
 
-gem 'doorkeeper', '~> 1.4.1'
+gem 'doorkeeper', '~> 4.3.2'
 gem 'omniauth', '~> 1.8.1'
+gem 'omniauth-identity'
 
 gem 'figaro'
 gem 'hashie'
@@ -40,12 +41,13 @@ gem 'pusher'
 gem 'eventmachine', '~> 1.0.4'
 gem 'em-websocket', '~> 0.5.1'
 
-gem 'simple_form', '~> 3.5.1'
+gem 'simple_form', '~> 4.0.1'
 gem 'slim-rails'
 gem 'sass-rails', '~> 5.0.7'
 gem 'coffee-rails'
 gem 'uglifier'
 gem "jquery-rails"
+gem 'simple_form_extension'
 gem "angularjs-rails"
 gem 'bootstrap-sass', '~> 3.2.0.2'
 gem 'bootstrap-wysihtml5-rails'

Gemfile.lock

@@ -137,9 +137,15 @@ GEM
     debug_inspector (0.0.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.3)
-    doorkeeper (1.4.2)
-      railties (>= 3.1)
+    doorkeeper (4.3.2)
+      railties (>= 4.2)
     dotenv (2.5.0)
     dotenv-rails (2.5.0)
       dotenv (= 2.5.0)
@@ -276,7 +282,11 @@ GEM
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
+    omniauth-identity (1.1.1)
+      bcrypt-ruby (~> 3.0)
+      omniauth (~> 1.0)
     open4 (1.3.4)
+    orm_adapter (0.5.0)
     paper_trail (9.2.0)
       activerecord (>= 4.2, < 5.3)
       paper_trail-association_tracking (< 2)
@@ -346,6 +356,10 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rbtree (0.4.2)
+    redactor-rails (0.5.0)
+      devise
+      mime-types
+      orm_adapter
     redis (4.0.1)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
@@ -365,6 +379,9 @@ GEM
       redis (>= 2.2, < 5)
     request_store (1.4.1)
       rack (>= 1.4)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rest-client (1.6.9)
       mime-types (~> 1.16)
     rotp (3.3.1)
@@ -400,16 +417,22 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    selectize-rails (0.12.5)
     selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
     simple_captcha2 (0.4.3)
       rails (>= 4.1)
-    simple_form (3.5.1)
-      actionpack (> 4, < 5.2)
-      activemodel (> 4, < 5.2)
+    simple_form (4.0.1)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
+    simple_form_extension (1.4.12)
+      rails (>= 3.1)
+      redactor-rails
+      selectize-rails
+      simple_form
     slim (3.0.9)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
@@ -445,6 +468,8 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    warden (1.2.7)
+      rack (>= 1.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -479,7 +504,7 @@ DEPENDENCIES
   daemons-rails
   database_cleaner
   datagrid
-  doorkeeper (~> 1.4.1)
+  doorkeeper (~> 4.3.2)
   dotenv-rails
   easy_table
   eco
@@ -511,6 +536,7 @@ DEPENDENCIES
   momentjs-rails
   mysql2 (~> 0.3.21)
   omniauth (~> 1.8.1)
+  omniauth-identity
   paper_trail (~> 9.2.0)
   paranoid2
   phonelib (~> 0.3.5)
@@ -532,7 +558,8 @@ DEPENDENCIES
   selenium-webdriver
   shoulda-matchers
   simple_captcha2
-  simple_form (~> 3.5.1)
+  simple_form (~> 4.0.1)
+  simple_form_extension
   slim-rails
   test-unit
   timecop

app/assets/stylesheets/application.css.scss

@@ -1,5 +1,5 @@
 @import "bourbon";
-
+@import "simple_form_extension";
 @import 'vars/bootstrap';
 
 @import 'bootstrap';

app/models/deposit.rb

@@ -4,7 +4,6 @@ class Deposit < ActiveRecord::Base
   extend Enumerize
 
   include AASM
-  include AASM::Locking
   include Currencible
 
   has_paper_trail on: [:update, :destroy]

app/models/withdraw.rb

@@ -6,7 +6,6 @@ class Withdraw < ActiveRecord::Base
   extend Enumerize
 
   include AASM
-  include AASM::Locking
   include Currencible
 
   has_paper_trail on: [:update, :destroy]

config/application.rb

@@ -1,11 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require 'rails/all'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -28,7 +23,6 @@ class Application < Rails::Application
     config.i18n.available_locales = ['en', 'zh-CN', 'ko']
 
     config.autoload_paths += %W(#{config.root}/lib #{config.root}/lib/extras)
-
     #config.assets.precompile += ['bootstrap-datetimepicker.css']
     config.assets.initialize_on_precompile = true
 

config/environments/production.rb

@@ -93,6 +93,4 @@
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
   config.active_record.default_timezone = :local
-
-  config.middleware.insert_before Rack::Runtime, Middleware::Security
 end

config/initializers/assets.rb

@@ -2,6 +2,7 @@
 
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.precompile += %w( html5.js market.css market.js )
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path

config/locales/simple_form.en.yml

@@ -0,0 +1,31 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+    # include_blanks:
+    #   defaults:
+    #     age: 'Rather not say'
+    # prompts:
+    #   defaults:
+    #     age: 'Select your age'