From 3e276250643525d307ce21959504f67c364e8268 Mon Sep 17 00:00:00 2001
From: gplane <g-plane@hotmail.com>
Date: Fri, 21 Apr 2017 00:05:45 +0800
Subject: [PATCH] Update storage display when checking in

---
 app/Http/Controllers/UserController.php |  1 +
 resources/assets/src/scripts/user.js    |  8 ++++++++
 resources/views/user/index.tpl          | 16 +++++++---------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6e058203..569f7de1 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -73,6 +73,7 @@ class UserController extends Controller
                 'errno'          => 0,
                 'msg'            => trans('user.sign-in-success', ['score' => $acuiredScore]),
                 'score'          => $this->user->getScore(),
+                'storage'        => $this->calculatePercentageUsed($this->user->getStorageUsed(), option('score_per_storage')),
                 'remaining_time' => round($this->user->getSignInRemainingTime() / 3600)
             ]);
         } else {
diff --git a/resources/assets/src/scripts/user.js b/resources/assets/src/scripts/user.js
index b14864af..d775288e 100644
--- a/resources/assets/src/scripts/user.js
+++ b/resources/assets/src/scripts/user.js
@@ -554,6 +554,14 @@ function signIn() {
                 var dom = '<i class="fa fa-calendar-check-o"></i> &nbsp;' + trans('user.signInRemainingTime', { time: String(json.remaining_time) });
                 $('#sign-in-button').attr('disabled', 'disabled').html(dom);
 
+                if (json.storage.used > 1024) {
+                    $('#user-storage').html(`<b>${Math.round(json.storage.used)}</b>/ ${Math.round(json.storage.total)} MB`);
+                } else {
+                    $('#user-storage').html(`<b>${Math.round(json.storage.used)}</b>/ ${Math.round(json.storage.total)} KB`);
+                }
+
+                $('#user-storage-bar').css('width', `${json.storage.percentage}%`)
+
                 swal({
                     type: 'success',
                     html: json.msg
diff --git a/resources/views/user/index.tpl b/resources/views/user/index.tpl
index e7dac682..22d3bdb4 100644
--- a/resources/views/user/index.tpl
+++ b/resources/views/user/index.tpl
@@ -44,18 +44,16 @@
                                         $total = $statistics['storage']['total'];
                                     ?>
 
-                                    @if ($used > 1024)
-                                    <span class="progress-number">
-                                        <b>{{ round($used / 1024, 1) }}</b>/ {{ is_string($total) ? $total : round($total / 1024, 1) }} MB
+                                    <span class="progress-number" id="user-storage">
+                                        @if ($used > 1024)
+                                            <b>{{ round($used / 1024, 1) }}</b>/ {{ is_string($total) ? $total : round($total / 1024, 1) }} MB
+                                        @else
+                                            <b>{{ $used }}</b>/ {{ $total }} KB
+                                        @endif
                                     </span>
-                                    @else
-                                    <span class="progress-number">
-                                        <b>{{ $used }}</b>/ {{ $total }} KB
-                                    </span>
-                                    @endif
 
                                     <div class="progress sm">
-                                        <div class="progress-bar progress-bar-yellow" style="width: {{ $statistics['storage']['percentage'] }}%"></div>
+                                        <div class="progress-bar progress-bar-yellow" id="user-storage-bar" style="width: {{ $statistics['storage']['percentage'] }}%"></div>
                                     </div>
                                 </div><!-- /.progress-group -->
                             </div><!-- /.col -->