Merge branch 'develop'

praxisnetau · Jan 3, 2018 · cf1dc43 · cf1dc43
2 parents 8c5acb2 + 87ad3ad
commit cf1dc43
Show file tree

Hide file tree

Showing 14 changed files with 1,008 additions and 269 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2017, Praxis Interactive.
+Copyright (c) 2018, Praxis Interactive.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the

diff --git a/README.md b/README.md
@@ -82,9 +82,9 @@ Please see [contributing](CONTRIBUTING.md) for more information.
 
 ## Maintainers
 
-[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](http://www.praxis.net.au)
+[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](https://www.praxis.net.au)
 ---|---
-[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](http://www.praxis.net.au)
+[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](https://www.praxis.net.au)
 
 ## License
 

diff --git a/app/_config.php b/app/_config.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * SilverWare application configuration file.
+ * {app-title} application configuration file.
  *
  * PHP version >=5.6.0
  *
  * For full copyright and license information, please view the
  * LICENSE.md file that was distributed with this source code.
  *
- * @package SilverWare\App
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @package {app-namespace}
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 
 // Define Application Constants:

diff --git a/app/code/Page.php b/app/code/Page.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of SilverWare.
+ * This file is part of {app-title}.
  *
  * PHP version >=5.6.0
  *
  * For full copyright and license information, please view the
  * LICENSE.md file that was distributed with this source code.
  *
- * @package SilverWare\App
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @package {app-namespace}
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 
 use SilverStripe\CMS\Model\SiteTree;
@@ -23,11 +23,11 @@
  * As SilverStripe relies on having a global Page class available, this class is
  * intentionally defined without a namespace in order to keep SilverStripe happy.
  *
- * @package SilverWare\App
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @package {app-namespace}
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 class Page extends SiteTree
 {

diff --git a/app/code/PageController.php b/app/code/PageController.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of SilverWare.
+ * This file is part of {app-title}.
  *
  * PHP version >=5.6.0
  *
  * For full copyright and license information, please view the
  * LICENSE.md file that was distributed with this source code.
  *
- * @package SilverWare\App
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @package {app-namespace}
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 
 use SilverStripe\CMS\Controllers\ContentController;
@@ -23,11 +23,11 @@
  * As SilverStripe relies on having a global PageController class available, this class is
  * intentionally defined without a namespace in order to keep SilverStripe happy.
  *
- * @package SilverWare\App
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @package {app-namespace}
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 class PageController extends ContentController
 {

diff --git a/app/package.json b/app/package.json
@@ -14,7 +14,7 @@
     {
       "name": "Colin Tucker",
       "email": "colin@praxis.net.au",
-      "url": "http://www.praxis.net.au"
+      "url": "https://www.praxis.net.au"
     }
   ],
   "repository": {
@@ -29,25 +29,29 @@
   },
   "scripts": {
     "watch": "webpack --env.development --colors --watch",
-    "build": "webpack --env.production --colors --optimize-minimize"
+    "build": "webpack --env.production --colors --progress --optimize-minimize"
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^7.1.6",
+    "autoprefixer": "^7.2.4",
     "babel-core": "^6.26.0",
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.1",
     "clean-webpack-plugin": "^0.1.17",
-    "copy-webpack-plugin": "^4.2.3",
+    "copy-webpack-plugin": "^4.3.1",
     "css-loader": "^0.28.7",
     "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^1.1.5",
+    "file-loader": "^1.1.6",
     "node-sass": "^4.7.2",
     "postcss-loader": "^2.0.9",
+    "resolve-url-loader": "^2.2.1",
     "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.0",
+    "style-loader": "^0.19.1",
+    "svgo": "^1.0.3",
+    "svgo-loader": "^2.1.0",
+    "uglifyjs-webpack-plugin": "^1.1.5",
     "url-loader": "^0.6.2",
-    "webpack": "^3.8.1"
+    "webpack": "^3.10.0"
   },
   "babel": {
     "presets": [

diff --git a/app/postcss.config.js b/app/postcss.config.js
@@ -1,3 +1,6 @@
+/* PostCSS Configuration
+===================================================================================================================== */
+
 module.exports = {
   plugins: [
     require('autoprefixer')

diff --git a/app/src/Pages/HomePage.php b/app/src/Pages/HomePage.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of SilverWare.
+ * This file is part of {app-title}.
  *
  * PHP version >=5.6.0
  *
  * For full copyright and license information, please view the
  * LICENSE.md file that was distributed with this source code.
  *
  * @package SilverWare\App\Pages
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 
 namespace SilverWare\App\Pages;
@@ -27,10 +27,10 @@
  * An extension of the page class for a home page.
  *
  * @package SilverWare\App\Pages
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 class HomePage extends Page
 {

diff --git a/app/src/Pages/HomePageController.php b/app/src/Pages/HomePageController.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of SilverWare.
+ * This file is part of {app-title}.
  *
  * PHP version >=5.6.0
  *
  * For full copyright and license information, please view the
  * LICENSE.md file that was distributed with this source code.
  *
  * @package SilverWare\App\Pages
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 
 namespace SilverWare\App\Pages;
@@ -23,10 +23,10 @@
  * An extension of the page controller class for a home page controller.
  *
  * @package SilverWare\App\Pages
- * @author Colin Tucker <colin@praxis.net.au>
- * @copyright 2017 Praxis Interactive
- * @license https://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @link https://github.com/praxisnetau/silverware-app
+ * @author {author-name} <{author-email}>
+ * @copyright {year} {author-company}
+ * @license {license-link} {license-name}
+ * @link {project-link}
  */
 class HomePageController extends PageController
 {