rocket_cms 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1894ec7ce4982aaecafca136f56bb70f222e6492dd169e3523a1e680b164c3b
-  data.tar.gz: ebb5e94cc9650abc145efb4b7dc91a7a595d6be8eb95d77cd441703ace6afaf8
+  metadata.gz: aabd9405b787031dfa64acff7d66f70f38f2ce2a847e8ddc9ddb1f63c808803d
+  data.tar.gz: 652c66cb6a073c2c79a38d908177de937627ea8ec2931bb1057e0f872c73b1d3
 SHA512:
-  metadata.gz: d7bb26a2b581544dcfde6483e5243543fb517a80cdb24367a8d84538b5b5776105ddcd84fe4f576df3a64f766bf499903dfa090eb22d6cdadbf9ea636041273c
-  data.tar.gz: cd9d53504099abe24d90c33aeaab2033c497c2613f4a7c58adae0b01e6fd499ed62516c66b4293237721d08cd3777a65790002d10ac79140ab68778ec1c889ce
+  metadata.gz: 7fce8c94473f098b2830d19f9d13bb1b9891dbc38bd1616207ace5027337ead463153a451b9dcac447ec9e2095570c8ee5666f1a26894dd4beeae6fe482291dc
+  data.tar.gz: 6e8cfcb58d1a026adcd45edd3ca7713db97e7641f4aff4e60eae0ebd00e036c5ad425ba7b162747e421bd4d5ce487896a1c8b18925127d698c38fc6d7e673e71

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.24.0)
+    rocket_cms (0.25.0)
       addressable
       coffee-rails
       jquery-rails
@@ -105,7 +105,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     public_suffix (3.0.2)
     rack (2.0.4)
-    rack-test (0.8.3)
+    rack-test (1.0.0)
       rack (>= 1.0, < 3)
     rails (5.1.5)
       actioncable (= 5.1.5)
@@ -122,8 +122,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     railties (5.1.5)
       actionpack (= 5.1.5)
       activesupport (= 5.1.5)

data/app/views/blocks/_counters.html

@@ -0,0 +1,6 @@
+<!-- Insert Yandex.Metrika counter -->
+<script type="text/javascript" data-turbolinks-eval="false">
+  window.metrika = 'yaCounterYOUR_ID_HERE'
+</script>
+
+<!-- Insert GTAG counter -->

data/app/views/blocks/_footer.slim

@@ -1,2 +1,2 @@
-footer
+footer.footer
   | (c) #{Date.today.year}

data/app/views/blocks/_header.slim

@@ -1,2 +1,2 @@
-header
+header.header
   = render_navigation &navigation(:main)

data/app/views/contact_mailer/{new_message_email.html.haml → new_message_email.html.slim}

@@ -1,16 +1,16 @@
 
 - excluded_column_names = %w[id c_at u_at created_at updated_at _id _type enabled attachment c_at u_at captcha captcha_key version creator_id creator updater_id updater modifier modifier_id]
 
-%h3 Сообщение из формы связи:
+h3 Сообщение из формы связи:
 
-%table
-  %tr
-    %th(style='padding: 2px 3px') Поле
-    %th(style='padding: 2px 3px') Значение
+table
+  tr
+    th style='padding: 2px 3px' Поле
+    th style='padding: 2px 3px' Значение
   - fields = (RocketCMS.mongoid? ? ContactMessage.fields.keys : ContactMessage.columns.map(&:name))
   - fields.reject{|c| excluded_column_names.include?(c) }.each do |c|
-    %tr
-      %td(style='padding: 2px 3px')
+    tr
+      td style='padding: 2px 3px'
         = ContactMessage.human_attribute_name(c)
-      %td(style='padding: 2px 3px')
+      td style='padding: 2px 3px'
         = @message.send(c.to_sym)

data/app/views/contacts/{new.html.haml → new.slim}

@@ -8,3 +8,4 @@
     = f.input :content
     = f.input :captcha, as: :simple_captcha
     = f.submit t('rs.send')
+

data/app/views/contacts/sent.slim

@@ -0,0 +1,4 @@
+#rocket_cms_contact_sent
+  h1 Обратная связь
+  h2 Ваше сообщение отправлено
+  div Если оно требует ответа, мы постараемся ответить в ближайшее время

data/app/views/errors/_base.slim

@@ -0,0 +1,3 @@
+#rocket_cms_error class="error-#{code}"
+  h1= t('rs.errors.title', code: code)
+  p #{text}

data/app/views/home/index.slim

@@ -0,0 +1 @@
+h1 RocketCMS: Home Page

data/app/views/layouts/application.slim

@@ -0,0 +1,39 @@
+doctype html
+html lang="ru"
+  head
+    meta charset="UTF-8"
+    meta name="viewport" content="width=device-width, maximum-scale=1, minimal-ui"
+    -# meta property="fb:app_id" content=Rails.application.secrets.fb_app_id
+    -# meta property="vk:app_id" content=Rails.application.secrets.vk_app_id
+    meta name="turbolinks-cache-control" content="no-cache"
+
+    title= page_title
+    = yield :meta
+    = csrf_meta_tags
+    = favicon_link_tag '/favicon.ico'
+
+    = stylesheet_link_tag *webpack_asset_paths('vendor', extension: 'css', ignore_missing: true)
+    = stylesheet_link_tag *webpack_asset_paths('application', extension: 'css')
+    = javascript_include_tag *webpack_asset_paths('vendor', extension: 'js', ignore_missing: true)
+    = javascript_include_tag *webpack_asset_paths('application', extension: 'js')
+
+  body.no-js class=body_class
+    = render 'blocks/header'
+    script.no-js-script
+      | document.body.classList.remove('no-js');
+
+    main.main
+      = render 'shared/messages'
+      = yield
+
+    = render 'blocks/footer'
+
+    .no-js-error.alert.alert-error
+      | К сожалению, в вашем браузере отключен JavaScript
+      span Включите его, чтобы зайти на сайт
+      a class="btn-transparent" target="_blank" href="https://yandex.ru/support/common/browsers-settings/browsers-java-js-settings.xml" Включить JavaScript
+
+    #fb-root data-turbolinks-permanent=""
+    #vk_api_transport data-turbolinks-permanent=""
+
+    = render 'blocks/counters'

data/app/views/news/{index.html.haml → index.slim}

@@ -1,8 +1,8 @@
 .rs-news-index
-  %h1= t('rs.news')
+  h1= t('rs.news')
   - @news.each do |news|
     .rs-news-date= l(news.time.to_date)
-    %a.rs-news-title{href: news_path(news)}= news.name
+    a.rs-news-title href=news_path(news)= news.name
     - if !RocketCMS.config.news_image_styles.nil? && news.image?
       .rs-news-image= image_tag news.image.url(:thumb)
     .rs-news-excerpt= news.excerpt

data/app/views/news/show.slim

@@ -0,0 +1,11 @@
+.rs-news-show
+  h1.rs-news-title= @news.name
+  .rs-news-date
+    = l(@news.time.to_date)
+  .rs-news-text
+    = @news.excerpt
+  - if !RocketCMS.config.news_image_styles.nil? && @news.image?
+    .rs-news-image
+      = image_tag @news.image.url(:main)
+  .rs-news-content
+    = render 'shared/obj', obj: @news

data/app/views/rails_admin/main/_check_boxes.html.haml

@@ -1,6 +1,6 @@
 - if params[:associations].nil?
   = render 'rails_admin/main/enum_check_boxes', field: field, form: form
-- else  
+- else
   :ruby
     related_id = params[:associations] && params[:associations][field.name.to_s]
     config = field.associated_model_config

data/app/views/search/index.html.haml

@@ -1,21 +1,21 @@
 .rs-search-results
-  %h1 Результаты поиска
+  h1 Результаты поиска
   = form_tag search_path, method: :get, class: 'nav_search' do
     = text_field_tag 'query', params[:query], placeholder: "Поиск"
     = submit_tag 'Найти'
-  %ol
+  ol
     - any = false
     - @results.each do |r|
       - any = true
-      %li
+      li
         -if RocketCMS.mongoid?
           - u = app_url(r)
           - next if u.nil?
           - next if u.respond_to?(:enabled) && !u.searchable.enabled
           - any = true
           .title
-            %a{href: u}
-              %strong= raw (r._highlight.nil? || r._highlight['name'].nil?) ? r.name : r._highlight['name'].join(' ... ')
+            a href=u
+              strong= raw (r._highlight.nil? || r._highlight['name'].nil?) ? r.name : r._highlight['name'].join(' ... ')
               (#{r.class.model_name.human})
           .text
             = raw (r._highlight.nil? || r._highlight['content'].nil?) ? (r.content.blank? ? '' : SmartExcerpt.truncate(r.content)) : r._highlight['content'].join(' ... ')
@@ -26,8 +26,8 @@
           - next if r.searchable.respond_to?(:enabled) && !r.searchable.enabled
           - any = true
           .title
-            %a{href: u}
-              %strong= raw highlight(r.searchable.name, params[:query], highlighter: '<em>\1</em>')
+            a href=u
+              strong= raw highlight(r.searchable.name, params[:query], highlighter: '<em>\1</em>')
               (#{r.searchable.class.model_name.human})
           .text
             - ex = excerpt(strip_tags(r.searchable.content), params[:query], radius: 150)
@@ -35,7 +35,7 @@
               = raw strip_tags(SmartExcerpt.h.smart_truncate(r.searchable.content, words: 20))
             - else
               = raw highlight(ex, params[:query], highlighter: '<em>\1</em>')
-            %span.more= link_to '', u
+            span.more= link_to '', u
   - unless any
     .rs-search-no-results К сожалению, ничего не найдено
 

data/app/views/shared/{_admin_link.html.haml → _admin_link.slim}

@@ -1,3 +1,3 @@
 - if user_signed_in? && respond_to?(:can?) && can?(:access, :rails_admin) && can?(:edit, obj)
-  %div.admin_link
+  .admin_link
     = link_to t('rs.edit'), rails_admin.edit_path(obj.class.model_name.i18n_key.to_s.gsub('/', '~'), obj.id), 'data-no-turbolink' => "true", 'data-turbolinks' => "false"

data/app/views/shared/{_messages.html.haml → _messages.slim}

@@ -2,6 +2,6 @@
   .flash
     - flash.each do |type, message|
       - next if message.blank?
-      %div{class: "message #{type}"}
-        %a.close_flash ×
+      .message class=type
+        a.close_flash ×
         = simple_format(message.strip)

data/app/views/shared/{_meta.html.haml → _meta.slim}

@@ -1,6 +1,6 @@
 - unless !obj.respond_to?(:keywords) || obj.keywords.blank?
-  %meta{name: "keywords", content: obj.keywords}/
+  meta name="keywords" content=obj.keywords
 - unless !obj.respond_to?(:description) || obj.description.blank?
-  %meta{name: "description", content: obj.description}/
+  meta name="description" content=obj.description}
 - unless !obj.respond_to?(:robots) || obj.robots.blank?
-  %meta{name: "robots", content: obj.robots}/
+  meta name="robots" content=obj.robots

data/app/views/shared/{_obj.html.haml → _obj.slim}

@@ -1,7 +1,7 @@
 - unless obj.nil?
   - content = capture do
     - if (!defined?(h1) || h1) && !obj.h1.blank?
-      %h1= obj.h1
+      h1= obj.h1
     - if !obj.respond_to?(:content) || obj.content.blank?
       - unless @seo_page.nil?
         = raw @seo_page.page_content

data/app/views/shared/_og.slim

@@ -0,0 +1,8 @@
+- if defined?(title) && !title.blank?
+  meta property='og:title' content=title
+- if defined?(image) && !image.blank?
+  meta property='og:image' content="http://#{request.host_with_port}#{image}"
+- if defined?(desc) && !desc.blank?
+  meta property='og:description' content=desc
+- if defined?(url) && !url.blank?
+  meta property='og:url' content=url

data/lib/generators/rocket_cms/layout_generator.rb

@@ -5,10 +5,13 @@ module RocketCms
   class LayoutGenerator < Rails::Generators::Base
     source_root File.expand_path("../../../..", __FILE__)
     include Generators::Utils::InstanceMethods
-    
+
     desc 'RocketCMS Layout generator'
     def layout
-      template('app/views/layouts/application.html.slim', 'app/views/layouts/application.html.slim')
+      template('app/views/layouts/application.slim', 'app/views/layouts/application.slim')
+      template('app/views/blocks/_footer.slim', 'app/views/blocks/_footer.slim')
+      template('app/views/blocks/_header.slim', 'app/views/blocks/_header.slim')
+      template('app/views/pages/home/index.slim', 'app/views/pages/home/index.slim')
     end
   end
 end

data/lib/generators/rocket_cms/templates/.babelrc

@@ -1,5 +1,8 @@
 {
-  "presets": ["es2015", "stage-0"],
-  "plugins": []
+  "presets": [["env", {
+   "targets": {
+    "browsers": ["last 2 versions", "ie >= 11"]
+    },
+    "useBuiltIns": true
+  }], "stage-0"]
 }
-

data/lib/generators/rocket_cms/templates/Capfile

@@ -8,9 +8,10 @@ require 'capistrano/bundler'
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
 #require "whenever/capistrano"
+require 'capistrano/webpack'
 
-require 'capistrano/rtrack'
-require 'capistrano/npm'
+#require 'capistrano/rtrack'
+#require 'capistrano/npm'
 
 require 'capistrano/puma'
 

data/lib/generators/rocket_cms/templates/admin.erb

@@ -1,6 +1,6 @@
 require 'rails_admin/custom_show_in_app'
 
-RailsAdminSettings.track_history!
+# RailsAdminSettings.track_history!
 
 RailsAdmin.config do |config|
   config.parent_controller = '::ApplicationController'
@@ -14,7 +14,7 @@ RailsAdmin.config do |config|
   config.current_user_method(&:current_user)
 
   ## == Cancan ==
-  config.authorize_with :cancancan2
+  config.authorize_with :cancan
 <% if RocketCMS.mongoid? %>
   ## == MongoidAudit
   # config.audit_with :mongoid_audit, 'HistoryTracker'
@@ -37,8 +37,8 @@ RailsAdmin.config do |config|
     edit
     delete
 
-    history_index
-    history_show
+    # history_index
+    # history_show
 
     nested_set do
       visible do

data/lib/generators/rocket_cms/templates/deploy.erb

@@ -7,7 +7,7 @@ set :branch, ENV["REVISION"] || "master"
 set :deploy_to, "<%= deploy_to %>"
 
 #set :rvm_type, :user
-#set :rvm_ruby_version, "2.4.1@#{fetch :application}"
+#set :rvm_ruby_version, "2.5.0@#{fetch :application}"
 set :use_sudo, false
 
 set :keep_releases, 20
@@ -17,38 +17,5 @@ set :linked_files, %w{config/mongoid.yml config/secrets.yml}
 <% else %>
 set :linked_files, %w{config/database.yml config/secrets.yml}
 <% end %>
-set :linked_dirs, %w{log tmp vendor/bundle public/assets public/system public/uploads public/ckeditor_assets public/sitemap}
-
-Rake::Task["puma:check"].clear
-Rake::Task["puma:config"].clear
-namespace :puma do
-  task :check do
-  end
-  task :config do
-  end
-end
-
-namespace :deploy do
-  desc "webpack"
-  task :webpack do
-    on roles(:app) do
-      within release_path do
-        with rails_env: fetch(:rails_env) do
-          execute :rake, "webpack:compile"
-        end
-      end
-    end
-  end
-end
-
-after "deploy:updated", "deploy:webpack"
-
-namespace :db do
-  desc "Create the indexes defined on your mongoid models"
-  task :create_mongoid_indexes do
-    on roles(:app) do
-      execute :rake, "db:mongoid:create_indexes"
-    end
-  end
-end
+set :linked_dirs, %w{log tmp vendor/bundle public/system public/uploads public/ckeditor_assets public/sitemap}
 

data/lib/generators/rocket_cms/templates/package.json

@@ -8,39 +8,45 @@
     "start": "./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline"
   },
   "dependencies": {
-    "autoprefixer": "^7.2.5",
-    "axios": "^0.17.1",
+    "autoprefixer": "^8.1.0",
+    "axios": "^0.18.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
-    "babel-plugin-lodash": "^3.3.2",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
-    "bootstrap": "^4.0.0",
     "compression-webpack-plugin": "^1.1.3",
-    "css-hot-loader": "^1.3.6",
     "css-loader": "^0.28.9",
-    "extract-text-webpack-plugin": "^3.0.2",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
+    "extracted-loader": "1.0.7",
     "file-loader": "^1.1.6",
-    "font-awesome": "^4.7.0",
-    "handlebars": "^4.0.11",
-    "handlebars-loader": "^1.6.0",
     "html-loader": "^0.5.5",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
+    "lodash-es": "^4.17.5",
     "node-sass": "^4.7.2",
+    "normalize.css": "^8.0.0",
     "postcss-functions": "^3.0.0",
     "postcss-loader": "^2.0.10",
+    "pug": "^2.0.1",
+    "pug-loader": "github:glebtv/pug-loader",
     "rails-ujs": "^5.1.4",
     "sass-loader": "^6.0.6",
     "stats-webpack-plugin": "^0.6.2",
-    "style-loader": "^0.19.1",
+    "style-loader": "^0.20.3",
+    "svg-inline-loader": "^0.8.0",
     "turbolinks": "^5.1.1",
-    "url-loader": "^0.6.2",
-    "webpack": "^3.10.0",
-    "webpack-dev-server": "^2.11.1",
-    "webpack-hot-middleware": "^2.21.0"
+    "url-loader": "^1.0.1",
+    "vue": "^2.5.15",
+    "vue-loader": "^14.2.1",
+    "vue-template-compiler": "^2.5.15",
+    "webpack": "^4.1.1",
+    "webpack-cli": "^2.0.11",
+    "webpack-dev-server": "^3.1.1",
+    "webpack-hot-middleware": "^2.21.0",
+    "webpack-manifest-plugin": "^2.0.0-rc.2"
   }
 }