Fix up columnizer mixin.

Add lory slider. Replace FocusPoint wiht FocalPointField. Add ImageResizer and SuperTable plugins. Fix postinstall script in package.json . Adjust default main.es6 . Add default fontello icon so that initial grunt run doesn't fail. Fix wording README.md .
Pennebaker · Sep 1, 2017 · 9a0d65b · 9a0d65b
1 parent dd3f828
commit 9a0d65b
Show file tree

Hide file tree

Showing 10 changed files with 151 additions and 87 deletions.
diff --git a/root/README.md b/root/README.md
@@ -6,7 +6,7 @@
 
 * Ensure your ssh public key has been added to your repo account for bitbucket and github.  
 * Ensure you have the latest stable version of node.js installed.  
-* Ensure you have [Valet](https://github.com/Pennebaker/grunt-init-craft/blob/master/valet.md) is installed  
+* Ensure you have [Valet](https://github.com/Pennebaker/grunt-init-craft/blob/master/valet.md) installed  
 
 ### In terminal run:
 

diff --git a/root/bower.json b/root/bower.json
@@ -46,7 +46,8 @@
     "lazysizes": "^2.0.7",
     "es6-object-assign": "rubennorte/es6-object-assign#^1.0.3",
     "loadjs": "^3.3.1",
-    "vue": "^2.2.1"
+    "vue": "^2.2.1",
+    "lory": "^2.2.1"
   },
   "resolutions": {
     "jquery": "~2.1.4",

diff --git a/root/composer.json b/root/composer.json
@@ -57,18 +57,6 @@
         }
       }
     },
-    {
-      "type":"package",
-      "package": {
-        "name": "smcyr/Craft-FocusPoint",
-        "version":"1.1.3",
-        "source": {
-          "url": "https://github.com/smcyr/Craft-FocusPoint.git",
-          "type": "git",
-          "reference":"1.1.3"
-        }
-      }
-    },
     {
       "type":"package",
       "package": {
@@ -165,15 +153,51 @@
         }
       }
     },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/SuperTable",
+        "version":"1.0.5",
+        "source": {
+          "url": "https://github.com/engram-design/SuperTable.git",
+          "type": "git",
+          "reference":"1.0.5"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "engram-design/ImageResizer",
+        "version":"1.0.0",
+        "source": {
+          "url": "https://github.com/engram-design/ImageResizer.git",
+          "type": "git",
+          "reference":"1.0.0"
+        }
+      }
+    },
+    {
+      "type":"package",
+      "package": {
+        "name": "aelvan/FocalPointField-Craft",
+        "version":"1.0.1",
+        "source": {
+          "url": "https://github.com/aelvan/FocalPointField-Craft.git",
+          "type": "git",
+          "reference":"v1.0.1"
+        }
+      }
+    },
     {
       "type":"package",
       "package": {
         "name": "aelvan/Imager-Craft",
-        "version":"1.6.1",
+        "version":"1.6.2",
         "source": {
           "url": "https://github.com/aelvan/Imager-Craft.git",
           "type": "git",
-          "reference":"v1.6.1"
+          "reference":"v1.6.2"
         }
       }
     },
@@ -212,32 +236,19 @@
           "reference":"v1.3.2"
         }
       }
-    },
-    {
-      "type":"package",
-      "package": {
-        "name": "engram-design/SuperTable",
-        "version":"1.0.5",
-        "source": {
-          "url": "https://github.com/engram-design/SuperTable.git",
-          "type": "git",
-          "reference":"1.0.5"
-        }
-      }
     }
   ],
   "require": {
     "pennebaker/craftcms-thearchitect": "1.6.0-beta.5",
-    "nystudio107/cookies": "1.0.4",
-    "nystudio107/instantanalytics": "1.1.8",
-    "nystudio107/minify": "1.1.2",
-    "nystudio107/richvariables": "1.0.5",
-    "nystudio107/seomatic": "1.1.47",
-    "nystudio107/transcoder": "1.1.1",
+    "nystudio107/cookies": "1.0.*",
+    "nystudio107/instantanalytics": "1.1.*",
+    "nystudio107/minify": "1.1.*",
+    "nystudio107/richvariables": "1.0.*",
+    "nystudio107/seomatic": "1.1.*",
+    "nystudio107/transcoder": "1.1.*",
     "craftcms/contact-form": "1.9.0",
     "mmikkel/CpFieldLinks-Craft": "1.2.2",
     "mmikkel/Reasons-Craft": "1.0.10",
-    "smcyr/Craft-FocusPoint": "1.1.3",
     "benjamminf/craft-neo": "1.4.1",
     "benjamminf/craft-quick-field": "0.3.4",
     "benjamminf/craft-nocache": "1.0.1",
@@ -246,10 +257,12 @@
     "jamiepittock/craft-typogrify": "1.0.1",
     "michaelrog/craftfieldnotes": "0.1",
     "engram-design/ExpandedSingles": "0.2.4",
-    "aelvan/Imager-Craft": "1.6.1",
+    "engram-design/SuperTable": "1.0.5",
+    "engram-design/ImageResizer": "1.0.0",
+    "aelvan/FocalPointField-Craft": "1.0.1",
+    "aelvan/Imager-Craft": "1.6.2",
     "fruitstudios/LinkIt": "2.3.4",
     "fromtheoutfit/navee": "v1.3.0",
-    "elliotlewis/Redactor-Extras": "1.3.2",
-    "engram-design/SuperTable": "1.0.5"
+    "elliotlewis/Redactor-Extras": "1.3.2"
   }
 }
diff --git a/root/composer.lock b/root/composer.lock
diff --git a/root/grunt/copy.coffee b/root/grunt/copy.coffee
@@ -174,6 +174,13 @@ module.exports = (grunt) ->
           dest: 'dist/public/assets/scripts/lazysizes-plugins'
           filter: 'isFile'
         }
+        {
+          expand: true
+          cwd: 'bower_components/lazysizes/plugins/respimg'
+          src: 'ls.respimg.min.js'
+          dest: 'dist/public/assets/scripts/lazysizes-plugins'
+          filter: 'isFile'
+        }
         {
           expand: true
           cwd: 'bower_components/dropkick/build/js'
@@ -202,6 +209,13 @@ module.exports = (grunt) ->
           dest: 'dist/public/assets/scripts'
           filter: 'isFile'
         }
+        {
+          expand: true
+          cwd: 'bower_components/lory/dist'
+          src: 'lory.js'
+          dest: 'dist/public/assets/scripts'
+          filter: 'isFile'
+        }
       ]
     main:
       files: [
@@ -474,6 +488,22 @@ module.exports = (grunt) ->
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
+        {
+          # Super Table Plugin
+          expand: true
+          cwd: 'vendor/engram-design/SuperTable'
+          src: 'supertable/**'
+          dest: 'dist/craft/plugins'
+          filter: 'isFile'
+        }
+        {
+          # Super Table Plugin
+          expand: true
+          cwd: 'vendor/engram-design/ImageResizer'
+          src: 'imageresizer/**'
+          dest: 'dist/craft/plugins'
+          filter: 'isFile'
+        }
         {
           # Imager Plugin
           expand: true
@@ -506,13 +536,5 @@ module.exports = (grunt) ->
           dest: 'dist/craft/plugins'
           filter: 'isFile'
         }
-        {
-          # Super Table Plugin
-          expand: true
-          cwd: 'vendor/engram-design/SuperTable'
-          src: 'supertable/**'
-          dest: 'dist/craft/plugins'
-          filter: 'isFile'
-        }
       ]
   return
diff --git a/root/package.json b/root/package.json
@@ -39,6 +39,6 @@
     "load-grunt-tasks": "^3.3.0"
   },
   "scripts": {
-    "postinstall": "composer update && grunt build"
+    "postinstall": "composer update; grunt build"
   }
 }