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

Update about page

app/Http/Controllers/SiteController.php

@@ -42,30 +42,14 @@ class SiteController extends Controller
 
     public function about()
     {
-        $res = Cache::remember('site:about', now()->addMinutes(120), function() {
-            $custom = Page::whereSlug('/site/about')->whereActive(true)->exists();
-            if($custom) {
-              $stats = Cache::remember('site:about:stats', now()->addMinutes(60), function() {
-                    return [
-                        'posts' => Status::whereLocal(true)->count(),
-                        'users' => User::count(),
-                        'admin' => User::whereIsAdmin(true)->first()
-                    ];
-                });
-                return View::make('site.about')->with('stats', $stats)->render();
-            } else {
-                $stats = Cache::remember('site:about:stats', now()->addMinutes(60), function() {
-                    return [
-                        'posts' => Status::whereLocal(true)->count(),
-                        'users' => User::count(),
-                        'admin' => User::whereIsAdmin(true)->first()
-                    ];
-                });
-                //return view('site.about', compact('stats'));
-                return View::make('site.about')->with('stats', $stats)->render();
-            }
+        $stats = Cache::remember('site:about', now()->addMinutes(120), function() {
+            return [
+                'posts' => Status::whereLocal(true)->count(),
+                'users' => User::count(),
+                'admin' => User::whereIsAdmin(true)->first()
+            ];
         });
-        return $res;
+        return view('site.about', compact('stats'));
     }
 
     public function language()

resources/views/layouts/anon.blade.php

@@ -5,7 +5,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <meta name="robots" content="noimageindex, noarchive">
     <meta name="mobile-web-app-capable" content="yes">

resources/views/site/about.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('layouts.anon')
 
 @section('content')
 <div class="jumbotron jumbotron-fluid bg-primary text-white mb-0 py-4">