Merge branch 'develop'

.env.example

@@ -31,3 +31,6 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+
+YOUDAO_APP_KEY=
+YOUDAO_APP_SECRET=

.gitignore

@@ -19,4 +19,3 @@ _ide_helper.php
 /public/img
 /public/plugins
 /public/mix-manifest.json
-/public/images

CHANGELOG.md

@@ -6,14 +6,44 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
-- Post publish and draft status
-- Soft delete support of models
 
 ### Changed
-- Dashboard panel text
 
 ### Fixed
-- Post editor full screen bug
+
+## 0.2.0 - 2017-06-15
+### Added
+- Backend
+    - Post publish status and draft status
+    - Soft delete support of models
+    - Active menu support
+    - Flash session in route redirection
+    - Function str_slug compitable with Chinese
+- Frontend
+    - Materialize css support
+    - materialize pagination blade
+    - Multi widgets
+    - Home page
+    - Article detail page
+
+### Changed
+- Backend
+    - Use dismissible alert component in alerts partial
+    - Route name with prefix
+    - Auto-generated slug could be repeated bug
+    - Repository concrete with adding method scopeBoot
+    - Default post scope with published status
+    - Rename multi views name
+    - Repository Contract&Concrete with adding withCount method
+    - Post table columns
+- Refactor assets folder structure 
+
+### Fixed
+- Backend
+    - Post editor full screen bug
+    - Post missing input fields
+    - Password is not required in user-update action
+    - Repository delete bug
 
 ## 0.1.0 - 2017-05-29
 ### Added

TODO.md

@@ -13,10 +13,16 @@
 - [ ] Wechat related
 - [ ] Schedule(backup,stat,)
 - [ ] I18N
+- [ ] Highlight tab
+- [ ] Links
+- [ ] Settings
+- [ ] File management
+- [ ] Feature image
+- [ ] Flash session
 
 ## Frontend
 
-- [ ] Materialize css
+- [x] Materialize css
 - [ ] Search
 - [ ] Websocket
 
@@ -25,4 +31,5 @@
 - [ ] Refactor views with VueJs
 - [ ] API
 - [ ] Package
-- [ ] Unit test
+- [ ] Unit test
+- [ ] Pjax

app/Http/Controllers/Auth/Traits/AuthRedirect.php

@@ -11,6 +11,6 @@ trait AuthRedirect
      */
     protected function redirectTo()
     {
-        return route('dashboard.index');
+        return route('admin.dashboard.index');
     }
 }

app/Http/Controllers/Backend/CategoryController.php

@@ -52,7 +52,7 @@ public function store(StoreUpdateCategoryRequest $request)
     {
         $category = $this->cateRepo->createCategory($request->all());
 
-        return redirect()->route('categories.index');
+        return redirect()->route('admin.categories.index')->withSuccess('Create category successfully!');
     }
 
     /**
@@ -92,7 +92,7 @@ public function update(StoreUpdateCategoryRequest $request, $id)
     {
         $category = $this->cateRepo->updateCategory($request->all(), $id);
 
-        return redirect()->route('categories.index');
+        return redirect()->route('admin.categories.index')->withSuccess('Update category successfully!');
     }
 
     /**
@@ -105,6 +105,6 @@ public function destroy($id)
     {
         $this->cateRepo->delete($id);
 
-        return redirect()->route('categories.index');
+        return redirect()->route('admin.categories.index')->withSuccess('Delete category successfully!');
     }
 }

app/Http/Controllers/Backend/PermissionController.php

@@ -52,7 +52,7 @@ public function store(StoreUpdatePermissionRequest $request)
     {
         $perm = $this->permRepo->create($request->all());
 
-        return redirect()->route('permissions.index');
+        return redirect()->route('admin.permissions.index')->withSuccess('Create permission successfully!');
     }
 
     /**
@@ -92,7 +92,7 @@ public function update(StoreUpdatePermissionRequest $request, $id)
     {
         $perm = $this->permRepo->update($request->all(), $id);
 
-        return redirect()->route('permissions.index');
+        return redirect()->route('admin.permissions.index')->withSuccess('Update permission successfully!');
     }
 
     /**
@@ -105,6 +105,6 @@ public function destroy($id)
     {
         $this->permRepo->delete($id);
 
-        return redirect()->route('permissions.index');
+        return redirect()->route('admin.permissions.index')->withSuccess('Delete permission successfully!');
     }
 }

app/Http/Controllers/Backend/PostController.php

@@ -43,11 +43,15 @@ public function __construct(PostRepository $postRepo, CategoryRepository $cateRe
 
     /**
      * Display a listing of the resource.
-     *
+     * @param Request $request
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
+        if ($request->has('trash')) {
+            $this->postRepo = $this->postRepo->onlyTrashed();
+        }
+
         $posts = $this->postRepo->with(['category', 'author'])->paginate();
 
         return view('admin.posts.index', compact('posts'));
@@ -76,7 +80,7 @@ public function store(StoreUpdatePostRequest $request)
     {
         $this->postRepo->createPost($request->all());
 
-        return redirect()->route('posts.index');
+        return redirect()->route('admin.posts.index')->withSuccess('Create post successfully!');
     }
 
     /**
@@ -100,13 +104,11 @@ public function show($id)
      */
     public function edit($id)
     {
-        $post = $this->postRepo->find($id);
+        $post = $this->postRepo->with('tags')->find($id);
 
         $categories = $this->cateRepo->all();
         $tags = $this->tagRepo->all();
 
-        $selected_tags = $this->postRepo->getTags($post);
-
         return view('admin.posts.edit', compact('post', 'categories', 'tags', 'selected_tags'));
     }
 
@@ -121,7 +123,7 @@ public function update(StoreUpdatePostRequest $request, $id)
     {
         $this->postRepo->updatePost($request->all(), $id);
 
-        return redirect()->route('posts.index');
+        return redirect()->route('admin.posts.index')->withSuccess('Update post successfully!');
     }
 
     /**
@@ -134,6 +136,28 @@ public function destroy($id)
     {
         $this->postRepo->delete($id);
 
-        return redirect()->route('posts.index');
+        return redirect()->route('admin.posts.index')->withSuccess('Move post to trash successfully!');
+    }
+
+    /**
+     * @param $id
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function restore($id)
+    {
+        $this->postRepo->restore($id);
+
+        return redirect()->route('admin.posts.index')->withSuccess('Restore post successfully!');
+    }
+
+    /**
+     * @param $id
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function forceDelete($id)
+    {
+        $this->postRepo->forceDelete($id);
+
+        return redirect()->back()->withSuccess('Force delete post successfully!');
     }
 }

app/Http/Controllers/Backend/RoleController.php

@@ -65,7 +65,7 @@ public function store(StoreUpdateRoleRequest $request)
     {
         $role = $this->roleRepo->createRole($request->all());
 
-        return redirect()->route('roles.index');
+        return redirect()->route('admin.roles.index')->withSuccess('Create role successfully!');
     }
 
     /**
@@ -109,7 +109,7 @@ public function update(StoreUpdateRoleRequest $request, $id)
     {
         $role = $this->roleRepo->updateRole($request->all(), $id);
 
-        return redirect()->route('roles.index');
+        return redirect()->route('admin.roles.index')->withSuccess('Update role successfully!');
     }
 
     /**
@@ -122,6 +122,6 @@ public function destroy($id)
     {
         $this->roleRepo->delete($id);
 
-        return redirect()->route('roles.index');
+        return redirect()->route('admin.roles.index')->withSuccess('Delete role successfully!');
     }
 }

app/Http/Controllers/Backend/TagController.php

@@ -52,7 +52,7 @@ public function store(StoreUpdateTagRequest $request)
     {
         $this->tagRepo->createTag($request->all());
 
-        return redirect()->route('tags.index');
+        return redirect()->route('admin.tags.index')->withSuccess('Create tag successfully!');
     }
 
     /**
@@ -92,7 +92,7 @@ public function update(StoreUpdateTagRequest $request, $id)
     {
         $this->tagRepo->updateTag($request->all(), $id);
 
-        return redirect()->route('tags.index');
+        return redirect()->route('admin.tags.index')->withSuccess('Update tag successfully!');
     }
 
     /**
@@ -105,6 +105,6 @@ public function destroy($id)
     {
         $this->tagRepo->delete($id);
 
-        return redirect()->route('tags.index');
+        return redirect()->route('admin.tags.index')->withSuccess('Delete tag successfully!');
     }
 }

app/Http/Controllers/Backend/UserController.php

@@ -65,7 +65,7 @@ public function store(StoreUpdateUserRequest $request)
     {
         $this->userRepo->createUser($request->all());
 
-        return redirect()->route('users.index');
+        return redirect()->route('admin.users.index')->withSuccess('Create user successfully!');
     }
 
     /**
@@ -109,7 +109,7 @@ public function update(StoreUpdateUserRequest $request, $id)
     {
         $this->userRepo->updateUser($request->all(), $id);
 
-        return redirect()->route('users.index');
+        return redirect()->route('admin.users.index')->withSuccess('Update user successfully!');
     }
 
     /**
@@ -122,6 +122,6 @@ public function destroy($id)
     {
         $this->userRepo->delete($id);
 
-        return redirect()->route('users.index');
+        return redirect()->route('admin.users.index')->withSuccess('Delete user successfully!');
     }
 }

app/Http/Controllers/Frontend/PostController.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers\Frontend;
+
+use App\Repositories\Contracts\PostRepository;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class PostController extends Controller
+{
+    /**
+     * @var PostRepository
+     */
+    protected $postRepo;
+
+    /**
+     * PostController constructor.
+     * @param PostRepository $postRepo
+     */
+    public function __construct(PostRepository $postRepo)
+    {
+        $this->postRepo = $postRepo;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        // TODO paginate page should be dynamic set in config, e.g. config('app.post.perPage', 5)
+        $posts = $this->postRepo
+            ->with(['category', 'tags', 'author'])
+            ->paginate(5);
+
+        return view('posts.index', compact('posts'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        $post = $this->postRepo
+            ->with(['category', 'tags', 'author'])
+            ->find($id);
+
+        return view('posts.show', compact('post'));
+    }
+}

app/Http/Requests/StoreUpdatePostRequest.php

@@ -24,11 +24,13 @@ public function authorize()
     public function rules()
     {
         $rules = [
-            'title' => 'required|max:25',
+            'title' => 'required',
             'description' => 'max:100',
-            'category_id' => 'required',
+            'category_id' => 'required|exists:categories,id',
             'slug' => 'unique:posts',
-            'content' => 'required'
+            'content' => 'required',
+            'excerpt' => 'required',
+            'feature_img' => 'sometimes|required|url'
         ];
 
         switch ($this->method()) {
@@ -44,4 +46,16 @@ public function rules()
 
         return $rules;
     }
+
+    /**
+     * Prepare the data for validation.
+     *
+     * @return void
+     */
+    protected function prepareForValidation()
+    {
+        if (!$this->has('feature_img')) {
+            $this->replace($this->except('feature_img'));
+        }
+    }
 }