Merge branch 'DT27-master'

cydrobolt · Mar 29, 2018 · eafce58 · eafce58
2 parents a243a87 + 398b63a
commit eafce58
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 1 deletion.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -30,6 +30,7 @@ public function displayLostPasswordPage(Request $request) {
 
     public function performLogoutUser(Request $request) {
         $request->session()->forget('username');
+        $request->session()->forget('role');
         return redirect()->route('index');
     }
 

diff --git a/public/css/shorten_result.css b/public/css/shorten_result.css
@@ -21,3 +21,13 @@
 .qr-code-container img {
     display: inline !important;
 }
+
+.input-group {
+    width: 40vw;
+    margin: 0 auto;
+}
+
+.input-group-addon {
+    padding: 0px 10px;
+    cursor: pointer;
+}
diff --git a/public/js/clipboard.min.js b/public/js/clipboard.min.js
diff --git a/public/js/shorten_result.js b/public/js/shorten_result.js
@@ -22,6 +22,19 @@ $('#generate-qr-code').click(function () {
     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 () {
     original_link = $('.result-box').val();
     select_text();

diff --git a/resources/views/shorten_result.blade.php b/resources/views/shorten_result.blade.php
@@ -6,7 +6,12 @@
 
 @section('content')
 <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 href='{{route('index')}}' class='btn btn-info'>Shorten another</a>
 
@@ -17,5 +22,6 @@
 
 @section('js')
 <script src='/js/qrcode.min.js'></script>
+<script src='/js/clipboard.min.js'></script>
 <script src='/js/shorten_result.js'></script>
 @endsection