diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index 1247542..3c39b40 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -8,6 +8,11 @@
class ApiController extends Controller
{
+ public function __construct(Request $request)
+ {
+ $this->setAuthMiddleware($request);
+ }
+
public function show(Concept $concept, Request $request)
{
$this->authorize('view', $concept);
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index b105079..5aeb9f3 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -19,6 +19,7 @@
namespace Knowfox\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\Request;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -37,4 +38,14 @@ protected function fromToken($token)
return $email_login->user;
}
+
+ protected function setAuthMiddleWare(Request $request)
+ {
+ if ($request->hasHeader('authorization')) {
+ $this->middleware('auth:api');
+ }
+ else {
+ $this->middleware('web');
+ }
+ }
}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e0523c4..f95a73d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -25,6 +25,11 @@
class UserController extends Controller
{
+ public function __construct(Request $request)
+ {
+ $this->setAuthMiddleware($request);
+ }
+
/**
* Display a listing of the resource.
*
diff --git a/public/ui/styles.css b/public/ui/styles.css
index d9f58e5..fe281da 100644
--- a/public/ui/styles.css
+++ b/public/ui/styles.css
@@ -6,6 +6,8 @@ body {
}
#toolbar {
+ display: flex;
+ justify-content: space-between;
position: fixed;
width: 100%;
top: 0;
@@ -15,6 +17,10 @@ body {
color: #FFF;
}
+#toolbar > div:last-child {
+ margin-right: 18px;
+}
+
main {
padding-top: 30px;
display: flex;
diff --git a/resources/views/ui.blade.php b/resources/views/ui.blade.php
index add01af..860669a 100644
--- a/resources/views/ui.blade.php
+++ b/resources/views/ui.blade.php
@@ -7,7 +7,16 @@
-
+
diff --git a/routes/api.php b/routes/api.php
index bfc9d2d..fd709ee 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,7 +13,7 @@
|
*/
-Route::group(['middleware' => 'auth:api'], function () {
+Route::group([], function () {
Route::get('user', function (Request $request) {
return $request->user();
diff --git a/routes/web.php b/routes/web.php
index ad5e75c..5fb3673 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -97,6 +97,8 @@
'uses' => 'ConceptController@store',
]);
+ // Route::resource('api/concept', 'ApiController');
+
Route::get('/{concept}', function ($concept) {
return redirect()->route('concept.show', [$concept]);
})->where('concept', '[0-9]+')->name('concept.short');