Merge pull request #525 from pixelfed/frontend-ui-refactor

Update Laravel 5.6 to 5.7

.gitignore

@@ -7,6 +7,7 @@
 /.vscode
 /.vagrant
 /docker-volumes
+composer.lock
 Homestead.json
 Homestead.yaml
 npm-debug.log

composer.json

@@ -6,20 +6,21 @@
     "type": "project",
     "require": {
         "php": "^7.1.3",
-        "beyondcode/laravel-self-diagnosis": "^0.4.0",
+        "beyondcode/laravel-self-diagnosis": "^1.0.2",
         "bitverse/identicon": "^1.1",
         "doctrine/dbal": "^2.7",
         "fideloper/proxy": "^4.0",
         "greggilbert/recaptcha": "dev-master",
         "intervention/image": "^2.4",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/horizon": "^1.2",
-        "laravel/passport": "^6.0",
+        "laravel/passport": "^7.0",
         "laravel/tinker": "^1.0",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-cached-adapter": "~1.0",
         "moontoast/math": "^1.1",
         "phpseclib/phpseclib": "~2.0",
+        "pbmedia/laravel-ffmpeg": "3.0.0",
         "pixelfed/bacon-qr-code": "^3.0",
         "pixelfed/dotenv-editor": "^2.0",
         "pixelfed/fractal": "^0.18.0",
@@ -29,7 +30,8 @@
         "predis/predis": "^1.1",
         "spatie/laravel-backup": "^5.0.0",
         "spatie/laravel-image-optimizer": "^1.1",
-        "spatie/laravel-partialcache": "^1.3"
+        "spatie/laravel-partialcache": "^1.3",
+        "stevebauman/purify": "2.0.*"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.1",

resources/views/layouts/anon.blade.php

@@ -10,10 +10,10 @@
     <meta name="robots" content="noimageindex, noarchive">
     <meta name="mobile-web-app-capable" content="yes">
 
-    <title>{{ $title or config('app.name', 'Laravel') }}</title>
+    <title>{{ $title ?? config('app.name', 'Laravel') }}</title>
 
     @if(isset($title))<meta property="og:site_name" content="{{ config('app.name', 'Laravel') }}">
-    <meta property="og:title" content="{{ $title or config('app.name', 'Laravel') }}">
+    <meta property="og:title" content="{{ $title ?? config('app.name', 'Laravel') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{request()->url()}}">
     @endif

resources/views/layouts/app.blade.php

@@ -12,7 +12,7 @@
     <title>{{ $title ?? config('app.name', 'Laravel') }}</title>
 
     <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title or config('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{request()->url()}}">
     @stack('meta')

resources/views/layouts/blank.blade.php

@@ -12,7 +12,7 @@
     <title>{{ $title ?? config('app.name', 'Laravel') }}</title>
 
     <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title or config('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{request()->url()}}">
     @stack('meta')
@@ -29,7 +29,6 @@
     <main id="content">
         @yield('content')
     </main>
-    @include('layouts.partial.footer')
     <script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
     @stack('scripts')
 </body>

resources/views/status/compose.blade.php

@@ -22,6 +22,9 @@
         </div>
       </div>
       <div class="card-body bg-light">
+        <div class="composeLoader d-none text-center">
+          <div class="lds-ring"><div></div><div></div><div></div><div></div></div> 
+        </div>
         <div class="d-none preview-pagination">
           <div class="d-flex justify-content-between align-items-center">
             <p class="prev text-light" onclick="pixelfed.uploader.previous()"><i class="fas fa-chevron-left"></i></p>
@@ -319,6 +322,7 @@ $(document).on('change', '.file-input', function(e) {
     if($('.welcome-text').hasClass('d-none') == false) {
       $('.welcome-text').addClass('d-none');
     }
+    $('.composeLoader').removeClass('d-none');
     let form = new FormData();
     form.append('file', io);
 
@@ -342,6 +346,7 @@ $(document).on('change', '.file-input', function(e) {
       };
       pixelfed.uploader.meta.push(meta);
       pixelfed.uploader.media.push(e.data);
+      $('.composeLoader').addClass('d-none');
       pixelfed.uploader.addPreview(e.data);
       pixelfed.uploader.paginate(e.data);
       if(pixelfed.uploader.ids.length >= pixelfed.uploader.limit) {
@@ -358,6 +363,7 @@ $(document).on('change', '.file-input', function(e) {
 $(document).on('click', '#addMedia', function(e) {
   e.preventDefault();
   let el = $(this);
+  el.attr('disabled', '');
   if(pixelfed.uploader.ids.length >= pixelfed.uploader.limit) {
     el.remove();
     return;
@@ -365,6 +371,7 @@ $(document).on('click', '#addMedia', function(e) {
   let fi = $('.file-input');
   fi.trigger('click');
   el.blur();
+  el.removeAttr('disabled');
 });
 
 $(document).on('change', '#filterSelectDropdown', function() {
@@ -458,6 +465,9 @@ $(document).on('click', '.preview-thumbs img', function(e) {
 
 $(document).on('click', '#create', function(e) {
   e.preventDefault();
+  let el = $(this);
+  el.attr('disabled', '');
+  $('.composeLoader').removeClass('d-none');
   let data = {
     media: pixelfed.uploader.meta,
     caption: $('.caption input').val(),

storage/framework/cache/.gitignore

@@ -1,2 +1,3 @@
 *
-!.gitignore
+!data/
+!.gitignore

storage/framework/cache/data/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore