fae-rails 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 627ef0b4fdd41a840e63ef13d5816702d67109e3
-  data.tar.gz: 2ee2bdb673debee82c40eb3064d44fdaf0143515
+  metadata.gz: '09c68df667f8b7ace15a19a487daa942920cbf0b'
+  data.tar.gz: dac2b54b4e27960568834510f11858e2173eddaa
 SHA512:
-  metadata.gz: 3b31bb1dce450aecd010f337e851fb895ef86c4ccbcc8983d77e7d594e72a28e457a9966d79f238963d8e45fcb32a539167cd2e29666d2c6fb8a7b908cf8e41b
-  data.tar.gz: 0d9775d7d639bc6fbe66ffbfb40ca5aaf1dccf99344c6160fbbdc6e2f7116e57f42bcc0da4b81345d7f504c2fa89fb206bc9235393f9913f14f3955fe6745e16
+  metadata.gz: 99e3412b45fd0809a4af841af0c810971e0106dbe71f43104e9063abc691af0bf46d15b6d6b4890d68eca748ad8c633903c3446209675acb5f8c55dff9b9627e
+  data.tar.gz: aa26791d19a9c46c6cc9c4b8feb133832961d4035751bb2eeb534f402cc3eb9597d952dd517c62f1919bd4a3fcd53b0cbb4de82a14588ca2ba5995e6149cbca4

data/README.md

@@ -7,7 +7,7 @@
 
 Like many Rails CMS engines, Fae delivers all the basics to get you up and running quickly: authentication, authorization, a sleek UI, form helpers, image processing and workflows. But unlike other engines, Fae's generated models, controllers, and views are built to customize and scale.
 
-Fae 2.0 supports Rails 5.0 to 5.2, support for Rails 4.x is deprecated as of Fae 2.0.
+Fae 3.x supports Rails 7. For legacy Rails support you can use Fae 2.x on Rails 5.0 to 5.2.
 
 ## Installation
 
@@ -63,6 +63,7 @@ https://www.faecms.com/documentation
 
 ### Tutorials
 
+* [Setting Up SEO with Fae](docs/tutorials/seo.md)
 * [Setting Up GraphQL with Fae](docs/tutorials/graphql_support.md)
 * [Setting Up Images and Files](docs/tutorials/image_and_files.md)
 * [Adding Dynamic Relationships to Pages](docs/tutorials/dynamic_relationships_to_pages.md)

data/app/assets/config/fae/manifest.js

@@ -0,0 +1,2 @@
+//= link fae/application.css
+//= link fae/application.js

data/app/assets/javascripts/fae/_contrast.js

@@ -0,0 +1,50 @@
+/* global Fae, modal, FCH */
+
+/**
+ * Fae contrast
+ * @namespace
+ */
+
+Fae.contrast = {
+  ready: function () {
+    this.highlightHex = getComputedStyle(document.body).getPropertyValue('--highlight-color');
+
+    // exit if highlight color css var not found
+    if (!this.highlightHex) {
+      return;
+    }
+    
+    this.$body        = $('body');
+    this.whiteHex     = '#fff';
+    this.blackHex     = '#000';
+    this.hexRegex     = /(^#[0-9a-fA-F]{6}$)/;
+
+    // exit if highlight color is not a valid hex color
+    if (!this.hexRegex.test(this.highlightHex)) {
+      return;
+    }
+
+    this.setForegroundColor();
+  },
+  
+
+  // dynamically set foreground color based on contrast with user set highlight color
+  setForegroundColor() {
+    const yiq = this.getContrastYIQ();
+    if (yiq >= 170) {
+      this.$body[0].style.setProperty('--foreground-color', this.blackHex);
+    } else {
+      this.$body[0].style.setProperty('--foreground-color', this.whiteHex);
+    }
+  },
+
+  getContrastYIQ() {
+    const hex = this.highlightHex.replace('#', '');
+    const r = parseInt(hex.substr(0, 2), 16);
+    const g = parseInt(hex.substr(2, 2), 16);
+    const b = parseInt(hex.substr(4, 2), 16);
+    return ((r * 299) + (g * 587) + (b * 114)) / 1000;
+  }
+
+
+};

data/app/assets/javascripts/fae/_deploy.js

@@ -15,7 +15,7 @@ Fae.deploy = {
     this.buttonsEnabled  = true;
     this.pollTimeout     = null;
     this.pollInterval    = 5000;
-    this.idleStates      = ['ready', 'error']
+    this.idleStates      = ['ready', 'error', 'rejected']
 
     this.pollDeployStatus();
     this.deployButtonListener();

data/app/assets/javascripts/fae/application.js

@@ -30,7 +30,9 @@
 //= require fae/vendor/jquery.tablesorter
 //= require fae/vendor/js.cookie
 //= require fae/vendor/touch_punch
-//= require fae/vendor/simplemde.min
+//= require fae/vendor/simplemde/simplemde.min
+//= require fae/vendor/simplemde/inline-attachment
+//= require fae/vendor/simplemde/codemirror-4.inline-attachment
 
 //= require fae/admin
 
@@ -49,6 +51,7 @@
 //= require fae/form/_form_manager
 //= require fae/form/fae_chosen
 //= require fae/form/fileinputer
+//= require fae/form/drag_drop
 
 //= require fae/navigation/sticky
 //= require fae/navigation/_navigation
@@ -59,6 +62,7 @@
 //= require fae/_modals
 //= require fae/_tables
 //= require fae/_deploy
+//= require fae/_contrast
 
 //= require fae
 

data/app/assets/javascripts/fae/form/_ajax.js

@@ -10,6 +10,7 @@ Fae.form.ajax = {
   init: function() {
     this.$addedit_form = $('.js-addedit-form, .js-index-addedit-form');
     this.$filter_form = $('.js-filter-form');
+    this.$nested_form = $('.nested-form');
 
     this.addEditLinks();
     this.addEditSubmission();
@@ -82,6 +83,8 @@ Fae.form.ajax = {
       Fae.form.checkbox.setCheckboxAsActive();
       Fae.form.select.init();
       Fae.form.formManager.setupAllFields($wrapper.find('form'));
+      Fae.form.dragDrop.init();
+      Fae.tables.rowSorting();
 
       // validate nested form fields on submit
       Fae.form.validator.formValidate(this.$nested_form);
@@ -118,6 +121,11 @@ Fae.form.ajax = {
 
       var $target = $(evt.target);
 
+      // We need to target the form wrapper containing the target form to enable nesting
+      // multiple forms.
+      // Relying on $this will end up redrawing the top-most parent form with the returned table
+      var $theFormWrapper = $target.closest('.js-addedit-form');
+
       // ignore calls not returning html
       if (data !== ' ' && $(data)[0]) {
         var $this = $(this);
@@ -133,13 +141,13 @@ Fae.form.ajax = {
         if ($html) {
           if($html.hasClass('js-addedit-form') || $html.hasClass( 'js-index-addedit-form' )) {
             // we're returning the table, replace everything
-            _this._addEditReplaceAndReinit($this, $html.html(), $target);
+            _this._addEditReplaceAndReinit($theFormWrapper, $html.html(), $target);
           } else if ($html.hasClass('nested-form')) {
 
             // we're returning the form due to an error, just replace the form
-            $this.find('.nested-form' ).replaceWith($html);
-            $this.find('.select select').fae_chosen();
-            $this.find('.input.file').fileinputer();
+            $theFormWrapper.find('.nested-form' ).replaceWith($html);
+            $theFormWrapper.find('.select select').fae_chosen();
+            $theFormWrapper.find('.input.file').fileinputer();
 
             Fae.form.dates.initDatepicker();
             Fae.form.dates.initDateRangePicker();
@@ -165,6 +173,7 @@ Fae.form.ajax = {
 
         $parent.fadeOut(function(){
           $parent.next('.asset-inputs').fadeIn();
+          $parent.remove();
         });
       }
 
@@ -273,6 +282,7 @@ Fae.form.ajax = {
 
         $parent.fadeOut(function(){
           $parent.next('.asset-inputs').fadeIn();
+          $parent.remove();
         });
       }
     });

data/app/assets/javascripts/fae/form/_form.js

@@ -21,15 +21,17 @@ Fae.form = {
     this.filtering.init();
     this.slugger.init();
     this.formManager.init();
-
+    
     // input type=file customization
     // This doesn't work in IE. It's not worth figuring out why by this point. IE9 gets plain file uploader.
     if (!FCH.IE9) {
       $('.input.file').fileinputer();
     }
-
+    
     // make all the hint areas
     $('.hint').hinter();
+    
+    this.dragDrop.init();
   },
 
   makeTwoColumnLabels: function() {