diff --git a/app/Http/Controllers/NotesAdminController.php b/app/Http/Controllers/NotesAdminController.php index c8841d4b..8db04587 100644 --- a/app/Http/Controllers/NotesAdminController.php +++ b/app/Http/Controllers/NotesAdminController.php @@ -6,6 +6,7 @@ use App\Note; use Validator; use Illuminate\Http\Request; use App\Services\NoteService; +use App\Jobs\SendWebMentions; class NotesAdminController extends Controller { @@ -41,6 +42,17 @@ class NotesAdminController extends Controller return view('admin.listnotes', ['notes' => $notes]); } + /** + * The delete note page. + * + * @param int id + * @return view + */ + public function deleteNotePage($id) + { + return view('admin.deletenote', ['id' => $id]); + } + /** * Display the form to edit a specific note. * @@ -92,16 +104,29 @@ class NotesAdminController extends Controller public function editNote($noteId, Request $request) { //update note data - $note = Note::find($noteId); + $note = Note::findOrFail($noteId); $note->note = $request->input('content'); $note->in_reply_to = $request->input('in-reply-to'); $note->save(); if ($request->input('webmentions')) { - $wmc = new WebMentionsController(); - $wmc->send($note); + dispatch(new SendWebMentions($note)); } return view('admin.editnotesuccess', ['id' => $noteId]); } + + /** + * Delete the note. + * + * @param int id + * @return view + */ + public function deleteNote($id) + { + $note = Note::findOrFail($id); + $note->delete(); + + return view('admin.deletenotesuccess'); + } } diff --git a/app/Jobs/SendWebMentions.php b/app/Jobs/SendWebMentions.php index 15a3e4a5..cd593e56 100644 --- a/app/Jobs/SendWebMentions.php +++ b/app/Jobs/SendWebMentions.php @@ -58,7 +58,7 @@ class SendWebMentions implements ShouldQueue * @param \GuzzleHttp\Client $guzzle * @return string The webmention endpoint URL */ - private function discoverWebmentionEndpoint($url, $guzzle) + public function discoverWebmentionEndpoint($url, $guzzle) { //let’s not send webmentions to myself if (parse_url($url, PHP_URL_HOST) == env('LONG_URL', 'localhost')) { diff --git a/changelog.md b/changelog.md index c0918751..70db6653 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Changelog +## Version 0.0.15.7 (2016-11-07) + - Add a reply icon in note metadata + - Allow notes to be deleted + ## Version 0.0.15.6 (2016-11-03) - Remove reply/like/repost links, not needed without indie-action - Add facebook syndication link (issue#29) diff --git a/composer.lock b/composer.lock index ce53b0dd..c9c21dce 100644 --- a/composer.lock +++ b/composer.lock @@ -58,16 +58,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.19.22", + "version": "3.19.23", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "04d2a027cac94674b52dfb4d68667bfe225b0fb5" + "reference": "fbfb87734e5d298b40354ac7fb3f95d0f72ad16e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/04d2a027cac94674b52dfb4d68667bfe225b0fb5", - "reference": "04d2a027cac94674b52dfb4d68667bfe225b0fb5", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fbfb87734e5d298b40354ac7fb3f95d0f72ad16e", + "reference": "fbfb87734e5d298b40354ac7fb3f95d0f72ad16e", "shasum": "" }, "require": { @@ -134,7 +134,7 @@ "s3", "sdk" ], - "time": "2016-11-02T22:24:48+00:00" + "time": "2016-11-03T20:28:28+00:00" }, { "name": "barnabywalters/mf-cleaner", diff --git a/public/assets/css/global.css b/public/assets/css/global.css index 6262d99b..a9d9641b 100644 --- a/public/assets/css/global.css +++ b/public/assets/css/global.css @@ -1,3 +1,3 @@ -html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:-ms-flexbox;display:flex;-ms-flex-flow:row;flex-flow:row}#topheader a{padding:0.5em 1em}#topheader h1{font-size:1em;margin:0}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em;fill:#268bd2}.coordinates{font-size:60%;color:#839496}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}article h1{font-size:1.2em;margin-bottom:0}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}code{font-family:"Operator Mono","Monaco","Inconsolata",monospace;font-weight:200}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px;font-size:1em}textarea{font-size:1.2em}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} +html{background:url("/assets/img/escheresque.png")}.map{height:150px}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}#topheader{display:-ms-flexbox;display:flex;-ms-flex-flow:row;flex-flow:row}#topheader a{padding:0.5em 1em}#topheader h1{font-size:1em;margin:0}nav{padding-top:0.5em}.social-list{padding-left:2em}.note{background-color:#eee8d5;box-shadow:0 0 10px 2px #93a1a1;padding:0.5em;margin-top:1em}.note::after{content:" ";display:block;height:0;clear:both}.note a{word-wrap:break-word}.note .e-content p:first-child{margin-top:0}.note-metadata{width:100%}.social-links{float:right}.social-links a{text-decoration:none}.icon{width:auto;height:1em}.coordinates{font-size:60%;color:#839496}.reply{margin-left:2em;margin-right:2em;font-size:0.8em;padding:0.5em}.reply-to{margin-left:2em;margin-right:2em;font-size:0.8em;padding-top:2em}.reply-to+.note{margin-top:0.3em}.mini-h-card{border-radius:2px;border:1px solid #586e75;padding:0 0.2em;text-decoration:none;margin-right:5px;white-space:nowrap}.mini-h-card img{height:1em;border-radius:2px;vertical-align:text-bottom}.like-photo{height:1.26em}.reply .e-content{margin-top:0.5em;padding-left:0.5em}.notes-subtitle{font-size:1em}.note-photo{width:100%;height:auto;image-orientation:from-image}article header{margin-top:0.5em;margin-bottom:0.8em}article h1{font-size:1.2em;margin-bottom:0}.post-info{font-size:0.8em;font-style:italic;margin-top:-0.8em}.contact{position:relative}.contact-links{list-style-type:none}.contact img{height:auto;width:2em;position:absolute;top:0;left:0}.contact-info{margin-left:2em}#map{height:300px}@media (min-width: 700px){main{margin-left:10em;margin-right:10em}footer{margin-left:13em;margin-right:13em}.youtube{width:640px;height:360px}}@media (max-width: 699px){main{margin-left:10px;margin-right:10px}article{word-wrap:break-word}footer{margin-left:15px;margin-right:15px}.youtube{width:100%;height:auto}}body{text-rendering:optimizeLegibility;font-feature-settings:"liga";font-family:"leitura-news",serif;font-size:1.2em}code{font-family:"Operator Mono","Monaco","Inconsolata",monospace;font-weight:200}#topheader h1{font-family:"leitura-news",serif}h1{font-family:"prenton",sans-serif}#topheader a{text-decoration:none}nav{font-feature-settings:"dlig"}article header h1 a{text-decoration:none}article div a{text-decoration:none}footer{font-size:0.8em}.emoji{width:auto;height:1em}body{color:#002b36}header a{color:#002b36}a{color:#268bd2}form{width:100%}fieldset{min-width:0;width:100%}input[type="text"],input[type="file"],textarea{width:100%}input,button,textarea{-webkit-appearance:none;-moz-appearance:none;background-color:#002b36;color:#fdf6e3;border:1px solid #fdf6e3;border-radius:4px;font-size:1em}textarea{font-size:1.2em}button:hover{transition:0.5s ease-in-out;background-color:#fdf6e3;color:#002b36}button:disabled{background-color:#93a1a1;color:#002b36}input[type="checkbox"]{-webkit-appearance:checkbox;-moz-appearance:checkbox}#photo{background:inherit;color:inherit;border:none}.twitter-tweet-rendered{margin-bottom:0 !important}.twitter-tweet-rendered+.note{margin-top:0} /*# sourceMappingURL=maps/global.css.map */ diff --git a/public/assets/css/global.css.br b/public/assets/css/global.css.br index 996165ae..1fe390da 100644 Binary files a/public/assets/css/global.css.br and b/public/assets/css/global.css.br differ diff --git a/public/assets/css/global.css.gz b/public/assets/css/global.css.gz index a4eaf8b2..4aa42539 100644 Binary files a/public/assets/css/global.css.gz and b/public/assets/css/global.css.gz differ diff --git a/public/assets/css/maps/global.css.map b/public/assets/css/maps/global.css.map index e9990b24..19c9a360 100644 --- a/public/assets/css/maps/global.css.map +++ b/public/assets/css/maps/global.css.map @@ -1 +1 @@ -{"version":3,"sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"names":[],"mappings":"AA0BA,KACI,6CAAe,CAClB,KAGG,YAAc,CACjB,KC7BG,qBAAuB,CAC1B,qBAKG,kBAAoB,CACvB,WAGG,oBAAA,AACA,aAAA,kBAAA,AAAe,aAAA,CAClB,aAGG,iBAAmB,CACtB,cAGG,cACA,QAAU,CACb,IAGG,iBAAmB,CACtB,aAGG,gBAAkB,CACrB,MAKG,yBACA,gCACA,cACA,cAAgB,CACnB,aAGG,YACA,cACA,SACA,UAAY,CACf,QAGG,oBAAsB,CACzB,+BAGG,YAAc,CACjB,eAGG,UAAY,CACf,cAGG,WAAa,CAChB,gBAGG,oBAAsB,CACzB,MAGG,WACA,WACA,YDpDe,CCqDlB,aAGG,cACA,aDlEe,CCmElB,OAGG,gBACA,iBACA,gBACA,aAAe,CAClB,UAGG,gBACA,iBACA,gBACA,eAAiB,CACpB,gBAGG,gBAAkB,CACrB,aAGG,kBACA,yBACA,gBACA,qBACA,iBACA,kBAAoB,CACvB,iBAGG,WACA,kBACA,0BAA4B,CAC/B,YAGG,aAAe,CAClB,kBAGG,iBACA,kBAAoB,CACvB,gBAGG,aAAe,CAClB,YAGG,WACA,YACA,4BAA8B,CACjC,eAKG,iBACA,mBAAqB,CACxB,WAGG,gBACA,eAAiB,CACpB,WAGG,gBACA,kBACA,iBAAmB,CACtB,SAIG,iBAAmB,CACtB,eAGG,oBAAsB,CACzB,aAGG,YACA,UACA,kBACA,MACA,MAAQ,CACX,cAGG,eAAiB,CACpB,KAGG,YAAc,CACjB,0BAIG,KACI,iBACA,iBAAmB,CACtB,OAGG,iBACA,iBAAmB,CACtB,SAGG,YACA,YAAc,CACjB,CAGL,0BACI,KACI,iBACA,iBAAmB,CACtB,QAGG,oBAAsB,CACzB,OAGG,iBACA,iBAAmB,CACtB,SAGG,WACA,WAAa,CAChB,CClNL,KACI,kCACA,6BACA,iCACA,eAAiB,CACpB,KAGG,6DACA,eAAiB,CACpB,cAGG,gCFZmC,CEatC,GAGG,gCFfsC,CEgBzC,aAGG,oBAAsB,CACzB,IAGG,4BAA8B,CACjC,oBAGG,oBAAsB,CACzB,cAGG,oBAAsB,CACzB,OAGG,eAAiB,CACpB,OAGG,WACA,UAAY,CACf,KC3CG,aHMe,CGLlB,SAGG,aHEe,CGDlB,EAGG,aHWe,CGVlB,KCRG,UAAY,CACf,SAGG,YACA,UAAY,CACf,+CAKG,UAAY,CACf,sBAKG,wBACA,qBACA,yBACA,cACA,yBACA,kBACA,aAAe,CAClB,SAGG,eAAiB,CACpB,aAGG,4BACA,yBACA,aJ5Be,CI6BlB,gBAGG,yBACA,aJjCe,CIkClB,uBAGG,4BACA,wBAA0B,CAC7B,OAGG,mBACA,cACA,WAAa,CAChB,wBClDG,0BAA4B,CAC/B,8BAGG,YAAc,CACjB","file":"../global.css","sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n$font-stack-code: \"Operator Mono\", \"Monaco\", \"Inconsolata\", monospace;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\n#topheader h1 {\n font-size: 1em;\n margin: 0;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n// notes\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n fill: $blue;\n}\n\n.coordinates {\n font-size: 60%;\n color: $base0;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\narticle h1 {\n font-size: 1.2em;\n margin-bottom: 0;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\ncode {\n font-family: $font-stack-code;\n font-weight: 200;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n font-size: 1em;\n}\n\ntextarea {\n font-size: 1.2em; //textarea doesn’t resize with the rest\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"]} \ No newline at end of file +{"version":3,"sources":["global.scss","layout.scss","components/fonts.scss","components/colours.scss","components/forms.scss","components/twitter.scss"],"names":[],"mappings":"AA0BA,KACI,6CAAe,CAClB,KAGG,YAAc,CACjB,KC7BG,qBAAuB,CAC1B,qBAKG,kBAAoB,CACvB,WAGG,oBAAA,AACA,aAAA,kBAAA,AAAe,aAAA,CAClB,aAGG,iBAAmB,CACtB,cAGG,cACA,QAAU,CACb,IAGG,iBAAmB,CACtB,aAGG,gBAAkB,CACrB,MAKG,yBACA,gCACA,cACA,cAAgB,CACnB,aAGG,YACA,cACA,SACA,UAAY,CACf,QAGG,oBAAsB,CACzB,+BAGG,YAAc,CACjB,eAGG,UAAY,CACf,cAGG,WAAa,CAChB,gBAGG,oBAAsB,CACzB,MAGG,WACA,UAAY,CACf,aAGG,cACA,aDjEe,CCkElB,OAGG,gBACA,iBACA,gBACA,aAAe,CAClB,UAGG,gBACA,iBACA,gBACA,eAAiB,CACpB,gBAGG,gBAAkB,CACrB,aAGG,kBACA,yBACA,gBACA,qBACA,iBACA,kBAAoB,CACvB,iBAGG,WACA,kBACA,0BAA4B,CAC/B,YAGG,aAAe,CAClB,kBAGG,iBACA,kBAAoB,CACvB,gBAGG,aAAe,CAClB,YAGG,WACA,YACA,4BAA8B,CACjC,eAKG,iBACA,mBAAqB,CACxB,WAGG,gBACA,eAAiB,CACpB,WAGG,gBACA,kBACA,iBAAmB,CACtB,SAIG,iBAAmB,CACtB,eAGG,oBAAsB,CACzB,aAGG,YACA,UACA,kBACA,MACA,MAAQ,CACX,cAGG,eAAiB,CACpB,KAGG,YAAc,CACjB,0BAIG,KACI,iBACA,iBAAmB,CACtB,OAGG,iBACA,iBAAmB,CACtB,SAGG,YACA,YAAc,CACjB,CAGL,0BACI,KACI,iBACA,iBAAmB,CACtB,QAGG,oBAAsB,CACzB,OAGG,iBACA,iBAAmB,CACtB,SAGG,WACA,WAAa,CAChB,CCjNL,KACI,kCACA,6BACA,iCACA,eAAiB,CACpB,KAGG,6DACA,eAAiB,CACpB,cAGG,gCFZmC,CEatC,GAGG,gCFfsC,CEgBzC,aAGG,oBAAsB,CACzB,IAGG,4BAA8B,CACjC,oBAGG,oBAAsB,CACzB,cAGG,oBAAsB,CACzB,OAGG,eAAiB,CACpB,OAGG,WACA,UAAY,CACf,KC3CG,aHMe,CGLlB,SAGG,aHEe,CGDlB,EAGG,aHWe,CGVlB,KCRG,UAAY,CACf,SAGG,YACA,UAAY,CACf,+CAKG,UAAY,CACf,sBAKG,wBACA,qBACA,yBACA,cACA,yBACA,kBACA,aAAe,CAClB,SAGG,eAAiB,CACpB,aAGG,4BACA,yBACA,aJ5Be,CI6BlB,gBAGG,yBACA,aJjCe,CIkClB,uBAGG,4BACA,wBAA0B,CAC7B,OAGG,mBACA,cACA,WAAa,CAChB,wBClDG,0BAA4B,CAC/B,8BAGG,YAAc,CACjB","file":"../global.css","sourcesContent":["//global.scss\n\n//variables\n$font-stack-body: \"leitura-news\", serif;\n$font-stack-headers: \"prenton\", sans-serif;\n$font-stack-code: \"Operator Mono\", \"Monaco\", \"Inconsolata\", monospace;\n\n//solarized variables TERMCOL\n$base03: #002b36;//brblack\n$base02: #073642;//black\n$base01: #586e75;//brgreen\n$base00: #657b83;//bryellow\n$base0: #839496;//brblue\n$base1: #93a1a1;//brcyan\n$base2: #eee8d5;//white\n$base3: #fdf6e3;//brwhite\n$yellow: #b58900;\n$orange: #cb4b16;\n$red: #dc322f;\n$magenta: #d33682;\n$violet: #6c71c4;\n$blue: #268bd2;\n$cyan: #2aa198;\n$green: #859900;\n\n//global styles\nhtml {\n background: url('/assets/img/escheresque.png');\n}\n\n.map {\n height: 150px;\n}\n\n//layout\n@import \"layout\";\n\n//components\n@import \"components/fonts\";\n@import \"components/colours\";\n@import \"components/forms\";\n@import \"components/twitter\";\n","//layout.scss\n\nhtml {\n box-sizing: border-box;\n}\n\n*,\n*::before,\n*::after {\n box-sizing: inherit;\n}\n\n#topheader {\n display: flex;\n flex-flow: row;\n}\n\n#topheader a {\n padding: 0.5em 1em;\n}\n\n#topheader h1 {\n font-size: 1em;\n margin: 0;\n}\n\nnav {\n padding-top: 0.5em;\n}\n\n.social-list {\n padding-left: 2em;\n}\n\n// notes\n\n.note {\n background-color: $base2;\n box-shadow: 0 0 10px 2px $base1;\n padding: 0.5em;\n margin-top: 1em;\n}\n\n.note::after {\n content: \" \";\n display: block;\n height: 0;\n clear: both;\n}\n\n.note a {\n word-wrap: break-word;\n}\n\n.note .e-content p:first-child {\n margin-top: 0;\n}\n\n.note-metadata {\n width: 100%;\n}\n\n.social-links {\n float: right;\n}\n\n.social-links a {\n text-decoration: none;\n}\n\n.icon {\n width: auto;\n height: 1em;\n}\n\n.coordinates {\n font-size: 60%;\n color: $base0;\n}\n\n.reply {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding: 0.5em;\n}\n\n.reply-to {\n margin-left: 2em;\n margin-right: 2em;\n font-size: 0.8em;\n padding-top: 2em;\n}\n\n.reply-to + .note {\n margin-top: 0.3em;\n}\n\n.mini-h-card {\n border-radius: 2px;\n border: 1px solid $base01;\n padding: 0 0.2em;\n text-decoration: none;\n margin-right: 5px;\n white-space: nowrap;\n}\n\n.mini-h-card img {\n height: 1em;\n border-radius: 2px;\n vertical-align: text-bottom;\n}\n\n.like-photo {\n height: 1.26em;\n}\n\n.reply .e-content {\n margin-top: 0.5em;\n padding-left: 0.5em;\n}\n\n.notes-subtitle {\n font-size: 1em;\n}\n\n.note-photo {\n width: 100%;\n height: auto;\n image-orientation: from-image;\n}\n\n//articles\n\narticle header {\n margin-top: 0.5em;\n margin-bottom: 0.8em;\n}\n\narticle h1 {\n font-size: 1.2em;\n margin-bottom: 0;\n}\n\n.post-info {\n font-size: 0.8em;\n font-style: italic;\n margin-top: -0.8em;\n}\n\n//contacts\n.contact {\n position: relative;\n}\n\n.contact-links {\n list-style-type: none;\n}\n\n.contact img {\n height: auto;\n width: 2em;\n position: absolute;\n top: 0;\n left: 0;\n}\n\n.contact-info {\n margin-left: 2em;\n}\n\n#map {\n height: 300px;\n}\n\n/* media queries */\n@media (min-width: 700px) {\n main {\n margin-left: 10em;\n margin-right: 10em;\n }\n\n footer {\n margin-left: 13em;\n margin-right: 13em;\n }\n\n .youtube {\n width: 640px;\n height: 360px;\n }\n}\n\n@media (max-width: 699px) {\n main {\n margin-left: 10px;\n margin-right: 10px;\n }\n\n article {\n word-wrap: break-word;\n }\n\n footer {\n margin-left: 15px;\n margin-right: 15px;\n }\n\n .youtube {\n width: 100%;\n height: auto;\n }\n}\n","//fonts.scss\n\nbody {\n text-rendering: optimizeLegibility;\n font-feature-settings: \"liga\";\n font-family: $font-stack-body;\n font-size: 1.2em;\n}\n\ncode {\n font-family: $font-stack-code;\n font-weight: 200;\n}\n\n#topheader h1 {\n font-family: $font-stack-body;\n}\n\nh1 {\n font-family: $font-stack-headers;\n}\n\n#topheader a {\n text-decoration: none;\n}\n\nnav {\n font-feature-settings: \"dlig\";\n}\n\narticle header h1 a {\n text-decoration: none;\n}\n\narticle div a {\n text-decoration: none;\n}\n\nfooter {\n font-size: 0.8em;\n}\n\n.emoji {\n width: auto;\n height: 1em;\n}\n","//colours.scss\nbody {\n color: $base03;\n}\n\nheader a {\n color: $base03;\n}\n\na {\n color: $blue;\n}\n","//forms.scss\n\nform {\n width: 100%;\n}\n\nfieldset {\n min-width: 0;\n width: 100%;\n}\n\ninput[type=\"text\"],\ninput[type=\"file\"],\ntextarea {\n width: 100%;\n}\n\ninput,\nbutton,\ntextarea {\n -webkit-appearance: none;\n -moz-appearance: none;\n background-color: $base03;\n color: $base3;\n border: 1px solid $base3;\n border-radius: 4px;\n font-size: 1em;\n}\n\ntextarea {\n font-size: 1.2em; //textarea doesn’t resize with the rest\n}\n\nbutton:hover {\n transition: 0.5s ease-in-out;\n background-color: $base3;\n color: $base03;\n}\n\nbutton:disabled {\n background-color: $base1;\n color: $base03;\n}\n\ninput[type=\"checkbox\"] {\n -webkit-appearance: checkbox;\n -moz-appearance: checkbox;\n}\n\n#photo {\n background: inherit;\n color: inherit;\n border: none;\n}\n","//twitter.scss\n\n.twitter-tweet-rendered {\n margin-bottom: 0 !important;\n}\n\n.twitter-tweet-rendered + .note {\n margin-top: 0;\n}\n"]} \ No newline at end of file diff --git a/public/assets/css/projects.css.gz b/public/assets/css/projects.css.gz index deca5763..f773d147 100644 Binary files a/public/assets/css/projects.css.gz and b/public/assets/css/projects.css.gz differ diff --git a/public/assets/frontend/Autolinker.min.js.gz b/public/assets/frontend/Autolinker.min.js.gz index 67189547..718764b6 100644 Binary files a/public/assets/frontend/Autolinker.min.js.gz and b/public/assets/frontend/Autolinker.min.js.gz differ diff --git a/public/assets/frontend/alertify.css.gz b/public/assets/frontend/alertify.css.gz index 0ea203b1..2387b322 100644 Binary files a/public/assets/frontend/alertify.css.gz and b/public/assets/frontend/alertify.css.gz differ diff --git a/public/assets/frontend/alertify.js.gz b/public/assets/frontend/alertify.js.gz index 291f3366..f6331ed3 100644 Binary files a/public/assets/frontend/alertify.js.gz and b/public/assets/frontend/alertify.js.gz differ diff --git a/public/assets/frontend/fetch.js.gz b/public/assets/frontend/fetch.js.gz index f1534130..e1a9f982 100644 Binary files a/public/assets/frontend/fetch.js.gz and b/public/assets/frontend/fetch.js.gz differ diff --git a/public/assets/frontend/marked.min.js.gz b/public/assets/frontend/marked.min.js.gz index 23d8aff6..6f889623 100644 Binary files a/public/assets/frontend/marked.min.js.gz and b/public/assets/frontend/marked.min.js.gz differ diff --git a/public/assets/frontend/sanitize.css.gz b/public/assets/frontend/sanitize.css.gz index 07dcaf64..9c6f46b2 100644 Binary files a/public/assets/frontend/sanitize.css.gz and b/public/assets/frontend/sanitize.css.gz differ diff --git a/public/assets/frontend/store2.min.js.gz b/public/assets/frontend/store2.min.js.gz index 657123f1..40ab6bd7 100644 Binary files a/public/assets/frontend/store2.min.js.gz and b/public/assets/frontend/store2.min.js.gz differ diff --git a/public/assets/js/form-save.js.gz b/public/assets/js/form-save.js.gz index 36a9e85d..ab71f29c 100644 Binary files a/public/assets/js/form-save.js.gz and b/public/assets/js/form-save.js.gz differ diff --git a/public/assets/js/links.js.gz b/public/assets/js/links.js.gz index 92f197cc..2397968a 100644 Binary files a/public/assets/js/links.js.gz and b/public/assets/js/links.js.gz differ diff --git a/public/assets/js/maps.js.gz b/public/assets/js/maps.js.gz index 1cbdf17c..8ea474e9 100644 Binary files a/public/assets/js/maps.js.gz and b/public/assets/js/maps.js.gz differ diff --git a/public/assets/js/newnote.js.gz b/public/assets/js/newnote.js.gz index 726d2e79..61250c01 100644 Binary files a/public/assets/js/newnote.js.gz and b/public/assets/js/newnote.js.gz differ diff --git a/public/assets/js/newplace.js.gz b/public/assets/js/newplace.js.gz index 3ac5913e..64577b0f 100644 Binary files a/public/assets/js/newplace.js.gz and b/public/assets/js/newplace.js.gz differ diff --git a/public/assets/prism/prism.css.gz b/public/assets/prism/prism.css.gz index 652d5e2b..03dc538d 100644 Binary files a/public/assets/prism/prism.css.gz and b/public/assets/prism/prism.css.gz differ diff --git a/public/assets/prism/prism.js.gz b/public/assets/prism/prism.js.gz index aaeb5ca2..40b9bc77 100644 Binary files a/public/assets/prism/prism.js.gz and b/public/assets/prism/prism.js.gz differ diff --git a/resources/assets/sass/layout.scss b/resources/assets/sass/layout.scss index d4bd6ef7..88937ed1 100644 --- a/resources/assets/sass/layout.scss +++ b/resources/assets/sass/layout.scss @@ -71,7 +71,6 @@ nav { .icon { width: auto; height: 1em; - fill: $blue; } .coordinates { diff --git a/resources/views/admin/deletenote.blade.php b/resources/views/admin/deletenote.blade.php new file mode 100644 index 00000000..11fad5b8 --- /dev/null +++ b/resources/views/admin/deletenote.blade.php @@ -0,0 +1,16 @@ +@extends('master') + +@section('title') +Delete Note « Admin CP +@stop + +@section('content') +
+ +
+ Delete Note +

Are you sure you want to delete the note? + +

+
+@stop diff --git a/resources/views/admin/deletenotesuccess.blade.php b/resources/views/admin/deletenotesuccess.blade.php new file mode 100644 index 00000000..e15a8506 --- /dev/null +++ b/resources/views/admin/deletenotesuccess.blade.php @@ -0,0 +1,9 @@ +@extends('master') + +@section('title') +Delete Note Success « Admin CP +@stop + +@section('content') +

The note was successfully deleted.

+@stop diff --git a/resources/views/admin/editnote.blade.php b/resources/views/admin/editnote.blade.php index 6bf7e1ee..c0e107df 100644 --- a/resources/views/admin/editnote.blade.php +++ b/resources/views/admin/editnote.blade.php @@ -12,7 +12,7 @@ Edit Note « Admin CP


-
+ Delete note? @stop diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index 01b76d40..ca9ae038 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -18,7 +18,7 @@ @if($note->client_name) via {{ $note->client_name }}@endif @if($note->placeLink)in {{ $note->address }} @elseif($note->address)in {!! $note->address !!}@endif - @if($note->replies > 0)Replies: {{ $note->replies }}@endif + @if($note->replies > 0) @include('templates.replies-icon'): {{ $note->replies }}@endif @if($note->tweet_id || $note->facebook_url)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'facebook_url' => $note->facebook_url])@endif @if ($note->placeLink)
diff --git a/resources/views/templates/replies-icon.blade.php b/resources/views/templates/replies-icon.blade.php new file mode 100644 index 00000000..8f6b9d7f --- /dev/null +++ b/resources/views/templates/replies-icon.blade.php @@ -0,0 +1,12 @@ + + + diff --git a/routes/web.php b/routes/web.php index da7a6f74..6cf3db0a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -45,8 +45,10 @@ Route::group(['domain' => config('url.longurl')], function () { Route::get('admin/note/new', 'NotesAdminController@newNotePage'); Route::get('admin/note/edit', 'NotesAdminController@listNotesPage'); Route::get('admin/note/edit/{id}', 'NotesAdminController@editNotePage'); + Route::get('admin/note/delete/{id}', 'NotesAdminController@deleteNotePage'); Route::post('admin/note/new', 'NotesAdminController@createNote'); Route::post('admin/note/edit/{id}', 'NotesAdminController@editNote'); + Route::post('admin/note/delete/{id}', 'NotesAdminController@deleteNote'); //Tokens Route::get('admin/tokens', 'TokensController@showTokens'); diff --git a/yarn.lock b/yarn.lock index 5dd5b1cc..53b1c007 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13,13 +13,13 @@ ajv-keywords@^1.0.0: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.1.1.tgz#02550bc605a3e576041565628af972e06c549d50" ajv@^4.7.0: - version "4.8.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.8.1.tgz#708213577289a84a8148e66daa980c32da6a562e" + version "4.8.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.8.2.tgz#65486936ca36fea39a1504332a78bebd5d447bdc" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" -alertify.js: +alertify.js@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/alertify.js/-/alertify.js-1.0.12.tgz#8c1f15423dbcbb07f0368f281cf79f6497e3cfea" dependencies: @@ -34,8 +34,8 @@ align-text@^0.1.1, align-text@^0.1.3: repeat-string "^1.5.2" amdefine@>=0.0.4: - version "1.0.0" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.0.tgz#fd17474700cb5cc9c2b709f0be9d23ce3c198c33" + version "1.0.1" + resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" ansi-escapes@^1.1.0, ansi-escapes@^1.3.0: version "1.4.0" @@ -165,11 +165,9 @@ atob@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" -autolinker: - version "1.2.0" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-1.2.0.tgz#ddb5bb4bb3e8f0b6f101f94f688f457a9c340509" - dependencies: - gulp-header "^1.7.1" +autolinker@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-1.2.1.tgz#1e7f4af9d14ca8c5b3d32d90d2ae911b2792ae27" autoprefixer@^6.0.0: version "6.5.1" @@ -204,12 +202,6 @@ beeper@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.0.tgz#9ee6fc1ce7f54feaace7ce73588b056037866a2c" -bl@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398" - dependencies: - readable-stream "~2.0.5" - block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" @@ -294,8 +286,8 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000554: - version "1.0.30000560" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000560.tgz#7f886302e912d15a6e53b81d6ab13de9dba95ee8" + version "1.0.30000574" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000574.tgz#4b10fb5435c50262effd10653405befd0d0bfc2c" capture-stack-trace@^1.0.0: version "1.0.0" @@ -390,10 +382,8 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" code-point-at@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.0.1.tgz#1104cd34f9b5b45d3eba88f1babc1924e1ce35fb" - dependencies: - number-is-nan "^1.0.0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" color-diff@^0.1.3: version "0.1.7" @@ -438,12 +428,6 @@ concat-stream@^1.4.7: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-with-sourcemaps@*: - version "1.0.4" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6" - dependencies: - source-map "^0.5.1" - configstore@^1.0.0, configstore@^1.2.0: version "1.4.0" resolved "https://registry.yarnpkg.com/configstore/-/configstore-1.4.0.tgz#c35781d0501d268c25c54b8b17f6240e8a4fb021" @@ -503,8 +487,8 @@ create-error-class@^3.0.1: capture-stack-trace "^1.0.0" cross-spawn-async@^2.0.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.4.tgz#c9a8d8e9a06502c7a46296e33a1a054b5d2f1812" + version "2.2.5" + resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" dependencies: lru-cache "^4.0.0" which "^1.2.8" @@ -701,8 +685,8 @@ duplexer2@0.0.2: readable-stream "~1.1.9" duplexify@^3.2.0: - version "3.4.6" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.4.6.tgz#1e586a13028caf31d5144a059813f9b071fec557" + version "3.5.0" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604" dependencies: end-of-stream "1.0.0" inherits "^2.0.1" @@ -893,7 +877,7 @@ for-in@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" -for-own@^0.1.3: +for-own@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" dependencies: @@ -903,13 +887,13 @@ forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" -form-data@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25" +form-data@~2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.1.tgz#4adf0342e1a79afa1e84c8c320a9ffc82392a1f3" dependencies: asynckit "^0.4.0" combined-stream "^1.0.5" - mime-types "^2.1.11" + mime-types "^2.1.12" fs-exists-sync@^0.1.0: version "0.1.0" @@ -1033,7 +1017,7 @@ glob@^4.3.1: minimatch "^2.0.1" once "^1.3.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -1052,17 +1036,6 @@ glob@~3.1.21: inherits "1" minimatch "~0.2.11" -glob@~7.0.3: - version "7.0.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob2base@^0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" @@ -1101,12 +1074,12 @@ globjoin@^0.1.2: resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" globule@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.0.0.tgz#f22aebaacce02be492453e979c3ae9b6983f1c6c" + version "1.1.0" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.1.0.tgz#c49352e4dc183d85893ee825385eb994bb6df45f" dependencies: - glob "~7.0.3" - lodash "~4.9.0" - minimatch "~3.0.0" + glob "~7.1.1" + lodash "~4.16.4" + minimatch "~3.0.2" globule@~0.1.0: version "0.1.0" @@ -1138,12 +1111,11 @@ got@^3.2.0: timed-out "^2.0.0" got@^5.0.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-5.6.0.tgz#bb1d7ee163b78082bbc8eb836f3f395004ea6fbf" + version "5.7.1" + resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35" dependencies: create-error-class "^3.0.1" duplexer2 "^0.1.4" - is-plain-obj "^1.0.0" is-redirect "^1.0.0" is-retry-allowed "^1.0.0" is-stream "^1.0.0" @@ -1154,8 +1126,8 @@ got@^5.0.0: pinkie-promise "^2.0.0" read-all-stream "^3.0.0" readable-stream "^2.0.5" - timed-out "^2.0.0" - unzip-response "^1.0.0" + timed-out "^3.0.0" + unzip-response "^1.0.2" url-parse-lax "^1.0.0" graceful-fs@^3.0.0: @@ -1165,8 +1137,8 @@ graceful-fs@^3.0.0: natives "^1.1.0" graceful-fs@^4.1.2, graceful-fs@4.X: - version "4.1.9" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.9.tgz#baacba37d19d11f9d146d3578bc99958c3787e29" + version "4.1.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131" graceful-fs@~1.2.0: version "1.2.3" @@ -1193,15 +1165,6 @@ gulp-brotli@^1.0.1: iltorb "^1.0.0" through2 "^2.0.0" -gulp-header@^1.7.1: - version "1.8.8" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.8.tgz#4509c64677aab56b5ee8e4669a79b1655933a49e" - dependencies: - concat-with-sourcemaps "*" - gulp-util "*" - object-assign "*" - through2 "^2.0.0" - gulp-sass@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/gulp-sass/-/gulp-sass-2.3.2.tgz#82b7ab90fe902cdc34c04f180d92f2c34902dd52" @@ -1213,8 +1176,8 @@ gulp-sass@^2.3.2: vinyl-sourcemaps-apply "^0.2.0" gulp-sourcemaps@^1.6.0: - version "1.8.1" - resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.8.1.tgz#714bb359ac7dfe50f42aa22f4a8fbcce476da22f" + version "1.9.0" + resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.9.0.tgz#d85c060aa775ec30e9b9fb8c2f38c4f2d5135385" dependencies: acorn "4.X" convert-source-map "1.X" @@ -1240,7 +1203,7 @@ gulp-uglify@^2.0.0: uglify-save-license "^0.4.1" vinyl-sourcemaps-apply "^0.2.0" -gulp-util@*, gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.4: +gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.4: version "3.0.7" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.7.tgz#78925c4b8f8b49005ac01a011c557e6218941cbb" dependencies: @@ -1538,10 +1501,6 @@ is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" -is-plain-obj@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - is-posix-bracket@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" @@ -1896,18 +1855,14 @@ lodash.templatesettings@^3.0.0: lodash._reinterpolate "^3.0.0" lodash.escape "^3.0.0" -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.3.0: - version "4.16.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.4.tgz#01ce306b9bad1319f2a5528674f88297aeb70127" +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.3.0, lodash@~4.16.4: + version "4.16.6" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" lodash@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" -lodash@~4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.9.0.tgz#4c20d742f03ce85dc700e0dd7ab9bcab85e6fc14" - log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -1958,7 +1913,7 @@ map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" -marked: +marked@^0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7" @@ -1999,7 +1954,7 @@ mime-db@~1.24.0: version "1.24.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.24.0.tgz#e2d13f939f0016c6e4e9ad25a8652f126c467f0c" -mime-types@^2.1.11, mime-types@~2.1.7: +mime-types@^2.1.12, mime-types@~2.1.7: version "2.1.12" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.12.tgz#152ba256777020dd4663f54c2e7bc26381e71729" dependencies: @@ -2011,7 +1966,7 @@ minimatch@^2.0.1: dependencies: brace-expansion "^1.0.0" -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.0: +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: @@ -2038,7 +1993,7 @@ minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0: +mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -2109,22 +2064,22 @@ node-gyp@^3.3.1: which "1" node-pre-gyp@^0.6.4: - version "0.6.30" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.30.tgz#64d3073a6f573003717ccfe30c89023297babba1" + version "0.6.31" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.31.tgz#d8a00ddaa301a940615dbcc8caad4024d58f6017" dependencies: - mkdirp "~0.5.0" - nopt "~3.0.1" - npmlog "4.x" - rc "~1.1.0" - request "2.x" - rimraf "~2.5.0" + mkdirp "~0.5.1" + nopt "~3.0.6" + npmlog "^4.0.0" + rc "~1.1.6" + request "^2.75.0" + rimraf "~2.5.4" semver "~5.3.0" - tar "~2.2.0" - tar-pack "~3.1.0" + tar "~2.2.1" + tar-pack "~3.3.0" node-sass@^3.4.2: - version "3.10.1" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.10.1.tgz#c535b2e1a5439240591e06d7308cb663820d616c" + version "3.11.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.11.1.tgz#0b25699663cc9d616e8c6fb874e7d9b25e5a8e20" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -2161,7 +2116,7 @@ node-zopfli@^1.2.1: nan "^2.0.0" node-pre-gyp "^0.6.4" -nopt@~3.0.1, "nopt@2 || 3": +nopt@~3.0.6, "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -2202,7 +2157,7 @@ npm-which@^2.0.0: npm-path "^1.0.0" which "^1.0.5" -npmlog@^4.0.0, npmlog@4.x: +npmlog@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.0.tgz#e094503961c70c1774eb76692080e8d578a9f88f" dependencies: @@ -2232,19 +2187,19 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@*, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" - object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" + object.omit@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.0.tgz#868597333d54e60662940bb458605dd6ae12fe94" + version "2.0.1" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" dependencies: - for-own "^0.1.3" + for-own "^0.1.4" is-extendable "^0.1.1" once@^1.3.0: @@ -2468,8 +2423,8 @@ postcss-value-parser@^3.1.1, postcss-value-parser@^3.2.3: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" postcss@^5.0.0, postcss@^5.0.18, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.8, postcss@^5.1.0, postcss@^5.2.0, postcss@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.4.tgz#8eb4bee3e5c4e091585b116df32d8db24a535f21" + version "5.2.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.5.tgz#ec428c27dffc7fac65961340a9b022fa4af5f056" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" @@ -2509,13 +2464,17 @@ pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" -qs@~6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" +qs@~6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" querystring@0.2.0: version "0.2.0" @@ -2528,7 +2487,7 @@ randomatic@^1.1.3: is-number "^2.0.2" kind-of "^3.0.2" -rc@^1.0.1, rc@^1.1.6, rc@~1.1.0: +rc@^1.0.1, rc@^1.1.6, rc@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9" dependencies: @@ -2595,7 +2554,7 @@ readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2. isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~2.0.0, readable-stream@~2.0.5: +readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" dependencies: @@ -2643,8 +2602,8 @@ repeat-element@^1.1.2: resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" repeat-string@^1.5.2: - version "1.5.4" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.5.4.tgz#64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5" + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" repeating@^1.1.2: version "1.1.3" @@ -2662,18 +2621,17 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -request@^2.61.0, request@^2.74.0, request@2, request@2.x: - version "2.75.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93" +request@^2.61.0, request@^2.74.0, request@^2.75.0, request@2: + version "2.78.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.78.0.tgz#e1c8dec346e1c81923b24acdb337f11decabe9cc" dependencies: aws-sign2 "~0.6.0" aws4 "^1.2.1" - bl "~1.1.2" caseless "~0.11.0" combined-stream "~1.0.5" extend "~3.0.0" forever-agent "~0.6.1" - form-data "~2.0.0" + form-data "~2.1.1" har-validator "~2.0.6" hawk "~3.1.3" http-signature "~1.1.0" @@ -2683,7 +2641,7 @@ request@^2.61.0, request@^2.74.0, request@2, request@2.x: mime-types "~2.1.7" node-uuid "~1.4.7" oauth-sign "~0.8.1" - qs "~6.2.0" + qs "~6.3.0" stringstream "~0.0.4" tough-cookie "~2.3.0" tunnel-agent "~0.4.1" @@ -2732,7 +2690,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@~2.5.0, rimraf@~2.5.1, rimraf@2: +rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -2749,7 +2707,7 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -sanitize.css: +sanitize.css@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-4.1.0.tgz#0bafc3c513699f2fe8c7980c6d37edf21d3f5448" @@ -3009,7 +2967,7 @@ staged-git-files@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35" -store2: +store2@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/store2/-/store2-2.3.2.tgz#463cb29c1b2e62f0db6e990f410aa4e4a3e61b6c" @@ -3185,9 +3143,9 @@ table@^3.7.8: slice-ansi "0.0.4" string-width "^2.0.0" -tar-pack@~3.1.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.1.4.tgz#bc8cf9a22f5832739f12f3910dac1eb97b49708c" +tar-pack@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.3.0.tgz#30931816418f55afc4d21775afdd6720cee45dae" dependencies: debug "~2.2.0" fstream "~1.0.10" @@ -3198,7 +3156,7 @@ tar-pack@~3.1.0: tar "~2.2.1" uid-number "~0.0.6" -tar@^2.0.0, tar@~2.2.0, tar@~2.2.1: +tar@^2.0.0, tar@~2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -3255,9 +3213,15 @@ timed-out@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a" +timed-out@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.0.0.tgz#ff88de96030ce960eabd42487db61d3add229273" + tough-cookie@~2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.1.tgz#99c77dfbb7d804249e8a299d4cb0fd81fef083fd" + version "2.3.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" + dependencies: + punycode "^1.4.1" trim-newlines@^1.0.0: version "1.0.0" @@ -3312,9 +3276,9 @@ unique-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" -unzip-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.1.tgz#4a73959f2989470fa503791cefb54e1dbbc68412" +unzip-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" update-notifier@^0.5.0: version "0.5.0" @@ -3435,7 +3399,7 @@ vinyl@1.X: clone-stats "^0.0.1" replace-ext "0.0.1" -whatwg-fetch: +whatwg-fetch@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz#01c2ac4df40e236aaa18480e3be74bd5c8eb798e"