Migration to WebPack 3

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "stage-2"]
+}

.gitignore

@@ -4,6 +4,11 @@
 .DS_Store?
 Thumbs.db
 
+node_modules
+public/bundles
+webpack-assets.json
+gems-assets-webpack-bridge.json
+
 db/REDIS/
 db/SPHINX/
 config/ENV/*

Gemfile

@@ -8,6 +8,8 @@ gem 'puma', '3.11.2'
 gem 'newrelic_rpm'
 gem 'exception_notification'
 
+gem 'gems_assets_webpack_bridge'
+
 # Datebase
 gem 'pg', '0.19.0'
 gem 'mysql2', '~> 0.3.18'
@@ -47,9 +49,10 @@ gem 'role_block_haml'
 gem 'kaminari'
 
 gem 'sass', '~> 3.4.1'
-gem 'font-awesome-sass'
+# gem 'font-awesome-sass' 4.1.0
+# gem 'bootstrap-sass', github: 'twbs/bootstrap-sass', 3.2.0.1
 gem 'sass-rails',     github: 'rails/sass-rails'
-gem 'bootstrap-sass', github: 'twbs/bootstrap-sass'
+
 gem 'compass-rails',  github: 'Compass/compass-rails'
 
 gem 'autoprefixer-rails'

Gemfile.lock

@@ -37,13 +37,6 @@ GIT
     the_sortable_tree (2.5.0)
       rails (>= 3.1)
 
-GIT
-  remote: git://github.com/twbs/bootstrap-sass.git
-  revision: 54317e5c02a4915e7a5def3a3e94cc2738a51ed3
-  specs:
-    bootstrap-sass (3.2.0.1)
-      sass (~> 3.2)
-
 PATH
   remote: X_GEMS/crop_tool
   specs:
@@ -333,11 +326,10 @@ GEM
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
-    font-awesome-sass (4.1.0)
-      sass (~> 3.2)
     foreman (0.82.0)
       thor (~> 0.19.1)
     fspath (3.0.3)
+    gems_assets_webpack_bridge (0.9.1)
     gibbon (1.1.5)
       httparty
       multi_json (>= 1.9.0)
@@ -596,7 +588,6 @@ DEPENDENCIES
   awesome_nested_set!
   better_errors
   binding_of_caller
-  bootstrap-sass!
   browser
   coffee-rails
   colorize
@@ -607,9 +598,9 @@ DEPENDENCIES
   exception_notification
   factory_girl
   faker
-  font-awesome-sass
   foreman
   friendly_id_pack!
+  gems_assets_webpack_bridge
   gibbon
   haml
   image_optim

X_GEMS/protozaur/app/assets/stylesheets/ptz/base.css.sass

@@ -102,4 +102,4 @@ noscript
   padding: 5px
 
   color: white
-  font-size: 20px
+  font-size: 20px

X_GEMS/protozaur/app/assets/stylesheets/ptz/framework.css.scss

@@ -102,4 +102,4 @@ $i: 100;
 
 // LETTER SPACING
 .ls0{ letter-spacing: 0 }
-.lsn{ letter-spacing: normal }
+.lsn{ letter-spacing: normal }

X_GEMS/rails_shop/app/assets/javascripts/rails_shop/application.js

@@ -0,0 +1,26 @@
+import '@jquery'
+import '@jquery-ujs'
+import '@toastr'
+
+import '@log_js-scripts/log_js'
+import '@role_slim_js-scripts/jquery.data-role-selector'
+
+import '@notifications-scripts/notifications'
+
+import '@crop_tool-scripts/crop_tool/crop_tool'
+import '@crop_tool-scripts/crop_tool/jcrop/jquery.Jcrop'
+
+import '../vendors/custom_select/custom_select'
+
+import './main_image'
+import './products_edit'
+import './delivery_types'
+import './editable_block_switcher'
+import './order_payment_button'
+import './order_payment_form'
+
+import '@user_room-scripts/user_room/registration_accordion'
+import '@user_room-scripts/user_room/login_popup'
+import '@app-scripts/_open_cook/section-switcher'
+
+import './application_initializer'

X_GEMS/rails_shop/app/assets/javascripts/rails_shop/application_initializer.js.coffee

@@ -18,7 +18,7 @@ toastr.options =
   "showMethod": "fadeIn"
   "hideMethod": "fadeOut"
 
-$(document).on 'ready page:load', ->
+$ ->
   MainImage.init()
   CropTool.init()
   Notifications.init()

X_GEMS/rails_shop/app/assets/stylesheets/rails_shop/application.sass

@@ -0,0 +1,49 @@
+@import '~@protozaur-styles/ptz/reset'
+@import '~@protozaur-styles/ptz/base'
+@import '~@protozaur-styles/ptz/framework'
+
+@import '~@protozaur-styles/ptz/inputs-buttons/base'
+@import '~@protozaur-styles/ptz/inputs-buttons/sizes'
+@import '~@protozaur-styles/ptz/inputs-buttons/icons'
+
+@import '~@protozaur_theme-styles/protozaur_theme/theme-0/radio-buttons'
+@import '~@protozaur_theme-styles/protozaur_theme/theme-0/styles'
+@import '~@protozaur_theme-styles/protozaur_theme/theme-0/table-light'
+@import '~@protozaur_theme-styles/protozaur_theme/theme-0/paginator'
+@import '~@protozaur_theme-styles/protozaur_theme/theme-0/content-typography'
+
+@import '~@user_room-styles/user_room/layout/user-room-header'
+@import '~@user_room-styles/user_room/social-login-btn'
+
+@import '~@table_holy_grail_layout-styles/layouts/table-holy-grail/styles'
+
+@import '~@crop_tool-styles/crop_tool/crop_tool'
+@import '~@crop_tool-styles/crop_tool/jcrop/jquery.Jcrop'
+
+@import './main/link-marker'
+@import './main/user'
+@import './main/shop-header'
+@import './main/shop-sub-header'
+
+@import './main/info-block'
+@import './main/catalog-menu'
+@import './main/products-list'
+@import './main/product-breadcrumbs'
+@import './main/product-card'
+@import './main/product-delivery'
+@import './main/shop-cart'
+
+@import './main/cart-delivery-info'
+@import './main/payment-systems'
+@import './main/order-process-steps'
+
+@import '~@notifications-styles/notifications/vendors/toastr'
+
+@import './main/gem-notifications'
+@import './main/notifications'
+
+@import './main/content-style-default'
+@import '../../javascripts/vendors/custom_select/custom_select'
+
+@import '~@app-styles/_open_cook/section-switcher'
+@import './main/shop-footer'

X_GEMS/rails_shop/app/views/rails_shop/delivery_types/edit.html.slim

@@ -17,12 +17,12 @@ h3.mt20.mb20.fs18 Редактировать тип доставки
 
   .mb15
     = f.label :title, 'Название', class: 'block fs13 mb5'
-    = f.text_field :title, class: 'ptz--btn ptz--size-15 w500 '
+    = f.text_field :title, class: 'ptz--input ptz--size-15 w500 '
 
   .mb15.clearfix
     .pull-left.mr30
       = f.label :price, 'Цена', class: 'block fs13 mb5'
-      = f.number_field :price, class: 'ptz--btn ptz--size-15 w150 ', maxlength: 10, min: 0, max: 100000, placeholder: '1000', autocomplete: :off
+      = f.number_field :price, class: 'ptz--input ptz--size-15 w150 ', maxlength: 10, min: 0, max: 100000, placeholder: '1000', autocomplete: :off
 
   .mb15
     = f.label :raw_intro, 'Короткое описание типа доставки', class: 'block fs13 mb5'

X_GEMS/rails_shop/app/views/rails_shop/layouts/table-holy-grail.html.slim

@@ -12,8 +12,10 @@ html(lang='en')
 
     = yield :meta_data
 
-    = stylesheet_link_tag    'rails_shop', media: :all, 'data-turbolinks-track' => true
-    = javascript_include_tag 'rails_shop', 'data-turbolinks-track' => true
+    = javascript_include_tag webpack_bundle_path('manifest')
+    = javascript_include_tag webpack_bundle_path('rails_shop')
+    = javascript_include_tag webpack_bundle_path('rails_shop_styles')
+
     = csrf_meta_tags
 
     = yield :js

X_GEMS/rails_shop/app/views/rails_shop/main_image/_toolbar.html.slim

@@ -5,7 +5,7 @@
   = render partial: 'notifications/form', locals: { object: object, format: :json }
   .clearfix@main-image-manage-intro
     .pull-left
-      .mb10.block fs13 mb5
+      .mb10.block.fs13.mb5
         | Главное изображение
 
       .pull-left.mr10
@@ -58,7 +58,7 @@
 
   @main-image-manage(style='display:none')
     .mb15
-      .block fs13 mb5
+      .block.fs13.mb5
         | Главное изображение
         .pull-right
           = link_to 'Свернуть', '#', class: 'fs12', data: { role: 'main-image-manage-switcher' }

X_GEMS/rails_shop/app/views/rails_shop/main_image/_uploader.html.slim

@@ -3,7 +3,7 @@
     = render partial: 'notifications/form', locals: { object: object, format: :json }
 
     .mb15
-      .block fs13 mb5 Загрузите главное изображение
+      .block.fs13.mb5 Загрузите главное изображение
 
     .mb15
       = f.file_field :main_image, class: 'input'

X_GEMS/user_room/app/assets/javascripts/user_room/layout/application.js

@@ -0,0 +1,19 @@
+import '@jquery'
+import '@toastr'
+import '@jquery-ujs'
+
+import '@log_js-scripts/log_js'
+import '@role_slim_js-scripts/jquery.data-role-selector'
+
+import '@notifications-scripts/notifications'
+
+import '../registration_accordion'
+import '../login_popup'
+
+import '@crop_tool-scripts/crop_tool/crop_tool'
+import '@crop_tool-scripts/crop_tool/jcrop/jquery.Jcrop'
+import '../avatar_crop'
+
+import '@app-scripts/_open_cook/section-switcher'
+
+import './application_initializer'

X_GEMS/user_room/app/assets/javascripts/user_room/layout/application_initializer.js.coffee

@@ -18,7 +18,7 @@ toastr.options =
   "showMethod": "fadeIn"
   "hideMethod": "fadeOut"
 
-$(document).on 'ready page:load', ->
+$ ->
   Notifications.init()
   Notifications.show_notifications()