rocket_cms 0.18.1 → 0.18.2

data/lib/generators/rocket_cms/templates/webpack/flash/index.es6

@@ -0,0 +1,12 @@
+import './index.sass';
+
+$(document).on("click", 'a.close_flash', function() {
+  $(this).parent().fadeOut(function() {
+    let $box = $(this).parents('.flash');
+    $(this).remove();
+    if ($box.children().length == 0) {
+      $box.remove();
+    }
+  })
+});
+

data/{app/assets/stylesheets/rocket_cms/flash.css.sass → lib/generators/rocket_cms/templates/webpack/flash/index.sass}

@@ -1,18 +1,18 @@
-
-
 .flash
-  margin: 0 auto
-  padding: 10px 0
-  width: 530px
+  position: fixed
+  top: 10px
+  right: 10px
+  z-index: 1000;
 
   .message
     border-radius: 3px
-    text-align: center
+    text-align: left
     margin: 0 auto 15px
     color: white
     font-family: Tahoma
     font-size: 17px
     position: relative
+    padding: 1px 10px 1px 1px
     a.close_flash
       cursor: pointer
       position: absolute
@@ -62,4 +62,3 @@
     text-shadow: 0px 1px #d71012
     a.close_flash
       color: #782124
-

data/lib/generators/rocket_cms/webpack_generator.rb

@@ -0,0 +1,30 @@
+require 'rails/generators'
+
+module RocketCms
+  class WebpackGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    def app_name
+      Rails.application.class.name.split("::")[0]
+    end
+
+    desc 'RocketCMS webpack generator'
+    def install
+      copy_file ".babelrc", ".babelrc"
+      copy_file "webpack.config.js", "config/webpack.config.js"
+
+      copy_file "webpack/application.es6", "webpack/application.es6"
+      copy_file "webpack/application.sass", "webpack/application.sass"
+
+      copy_file "webpack/errors/index.es6", "webpack/errors/index.es6"
+      copy_file "webpack/errors/index.sass", "webpack/errors/index.sass"
+      copy_file "webpack/errors/errors.handlebars", "webpack/errors/errors.handlebars"
+
+      copy_file "webpack/flash/index.es6", "webpack/flash/index.es6"
+      copy_file "webpack/flash/index.sass", "webpack/flash/index.sass"
+
+      remove_file "package.json"
+      template "package.json", "package.json"
+    end
+  end
+end
+

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
 end

data/template.rb

@@ -2,6 +2,7 @@ rails_spec = (Gem.loaded_specs["railties"] || Gem.loaded_specs["rails"])
 version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
+yarn = options[:yarn]
 
 if Gem::Version.new(version) < Gem::Version.new('5.0.0')
   puts "You are using an old version of Rails (#{version})"
@@ -110,10 +111,27 @@ TEXT
 end
 
 remove_file 'README.md'
-create_file 'README.md', "## #{app_name}\nProject generated by RocketCMS\n\nORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}\n\n"
+create_file 'README.md', "## #{app_name}
+Project generated by RocketCMS
 
-create_file '.ruby-version', "2.4.0\n"
-create_file '.ruby-gemset', "#{app_name}\n"
+ORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}
+
+To run (windows):
+```
+.\node_modules\.bin\webpack-dev-server.cmd --config config\webpack.config.js --hot --inline
+bundle exec rails s webrick
+```
+
+
+To run (nix/mac):
+```
+./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline
+puma
+```
+"
+
+#create_file '.ruby-version', "2.4.0\n"
+#create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
 
@@ -429,23 +447,6 @@ end
 TEXT
 end
 
-remove_file 'app/assets/stylesheets/application.css'
-create_file 'app/assets/stylesheets/application.css.sass' do <<-TEXT
-@import 'rocket_cms'
-
-#wrapper
-  width: 960px
-  margin: 0 auto
-  #sidebar
-    float: left
-    width: 200px
-  #content
-    float: right
-    width: 750px
-
-TEXT
-end
-
 remove_file 'app/assets/javascripts/application.js'
 create_file 'app/assets/javascripts/application.js' do <<-TEXT
 TEXT
@@ -456,227 +457,6 @@ create_file 'app/assets/javascripts/application.css' do <<-TEXT
 TEXT
 end
 
-create_file 'webpack/application.sass' do <<-TEXT
-html
-  font-family: Tahoma, Geneva, sans-serif
-  font-size: 14px
-  text-rendering: optimizeLegibility
-  -webkit-font-smoothing: antialiased
-  -moz-osx-font-smoothing: grayscale
-TEXT
-end
-
-create_file 'webpack/application.es6' do <<-TEXT
-html
-  font-family: Tahoma, Geneva, sans-serif
-  font-size: 14px
-  text-rendering: optimizeLegibility
-  -webkit-font-smoothing: antialiased
-  -moz-osx-font-smoothing: grayscale
-TEXT
-end
-
-create_file '.babelrc' do <<-TEXT
-{
-  "presets": ["es2015", "stage-0"],
-  "plugins": []
-}
-TEXT
-end
-
-create_file 'package.json' do <<-TEXT
-{
-  "name": "#{app_name.camelize}",
-  "version": "0.0.1",
-  "license": "UNLICENSED",
-  "private": true,
-  "repository": "git@rscz.ru:rocket-science/#{app_name}.git",
-  "dependencies": {
-    "autoprefixer": "^6.5.3",
-    "axios": "^0.16.1",
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.18.2",
-    "babel-loader": "^7.0.0",
-    "babel-plugin-lodash": "^3.2.9",
-    "babel-plugin-transform-runtime": "^6.15.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-stage-0": "^6.16.0",
-    "babel-runtime": "^6.20.0",
-    "bootstrap": "4.0.0-alpha.6",
-    "compression-webpack-plugin": "^0.4.0",
-    "css-loader": "^0.28.0",
-    "extract-text-webpack-plugin": "^2.0.0-rc.3",
-    "file-loader": "^0.11.1",
-    "font-awesome": "^4.7.0",
-    "handlebars": "^4.0.6",
-    "handlebars-loader": "^1.4.0",
-    "html-loader": "^0.4.4",
-    "jquery": "^3.1.1",
-    "jquery-ujs": "^1.2.2",
-    "js-cookie": "^2.1.3",
-    "node-sass": "^4.0.0",
-    "postcss-functions": "^2.1.0",
-    "postcss-loader": "^1.3.0",
-    "sass-loader": "^6.0.0",
-    "stats-webpack-plugin": "^0.6.0",
-    "style-loader": "^0.16.1",
-    "turbolinks": "^5.0.0",
-    "url-loader": "^0.5.7",
-    "webpack": "^2.2.1",
-    "webpack-dev-server": "^2.3.0",
-    "webpack-hot-middleware": "^2.7.1"
-  }
-}
-TEXT
-end
-
-create_file 'config/webpack.config.js' do <<-TEXT
-'use strict';
-
-var path = require('path');
-var webpack = require('webpack');
-var functions = require('postcss-functions');
-var StatsPlugin = require('stats-webpack-plugin');
-
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-
-var autoprefixer = require('autoprefixer');
-var CompressionPlugin = require("compression-webpack-plugin");
-
-var host = process.env.HOST || 'localhost'
-var devServerPort = 3808;
-
-var production = process.env.NODE_ENV === 'production';
-
-const extractSass = new ExtractTextPlugin({
-    filename: "[name].[contenthash].css",
-    disable: !production
-});
-
-console.log("dir:", __dirname)
-
-var sassExtractor = () => {
-  return extractSass.extract({
-    use: [{
-      loader: "style-loader"
-    }, {
-      loader: "css-loader",
-      options: {
-        sourceMap: true
-      }
-    }, {
-      loader: "sass-loader",
-      options: {
-        sourceMap: true
-      }
-    }],
-    fallback: "style-loader"
-  })
-}
-
-var config = {
-  entry: {
-    // Sources are expected to live in $app_root/webpack
-    vendor: [
-      'babel-polyfill',
-      'axios',
-      'jquery',
-      'lodash',
-    ],
-    application: 'application.es6'
-  },
-
-  module: {
-      rules: [
-          { test: /\.es6/, use: "babel-loader" },
-          { test: /\.handlebars$/, use: "handlebars-loader" },
-          { test: /\.(jpe?g|png|gif)$/i, use: "file-loader" },
-          {
-            test: /\.woff($|\?)|\.woff2($|\?)|\.ttf($|\?)|\.eot($|\?)|\.svg($|\?)/,
-            use: production ? 'file-loader' : 'url-loader'
-          },
-          { test: /\.sass$/, use: sassExtractor() },
-          { test: /\.scss$/, use: sassExtractor() },
-          { test: /\.css$/, use: sassExtractor() }
-      ]
-  },
-
-  output: {
-    // Build assets directly in to public/webpack/, let webpack know
-    // that all webpacked assets start with webpack/
-
-    // must match config.webpack.output_dir
-    path: path.join(__dirname, '..', 'public', 'webpack'),
-    publicPath: '/webpack/',
-
-    filename: production ? '[name]-[chunkhash].js' : '[name].js'
-  },
-
-  resolve: {
-    modules: [path.resolve(__dirname, "..", "webpack"), path.resolve(__dirname, "..", "node_modules")],
-    extensions: [".js", ".es6", ".css", ".sass", ".scss"],
-  },
-
-  plugins: [
-    extractSass,
-    new StatsPlugin('manifest.json', {
-      chunkModules: false,
-      source: false,
-      chunks: false,
-      modules: false,
-      assets: true
-    }),
-    new webpack.ProvidePlugin({
-      $: "jquery/dist/jquery",
-      jQuery: "jquery/dist/jquery",
-      "window.jQuery": "jquery/dist/jquery",
-      //Tether: "tether",
-      //"window.Tether": "tether",
-      "_": "lodash",
-      "window._": "lodash",
-      //Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
-      //Button: "exports-loader?Button!bootstrap/js/dist/button",
-    })
-  ]
-};
-
-if (production) {
-  config.plugins.push(
-    new webpack.optimize.CommonsChunkPlugin({name: 'vendor', filename: 'vendor-[chunkhash].js'}),
-    new webpack.optimize.UglifyJsPlugin({
-      compressor: { warnings: false },
-      sourceMap: false
-    }),
-    new webpack.DefinePlugin({ // <--key to reduce React's size
-      'process.env': { NODE_ENV: JSON.stringify('production') }
-    }),
-    new CompressionPlugin({
-        asset: "[path].gz",
-        algorithm: "gzip",
-        test: /\.js$|\.css$/,
-        threshold: 4096,
-        minRatio: 0.8
-    })
-  );
-} else {
-  config.plugins.push(
-    new webpack.optimize.CommonsChunkPlugin({name: 'vendor', filename: 'vendor.js'}),
-    new webpack.NamedModulesPlugin()
-  )
-
-  config.devServer = {
-    port: devServerPort,
-    headers: { 'Access-Control-Allow-Origin': '*' },
-  };
-  config.output.publicPath = 'http://' + host + ':' + devServerPort + '/webpack/';
-  config.devtool = 'source-map';
-}
-
-module.exports = config;
-
-TEXT
-end
-
 
 if mongoid
   FileUtils.cp(Pathname.new(destination_root).join('config', 'mongoid.yml').to_s, Pathname.new(destination_root).join('config', 'mongoid.yml.example').to_s)
@@ -692,7 +472,11 @@ unless mongoid
   rake "db:migrate"
 end
 
-run 'npm install'
+if yarn
+  run 'yarn install'
+else
+  run 'npm install'
+end
 
 git :init
 git add: "."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - glebtv
@@ -201,14 +201,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/javascripts/head.load.js
-- app/assets/javascripts/jquery.placeholder.js
 - app/assets/javascripts/rocket_cms.js.coffee
-- app/assets/javascripts/rocket_cms/flash.js.coffee
-- app/assets/javascripts/rocket_cms/map.js.coffee
 - app/assets/stylesheets/rocket_cms.css.sass
-- app/assets/stylesheets/rocket_cms/flash.css.sass
-- app/assets/stylesheets/rocket_cms/normalize.css.scss
 - app/controllers/concerns/no_cache.rb
 - app/controllers/concerns/rs_cookies.rb
 - app/controllers/concerns/rs_errors.rb
@@ -233,7 +227,8 @@ files:
 - app/models/news.rb
 - app/models/page.rb
 - app/models/seo.rb
-- app/views/blocks/_footer.html.haml
+- app/views/blocks/_footer.slim
+- app/views/blocks/_header.slim
 - app/views/contact_mailer/new_message_email.html.haml
 - app/views/contacts/new.html.haml
 - app/views/contacts/sent.html.haml
@@ -242,7 +237,6 @@ files:
 - app/views/errors/error_404.html.haml
 - app/views/errors/error_500.html.haml
 - app/views/home/index.html.haml
-- app/views/layouts/application.html.haml
 - app/views/layouts/application.html.slim
 - app/views/news/index.html.haml
 - app/views/news/show.html.haml
@@ -275,6 +269,7 @@ files:
 - lib/generators/rocket_cms/capify_generator.rb
 - lib/generators/rocket_cms/layout_generator.rb
 - lib/generators/rocket_cms/migration_generator.rb
+- lib/generators/rocket_cms/templates/.babelrc
 - lib/generators/rocket_cms/templates/Capfile
 - lib/generators/rocket_cms/templates/ability.erb
 - lib/generators/rocket_cms/templates/admin.erb
@@ -284,9 +279,19 @@ files:
 - lib/generators/rocket_cms/templates/migration_news.rb
 - lib/generators/rocket_cms/templates/migration_pages.rb
 - lib/generators/rocket_cms/templates/migration_seos.rb
+- lib/generators/rocket_cms/templates/package.json
 - lib/generators/rocket_cms/templates/production.erb
 - lib/generators/rocket_cms/templates/unicorn.erb
+- lib/generators/rocket_cms/templates/webpack.config.js
+- lib/generators/rocket_cms/templates/webpack/application.es6
+- lib/generators/rocket_cms/templates/webpack/application.sass
+- lib/generators/rocket_cms/templates/webpack/errors/errors.handlebars
+- lib/generators/rocket_cms/templates/webpack/errors/index.es6
+- lib/generators/rocket_cms/templates/webpack/errors/index.sass
+- lib/generators/rocket_cms/templates/webpack/flash/index.es6
+- lib/generators/rocket_cms/templates/webpack/flash/index.sass
 - lib/generators/rocket_cms/utils.rb
+- lib/generators/rocket_cms/webpack_generator.rb
 - lib/manual_slug.rb
 - lib/manual_slug/active_record.rb
 - lib/manual_slug/mongoid.rb