mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Add multiple UrlGenerator classes for forum/api/admin

Browse Source 
Spent quite a while looking into the best solution here and ended up going with three separate classes. Thanks to @Luceos for the PR that got this rolling (#518). My reasoning is:

- The task of routing and URL generation is independent for each section of the app. Take Flarum\Api\Users\IndexAction for example. I don't want to generate a URL to a Flarum route... I specifically want to generate a URL to an API route. So there should be a class with that specific responsibility.
- In fact, each URL generator is slightly different, because we need to add a certain prefix to the start (e.g. /api)
- This also allows us to get rid of the "flarum.api" prefix on each route's name.
- It's still DRY, because they all extend a base class.

At the same time, I could see no reason this needed to be "interfaced", so all of the classes are concrete.

Goes a long way to fixing #123 - still just a few places left remaining with hardcoded URLs.
This commit is contained in:
Toby Zerner
2015-10-02 17:35:29 +09:30
parent 9e91ada4a8
commit f255d318ef
15 changed files with 124 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
views/index.blade.php
View File

@@ -1,5 +1,5 @@
<?php
$url = app('Flarum\Http\UrlGeneratorInterface');
$url = app('Flarum\Forum\UrlGenerator');
?>
<div class="container">
<h2>All Discussions</h2>
@@ -7,7 +7,7 @@ $url = app('Flarum\Http\UrlGeneratorInterface');
<ul>
@foreach ($document->data as $discussion)
<li>
<a href="{{ $url->toRoute('flarum.forum.discussion', [
<a href="{{ $url->toRoute('discussion', [
'id' => $discussion->id . '-' . $discussion->attributes->title
]) }}">
{{ $discussion->attributes->title }}
@@ -16,5 +16,5 @@ $url = app('Flarum\Http\UrlGeneratorInterface');
@endforeach
</ul>
<a href="{{ $url->toRoute('flarum.forum.index') }}?page={{ $page + 1 }}">Next Page &raquo;</a>
<a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">Next Page &raquo;</a>
</div>

2
views/reset.blade.php
View File

@@ -11,7 +11,7 @@
<body>
<h1>Reset Your Password</h1>
<form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Http\UrlGeneratorInterface')->toRoute('flarum.forum.savePassword') }}">
<form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Forum\UrlGenerator')->toRoute('savePassword') }}">
<input type="hidden" name="token" value="{{ $token }}">
<div class="form-group">