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

Frontend ui refactor

.env.example

@@ -66,6 +66,7 @@ HORIZON_DARKMODE=true
 ACTIVITY_PUB=false
 REMOTE_FOLLOW=false
 
+PF_COSTAR_ENABLED=false
 CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
 CS_CW_DOMAINS='example.org,example.net,example.com'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'

.env.testing

@@ -57,6 +57,7 @@ MIX_API_SEARCH="${API_SEARCH}"
 TELESCOPE_ENABLED=false
 PF_MAX_USERS=1000
 
+PF_COSTAR_ENABLED=true
 CS_BLOCKED_DOMAINS='example.org,example.net,example.com'
 CS_CW_DOMAINS='example.org,example.net,example.com'
 CS_UNLISTED_DOMAINS='example.org,example.net,example.com'

app/Http/Controllers/SettingsController.php

@@ -74,7 +74,7 @@ class SettingsController extends Controller
 
     public function exportFollowing()
     {
-        $data = Cache::remember('account:export:profile:following:'.Auth::user()->profile->id, now()->addMinutes(1440), function() {
+        $data = Cache::remember('account:export:profile:following:'.Auth::user()->profile->id, now()->addMinutes(60), function() {
             return Auth::user()->profile->following()->get()->map(function($i) {
                 return $i->url();
             });
@@ -86,7 +86,7 @@ class SettingsController extends Controller
 
     public function exportFollowers()
     {
-        $data = Cache::remember('account:export:profile:followers:'.Auth::user()->profile->id, now()->addMinutes(1440), function() {
+        $data = Cache::remember('account:export:profile:followers:'.Auth::user()->profile->id, now()->addMinutes(60), function() {
             return Auth::user()->profile->followers()->get()->map(function($i) {
                 return $i->url();
             });
@@ -105,7 +105,7 @@ class SettingsController extends Controller
         if(!$exists) {
             return redirect()->back();
         }
-        $data = Cache::remember('account:export:profile:muteblocklist:'.Auth::user()->profile->id, now()->addMinutes(1440), function() use($profile) {
+        $data = Cache::remember('account:export:profile:muteblocklist:'.Auth::user()->profile->id, now()->addMinutes(60), function() use($profile) {
             return json_encode([
                 'muted' => $profile->mutedProfileUrls(),
                 'blocked' => $profile->blockedProfileUrls()

composer.json

@@ -9,6 +9,7 @@
         "ext-bcmath": "*",
         "ext-ctype": "*",
         "ext-curl": "*",
+        "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",

config/costar.php

@@ -10,7 +10,7 @@
 
 
 return [
-	'enabled' => env('PF_COSTAR_ENABLED', true),
+	'enabled' => env('PF_COSTAR_ENABLED', false),
 
 	'domain' => [
 		'block' => env('CS_BLOCKED_DOMAINS', null) ? explode(',', env('CS_BLOCKED_DOMAINS')) : null,

resources/views/settings/partial/sidebar.blade.php

@@ -6,37 +6,17 @@
       <li class="nav-item pl-3 {{request()->is('settings/password')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.password')}}">Password</a>
       </li>
-      {{-- <li class="nav-item pl-3 {{request()->is('settings/email')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.email')}}">Email</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('settings/notifications')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.notifications')}}">Notifications</a>
-      </li> --}}
-  
       <li class="nav-item pl-3 {{request()->is('settings/privacy*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.privacy')}}">Privacy</a>
       </li>
       <li class="nav-item pl-3 {{request()->is('settings/security*')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('settings.security')}}">Security</a>
       </li>
-      {{-- <li class="nav-item">
-        <hr>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('*import*')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.import')}}">Import</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('settings/data-export')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Export</a>
-      </li>
-      </li>
       <li class="nav-item">
         <hr>
       </li>
-      <li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
+      <li class="nav-item pl-3 {{request()->is('settings/data-export')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="#">Applications</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Data Export</a>
       </li>
-      <li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="#">Developers</a>
-      </li> --}}
     </ul>
   </div>