Merge branch 'release/0.0.14.11'

app/Http/Controllers/NotesController.php

@@ -283,7 +283,7 @@ class NotesController extends Controller
      *
      * @param  float  The latitude
      * @param  float  The longitude
-     * @return string The location name
+     * @return string The location HTML
      */
     public function reverseGeoCode(float $latitude, float $longitude): string
     {
@@ -303,7 +303,7 @@ class NotesController extends Controller
             ]);
             $json = json_decode($response->getBody());
             if (isset($json->address->town)) {
-                $address = $json->address->town . ', ' . $json->address->country;
+                $address = '<span class="p-locality">' . $json->address->town . '</span>, <span class="p-country-name">' . $json->address->country . '</span>';
                 Cache::forever($latlng, $address);
 
                 return $address;
@@ -315,14 +315,15 @@ class NotesController extends Controller
                 return $address;
             }
             if (isset($json->address->county)) {
-                $address = $json->address->county . ', ' . $json->reversegeocode->country;
+                $address = '<span class="p-region">' . $json->address->county . '</span>, <span class="p-country-name">' . $json->address->country . '</span>';
                 Cache::forever($latlng, $address);
 
                 return $address;
             }
-            Cache::forever($latlng, $json->address->country);
+            $adress = '<span class="p-country-name">' . $json->address->country . '</span>';
+            Cache::forever($latlng, $address);
 
-            return $json->reversegeocode->addressparts->country;
+            return $address;
         });
     }
 }

bower.json

@@ -1,26 +0,0 @@
-{
-  "name": "jbuk-frontend",
-  "description": "",
-  "main": "",
-  "authors": [
-    "Jonny Barnes <jonny@jonnybarnes.uk>"
-  ],
-  "license": "CC0-1.0",
-  "homepage": "https://github.com/jonnybarnes/jonnybarnes.uk",
-  "moduleType": [],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "fetch": "~1.0",
-    "alertify.js": "alertifyjs#~1.0.5",
-    "store2": "~2.3.2",
-    "Autolinker.js": "~1.0",
-    "marked": "^0.3.6",
-    "sanitize-css": "^4.1.0"
-  }
-}

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 0.0.14.11 (2016-1024)
+  - Having used `yarn` for npm packages, we now also use it for bower packages
+  - Update typekit sri hash
+  - Hide co-ordinates, in data tags, we want them to be read by machines, but not humans
+  - Use `h-card` for “places”, and`h-adr` for reverse lookup location name
+
 ## Version 0.0.14.10 (2016-10-21)
   - Fix: Trying to get brid.gy markup compatibility
 

database/seeds/NotesTableSeeder.php

@@ -35,5 +35,9 @@ class NotesTableSeeder extends Seeder
             mkdir(public_path() . '/assets/profile-images/aaronparecki.com', 0755);
             copy(base_path() . '/tests/aaron.png', public_path() . '/assets/profile-images/aaronparecki.com/image');
         }
+        $noteWithCoords = App\Note::create([
+            'note' => 'Note from somehwere',
+            'location' => '53.499,-2.379'
+        ]);
     }
 }

gulpfile.js

@@ -27,22 +27,22 @@ gulp.task('js-assets', function () {
         .pipe(gulp.dest('./public/assets/js'));
 });
 
-gulp.task('bower', function () {
+gulp.task('frontend', function () {
     //copy JS files
     gulp.src([
-            'bower_components/fetch/fetch.js',
-            'bower_components/alertify.js/dist/js/alertify.js',
-            'bower_components/store2/dist/store2.min.js',
-            'bower_components/Autolinker.js/dist/Autolinker.min.js',
-            'bower_components/marked/marked.min.js',
+            'node_modules/whatwg-fetch/fetch.js',
+            'node_modules/alertify.js/dist/js/alertify.js',
+            'node_modules/store2/dist/store2.min.js',
+            'node_modules/autolinker/dist/Autolinker.min.js',
+            'node_modules/marked/marked.min.js',
         ])
-        .pipe(gulp.dest('public/assets/bower/'));
+        .pipe(gulp.dest('public/assets/frontend/'));
     //copy CSS files
     gulp.src([
-            'bower_components/alertify.js/dist/css/alertify.css',
-            'bower_components/sanitize-css/sanitize.css',
+            'node_modules/alertify.js/dist/css/alertify.css',
+            'node_modules/sanitize.css/sanitize.css',
         ])
-        .pipe(gulp.dest('public/assets/bower/'));
+        .pipe(gulp.dest('public/assets/frontend/'));
 });
 
 gulp.task('compress', function () {
@@ -61,18 +61,18 @@ gulp.task('compress', function () {
         .pipe(brotli.compress({mode: 1, quality: 11}))
         .pipe(gulp.dest('public/assets/js/'));
     //bower components
-    gulp.src('public/assets/bower/*.css')
+    gulp.src('public/assets/frontend/*.css')
         .pipe(zopfli({ format: 'gzip', append: true }))
-        .pipe(gulp.dest('public/assets/bower/'));
-    gulp.src('public/assets/bower/*.js')
+        .pipe(gulp.dest('public/assets/frontend/'));
+    gulp.src('public/assets/frontend/*.js')
         .pipe(zopfli({ format: 'gzip', append: true }))
-        .pipe(gulp.dest('public/assets/bower/'));
+        .pipe(gulp.dest('public/assets/frontend/'));
     gulp.src('public/assets/bower/*.css')
         .pipe(brotli.compress({mode: 1, quality: 11}))
-        .pipe(gulp.dest('public/assets/bower/'));
+        .pipe(gulp.dest('public/assets/frontend/'));
     gulp.src('public/assets/bower/*.js')
         .pipe(brotli.compress({mode: 1, quality: 11}))
-        .pipe(gulp.dest('public/assets/bower/'));
+        .pipe(gulp.dest('public/assets/frontend/'));
     //prism
     gulp.src('public/assets/prism/*.css')
         .pipe(zopfli({ format: 'gzip', append: true }))

package.json

@@ -27,5 +27,13 @@
   },
   "pre-commit": [
     "lint-staged"
-  ]
+  ],
+  "dependencies": {
+    "alertify.js": "^1.0.12",
+    "autolinker": "^1.2.0",
+    "marked": "^0.3.6",
+    "sanitize.css": "^4.1.0",
+    "store2": "^2.3.2",
+    "whatwg-fetch": "^1.0.0"
+  }
 }

public/assets/frontend/alertify.css

@@ -0,0 +1 @@
+.alertify-logs>*{padding:12px 24px;color:#fff;box-shadow:0 2px 5px 0 rgba(0,0,0,.2);border-radius:1px}.alertify-logs>*,.alertify-logs>.default{background:rgba(0,0,0,.8)}.alertify-logs>.error{background:rgba(244,67,54,.8)}.alertify-logs>.success{background:rgba(76,175,80,.9)}.alertify{position:fixed;background-color:rgba(0,0,0,.3);left:0;right:0;top:0;bottom:0;width:100%;height:100%;z-index:1}.alertify.hide{opacity:0;pointer-events:none}.alertify,.alertify.show{box-sizing:border-box;transition:all .33s cubic-bezier(.25,.8,.25,1)}.alertify,.alertify *{box-sizing:border-box}.alertify .dialog{padding:12px}.alertify .alert,.alertify .dialog{width:100%;margin:0 auto;position:relative;top:50%;transform:translateY(-50%)}.alertify .alert>*,.alertify .dialog>*{width:400px;max-width:95%;margin:0 auto;text-align:center;padding:12px;background:#fff;box-shadow:0 2px 4px -1px rgba(0,0,0,.14),0 4px 5px 0 rgba(0,0,0,.098),0 1px 10px 0 rgba(0,0,0,.084)}.alertify .alert .msg,.alertify .dialog .msg{padding:12px;margin-bottom:12px;margin:0;text-align:left}.alertify .alert input:not(.form-control),.alertify .dialog input:not(.form-control){margin-bottom:15px;width:100%;font-size:100%;padding:12px}.alertify .alert input:not(.form-control):focus,.alertify .dialog input:not(.form-control):focus{outline-offset:-2px}.alertify .alert nav,.alertify .dialog nav{text-align:right}.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button),.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button){background:transparent;box-sizing:border-box;color:rgba(0,0,0,.87);position:relative;outline:0;border:0;display:inline-block;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center;padding:0 6px;margin:6px 8px;line-height:36px;min-height:36px;white-space:nowrap;min-width:88px;text-align:center;text-transform:uppercase;font-size:14px;text-decoration:none;cursor:pointer;border:1px solid transparent;border-radius:2px}.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):active,.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover,.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):active,.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):hover{background-color:rgba(0,0,0,.05)}.alertify .alert nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus,.alertify .dialog nav button:not(.btn):not(.pure-button):not(.md-button):not(.mdl-button):focus{border:1px solid rgba(0,0,0,.1)}.alertify .alert nav button.btn,.alertify .dialog nav button.btn{margin:6px 4px}.alertify-logs{position:fixed;z-index:1}.alertify-logs.bottom,.alertify-logs:not(.top){bottom:16px}.alertify-logs.left,.alertify-logs:not(.right){left:16px}.alertify-logs.left>*,.alertify-logs:not(.right)>*{float:left;transform:translateZ(0);height:auto}.alertify-logs.left>.show,.alertify-logs:not(.right)>.show{left:0}.alertify-logs.left>*,.alertify-logs.left>.hide,.alertify-logs:not(.right)>*,.alertify-logs:not(.right)>.hide{left:-110%}.alertify-logs.right{right:16px}.alertify-logs.right>*{float:right;transform:translateZ(0)}.alertify-logs.right>.show{right:0;opacity:1}.alertify-logs.right>*,.alertify-logs.right>.hide{right:-110%;opacity:0}.alertify-logs.top{top:0}.alertify-logs>*{box-sizing:border-box;transition:all .4s cubic-bezier(.25,.8,.25,1);position:relative;clear:both;backface-visibility:hidden;perspective:1000;max-height:0;margin:0;padding:0;overflow:hidden;opacity:0;pointer-events:none}.alertify-logs>.show{margin-top:12px;opacity:1;max-height:1000px;padding:12px;pointer-events:auto}