Skip to content

Commit

Permalink
Reformat controller code
Browse files Browse the repository at this point in the history
  • Loading branch information
austintoddj committed Apr 25, 2016
1 parent 2967884 commit ea4fa32
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 53 deletions.
19 changes: 5 additions & 14 deletions app/Http/Controllers/Admin/PostController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ class PostController extends Controller
*/
public function index()
{
return view('admin.post.index')
->withPosts(Post::all());
return view('admin.post.index')->withPosts(Post::all());
}

/**
Expand All @@ -40,9 +39,7 @@ public function store(PostCreateRequest $request)
$post = Post::create($request->postFillData());
$post->syncTags($request->get('tags', []));

return redirect()
->route('admin.post.index')
->withSuccess('New Post Successfully Created.');
return redirect()->route('admin.post.index')->withSuccess('New Post Successfully Created.');
}

/**
Expand Down Expand Up @@ -72,14 +69,10 @@ public function update(PostUpdateRequest $request, $id)
$post->syncTags($request->get('tags', []));

if ($request->action === 'continue') {
return redirect()
->back()
->withSuccess('Post saved.');
return redirect()->back()->withSuccess('Post saved.');
}

return redirect()
->route('admin.post.index')
->withSuccess('Post saved.');
return redirect()->route('admin.post.index')->withSuccess('Post saved.');
}

/**
Expand All @@ -94,8 +87,6 @@ public function destroy($id)
$post->tags()->detach();
$post->delete();

return redirect()
->route('admin.post.index')
->withSuccess('Post deleted.');
return redirect()->route('admin.post.index')->withSuccess('Post deleted.');
}
}
3 changes: 1 addition & 2 deletions app/Http/Controllers/Admin/TagController.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public function store(TagCreateRequest $request)
}
$tag->save();

return redirect('/admin/tag')
->withSuccess("The tag '$tag->tag' was created.");
return redirect('/admin/tag')->withSuccess("The tag '$tag->tag' was created.");
}

/**
Expand Down
46 changes: 15 additions & 31 deletions app/Http/Controllers/Admin/UploadController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(UploadsManager $manager)
public function index(Request $request)
{
$folder = $request->get('folder');
$data = $this->manager->folderInfo($folder);
$data = $this->manager->folderInfo($folder);

return view('admin.upload.index', $data);
}
Expand All @@ -34,20 +34,16 @@ public function index(Request $request)
public function createFolder(UploadNewFolderRequest $request)
{
$new_folder = $request->get('new_folder');
$folder = $request->get('folder').'/'.$new_folder;
$folder = $request->get('folder').'/'.$new_folder;

$result = $this->manager->createDirectory($folder);

if ($result === true) {
return redirect()
->back()
->withSuccess("Folder '$new_folder' created.");
return redirect()->back()->withSuccess("Folder '$new_folder' created.");
}

$error = $result ? : "An error occurred creating directory.";
return redirect()
->back()
->withErrors([$error]);
return redirect()->back()->withErrors([$error]);
}

/**
Expand All @@ -56,20 +52,16 @@ public function createFolder(UploadNewFolderRequest $request)
public function deleteFile(Request $request)
{
$del_file = $request->get('del_file');
$path = $request->get('folder').'/'.$del_file;
$path = $request->get('folder').'/'.$del_file;

$result = $this->manager->deleteFile($path);

if ($result === true) {
return redirect()
->back()
->withSuccess("File '$del_file' deleted.");
return redirect()->back()->withSuccess("File '$del_file' deleted.");
}

$error = $result ? : "An error occurred deleting file.";
return redirect()
->back()
->withErrors([$error]);
return redirect()->back()->withErrors([$error]);
}

/**
Expand All @@ -83,39 +75,31 @@ public function deleteFolder(Request $request)
$result = $this->manager->deleteDirectory($folder);

if ($result === true) {
return redirect()
->back()
->withSuccess("Folder '$del_folder' deleted.");
return redirect()->back()->withSuccess("Folder '$del_folder' deleted.");
}

$error = $result ? : "An error occurred deleting directory.";
return redirect()
->back()
->withErrors([$error]);
return redirect()->back()->withErrors([$error]);
}

/**
* Upload new file
*/
public function uploadFile(UploadFileRequest $request)
{
$file = $_FILES['file'];
$file = $_FILES['file'];
$fileName = $request->get('file_name');
$fileName = $fileName ?: $file['name'];
$path = str_finish($request->get('folder'), '/') . $fileName;
$content = File::get($file['tmp_name']);
$path = str_finish($request->get('folder'), '/') . $fileName;
$content = File::get($file['tmp_name']);

$result = $this->manager->saveFile($path, $content);

if ($result === true) {
return redirect()
->back()
->withSuccess("File '$fileName' uploaded.");
return redirect()->back()->withSuccess("File '$fileName' uploaded.");
}

$error = $result ? : "An error occurred uploading file.";
return redirect()
->back()
->withErrors([$error]);
return redirect()->back()->withErrors([$error]);
}
}
}
14 changes: 9 additions & 5 deletions app/Http/Controllers/BlogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ class BlogController extends Controller
*/
public function index(Request $request)
{
$tag = $request->get('tag');
$data = $this->dispatch(new BlogIndexData($tag));
$tag = $request->get('tag');
$data = $this->dispatch(new BlogIndexData($tag));
$layout = $tag ? Tag::layout($tag) : 'blog.layouts.index';

return view($layout, $data);
}

Expand All @@ -30,12 +31,14 @@ public function index(Request $request)
*/
public function showPost($slug, Request $request)
{
$post = Post::with('tags')->whereSlug($slug)->firstOrFail();
$tag = $request->get('tag');
$title = $post->title;
$post = Post::with('tags')->whereSlug($slug)->firstOrFail();
$tag = $request->get('tag');
$title = $post->title;

if ($tag) {
$tag = Tag::whereTag($tag)->firstOrFail();
}

return view($post->layout, compact('post', 'tag', 'slug', 'title'));
}

Expand All @@ -47,6 +50,7 @@ public function showPost($slug, Request $request)
public function rss(RssFeed $feed)
{
$rss = $feed->getRSS();

return response($rss)->header('Content-type', 'application/rss+xml');
}
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace App\Http\Controllers;

use Illuminate\Http\Request;
use App\Http\Requests;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;

class HomeController extends Controller
Expand Down

0 comments on commit ea4fa32

Please sign in to comment.