From c403d057551699fdda7508da4d7c24a2ad90f12a Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Nov 2016 19:11:15 +0000
Subject: [PATCH 1/2] Fixed social login routes
Fixes #239
---
app/Http/Controllers/Auth/LoginController.php | 1 +
app/Http/Controllers/Auth/RegisterController.php | 3 +--
routes/web.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 0de4a8282..c9d6a5496 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -2,6 +2,7 @@
namespace BookStack\Http\Controllers\Auth;
+use BookStack\Exceptions\AuthException;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\UserRepo;
use BookStack\Services\SocialAuthService;
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 6bba6de04..d9bb500b4 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -51,7 +51,7 @@ class RegisterController extends Controller
*/
public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{
- $this->middleware('guest');
+ $this->middleware('guest')->except(['socialCallback', 'detachSocialAccount']);
$this->socialAuthService = $socialAuthService;
$this->emailConfirmationService = $emailConfirmationService;
$this->userRepo = $userRepo;
@@ -297,5 +297,4 @@ class RegisterController extends Controller
return $this->registerUser($userData, $socialAccount);
}
-
}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 28e6dccb1..d179c28a5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -153,7 +153,7 @@ Route::group(['middleware' => 'auth'], function () {
});
// Social auth routes
-Route::get('/login/service/{socialDriver}', 'Auth\RegisterController@getSocialLogin');
+Route::get('/login/service/{socialDriver}', 'Auth\LoginController@getSocialLogin');
Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback');
Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount');
Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister');
From 286f9b0c7d2d85613680af3198efc967104ab6d6 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sun, 27 Nov 2016 19:37:57 +0000
Subject: [PATCH 2/2] Moved page tags to sidebar
Fixed #238
---
resources/assets/sass/_blocks.scss | 5 ++++-
resources/assets/sass/_lists.scss | 2 ++
resources/assets/sass/_pages.scss | 19 ++++++++++--------
resources/views/pages/page-display.blade.php | 20 -------------------
resources/views/pages/show.blade.php | 2 ++
.../views/pages/sidebar-tree-list.blade.php | 16 +++++++++++++++
6 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss
index 727633f75..7eb595d36 100644
--- a/resources/assets/sass/_blocks.scss
+++ b/resources/assets/sass/_blocks.scss
@@ -135,7 +135,10 @@
border-left: 3px solid #BBB;
background-color: #EEE;
padding: $-s;
- display: flex;
+ display: block;
+ > * {
+ display: inline-block;
+ }
&:before {
font-family: 'Material-Design-Iconic-Font';
padding-right: $-s;
diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index 54fd55dff..e98e5bfcd 100644
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -110,6 +110,8 @@
border-left: 0px solid #FFF;
background-color: #FFF;
&.fixed {
+ background-color: #FFF;
+ z-index: 5;
position: fixed;
top: 0;
padding-left: $-l;
diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 880a9fdcc..0052a3319 100755
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -248,29 +248,32 @@
}
.tag-display {
- margin: $-xl $-m;
- border: 1px solid #DDD;
- min-width: 180px;
- max-width: 320px;
- opacity: 0.7;
- z-index: 5;
+ width: 100%;
+ //opacity: 0.7;
position: relative;
table {
width: 100%;
margin: 0;
padding: 0;
}
+ tr:first-child td {
+ padding-top: 0;
+ }
.heading th {
padding: $-xs $-s;
- color: #333;
+ color: rgba(100, 100, 100, 0.7);
+ border: 0;
font-weight: 400;
}
td {
border: 0;
- border-bottom: 1px solid #DDD;
+ border-bottom: 1px solid #EEE;
padding: $-xs $-s;
color: #444;
}
+ tr td:first-child {
+ padding-left:0;
+ }
.tag-value {
color: #888;
}
diff --git a/resources/views/pages/page-display.blade.php b/resources/views/pages/page-display.blade.php
index 6ffe4b502..fb6ca3045 100644
--- a/resources/views/pages/page-display.blade.php
+++ b/resources/views/pages/page-display.blade.php
@@ -2,26 +2,6 @@
<h1 id="bkmrk-page-title" class="float left">{{$page->name}}</h1>
- @if(count($page->tags) > 0)
- <div class="tag-display float right">
- <table>
- <thead>
- <tr class="text-left heading primary-background-light">
- <th colspan="2">Page Tags</th>
- </tr>
- </thead>
- <tbody>
- @foreach($page->tags as $tag)
- <tr class="tag">
- <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
- @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
- </tr>
- @endforeach
- </tbody>
- </table>
- </div>
- @endif
-
<div style="clear:left;"></div>
@if (isset($diff) && $diff)
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index af85075a2..50c6f5d2c 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -115,6 +115,8 @@
</div>
@endif
+
+
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
</div>
diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 09d9b77f9..5309cb774 100644
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -1,6 +1,22 @@
<div class="book-tree" ng-non-bindable>
+ @if(isset($page) && $page->tags->count() > 0)
+ <div class="tag-display">
+ <h6 class="text-muted">Page Tags</h6>
+ <table>
+ <tbody>
+ @foreach($page->tags as $tag)
+ <tr class="tag">
+ <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
+ @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search/all?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+ @endif
+
@if (isset($page) && $page->attachments->count() > 0)
<h6 class="text-muted">Attachments</h6>
@foreach($page->attachments as $attachment)