locomotivecms_wagon 3.0.0.beta2 → 3.0.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33351fe2046901e6626169513512649c1ef89138ddefbb7e6518f7638aa9551
-  data.tar.gz: c68a753d743433cc31a90869cf5a64b9dec4b003e824700c97307b290aa5cb0b
+  metadata.gz: be2e4bcabdf447758386d1952580b9d12917117aae509c4f477e3db10debd744
+  data.tar.gz: 586222a4234b54ad585022b81574c53b7e8846bf5b95f62a0522e5de595ac20a
 SHA512:
-  metadata.gz: cc455822bee6b547cbcb809e6c37089aff24d6a1e693ba260fe5b40321b65e0fa65baec724f2d8c39aed10f1119f62f7c7becba871f310c5e553c05e0f45eaf6
-  data.tar.gz: 0170d1822297219fde5aec1052710b3f2fc29cc6aa7f94b78630713c3eb0ab9a98781706828d9c76aca9e037aacb59576fb3d40b91ddc6ab566f188f90017cb8
+  metadata.gz: e786b0893b808d9e4eef0402781e0aa489dcf0cbc110ebe48c56dcc93979c2f6484eb77015952f79871ab1e48cffdc860e028234584ffa810f45dd8af33c2ea1
+  data.tar.gz: 06fdd25d3af7dc1c5bf37a8c471705fec58724583bca578be72b617181405b22b4bff160cb666910937547ed94ca4ed9b7bf464d25035a591d6d62282c00be0f

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rb-fsevent', '~> 0.9.1'
 # Development
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '4d1bd56' , require: false
 # gem 'locomotivecms_coal',   github: 'locomotivecms/coal',   ref: '01a0a32', require: false
-# gem 'locomotivecms_steam',  github: 'locomotivecms/steam',  ref: 'd621100', require: false
+# gem 'locomotivecms_steam',  github: 'locomotivecms/steam',  ref: 'dabf63f67b', require: false
 # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
 
 # Local development

data/generators/blank/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+Guardfile
+log/
+node_modules/
+config/deploy.yml
+public/stylesheets/bundle.css
+public/javascripts/bundle.js

data/generators/blank/Gemfile.tt

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gem 'locomotivecms_wagon', '~> <%= config[:version] -%>'
 
-# gem 'guard-livereload', '~> 2.5.1'
-
 group :development do
   # Mac OS X
   gem 'rb-fsevent', '~> 0.9.1', require: 'rb-fsevent' if RUBY_PLATFORM.include?('darwin')

data/generators/blank/app/assets/.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": ["env"]
+  "presets": ["@babel/preset-env"],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
 }

data/generators/blank/app/assets/javascripts/sections/index.js

@@ -1,5 +1,5 @@
 // Import all the sections here
 //
 // Example:
-// export { default as Hero } from './hero';
+// export { default as MyAwesomeSection } from './my_awesome_section';
 //

data/generators/blank/app/assets/webpack.common.js

@@ -1,8 +1,9 @@
 const path = require('path');
+const Webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
-  entry: './javascripts/app.js',
+  entry: './app/assets/javascripts/app.js',
   output: {
     path:     path.resolve(__dirname, '../../public'),
     filename: 'javascripts/bundle.js'
@@ -12,8 +13,12 @@ module.exports = {
       {
         test: /\.(js|jsx|es6)$/,
         exclude: /(node_modules|bower_components)/,
-        loader: 'babel-loader',
-        query: { presets: ['env'] }
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-env']
+          }
+        }
       },
       {
         test: /\.scss$/,
@@ -42,6 +47,11 @@ module.exports = {
     ]
   },
   plugins: [
+    new Webpack.ProvidePlugin({
+      $: 'jquery',
+      jQuery: 'jquery',
+      'window.jQuery': 'jquery'
+    }),
     new MiniCssExtractPlugin({ filename: 'stylesheets/bundle.css', allChunks: true })
   ]
 };

data/generators/blank/app/assets/webpack.dev.js

@@ -1,7 +1,11 @@
 const merge = require('webpack-merge');
 const common = require('./webpack.common.js');
+const LiveReloadPlugin = require('webpack-livereload-plugin');
 
 module.exports = merge(common, {
   mode: 'development',
-  devtool: 'inline-source-map'
+  devtool: 'inline-source-map',
+  plugins: [
+    new LiveReloadPlugin()
+  ]
 });

data/generators/blank/app/views/pages/layouts/default.liquid

@@ -12,6 +12,10 @@ is_layout: false
 
     {{ 'bundle.css' | stylesheet_tag }}
     {{ 'bundle.js' | javascript_tag }}
+
+    {% if wagon %}
+      <script src="http://localhost:35729/livereload.js"></script>
+    {% endif %}
   </head>
   <body>
     <h1>{{ page.title }}</h1>

data/generators/blank/config/site.yml.tt

@@ -46,3 +46,7 @@ meta_description: "some meta description"
 #     address: 700 South Laflin Street
 #   theme:
 #     background_image: "/samples/background.png"
+
+# Custom routes
+# routes:
+#   - "posts/:year/:month": "blog_posts"

data/generators/blank/{app/assets/package.json.tt → package.json.tt}

@@ -4,9 +4,9 @@
   "description": "Assets source for the <%= config[:name] %> website",
   "main": "index.js",
   "scripts": {
-    "start": "webpack --config webpack.dev.js --progress --colors --watch",
-    "build:dev": "webpack --config webpack.dev.js --progress",
-    "build:prod": "NODE_ENV=production webpack --config webpack.prod.js --progress",
+    "start": "webpack --config app/assets/webpack.dev.js --progress --colors --watch",
+    "build:dev": "webpack --config app/assets/webpack.dev.js --progress",
+    "build:prod": "NODE_ENV=production webpack --config app/assets/webpack.prod.js --progress --mode production",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Wagon",
@@ -14,11 +14,13 @@
   "dependencies": {
   },
   "devDependencies": {
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.4",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.24.1",
+    "@babel/core": "^7.4.3",
+    "@babel/plugin-proposal-class-properties": "^7.4.0",
+    "babel-loader": "^8.0.5",
+    "@babel/preset-env": "^7.4.3",
     "css-loader": "^0.28.11",
+    "file-loader": "^1.1.11",
+    "image-webpack-loader": "^4.3.0",
     "mini-css-extract-plugin": "^0.4.0",
     "node-sass": "^4.9.0",
     "optimize-css-assets-webpack-plugin": "^4.0.2",
@@ -29,7 +31,6 @@
     "webpack": "^4.20.2",
     "webpack-cli": "^3.1.1",
     "webpack-merge": "^4.1.4",
-    "file-loader": "^1.1.11",
-    "image-webpack-loader": "^4.3.0"
+    "webpack-livereload-plugin": "^2.2.0"
   }
 }

data/generators/cloned/Gemfile.tt

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gem 'locomotivecms_wagon', '~> <%= config[:version] -%>'
 
-# gem 'guard-livereload', '~> 2.5.1'
-
 group :development do
   # Mac OS X
   gem 'rb-fsevent', '~> 0.9.1', require: 'rb-fsevent' if RUBY_PLATFORM.include?('darwin')

data/generators/content_type/app/content_types/%slug%.yml.tt

@@ -25,6 +25,10 @@ order_by: manually
 # Array of emails to be notified of new entries made with the public API
 # public_submission_accounts: ['john@example.com']
 
+# we recommend to require Google Recaptcha when submitting the form
+# if the public submission attribute is enabled in order to prevent spams
+# recaptcha_required: true
+
 # Control the display of the content type in the back-office.
 # display_settings:
 #   seo: false              # display the SEO tab for the content entries

data/generators/public_form/content_type.yml.tt

@@ -0,0 +1,53 @@
+# Human readable name of this type
+name: <%= config[:name] %>
+
+# Lowercase, underscored handle used to access this type
+slug: <%= config[:slug] %>
+
+# Explanatory text displayed in the back-office
+description: Public form
+
+# Slug of field used to identify entries by default, such as the title
+label_field_name: 'email'
+
+# Valid values: manually, created_at, updated_at, or the slug of any field
+order_by: created_at
+
+# Valid values: asc (ascending) and desc (descending). Set to asc by default.
+order_direction: desc
+
+# Activate public 'create' API (e.g for a contact form)
+public_submission_enabled: true
+
+# Array of emails to be notified of new entries made with the public API
+# public_submission_accounts: ['john@example.com']
+
+# Prevent spams thanks to Google Recaptcha
+recaptcha_required: true
+
+# Control the display of the content type in the back-office.
+display_settings:
+  seo: false              # display the SEO tab for the content entries
+  advanced: false         # display the Advanced tab for the content entries
+#  position: 1             # position in the sidebar menu
+#  hidden: false           # hidden for authors?
+
+# By default, the back-office displays the _label property (see label_field_name) of the content entry. This can be modified by writing your own Liquid template below:
+# entry_template: '<a href="{{ link }}">{{ entry._label }}</a>' # The default template
+
+# A list describing each field
+fields:
+- name:
+    label: Name
+    type: string
+    required: true
+
+- email:
+    label: Email
+    type: email
+    required: true
+
+- message:
+    label: Message
+    type: text
+    required: true

data/generators/public_form/page.liquid.tt

@@ -0,0 +1,75 @@
+---
+title: <%= config[:title] %>
+
+# If you want to reference that page in other templates. Ex: {% path_to '<%= config[:handle] %>' %}
+handle: <%= config[:handle] %>
+
+# true if the page is included in the menu
+published: true
+
+# true if the page is published
+listed: true
+
+# position among sibling pages
+# position: 1
+---
+{% extends parent %}
+
+{% block main %}
+
+  {% model_form '<%= config[:content_type] %>', class: 'form', recaptcha: true %}
+
+    {% if user_message.errors %}
+      <p>Your form has errors</p>
+    {% else %}
+      {% if user_message != nil %}
+        <p>Your form has been posted with success</p>
+      {% endif %}
+    {% endif %}
+
+    <div class="field">
+      <label class="label">Name</label>
+      <div class="control">
+        <input type="text" name="content[name]" placeholder="Your full name" value="{{ <%= config[:content_type].singularize %>.name }}" class="input {% if user_message.errors.name %}is-danger{% endif %}" />
+        {% if user_message.errors.name %}
+          <p class="help is-danger">{{ user_message.errors.name }}</p>
+        {% endif %}
+      </div>
+    </div>
+
+    <div class="field">
+      <label class="label">Email</label>
+      <div class="control">
+        <input type="email" name="content[email]" placeholder="Your email address" value="{{ <%= config[:content_type].singularize %>.email }}" class="input {% if user_message.errors.email %}is-danger{% endif %}" />
+        {% if user_message.errors.email %}
+          <p class="help is-danger">{{ user_message.errors.email }}</p>
+        {% endif %}
+      </div>
+    </div>
+
+    <div class="field">
+      <label class="label">Message</label>
+      <div class="control">
+        <textarea class="textarea" name="content[message]" placeholder="Anything you need">{{ <%= config[:content_type].singularize %>.message }}</textarea>
+      </div>
+    </div>
+
+    <div class="field ">
+      <div class="control">
+        <button class="button is-link">Submit</button>
+      </div>
+    </div>
+
+  {% endmodel_form %}
+
+  <script src="https://www.google.com/recaptcha/api.js?render={{ site.metafields.google.recaptcha_site_key }}"></script>
+
+  <script>
+    grecaptcha.ready(function() {
+      grecaptcha.execute('{{ site.metafields.google.recaptcha_site_key }}', {action: 'register'}).then(function(token) {
+        document.getElementById('g-recaptcha-response').value  = token;
+      });
+    });
+  </script>
+
+{% endblock %}

data/generators/webpack/app/assets/.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": ["@babel/preset-env"],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
+}

data/generators/webpack/app/assets/fonts/.empty_directory

@@ -0,0 +1 @@
+.empty_directory

data/generators/webpack/app/assets/javascripts/app.js

@@ -0,0 +1,19 @@
+// === Wagon main javascript file ===
+
+// Tell Webpack to load the style
+import '../stylesheets/app.scss';
+
+// Import the classes required to handle sections
+import SectionsManager from './sections/_manager';
+import * as Sections from './sections';
+
+document.addEventListener('DOMContentLoaded', event => {
+
+  // Load all the sections
+  const sectionsManager = new SectionsManager();
+
+  // Register sections here. DO NOT REMOVE OR UPDATE THIS LINE
+
+  sectionsManager.start();
+
+});

data/generators/webpack/app/assets/javascripts/sections/_manager.js

@@ -0,0 +1,94 @@
+class Manager {
+
+  constructor() {
+    this.sections = {};
+  }
+
+  registerSection(type, actions) {
+    console.log(type, actions);
+    this.sections[type] = actions;
+  }
+
+  start() {
+    this.eachType((type, actions) => {
+      this.queryAll(`.locomotive-section[data-locomotive-section-type="${type}"]`).forEach((section, index) => {
+        this.runAction(actions, 'load', section);
+      });
+    });
+    this.registerEvents();
+
+    window._sectionsManager = this;
+  }
+
+  registerEvents() {
+    const events = {
+      section: ['load', 'unload', 'select', 'deselect', 'reorder'],
+      block: ['select', 'deselect']
+    }
+
+    for (var namespace in events) {
+      events[namespace].forEach(eventType => {
+        const eventName = `locomotive::${namespace}::${eventType}`;
+        const actionName = this.eventTypeToActionName(namespace, eventType);
+
+        document.addEventListener(eventName, event => {
+          this.applyRuleToEvent(actionName, event);
+        });
+      });
+    }
+  }
+
+  applyRuleToEvent(actionName, event) {
+    const { sectionId, blockId } = event.detail;
+    const section   = document.getElementById(`locomotive-section-${sectionId}`);
+    const type      = section.getAttribute('data-locomotive-section-type');
+    const block     = this.queryOne(`[data-locomotive-block="section-${sectionId}-block-${blockId}"]`, section);
+
+    this.runAction(this.sections[type], actionName, section, block)
+  }
+
+  eventTypeToActionName(namespace, eventType) {
+    if (namespace === 'section')
+      return eventType;
+    else
+      return namespace + eventType.charAt(0).toUpperCase() + eventType.slice(1);
+  }
+
+  runAction(actions, actionName, section, block) {
+    const action = actions[actionName];
+
+    if (action !== undefined)
+      action(section, block);
+  }
+
+  eachType(callback) {
+    for (var type in this.sections) {
+      const actions = this.sections[type];
+      callback(type, actions)
+    }
+  }
+
+  queryAll(selector, scope) {
+    scope = scope ? scope : document;
+    return scope.querySelectorAll(selector);
+  }
+
+  queryOne(selector, scope) {
+    scope = scope ? scope : document;
+    return scope.querySelector(selector);
+  }
+
+  testAction(eventType, section, block) {
+    const hasBlock  = block !== undefined && block !== null ;
+    const namespace = hasBlock ? 'block' : 'section';
+    const sectionId = section.getAttribute('id').replace('locomotive-section-', '');
+    const blockId   = hasBlock ? block.getAttribute('data-locomotive-block').replace(`section-${sectionId}-block-`, '') : null;
+    const detail    = { detail: { sectionId, blockId } };
+    const eventName = `locomotive::${namespace}::${eventType}`;
+
+    document.dispatchEvent(new CustomEvent(eventName, detail));
+  }
+
+}
+
+export default Manager;