1
0
mirror of https://github.com/cydrobolt/polr.git synced 2024-11-09 11:42:28 +01:00

Merge branch 'DT27-master'

This commit is contained in:
Chaoyi Zha 2018-03-29 00:04:30 -04:00
commit eafce58825
5 changed files with 38 additions and 1 deletions

View File

@ -30,6 +30,7 @@ class UserController extends Controller {
public function performLogoutUser(Request $request) { public function performLogoutUser(Request $request) {
$request->session()->forget('username'); $request->session()->forget('username');
$request->session()->forget('role');
return redirect()->route('index'); return redirect()->route('index');
} }

View File

@ -21,3 +21,13 @@
.qr-code-container img { .qr-code-container img {
display: inline !important; display: inline !important;
} }
.input-group {
width: 40vw;
margin: 0 auto;
}
.input-group-addon {
padding: 0px 10px;
cursor: pointer;
}

7
public/js/clipboard.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -22,6 +22,19 @@ $('#generate-qr-code').click(function () {
container.show(); container.show();
}); });
var clipboard = new Clipboard('#clipboard-copy');
clipboard.on('success', function(e) {
e.clearSelection();
$('#clipboard-copy').tooltip('show');
});
$('#clipboard-copy').on('blur',function () {
$(this).tooltip('destroy');
}).on('mouseleave',function () {
$(this).tooltip('destroy');
});
$(function () { $(function () {
original_link = $('.result-box').val(); original_link = $('.result-box').val();
select_text(); select_text();

View File

@ -6,7 +6,12 @@
@section('content') @section('content')
<h3>Shortened URL</h3> <h3>Shortened URL</h3>
<input type='text' class='result-box form-control' value='{{$short_url}}' /> <div class="input-group">
<input type='text' class='result-box form-control' value='{{$short_url}}' id='short_url' />
<div class='input-group-addon' id='clipboard-copy' data-clipboard-target='#short_url' data-toggle='tooltip' data-placement='bottom' data-title='Copied!'>
<i class='fa fa-clipboard' aria-hidden='true' title='Copy to clipboard'></i>
</div>
</div>
<a id="generate-qr-code" class='btn btn-primary'>Generate QR Code</a> <a id="generate-qr-code" class='btn btn-primary'>Generate QR Code</a>
<a href='{{route('index')}}' class='btn btn-info'>Shorten another</a> <a href='{{route('index')}}' class='btn btn-info'>Shorten another</a>
@ -17,5 +22,6 @@
@section('js') @section('js')
<script src='/js/qrcode.min.js'></script> <script src='/js/qrcode.min.js'></script>
<script src='/js/clipboard.min.js'></script>
<script src='/js/shorten_result.js'></script> <script src='/js/shorten_result.js'></script>
@endsection @endsection