diff --git a/public/static/css/reset.css b/public/static/css/reset.css index 1cc5e51..b11c4e5 100644 --- a/public/static/css/reset.css +++ b/public/static/css/reset.css @@ -18,7 +18,8 @@ html { background-color: #ecf0f1; /* background: url("bg.jpg") no-repeat left center fixed; background-size: auto 100%; */ - font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-family: "Helvetica Neue", "Helvetica", "PingFang SC", "Microsoft YaHei", + "Arial", sans-serif; font-size: 62.5%; } body { @@ -101,7 +102,7 @@ button { border: none; border-radius: 0.5rem; padding: 0.8rem 1rem; - + background-color: rgba(0, 0, 0, 0.3); font-weight: bold; diff --git a/src/handlers/multiusers/handlers.go b/src/handlers/multiusers/handlers.go index 95f09f5..c077827 100644 --- a/src/handlers/multiusers/handlers.go +++ b/src/handlers/multiusers/handlers.go @@ -560,10 +560,11 @@ func (h *MultiUsersSvc) isValidRole(role string) error { } type SelfResp struct { - ID string `json:"id"` - Name string `json:"name"` - Role string `json:"role"` - UsedSpace int64 `json:"usedSpace,string"` + ID string `json:"id"` + Name string `json:"name"` + Role string `json:"role"` + Quota *userstore.Quota `json:"quota"` + UsedSpace int64 `json:"usedSpace,string"` } func (h *MultiUsersSvc) Self(c *gin.Context) { @@ -583,6 +584,7 @@ func (h *MultiUsersSvc) Self(c *gin.Context) { ID: claims[q.UserIDParam], Name: claims[q.UserParam], Role: claims[q.RoleParam], + Quota: user.Quota, UsedSpace: user.UsedSpace, }) } diff --git a/src/server/server_users_test.go b/src/server/server_users_test.go index 3f70bdd..33aafc8 100644 --- a/src/server/server_users_test.go +++ b/src/server/server_users_test.go @@ -75,7 +75,12 @@ func TestUsersHandlers(t *testing.T) { t.Fatal(resp.StatusCode) } else if selfResp.ID != "0" || selfResp.Name != adminName || - selfResp.Role != userstore.AdminRole { + selfResp.Role != userstore.AdminRole || + selfResp.UsedSpace != 0 || + selfResp.Quota.SpaceLimit != 1024*1024*1024 || + selfResp.Quota.UploadSpeedLimit != 50*1024*1024 || + selfResp.Quota.DownloadSpeedLimit != 50*1024*1024 { + // TODO: expose default values from userstore t.Fatalf("user infos don't match %v", selfResp) }