Changed where stuff compiled

  - css now compiles to /css instead of /client/dist/css
Css is now loaded via themedCSS in the template
Javascript requirements now load in using the module name, not the path
Updated gitattributes

.gitattributes

@@ -1,4 +1,19 @@
+# tests
 /tests export-ignore
+/phpunit.xml.dist export-ignore
+/phpcs.xml.dist export-ignore
+
+# js related stuff
+/.eslint export-ignore
+/package.json export-ignore
+/package-lock.json export-ignore
+/webpack.config.dev.js export-ignore
+/webpack.config.prod.js export-ignore
+/client/src export-ignore
+/client/tests export-ignore
+
+# other
 /.gitignore export-ignore
 /.travis.yml export-ignore
-/client/src export-ignore
+/.scrutinizer.yml export-ignore
+/.editorconfig export-ignore

client/dist/js/vendor.js

@@ -91,7 +91,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "js/" + chunkId + ".js";
+/******/ 		script.src = __webpack_require__.p + "client/dist/js/" + chunkId + ".js";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

client/src/js/components/list/Location.jsx

@@ -28,10 +28,10 @@ class Location extends Component {
    * @return Boolean | String
    */
   getDistance() {
-    const { location, search } = this.props;
+    const { location } = this.props;
     const distance = location.Distance;
 
-    if (distance === 0 && !search) {
+    if (distance === -1) {
       return false;
     }
 

src/objects/Location.php

@@ -127,6 +127,7 @@ public function getCoords()
      * custom labels for fields
      *
      * @param bool $includerelations
+     *
      * @return array|string
      */
     public function fieldLabels($includerelations = true)
@@ -137,6 +138,7 @@ public function fieldLabels($includerelations = true)
         $labels['Category.Name'] = 'Category';
         $labels['Category.ID'] = 'Category';
         $labels['Featured.NiceAsBoolean'] = 'Featured';
+
         return $labels;
     }
 
@@ -145,38 +147,37 @@ public function fieldLabels($includerelations = true)
      */
     public function getCMSFields()
     {
-        $fields = parent::getCMSFields();
-
-        $fields->removeByName(array(
-            'Import_ID',
-        ));
-
-        $fields->dataFieldByName('Website')
-            ->setAttribute('placeholder', 'http://');
-
-        $fields->replaceField('Email', EmailField::create('Email'));
-
-        $fields->replaceField(
-            'CategoryID',
-            DropdownField::create('CategoryID', 'Category', LocationCategory::get()->map())->setEmptyString('')
-        );
-
-        $featured = $fields->dataFieldByName('Featured')
-            ->setDescription('Location will display near the top of the results list');
-        $fields->insertAfter(
-            $featured,
-            'CategoryID'
-        );
-
-        // allow to be extended via DataExtension
-        $this->extend('updateLocationFields', $fields);
-
-        return $fields;
+        // so it can easily be extended - concept taken from the blog module
+        $this->beforeUpdateCMSFields(function ($fields) {
+            $fields->removeByName(array(
+                'Import_ID',
+            ));
+
+            $fields->dataFieldByName('Website')
+                   ->setAttribute('placeholder', 'http://');
+
+            $fields->replaceField('Email', EmailField::create('Email'));
+
+            $fields->replaceField(
+                'CategoryID',
+                DropdownField::create('CategoryID', 'Category', LocationCategory::get()->map())->setEmptyString('')
+            );
+
+            $featured = $fields->dataFieldByName('Featured')
+                               ->setDescription('Location will display near the top of the results list');
+            $fields->insertAfter(
+                $featured,
+                'CategoryID'
+            );
+        });
+
+        return parent::getCMSFields();
     }
 
     /**
      * @param null $member
      * @param array $context
+     *
      * @return bool
      */
     public function canView($member = null, $context = [])
@@ -187,6 +188,7 @@ public function canView($member = null, $context = [])
     /**
      * @param null $member
      * @param array $context
+     *
      * @return bool|int
      */
     public function canEdit($member = null, $context = [])
@@ -197,6 +199,7 @@ public function canEdit($member = null, $context = [])
     /**
      * @param null $member
      * @param array $context
+     *
      * @return bool|int
      */
     public function canDelete($member = null, $context = [])
@@ -207,6 +210,7 @@ public function canDelete($member = null, $context = [])
     /**
      * @param null $member
      * @param array $context
+     *
      * @return bool|int
      */
     public function canCreate($member = null, $context = [])

src/pages/Locator.php

@@ -79,36 +79,36 @@ class Locator extends Page
      */
     public function getCMSFields()
     {
-        $fields = parent::getCMSFields();
-
-        // Settings
-        $fields->addFieldsToTab('Root.Settings', array(
-            HeaderField::create('DisplayOptions', 'Display Options', 3),
-            OptionsetField::create('Unit', 'Unit of measure', array(
-                'm' => 'Miles',
-                'km' => 'Kilometers'
-            ), 'm'),
-            DropdownField::create('Clusters', 'Use clusters?', array(
-                'false' => 'No',
-                'true' => 'Yes'
-            ), 'false'),
-        ));
-
-        // Filter categories
-        $config = GridFieldConfig_RelationEditor::create();
-        $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-        $config->addComponent(new GridFieldAddExistingSearchButton());
-        $categories = $this->Categories();
-        $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
-                                    ->setDescription('only show locations from the selected category');
-
-        // Filter
-        $fields->addFieldsToTab('Root.Filter', array(
-            HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
-            $categoriesField,
-        ));
-
-        return $fields;
+        // so it can easily be extended - concept taken from the blog module
+        $this->beforeUpdateCMSFields(function($fields) {
+            // Settings
+            $fields->addFieldsToTab('Root.Settings', array(
+                HeaderField::create('DisplayOptions', 'Display Options', 3),
+                OptionsetField::create('Unit', 'Unit of measure', array(
+                    'm' => 'Miles',
+                    'km' => 'Kilometers'
+                ), 'm'),
+                OptionsetField::create('Clusters', 'Use clusters?', array(
+                    'false' => 'No',
+                    'true' => 'Yes'
+                ), 'false'),
+            ));
+
+            // Filter categories
+            $config = GridFieldConfig_RelationEditor::create();
+            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+            $config->addComponent(new GridFieldAddExistingSearchButton());
+            $categories = $this->Categories();
+            $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
+                                        ->setDescription('only show locations from the selected category');
+
+            // Filter
+            $fields->addFieldsToTab('Root.Filter', array(
+                HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
+                $categoriesField,
+            ));
+        });
+        return parent::getCMSFields();
     }
 
     /**

templates/Dynamic/Locator/Layout/Locator.ss

@@ -8,7 +8,7 @@
 
 </div>
 
-<% require javascript('locator/client/dist/js/vendor.js') %>
-<% require javascript('locator/client/dist/js/main.js') %>
+<% require javascript('dynamic/silverstripe-locator:client/dist/js/vendor.js') %>
+<% require javascript('dynamic/silverstripe-locator:client/dist/js/main.js') %>
 <%-- TODO - make optional? --%>
-<% require css('locator/client/dist/css/main.css') %>
+<% require themedCSS('locator') %>

webpack.config.dev.js

@@ -7,7 +7,7 @@ const Path = require('path');
 const paths = {
   srcJs: Path.resolve('client', 'src', 'js'),
   srcSass: Path.resolve('client', 'src', 'scss'),
-  dist: Path.resolve('client', 'dist'),
+  dist: Path.resolve(''),
 };
 
 module.exports = {
@@ -17,7 +17,7 @@ module.exports = {
   },
   output: {
     path: paths.dist,
-    filename: Path.join('js', '[name].js'),
+    filename: Path.join('client', 'dist', 'js', '[name].js'),
   },
   devtool: 'source-map',
   resolve: {
@@ -86,7 +86,7 @@ module.exports = {
         test: /\.(png|gif|jpe?g|svg)$/,
         loader: 'file-loader',
         options: {
-          name: Path.join('images', '[name].[ext]'),
+          name: Path.join('client', 'dist', 'images', '[name].[ext]'),
         },
       },
     ],
@@ -102,6 +102,6 @@ module.exports = {
       // move any modules inside "node_modules" to inside the vendor dist file
       minChunks: module => module.context && module.context.indexOf('/node_modules/') > -1,
     }),
-    new ExtractTextPlugin({ filename: Path.join('css', 'main.css'), allChunks: true }),
+    new ExtractTextPlugin({ filename: Path.join('css', 'locator.css'), allChunks: true }),
   ],
 };

webpack.config.prod.js

@@ -102,6 +102,6 @@ module.exports = {
       // move any modules inside "node_modules" to inside the vendor dist file
       minChunks: module => module.context && module.context.indexOf('/node_modules/') > -1,
     }),
-    new ExtractTextPlugin({ filename: Path.join('css', 'main.css'), allChunks: true }),
+    new ExtractTextPlugin({ filename: Path.join('css', 'locator.css'), allChunks: true }),
   ],
 };