diff --git a/app/Http/Controllers/Admin/ArticlesController.php b/app/Http/Controllers/Admin/ArticlesController.php index b0b58420..e10c68d2 100644 --- a/app/Http/Controllers/Admin/ArticlesController.php +++ b/app/Http/Controllers/Admin/ArticlesController.php @@ -17,7 +17,7 @@ class ArticlesController extends Controller { $posts = Article::select('id', 'title', 'published')->orderBy('id', 'desc')->get(); - return view('admin.articles.list', ['posts' => $posts]); + return view('admin.articles.index', ['posts' => $posts]); } /** @@ -29,7 +29,7 @@ class ArticlesController extends Controller { $message = session('message'); - return view('admin.articles.new', ['message' => $message]); + return view('admin.articles.create', ['message' => $message]); } /** @@ -65,13 +65,13 @@ class ArticlesController extends Controller $unique = strpos($msg, '1062'); if ($unique !== false) { //We've checked for error 1062, i.e. duplicate titleurl - return redirect('admin/blog/new')->withInput()->with('message', 'Duplicate title, please change'); + return redirect('/admin/blog/create')->withInput()->with('message', 'Duplicate title, please change'); } //this isn't the error you're looking for throw $e; } - return view('admin.articles.newsuccess', ['id' => $article->id, 'title' => $article->title]); + return redirect('/admin/blog'); } /** @@ -112,18 +112,7 @@ class ArticlesController extends Controller $article->published = $published; $article->save(); - return view('admin.articles.editsuccess', ['id' => $articleId]); - } - - /** - * Show the delete confirmation form for an article. - * - * @param string The article id - * @return \Illuminate\View\Factory view - */ - public function delete($articleId) - { - return view('admin.articles.delete', ['id' => $articleId]); + return redirect('/admin/blog'); } /** @@ -136,6 +125,6 @@ class ArticlesController extends Controller { Article::where('id', $articleId)->delete(); - return view('admin.articles.deletesuccess', ['id' => $articleId]); + return redirect('/admin/blog'); } } diff --git a/app/Http/Controllers/Admin/ClientsController.php b/app/Http/Controllers/Admin/ClientsController.php index 96d6a8ac..f57603bf 100644 --- a/app/Http/Controllers/Admin/ClientsController.php +++ b/app/Http/Controllers/Admin/ClientsController.php @@ -17,7 +17,7 @@ class ClientsController extends Controller { $clients = MicropubClient::all(); - return view('admin.clients.list', ['clients' => $clients]); + return view('admin.clients.index', compact('clients')); } /** @@ -27,7 +27,23 @@ class ClientsController extends Controller */ public function create() { - return view('admin.clients.new'); + return view('admin.clients.create'); + } + + /** + * Process the request to adda new client name. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\View\Factory view + */ + public function store(Request $request) + { + MicropubClient::create([ + 'client_url' => $request->input('client_url'), + 'client_name' => $request->input('client_name'), + ]); + + return redirect('/admin/clients'); } /** @@ -47,22 +63,6 @@ class ClientsController extends Controller ]); } - /** - * Process the request to adda new client name. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\View\Factory view - */ - public function store(Request $request) - { - MicropubClient::create([ - 'client_url' => $request->input('client_url'), - 'client_name' => $request->input('client_name'), - ]); - - return view('admin.clients.newsuccess'); - } - /** * Process the request to edit a client name. * @@ -73,17 +73,23 @@ class ClientsController extends Controller public function update($clientId, Request $request) { $client = MicropubClient::findOrFail($clientId); - if ($request->input('edit')) { - $client->client_url = $request->input('client_url'); - $client->client_name = $request->input('client_name'); - $client->save(); + $client->client_url = $request->input('client_url'); + $client->client_name = $request->input('client_name'); + $client->save(); - return view('admin.clietns.editsuccess'); - } - if ($request->input('delete')) { - $client->delete(); + return redirect('/admin/clients'); + } - return view('admin.clients.deletesuccess'); - } + /** + * Process a request to delete a client. + * + * @param string The client id + * @return redirect + */ + public function destroy($articleId) + { + MicropubClient::where('id', $articleId)->delete(); + + return redirect('/admin/clients'); } } diff --git a/app/Http/Controllers/Admin/ContactsController.php b/app/Http/Controllers/Admin/ContactsController.php index 6b2ff1d2..b77b630b 100644 --- a/app/Http/Controllers/Admin/ContactsController.php +++ b/app/Http/Controllers/Admin/ContactsController.php @@ -19,7 +19,7 @@ class ContactsController extends Controller { $contacts = Contact::all(); - return view('admin.contacts.list', ['contacts' => $contacts]); + return view('admin.contacts.index', compact('contacts')); } /** @@ -29,30 +29,7 @@ class ContactsController extends Controller */ public function create() { - return view('admin.contacts.new'); - } - - /** - * Show the form to edit an existing contact. - * - * @param string The contact id - * @return \Illuminate\View\Factory view - */ - public function edit($contactId) - { - $contact = Contact::findOrFail($contactId); - - return view('admin.contacts.edit', ['contact' => $contact]); - } - - /** - * Show the form to confirm deleting a contact. - * - * @return \Illuminate\View\Factory view - */ - public function delete($contactId) - { - return view('admin.contacts.delete', ['id' => $contactId]); + return view('admin.contacts.create'); } /** @@ -71,7 +48,20 @@ class ContactsController extends Controller $contact->facebook = $request->input('facebook'); $contact->save(); - return view('admin.contacts.newsuccess', ['id' => $contact->id]); + return redirect('/admin/contacts'); + } + + /** + * Show the form to edit an existing contact. + * + * @param string The contact id + * @return \Illuminate\View\Factory view + */ + public function edit($contactId) + { + $contact = Contact::findOrFail($contactId); + + return view('admin.contacts.edit', compact('contact')); } /** @@ -105,7 +95,7 @@ class ContactsController extends Controller } } - return view('admin.contacts.editsuccess'); + return redirect('/admin/contacts'); } /** @@ -119,7 +109,7 @@ class ContactsController extends Controller $contact = Contact::findOrFail($contactId); $contact->delete(); - return view('admin.contacts.deletesuccess'); + return redirect('/admin/contacts'); } /** diff --git a/app/Http/Controllers/Admin/NotesController.php b/app/Http/Controllers/Admin/NotesController.php index 7005d824..35d5d17d 100644 --- a/app/Http/Controllers/Admin/NotesController.php +++ b/app/Http/Controllers/Admin/NotesController.php @@ -30,7 +30,7 @@ class NotesController extends Controller $note->originalNote = $note->getOriginal('note'); } - return view('admin.notes.list', ['notes' => $notes]); + return view('admin.notes.index', comapct('notes')); } /** @@ -40,32 +40,7 @@ class NotesController extends Controller */ public function create() { - return view('admin.notes.new'); - } - - /** - * Display the form to edit a specific note. - * - * @param string The note id - * @return \Illuminate\View\Factory view - */ - public function edit($noteId) - { - $note = Note::find($noteId); - $note->originalNote = $note->getOriginal('note'); - - return view('admin.notes.edit', ['id' => $noteId, 'note' => $note]); - } - - /** - * The delete note page. - * - * @param int id - * @return view - */ - public function delete($noteId) - { - return view('admin.notes.delete', ['id' => $id]); + return view('admin.notes.create'); } /** @@ -82,7 +57,7 @@ class NotesController extends Controller ['photosize' => 'At least one uploaded file exceeds size limit of 5MB'] ); if ($validator->fails()) { - return redirect('/admin/note/new') + return redirect('/admin/notes/create') ->withErrors($validator) ->withInput(); } @@ -101,10 +76,21 @@ class NotesController extends Controller $note = $this->noteService->createNote($data); - return view('admin.notes.newsuccess', [ - 'id' => $note->id, - 'shorturl' => $note->shorturl, - ]); + return redirect('/admin/notes'); + } + + /** + * Display the form to edit a specific note. + * + * @param string The note id + * @return \Illuminate\View\Factory view + */ + public function edit($noteId) + { + $note = Note::find($noteId); + $note->originalNote = $note->getOriginal('note'); + + return view('admin.notes.edit', compact('note')); } /** @@ -126,7 +112,7 @@ class NotesController extends Controller dispatch(new SendWebMentions($note)); } - return view('admin.notes.editsuccess', ['id' => $noteId]); + return redirect('/admin/notes'); } /** @@ -140,6 +126,6 @@ class NotesController extends Controller $note = Note::findOrFail($id); $note->delete(); - return view('admin.notes.deletesuccess'); + return redirect('/admin/notes'); } } diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php index aafc5f25..b0157b8a 100644 --- a/app/Http/Controllers/Admin/PlacesController.php +++ b/app/Http/Controllers/Admin/PlacesController.php @@ -26,7 +26,7 @@ class PlacesController extends Controller { $places = Place::all(); - return view('admin.places.list', ['places' => $places]); + return view('admin.places.index', compact('places')); } /** @@ -36,7 +36,25 @@ class PlacesController extends Controller */ public function create() { - return view('admin.places.new'); + return view('admin.places.create'); + } + + /** + * Process a request to make a new place. + * + * @param Illuminate\Http\Request $request + * @return Illuminate\View\Factory view + */ + public function store(Request $request) + { + $data = []; + $data['name'] = $request->name; + $data['description'] = $request->description; + $data['latitude'] = $request->latitude; + $data['longitude'] = $request->longitude; + $place = $this->placeService->createPlace($data); + + return redirect('/admin/places'); } /** @@ -61,24 +79,6 @@ class PlacesController extends Controller ]); } - /** - * Process a request to make a new place. - * - * @param Illuminate\Http\Request $request - * @return Illuminate\View\Factory view - */ - public function store(Request $request) - { - $data = []; - $data['name'] = $request->name; - $data['description'] = $request->description; - $data['latitude'] = $request->latitude; - $data['longitude'] = $request->longitude; - $place = $this->placeService->createPlace($data); - - return view('admin.places.newsuccess'); - } - /** * Process a request to edit a place. * @@ -94,6 +94,6 @@ class PlacesController extends Controller $place->location = new Point((float) $request->latitude, (float) $request->longitude); $place->save(); - return view('admin.places.editsuccess'); + return redirect('/admin/places'); } } diff --git a/resources/views/admin/articles/create.blade.php b/resources/views/admin/articles/create.blade.php new file mode 100644 index 00000000..1bcf0eab --- /dev/null +++ b/resources/views/admin/articles/create.blade.php @@ -0,0 +1,27 @@ +@extends('master') + +@section('title') +New Article « Admin CP +@stop + +@section('content') +@if(isset($message))
{{ $message }}
@endif + +@stop diff --git a/resources/views/admin/articles/delete.blade.php b/resources/views/admin/articles/delete.blade.php deleted file mode 100644 index 95ab35d3..00000000 --- a/resources/views/admin/articles/delete.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends('master') - -@section('title') -Delete Article? « Admin CP -@stop - -@section('content') - -@stop diff --git a/resources/views/admin/articles/deletesuccess.blade.php b/resources/views/admin/articles/deletesuccess.blade.php deleted file mode 100644 index 1eac9ce1..00000000 --- a/resources/views/admin/articles/deletesuccess.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('master') - -@section('title') -Article Deleted « Admin CP -@stop - -@section('content') -You have successfully deletd the article with id: {{ $id }}
-@stop diff --git a/resources/views/admin/articles/edit.blade.php b/resources/views/admin/articles/edit.blade.php index 9043142f..7d5908aa 100644 --- a/resources/views/admin/articles/edit.blade.php +++ b/resources/views/admin/articles/edit.blade.php @@ -5,8 +5,9 @@ Edit Article « Admin CP @stop @section('content') - -Successfully edited article with id: {{ $id }}
-@stop diff --git a/resources/views/admin/articles/list.blade.php b/resources/views/admin/articles/index.blade.php similarity index 62% rename from resources/views/admin/articles/list.blade.php rename to resources/views/admin/articles/index.blade.php index 04049827..56a66462 100644 --- a/resources/views/admin/articles/list.blade.php +++ b/resources/views/admin/articles/index.blade.php @@ -8,7 +8,7 @@ List Articles « Admin CPSelect article to edit:
{{ $message }}
@endif - -Successfully created article with id: {{ $id }}, title: {{ $title }}
-@stop diff --git a/resources/views/admin/clients/new.blade.php b/resources/views/admin/clients/create.blade.php similarity index 83% rename from resources/views/admin/clients/new.blade.php rename to resources/views/admin/clients/create.blade.php index a025e248..d0683ca3 100644 --- a/resources/views/admin/clients/new.blade.php +++ b/resources/views/admin/clients/create.blade.php @@ -6,7 +6,7 @@ New Client « Admin CP @section('content')Successfully edited the client information.
-@stop diff --git a/resources/views/admin/clients/list.blade.php b/resources/views/admin/clients/index.blade.php similarity index 65% rename from resources/views/admin/clients/list.blade.php rename to resources/views/admin/clients/index.blade.php index ad699eed..96fdb863 100644 --- a/resources/views/admin/clients/list.blade.php +++ b/resources/views/admin/clients/index.blade.php @@ -9,9 +9,9 @@ List Clients « Admin CPCreaten a new entry?
+Create a new entry?
@stop diff --git a/resources/views/admin/clients/newsuccess.blade.php b/resources/views/admin/clients/newsuccess.blade.php deleted file mode 100644 index ac23d4fa..00000000 --- a/resources/views/admin/clients/newsuccess.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('master') - -@section('title') -New Client « Admin CP -@stop - -@section('content') -Succesfully created new client info.
-@stop diff --git a/resources/views/admin/contacts/new.blade.php b/resources/views/admin/contacts/create.blade.php similarity index 81% rename from resources/views/admin/contacts/new.blade.php rename to resources/views/admin/contacts/create.blade.php index 0c38a367..9c32daf8 100644 --- a/resources/views/admin/contacts/new.blade.php +++ b/resources/views/admin/contacts/create.blade.php @@ -6,12 +6,12 @@ New Contact « Admin CP @section('content')Successfully deleted the contact information.
-@stop diff --git a/resources/views/admin/contacts/edit.blade.php b/resources/views/admin/contacts/edit.blade.php index 618e024e..f8c31f8a 100644 --- a/resources/views/admin/contacts/edit.blade.php +++ b/resources/views/admin/contacts/edit.blade.php @@ -6,8 +6,9 @@ Edit Contact « Admin CP @section('content')