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

Frontend ui refactor

app/Jobs/ImportPipeline/ImportInstagram.php

@@ -88,7 +88,7 @@ class ImportInstagram implements ShouldQueue
                 $status->profile_id = $profile->id;
                 $status->caption = strip_tags($caption);
                 $status->is_nsfw = false;
-                $status->visibility = 'public';
+                $status->visibility = 'unlisted';
                 $status->created_at = $taken_at;
                 $status->save();
 

app/Jobs/StatusPipeline/StatusActivityPubDeliver.php

@@ -56,7 +56,7 @@ class StatusActivityPubDeliver implements ShouldQueue
 
         $audience = $status->profile->getAudienceInbox();
 
-        if(empty($audience)) {
+        if(empty($audience) || $status->visibility != 'public') {
             // Return on profiles with no remote followers
             return;
         }

resources/views/settings/import/home.blade.php

@@ -8,7 +8,8 @@
   <hr>
   <section>
     <p class="lead">Account Import allows you to import your data from a supported service.</p>
-    <p class="alert alert-warning">Importing from another service will not impact existing data by default however you may choose to update avatar, bio or nickname fields during the process.</p>
+    <p class="alert alert-warning"><strong>Warning: </strong> This is an experimental beta feature. Use at your own risk!</p>
+    <p class="alert alert-warning"><strong>Warning: </strong> Imported posts will not appear on timelines or be delivered to followers.</p>
   </section>
   <section class="mt-5">
     <p class="small text-muted font-weight-bold text-uppercase mb-3">Supported Services</p>
@@ -21,10 +22,7 @@
       <a class="btn btn-outline-secondary font-weight-bold disabled" href="#">Import from Mastodon</a>
     </p>
     <p class="">
-      <a class="btn btn-outline-secondary font-weight-bold disabled" href="#">Import from Pleroma</a>
-    </p>
-    <p class="">
-      <a class="btn btn-outline-secondary font-weight-bold disabled" href="#">Import from GNU/Social</a>
+      <a class="btn btn-outline-secondary font-weight-bold disabled" href="#">Import from Tumblr</a>
     </p>
   </section>
 @endsection

resources/views/settings/import/instagram/step-one.blade.php

@@ -0,0 +1,28 @@
+@extends('settings.template')
+
+@section('section')
+
+  <div class="title">
+    <h3 class="font-weight-bold">Import from Instagram</h3>
+    <p class="lead">Step 1</p>
+  </div>
+  <hr>
+  <section>
+    <p class="lead">Before you proceed, you need to have a backup of your account from Instagram, you can do that <a href="https://www.instagram.com/download/request/">here</a>.</p>
+  </section>
+  <section class="mt-5 col-md-8 offset-md-2">
+    <div class="card mb-3 step-one">
+      <div class="card-body text-center">
+        <p class="h5 font-weight-bold">Import <b>photos</b> directory</p>
+        <p class="text-muted">250mb limit, if your photos directory exceeds that amount, you will have to wait until we support larger imports.</p>
+        <hr>
+        <form enctype="multipart/form-data" class="" method="post">
+          @csrf
+          <input type="file" name="media[]" multiple="" directory="" webkitdirectory="" mozdirectory="" accept="image/*">
+          <button type="submit" class="mt-4 btn btn-primary btn-block font-weight-bold">Upload Photos</button>
+        </form>
+      </div>
+    </div>
+  </section>
+
+@endsection

resources/views/settings/import/instagram/step-three.blade.php

@@ -0,0 +1,25 @@
+@extends('settings.template')
+
+@section('section')
+
+  <div class="title">
+    <h3 class="font-weight-bold">Import from Instagram</h3>
+    <p class="lead">Step 3</p>
+  </div>
+  <hr>
+  <section class="mt-5 col-md-8 offset-md-2">
+    <div class="card mb-3 step-three">
+      <div class="card-body text-center">
+        <p class="h5 font-weight-bold">Found {{$job->files->count()}} posts to import</p>
+        <p class="text-muted"></p>
+        <hr>
+        <form enctype="multipart/form-data" class="" method="post">
+          @csrf
+          <button type="submit" class="mt-4 btn btn-primary btn-block font-weight-bold">Import All</button>
+        </form>
+      </div>
+      </div>
+    </div>
+  </section>
+
+@endsection

resources/views/settings/import/instagram/step-two.blade.php

@@ -0,0 +1,26 @@
+@extends('settings.template')
+
+@section('section')
+
+  <div class="title">
+    <h3 class="font-weight-bold">Import from Instagram</h3>
+    <p class="lead">Step 2</p>
+  </div>
+  <hr>
+  <section class="mt-5 col-md-8 offset-md-2">
+    <div class="card mb-3 step-two">
+      <div class="card-body text-center">
+        <p class="h5 font-weight-bold">Import <b>media.json</b> file</p>
+        <p class="text-muted">10mb limit, please only upload the media.json file</p>
+        <hr>
+        <form enctype="multipart/form-data" class="" method="post">
+          @csrf
+          <input type="file" name="media">
+          <button type="submit" class="mt-4 btn btn-primary btn-block font-weight-bold">Upload media.json</button>
+        </form>
+      </div>
+      </div>
+    </div>
+  </section>
+
+@endsection