Code optimization

app/Http/Controllers/Backend/CategoryController.php

@@ -10,7 +10,6 @@ use App\Repositories\CategoryRepositoryEloquent;
 use App\Http\Requests\Backend\Category\CreateRequest;
 use App\Http\Requests\Backend\Category\UpdateRequest;
 use App\Repositories\NavigationRepositoryEloquent;
-use Mockery\CountValidator\Exception;
 
 class CategoryController extends Controller
 {
@@ -51,10 +50,12 @@ class CategoryController extends Controller
     public function store(CreateRequest $request)
     {
         $result = $this->category->store($request->all());
+        
         if ($result) {
             return redirect('backend/category')->with('success', '分类添加成功');
         }
-        return redirect(route('backend.category.create'))->withErrors('系统异常，分类添加失败');
+        
+        return redirect(route('backend.category.create'))->withErrors('分类添加失败');
     }
 
     /**
@@ -81,20 +82,21 @@ class CategoryController extends Controller
     }
 
     /**
-     * Update the specified resource in storage.
+     * update
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @param UpdateRequest $request
+     * @param $id
+     * @return $this|\Illuminate\Http\RedirectResponse
      */
     public function update(UpdateRequest $request, $id)
     {
-
         $result = $this->category->update($request->all(), $id);
+
         if ($result) {
             return redirect('backend/category')->with('success', '分类修改成功');
         }
-        return redirect(route('backend.category.edit', ['id' => $id]))->withErrors('系统异常，分类修改失败');
+
+        return redirect(route('backend.category.edit', ['id' => $id]))->withErrors('分类修改失败');
     }
 
     /**
@@ -114,19 +116,16 @@ class CategoryController extends Controller
     /**
      * @param $id
      * @param NavigationRepositoryEloquent $nav
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function setNavigation($id, NavigationRepositoryEloquent $nav)
     {
-        try {
-            $category = $this->category->find($id);
-            if ($nav->setCategoryNav($category->id, $category->name)) {
-                return redirect()->back()->with('success', '设置成功');
-            }
-            throw new Exception('设置失败');
-        } catch (\Exception $e) {
-            dd($e->getMessage());
-            return redirect()->back()->withErrors($e->getMessage());
+        $category = $this->category->find($id);
+
+        if ($nav->setCategoryNav($category->id, $category->name)) {
+            return redirect()->back()->with('success', '设置成功');
         }
+
+        return redirect()->back()->withErrors('失败');
     }
 }

app/Http/Controllers/Backend/HomeController.php

@@ -12,8 +12,6 @@ class HomeController extends Controller
 {
     public function index()
     {
-        /*$user = Auth::user();
-        return view('backend.home', compact('user'));*/
         return view('backend.home');
     }
 }

app/Http/Controllers/Backend/LinkController.php

@@ -51,6 +51,7 @@ class LinkController extends Controller
         if ($this->link->create($request->all())) {
             return redirect('backend/link')->with('success', '友情链接添加成功');
         }
+
         return redirect()->back()->withErrors('系统异常，友情链接添加失败');
     }
 
@@ -86,13 +87,11 @@ class LinkController extends Controller
      */
     public function update(UpdateRequest $request, $id)
     {
-        $link = $this->link->find($id);
-        if ($link) {
-            if ($this->link->update($request->all(), $id)) {
-                return redirect('backend/link')->with('success', '友情链接添加成功');
-            }
+        if ($this->link->update($request->all(), $id)) {
+            return redirect('backend/link')->with('success', '友情链接添加成功');
         }
-        return redirect()->back()->withErrors('系统异常，修改友情链接失败');
+
+        return redirect()->back()->withErrors('修改友情链接失败');
     }
 
     /**
@@ -103,11 +102,10 @@ class LinkController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->link->find($id)) {
-            if ($this->link->delete($id)) {
-                return response()->json(['status' => 0]);
-            }
+        if ($this->link->delete($id)) {
+            return response()->json(['status' => 0]);
         }
+
         return response()->json(['status' => 1]);
     }
 }

app/Http/Controllers/Backend/NavigationController.php

@@ -26,7 +26,10 @@ class NavigationController extends Controller
      */
     public function index()
     {
-        $navigations = $this->navigation->orderBy('sequence', 'desc')->all();
+        $navigations = $this->navigation->with([
+            'category'
+        ])->orderBy('sequence', 'desc')->all();
+
         return view('backend.navigation.index', compact('navigations'));
     }
 
@@ -51,6 +54,7 @@ class NavigationController extends Controller
         if ($this->navigation->create($request->all())) {
             return redirect('backend/navigation')->with('success', '导航添加成功');
         }
+
         return redirect()->back()->withErrors('系统异常,导航添加失败');
     }
 
@@ -74,9 +78,8 @@ class NavigationController extends Controller
     public function edit($id)
     {
         $navigation = $this->navigation->find($id);
-        if ($navigation) {
-            return view('backend.navigation.edit', compact('navigation'));
-        }
+
+        return view('backend.navigation.edit', compact('navigation'));
     }
 
     /**
@@ -91,6 +94,7 @@ class NavigationController extends Controller
         if ($this->navigation->update($request->all(), $id)) {
             return redirect('backend/navigation')->with('success', '导航修改成功');
         }
+
         return redirect()->back()->withErrors('系统异常,修改导航失败');
     }
 
@@ -102,12 +106,10 @@ class NavigationController extends Controller
      */
     public function destroy($id)
     {
-        $navigation = $this->navigation->find($id);
-        if ($navigation) {
-            if ($this->navigation->delete($id)) {
-                return response()->json(['status' => 0]);
-            }
+        if ($this->navigation->delete($id)) {
+            return response()->json(['status' => 0]);
         }
+
         return response()->json(['status' => 1]);
     }
 }

app/Http/Controllers/Backend/PageController.php

@@ -27,6 +27,7 @@ class PageController extends Controller
     public function index()
     {
         $pages = $this->page->all();
+
         return view('backend.page.index', compact('pages'));
     }
 
@@ -102,12 +103,10 @@ class PageController extends Controller
      */
     public function destroy($id)
     {
-        $page = $this->page->find($id);
-        if ($page) {
-            if ($this->page->delete($id)) {
-                return response()->json(['status' => 0]);
-            }
+        if ($this->page->delete($id)) {
+            return response()->json(['status' => 0]);
         }
+        
         return response()->json(['status' => 1]);
     }
 }

app/Http/Controllers/Backend/TagController.php

@@ -54,7 +54,8 @@ class TagController extends Controller
             return redirect('backend/tag')
                 ->with('success', '标签添加成功');
         }
-        return redirect(route('backend.tag.create'))->withErrors('系统异常，标签添加失败');
+
+        return redirect(route('backend.tag.create'))->withErrors('标签添加失败');
     }
 
     /**
@@ -89,18 +90,16 @@ class TagController extends Controller
      */
     public function update(UpdateRequest $request, $id)
     {
-        $tag = $this->tag->find($id);
-        if ($tag) {
-            $data = [];
-            $data['tag_name'] = $request->name;
-            if ($this->tag->update($data, $id)) {
-                return redirect('backend/tag')
-                    ->with('success', '标签修改成功');
-            }
+        $data = [];
+        $data['tag_name'] = $request->name;
+        if ($this->tag->update($data, $id)) {
+            return redirect('backend/tag')
+                ->with('success', '标签修改成功');
         }
+
         return redirect()
             ->back()
-            ->withErrors('系统异常，标签修改失败');
+            ->withErrors('标签修改失败');
     }
 
     /**
@@ -111,11 +110,10 @@ class TagController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->tag->find($id)) {
-            if ($this->tag->delete($id)) {
-                return response()->json(['status' => 0]);
-            }
+        if ($this->tag->delete($id)) {
+            return response()->json(['status' => 0]);
         }
+
         return response()->json(['status' => 1]);
     }
 }

app/Http/Controllers/Backend/UserController.php

@@ -108,9 +108,6 @@ class UserController extends Controller
     public function update(UpdateRequest $request, $id, ImageUploads $imageUploads)
     {
         $user = $this->user->find($id);
-        if (!$user) {
-            return redirect(route('backend.user.edit'))->back()->withErrors('非法参数或者用户不存在');
-        }
 
         if ($request->hasFile('user_pic')) {
             $file = $request->file('user_pic');
@@ -145,11 +142,10 @@ class UserController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->user->find($id)) {
-            if ($this->user->delete($id)) {
-                return response()->json(['status' => 0]);
-            }
+        if ($this->user->delete($id)) {
+            return response()->json(['status' => 0]);
         }
+
         return response()->json(['status' => 1]);
     }
 }

app/Models/Navigation.php

@@ -12,4 +12,9 @@ class Navigation extends Model implements Transformable
 
     protected $fillable = ['name','url','sequence','state', 'article_cate_id', 'nav_type'];
 
+    public function category()
+    {
+        return $this->belongsTo('App\Models\Category', 'article_cate_id', 'id');
+    }
+
 }

app/Presenters/ArticlePresenter.php

@@ -40,7 +40,7 @@ class ArticlePresenter extends FractalPresenter
     {
         return $this->article
             ->orderBy('read_count', 'desc')
-            ->paginate(10, [
+            ->paginate(8, [
                 'id',
                 'title',
                 'read_count'
@@ -49,10 +49,10 @@ class ArticlePresenter extends FractalPresenter
 
     public function formatTitle($title)
     {
-        if (strlen($title) <= 25) {
+        if (strlen($title) <= 20) {
             return $title;
         } else {
-            return mb_substr($title, 0, 25, 'utf-8')."...";
+            return mb_substr($title, 0, 20, 'utf-8')."...";
         }
     }
 }

resources/views/backend/navigation/index.blade.php

@@ -60,8 +60,8 @@
                                         @endif
                                     </td>
                                     <td>
-                                        @if ($navigation->article_cate_id > 0)
-                                            {{ $articleCategory->getIdName($navigation->article_cate_id) }}
+                                        @if ($navigation->category)
+                                            {{ $navigation->category->name }}
                                         @endif
                                     </td>
                                     <td>