jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'release/0.0.11'

Browse source
This commit is contained in:
Jonny Barnes 2016-09-17 21:22:59 +01:00
commit 421d11b151
19 changed files with 324 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
app/Console/Commands/ParseCachedWebMentions.php Normal file
View file

@ -0,0 +1,70 @@
<?php
namespace App\Console\Commands;
use App\WebMention;
use Illuminate\Console\Command;
use Illuminate\FileSystem\FileSystem;
class ParseCachedWebMentions extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'webmentions:parsecached';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Re-parse the webmention’s cached HTML';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle(FileSystem $filesystem)
{
$HTMLfiles = $filesystem->allFiles(storage_path() . '/HTML');
foreach($HTMLfiles as $file) {
$filepath = $file->getPathname();
$html = $filesystem->get($filepath);
$url = $this->URLFromFilename($filepath);
$microformats = \Mf2\parse($html, $url);
$webmention = WebMention::where('source', $url)->firstOrFail();
$webmention->mf2 = json_encode($microformats);
$webmention->save();
}
}
/**
* Determine the source URL from a filename.
*
* @param string
* @return string
*/
private function URLFromFilename($filepath)
{
$dir = mb_substr($filepath, mb_strlen(storage_path() . '/HTML/'));
$url = str_replace(['http/', 'https/'], ['http://', 'https://'], $dir);
if (mb_substr($url, -1) == 'index.html') {
$url = mb_substr($url, 0, mb_strlen($url) - 10);
}
return $url;
}
}

47
app/Console/Commands/ReDownloadWebMentions.php Normal file
View file

@ -0,0 +1,47 @@
<?php
namespace App\Console\Commands;
use App\WebMention;
use Illuminate\Console\Command;
use App\Jobs\DownloadWebMention;
class ReDownloadWebMentions extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'webmentions:redownload';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Redownload the HTML content of webmentions';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$webmentions = WebMention::all();
foreach ($webmentions as $webmention) {
$this->dispatch(new DownloadWebMention($webmention->source));
}
}
}

2
app/Console/Kernel.php
View file

@ -14,6 +14,8 @@ class Kernel extends ConsoleKernel
*/
protected $commands = [
Commands\SecurityCheck::class,
Commands\ParseCachedWebMentions::class,
Commands\ReDownloadWebMentions::class,
];
/**

67
app/Jobs/DownloadWebMention.php Normal file
View file

@ -0,0 +1,67 @@
<?php
namespace App\Jobs;
use GuzzleHttp\Client;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
class DownloadWebMention implements ShouldQueue
{
use InteractsWithQueue, Queueable, SerializesModels;
/**
* The webmention source URL.
*
* @var
*/
protected $source;
/**
* Create a new job instance.
*
* @return void
*/
public function __construct(string $source)
{
$this->source = $source;
}
/**
* Execute the job.
*
* @return void
*/
public function handle(Client $guzzle)
{
$response = $guzzle->request('GET', $source);
//4XX and 5XX responses should get Guzzle to throw an exception,
//Laravel should catch and retry these automatically.
if ($response->getStatusCode() == '200') {
$filesystem = \Illuminate\FileSystem\FileSystem();
$filesystem->put(
$this->createFilenameFromURL($source),
(string) $response->getBody())
}
}
}
/**
* Create a file path from a URL. This is used when caching the HTML
* response.
*
* @param string The URL
* @return string The path name
*/
private function createFilenameFromURL($url)
{
$url = str_replace(['https://', 'http://'], ['https/', 'http/'], $url);
if (substr($url, -1) == '/') {
$url = $url . 'index.html';
}
return $url;
}
}

62
app/Jobs/ProcessWebMention.php
View file

@ -4,10 +4,8 @@ namespace App\Jobs;
use Mf2;
use App\Note;
use HTMLPurifier;
use App\WebMention;
use GuzzleHttp\Client;
use HTMLPurifier_Config;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Jonnybarnes\WebmentionsParser\Parser;
@ -22,7 +20,6 @@ class ProcessWebMention extends Job implements ShouldQueue
protected $note;
protected $source;
protected $guzzle;
/**
* Create a new job instance.
@ -31,28 +28,26 @@ class ProcessWebMention extends Job implements ShouldQueue
* @param string $source
* @return void
*/
public function __construct(Note $note, $source, Client $guzzle = null)
public function __construct(Note $note, $source)
{
$this->note = $note;
$this->source = $source;
$this->guzzle = $guzzle ?? new Client();
}
/**
* Execute the job.
*
* @param \Jonnybarnes\WebmentionsParser\Parser $parser
* @param \Jonnybarnes\WebmentionsParser\Parser $parser
* @param \GuzzleHttp\Client $guzzle
* @return void
*/
public function handle(Parser $parser)
public function handle(Parser $parser, Client $guzzle)
{
$sourceURL = parse_url($this->source);
$baseURL = $sourceURL['scheme'] . '://' . $sourceURL['host'];
$remoteContent = $this->getRemoteContent($this->source);
$remoteContent = $this->getRemoteContent($this->source, $guzzle);
if ($remoteContent === null) {
throw new RemoteContentNotFoundException;
}
$microformats = Mf2\parse($remoteContent, $baseURL);
$microformats = Mf2\parse($remoteContent, $this->source);
$webmentions = WebMention::where('source', $this->source)->get();
foreach ($webmentions as $webmention) {
//check webmention still references target
@ -65,7 +60,6 @@ class ProcessWebMention extends Job implements ShouldQueue
return;
}
//webmenion is still a reply, so update content
$microformats = $this->filterHTML($microformats);
$this->dispatch(new SaveProfileImage($microformats));
$webmention->mf2 = json_encode($microformats);
$webmention->save();
@ -94,7 +88,6 @@ class ProcessWebMention extends Job implements ShouldQueue
$webmention = new WebMention();
$type = $parser->getMentionType($microformats); //throw error here?
$this->dispatch(new SaveProfileImage($microformats));
$microformats = $this->filterHTML($microformats);
$webmention->source = $this->source;
$webmention->target = $this->note->longurl;
$webmention->commentable_id = $this->note->id;
@ -107,13 +100,14 @@ class ProcessWebMention extends Job implements ShouldQueue
/**
* Retreive the remote content from a URL, and caches the result.
*
* @param string The URL to retreive content from
* @return string|null The HTML from the URL (or null if error)
* @param string $url
* @param GuzzleHttp\client $guzzle
* @return string|null
*/
private function getRemoteContent($url)
private function getRemoteContent($url, Client $guzzle)
{
try {
$response = $this->guzzle->request('GET', $url);
$response = $guzzle->request('GET', $url);
} catch (RequestException $e) {
return;
}
@ -139,43 +133,11 @@ class ProcessWebMention extends Job implements ShouldQueue
*/
private function createFilenameFromURL($url)
{
$url = str_replace(['https://', 'http://'], ['', ''], $url);
$url = str_replace(['https://', 'http://'], ['https/', 'http/'], $url);
if (substr($url, -1) == '/') {
$url = $url . 'index.html';
}
return $url;
}
/**
* Filter the HTML in a reply webmention.
*
* @param array The unfiltered microformats
* @return array The filtered microformats
*/
private function filterHTML($microformats)
{
if (isset($microformats['items'][0]['properties']['content'][0]['html'])) {
$microformats['items'][0]['properties']['content'][0]['html_purified'] = $this->useHTMLPurifier(
$microformats['items'][0]['properties']['content'][0]['html']
);
}
return $microformats;
}
/**
* Set up and use HTMLPurifer on some HTML.
*
* @param string The HTML to be processed
* @return string The processed HTML
*/
private function useHTMLPurifier($html)
{
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.SerializerPath', storage_path() . '/HTMLPurifier');
$purifier = new HTMLPurifier($config);
return $purifier->purify($html);
}
}

65
app/Observers/WebMentionObserver.php Normal file
View file

@ -0,0 +1,65 @@
<?php
namespace App\Observers;
use HTMLPurifier;
use App\WebMention;
use HTMLPurifier_Config;
class WebMentionObserver
{
/**
* Listen for the created event.
*
* @param WebMention $webmention
* @return void
*/
public function created(WebMention $webmention)
{
$this->addFilteredHTML($webmention);
}
/**
* Listen for the updated event.
*
* @param WebMention $webmention
* @return void
*/
public function updated(WebMention $webmention)
{
$this->addFilteredHTML($webmention);
}
/**
* Filter the HTML in a reply webmention.
*
* @param WebMention The WebMention model
* @return void
*/
private function addFilteredHTML(WebMention $webmention)
{
$mf2 = json_decode($webmention->mf2);
if (isset($mf2['items'][0]['properties']['content'][0]['html'])) {
$mf2['items'][0]['properties']['content'][0]['html_purified'] = $this->useHTMLPurifier(
$mf2['items'][0]['properties']['content'][0]['html']
);
}
$webmention->mf2 = json_encode($mf2);
$webmetion->save();
}
/**
* Set up and use HTMLPurifer on some HTML.
*
* @param string The HTML to be processed
* @return string The processed HTML
*/
private function useHTMLPurifier($html)
{
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.SerializerPath', storage_path() . '/HTMLPurifier');
$purifier = new HTMLPurifier($config);
return $purifier->purify($html);
}
}

5
app/Providers/AppServiceProvider.php
View file

@ -5,6 +5,8 @@ namespace App\Providers;
use App\Tag;
use App\Note;
use Validator;
use App\WebMention;
use App\Observers\WebMentionObserver;
use Illuminate\Support\ServiceProvider;
class AppServiceProvider extends ServiceProvider
@ -45,6 +47,9 @@ class AppServiceProvider extends ServiceProvider
$note->tags()->attach($tagsToAdd);
}
});
//observer the webmention model
WebMention::observe(WebMentionObserver::class);
}
/**

8
changelog.md
View file

@ -1,5 +1,13 @@
# Changelog
## Version 0.0.11 (2016-09-17)
- update linked GPG key (issue#7)
- Added `integrity` values to external assets (issue#10)
- Move mapbox links into own sub-view (issue#11)
- Updated mapbox version (issue#12)
- Massive refactor of webmention code, allowing for re-parse command (issue#8)
- Add license file (issue#13)
## Version 0.0.10 (2016-09-10)
- Add an artisan command for sensiolab’s security check
- Remove `filp/whoops`, just use Laravel’s error reporting

26
license.md Normal file
View file

@ -0,0 +1,26 @@
The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.

32
public/assets/jonnybarnes-public-key-ecc.asc
View file

@ -1,22 +1,16 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mHMEVLAKNRMJKyQDAwIIAQELAwMEXwZt3GCBMfYdy4E6SYBlhI5OWB5KLWDJIszb
rHVk1lFzuCh8v9vO3TMJipved89lKdsqc8xa1rtUhDUSyk3DN6G9EA8CaZzPAI0W
3rIIjKr/6XdsrCbr4uBm8pfxojlrtCNKb25ueSBCYXJuZXMgPGpvbm55QGpvbm55
YmFybmVzLnVrPoifBBMTCgAnAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheABQJW
jWw8BQkDvpWHAAoJEE6N3A7eXSOmEV0Bf1mwzjzKSZvn5l/VhQTrMbM47K82w/wj
JYF9ZTy1jmXTWTMB3grnjB+VhkF0fJEO7QF+N6EULNZu9xpUX00LfasRvjhDQEoZ
GWLJWuES3pIheS2wUKScnVxv/3Ntxl9DZyBRuHcEVLAKNRIJKyQDAwIIAQELAwME
MyNUNRiVoPuUZHkZmoR2fP0j2d6ukPxSyIwE1i0SOokPgh2ho9az2i1JuEJnAJdC
Jk7anTWqVIVDqY24BPdCAq3Tevvw6ZxYTX5syhQ06rP5fmA9qRvaJMj96bUk2I7U
AwEJCYiHBBgTCgAPAhsMBQJWjWxuBQkDvpW5AAoJEE6N3A7eXSOmEE4Bfj2IlY+w
66UuDaZubytEJ7RqZjxroSTygbFzmrrPcyeJo34spa97on2RJa3I1SUEqAF/ZXkY
dwnMIGjsQFhmp0v0SeQqRKzQ0UsP4X/fCMhXcq1qvSZvp0xGd88OIawGL5YauDME
VLBHDxYJKwYBBAHaRw8BAQdAN3zPDRahp3XZ2Q6SJcE4s36GziDIEOLq+jYZVTjG
mQ6I5wQYEwoADwIbAgUCVo1sjAUJA75Y/QBqXyAEGRYKAAYFAlSwRw8ACgkQzehE
GPNsf3t+2wEA4ZD2Fpw9oZuDVLKUfY2/7WvG9MFTJmhO7j6N2C8rdYgBAIm15ezk
A2DUCxDKmufsYrkp73nyB/5jq0++qdFXI2oMCRBOjdwO3l0jpm9FAX49J1fL41ZU
7QpJFEd8gJbYwjCu93YuIP6xpgSfNzE7y4Yl3fYEihmo21aEpeuxIY4BfiNY6r/z
e5MEKgkw5EYZZK295zhyzZUh0k+0Aezlj1G9faAWgasI+Hp4ATIicNunng==
=uwJN
mG8EV0W04xMFK4EEACIDAwSZOjA8NdI6UvbI/Sqw8LfpckfDXMuiowrVgcANjhDr
vQtvr0bYm7RnNlbiuwTQHQ064H3pwjJJYC12I5B6q1Is7h4PYzU4/ahtisb03U/Q
ThDDuWxDKQq2hcyfrNI02KO0I0pvbm55IEJhcm5lcyA8am9ubnlAam9ubnliYXJu
ZXMudWs+iJ8EExMKACcFAldFtOMCGwMFCQHhM4AFCwkIBwMFFQoJCAsFFgMCAQAC
HgECF4AACgkQGyx2r7FshZvSrAF+KMkuQT9BQfuIABIsO0PelQazXdNTKevOXafw
106fCYlMN0Hp4VPn5fECCa7D6jbzAX4wwSrN/4QuqMTKT8NlpncqD1wlACbfJtzT
AUrL+SpDYdhNoXAQbd0DJ8UN12S5oMS4cwRXRbTjEgUrgQQAIgMDBHSZG2tOrrTg
IWIDw51BHvsBVzyVGs3EU/Cju4lawgQ8E1VMdqwLg4JcC8aCb1s+CBBQ2g5Dh9QI
2YCCxV4alhD9vrubTJ2qNysel3R8hFsrmTJZi9g9GxnqZOCIqiytkgMBCQmIhwQY
EwoADwUCV0W04wIbDAUJAeEzgAAKCRAbLHavsWyFm5pnAYDDGoSt9oVjs8MrPNZj
POjI5i6+rP2D7t+ceSnhYfJ6m1pn85qb4kOOsiOtf3sB4IABgIRdK3p4ir1x6ikh
3RM9aDM/2ZzrI4t1TpPDWtkqXf9RdpGy7qG7IM9TNq1PY1EOrQ==
=zu6v
-----END PGP PUBLIC KEY BLOCK-----

52
public/assets/jonnybarnes-public-key.asc
View file

@ -1,52 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
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
igdpfiESmrELanSGdSsSBtieo+imJ3G3xmj2vrs=
=dnNH
-----END PGP PUBLIC KEY BLOCK-----

3
resources/views/admin/newnote.blade.php
View file

@ -22,8 +22,7 @@ New Note « Admin CP
@stop
@section('scripts')
<link rel="styelsheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
@include('templates.mapbox-links')
<script src="/assets/js/newnote.js"></script>
<script src="/assets/bower/store2.min.js"></script>

3
resources/views/admin/newplace.blade.php
View file

@ -19,8 +19,7 @@ New Place « Admin CP
@stop
@section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
@include('templates.mapbox-links')
<script src="/assets/js/newplace.js"></script>
@stop

3
resources/views/allnotes.blade.php
View file

@ -19,8 +19,7 @@ Notes « Jonny Barnes
@stop
@section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
@include('templates.mapbox-links')
<script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script>

2
resources/views/master.blade.php
View file

@ -30,7 +30,7 @@
<main>
@yield('content')
</main>
<script src="//use.typekit.net/kmb3cdb.js"></script>
<script src="https://use.typekit.net/kmb3cdb.js" integrity="sha384-K/4E0NzJZXdpsxDKWbpP3NkSG+eA9slO7vv62+eOYgGPD142NqbSIvjcoVGvEh/r" crossorigin="anonymous"></script>
<script>try{Typekit.load({ async: true });}catch(e){}</script>
@section('scripts')
<!--scripts go here when needed-->

3
resources/views/micropubnewnotepage.blade.php
View file

@ -32,8 +32,7 @@ New Note « Jonny Barnes
@stop
@section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
@include('templates.mapbox-links')
<script src="/assets/bower/fetch.js"></script>
<script src="/assets/bower/store2.min.js"></script>

3
resources/views/singlenote.blade.php
View file

@ -31,8 +31,7 @@
@stop
@section('scripts')
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
@include('templates.mapbox-links')
<script src="/assets/bower/Autolinker.min.js"></script>
<script src="/assets/js/links.js"></script>

3
resources/views/singleplace.blade.php
View file

@ -14,8 +14,7 @@
@stop
@section('scripts')
<script src="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.js"></script>
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.2.3/mapbox.css">
@include('templates.mapbox-links')
<script src="/assets/js/maps.js"></script>
@stop

2
resources/views/templates/mapbox-links.blade.php Normal file
View file

@ -0,0 +1,2 @@
<link rel="stylesheet" href="https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css" integrity="sha384-ZDBUvY/seENyR1fE6u4p1oMFfsKVjIlkiB6TrCdXjeZVPlYanREcmZopTV8WFZ0q" crossorigin="anonymous">
<script src="https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.js" integrity="sha384-RIOuxiXOmovmIxeDCaAvWrMaX/XWXpPiRTUIBEjiZt5HQ8orGVqQhlmfno0eoLaX" crossorigin="anonymous"></script>