From 7728ffb9a47c34182ed313763f9f7e375bb463b4 Mon Sep 17 00:00:00 2001 From: jayden Date: Tue, 25 Jul 2017 18:15:23 +0800 Subject: [PATCH 1/8] admin panel layout --- cmd/web.go | 9 ++++ core/userService/user_service.go | 38 ++++++++++++++ model/dto/dto_user.go | 17 ++++++ model/user.go | 62 +++++++++++++++++----- module/context/auth.go | 13 +++++ public/css/goby.css | 5 +- public/js/admin.js | 77 ++++++++++++++++++++++++++++ router/web/admin.go | 32 ++++++++++++ template/admin/users.html | 75 +++++++++++++++++++++++++++ template/app/detail/deployments.html | 11 ++-- template/base/footer.html | 23 +++------ template/base/header.html | 41 +++++++++------ 12 files changed, 352 insertions(+), 51 deletions(-) create mode 100644 public/js/admin.js create mode 100644 router/web/admin.go create mode 100644 template/admin/users.html diff --git a/cmd/web.go b/cmd/web.go index 18c32a8..1c63c5d 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -142,6 +142,7 @@ func runWeb(cliCtx *cli.Context) { reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequire: true}) ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequire: setting.Service.RequireSignInView}) reqSignOut := context.Toggle(&context.ToggleOptions{SignOutRequire: true}) + reqAdmin := context.Toggle(&context.ToggleOptions{SignInRequire: true, AdminRequire: true}) bindIgnErr := binding.BindIgnErr apiBind := binding.Bind @@ -168,6 +169,14 @@ func runWeb(cliCtx *cli.Context) { m.Combo("/list").Get(web.AccessKeysGet) }, reqSignIn) + m.Group("/admin/api", func() { + m.Get("/users/:pageIndex/:pageCount", web.UsersQuery) + }) + + m.Group("/admin", func() { + m.Get("/users", web.UsersGet) + }, reqAdmin) + }) m.Group("/auth", func() { diff --git a/core/userService/user_service.go b/core/userService/user_service.go index c67c05d..554a536 100644 --- a/core/userService/user_service.go +++ b/core/userService/user_service.go @@ -7,9 +7,11 @@ import ( "unicode/utf8" "github.com/Unknwon/com" + . "gopkg.in/ahmetb/go-linq.v3" . "github.com/MessageDream/goby/core" "github.com/MessageDream/goby/model" + "github.com/MessageDream/goby/model/dto" "github.com/MessageDream/goby/module/infrastructure" "github.com/MessageDream/goby/module/setting" ) @@ -192,3 +194,39 @@ func Signin(emailOrName, pwd string) (*model.User, error) { } return user, nil } + +func QueryUsers(uid uint64, pageIndex, pageCount int, email string) (*dto.Pager, error) { + if pageCount > 100 { + pageCount = 100 + } + pager, err := model.QueryUsers(uid, pageIndex, pageCount, email) + if err != nil { + return nil, err + } + + var results []*dto.UserDetail + + From(pager.Data).Select(func(item interface{}) interface{} { + u := item.(*model.User) + var role = 0 + if u.IsAdmin { + role = 1 + } + return &dto.UserDetail{ + Email: u.Email, + UserName: u.UserName, + Role: role, + IsActive: u.IsActive, + IsForbidden: u.IsForbidden, + JoinedAt: u.CreatedAt, + } + }).ToSlice(&results) + + return &dto.Pager{ + TotalCount: pager.TotalCount, + TotalPageCount: pager.TotalPageCount, + PageIndex: pager.PageIndex, + PageCount: pager.PageCount, + Data: results, + }, nil +} diff --git a/model/dto/dto_user.go b/model/dto/dto_user.go index 025aec2..cc702ef 100644 --- a/model/dto/dto_user.go +++ b/model/dto/dto_user.go @@ -24,3 +24,20 @@ type Collaborator struct { IsCurrentAccount bool `json:"isCurrentAccount"` Permission string `json:"permission"` } + +type Pager struct { + PageIndex int `json:"pageIndex"` + PageCount int `json:"pageCount"` + TotalCount int64 `json:"totalCount"` + TotalPageCount int64 `json:"totalPageCount"` + Data interface{} `json:"data"` +} + +type UserDetail struct { + Email string `json:"email"` + UserName string `json:"userName"` + Role int `json:"role"` + IsActive bool `json:"isActive"` + IsForbidden bool `json:"isForbidden"` + JoinedAt time.Time `json:"joinedTime"` +} diff --git a/model/user.go b/model/user.go index a645bc5..83336b3 100644 --- a/model/user.go +++ b/model/user.go @@ -11,24 +11,28 @@ import ( "github.com/Unknwon/com" "golang.org/x/crypto/pbkdf2" + "math" + "github.com/MessageDream/goby/model/dto" "github.com/MessageDream/goby/module/infrastructure" "github.com/MessageDream/goby/module/mailer" + "github.com/go-xorm/xorm" ) type User struct { - ID uint64 `xorm:"pk autoincr"` - Email string `xorm:"unique notnull"` - Password string `xorm:"notnull"` - Rands string `xorm:"index"` - UserName string - LowerName string `xorm:"unique notnull"` - IsAdmin bool `xorm:"notnull default(0)"` - IsActive bool `xorm:"notnull default(0)"` - Salt string - CreatedAt time.Time `xorm:"created"` - UpdatedAt time.Time `xorm:"updated"` - DeletedAt time.Time `xorm:"deleted"` + ID uint64 `xorm:"pk autoincr"` + Email string `xorm:"unique notnull"` + Password string `xorm:"notnull"` + Rands string `xorm:"index"` + UserName string + LowerName string `xorm:"unique notnull"` + IsAdmin bool `xorm:"notnull default(0)"` + IsActive bool `xorm:"notnull default(0)"` + IsForbidden bool `xorm:"notnull default(0)"` + Salt string + CreatedAt time.Time `xorm:"created"` + UpdatedAt time.Time `xorm:"updated"` + DeletedAt time.Time `xorm:"deleted"` } func (self *User) EncodePasswd() { @@ -124,6 +128,40 @@ func FindUserByIDs(ids []uint64) ([]*User, error) { return users, x.In("id", ids).Find(&users) } +func QueryUsers(currentUserID uint64, pageIndex, pageCount int, email string) (*dto.Pager, error) { + users := make([]*User, 0, 50) + var sess *xorm.Session + if len(email) != 0 { + sess = x.Where("id > ? and id != ? and email like ?", 1, currentUserID, "%"+email+"%") + } else { + sess = x.Where("id > ? and id != ?", 1, currentUserID) + } + total, err := sess.Count(new(User)) + if err != nil { + return nil, err + } + + if len(email) != 0 { + sess = x.Where("id > ? and id != ? and email like ?", 1, currentUserID, "%"+email+"%") + } else { + sess = x.Where("id > ? and id != ?", 1, currentUserID) + } + + err = sess.Desc("created_at").Limit(pageCount, pageIndex*pageCount).Find(&users) + if err != nil { + return nil, err + } + + return &dto.Pager{ + TotalCount: total, + TotalPageCount: int64(math.Ceil(float64(total) / float64(pageCount))), + PageIndex: pageIndex, + PageCount: pageCount, + Data: users, + }, nil + +} + type mailerUser struct { user *User activeCodeLives int diff --git a/module/context/auth.go b/module/context/auth.go index e0ef3d5..3f9abd8 100644 --- a/module/context/auth.go +++ b/module/context/auth.go @@ -61,6 +61,13 @@ func APIToggle(options *ToggleOptions) macaron.Handler { return } } + + if options.AdminRequire { + if !ctx.User.IsAdmin { + ctx.Status(403) + return + } + } } } @@ -90,6 +97,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { ctx.HTML(200, "auth/activate") return } + } if options.AdminRequire { @@ -99,5 +107,10 @@ func Toggle(options *ToggleOptions) macaron.Handler { } ctx.Data["PageIsAdmin"] = true } + + if ctx.User != nil && ctx.User.IsAdmin { + ctx.Data["IsAdmin"] = true + } + } } diff --git a/public/css/goby.css b/public/css/goby.css index bfdca02..a4798da 100644 --- a/public/css/goby.css +++ b/public/css/goby.css @@ -852,7 +852,7 @@ ul { clear: both; padding-top: 0.755em; } -.dataTables_filter input { + /* .dataTables_filter input { background: #fff none repeat scroll 0 0; border: 1px solid rgba(34, 36, 38, 0.15); border-radius: 0.285714rem; @@ -871,7 +871,8 @@ ul { -o-transition: background-color 0.1s ease 0s, box-shadow 0.1s ease 0s, border-color 0.1s ease 0s; -webkit-transition: background-color 0.1s ease 0s, box-shadow 0.1s ease 0s, border-color 0.1s ease 0s; transition: background-color 0.1s ease 0s, box-shadow 0.1s ease 0s, border-color 0.1s ease 0s; -} +} */ + /* =============Datatable Page Css============= */ /* MOBIL PAGE SETTINGS*/ /* Desktops and laptops ----------- */ diff --git a/public/js/admin.js b/public/js/admin.js new file mode 100644 index 0000000..5cf5e44 --- /dev/null +++ b/public/js/admin.js @@ -0,0 +1,77 @@ +function active(element) { + +} + +function changeRole(element) { + +} + +function forbid(element) { + +} + +function fetchAllUsers(params, callback, settings) { + var start = params.start ? params.start : 0 + var length = params.length ? params.length : 20 + var search = params.search ? params.search.value : "" + var pageIndex = start / length; + var returnData = {}; + $.ajax({ + url: '/web/admin/api/users/' + pageIndex + '/' + length + '?email=' + search, + type: 'GET', + success: function (data, textStatus) { + var result = data.users; + returnData.start = start; + returnData.recordsTotal = result.totalCount; + returnData.recordsFiltered = result.totalCount; + returnData.data = result.data; + if (callback) { + callback(returnData); + } + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + returnData.error = XMLHttpRequest.responseJSON.message; + if (callback) { + callback(returnData); + } + } + }); +} + +var admin_users_table = $('#table_users').dataTable({ + "ordering": false, + "paginate": true, + "lengthMenu": [20, 50, 100], + "processing": true, + "serverSide": true, + "ajax": fetchAllUsers, + "columns": [ + { data: 'userName' }, + { data: 'email' }, + { data: 'isActive' }, + { + data: 'role', + render: function (data, type, row, meta) { + return data == 1 ? 'admin' : 'member'; + } + }, + { + data: 'joinedTime', + render: function (data, type, row, meta) { + return moment(new Date(data)).format("YYYY-MM-DD hh:mm:ss"); + } + }, + { + data: 'email', + render: function (data, type, row, meta) { + if (!row.isActive) { + return ''; + } else { + var roleButton = ''; + var forbiddenButton = ''; + return '
' + roleButton + forbiddenButton + '
'; + } + } + } + ] +}).api(); \ No newline at end of file diff --git a/router/web/admin.go b/router/web/admin.go new file mode 100644 index 0000000..b36fb8d --- /dev/null +++ b/router/web/admin.go @@ -0,0 +1,32 @@ +package web + +import ( + "github.com/MessageDream/goby/core/userService" + "github.com/MessageDream/goby/module/context" + "github.com/MessageDream/goby/module/infrastructure" +) + +const ( + ADMIN_USERS infrastructure.TplName = "admin/users" +) + +func UsersGet(ctx *context.HTMLContext) { + ctx.Data["PageIsAdminUsers"] = true + ctx.HTML(200, ADMIN_USERS) +} + +func UsersQuery(ctx *context.APIContext) { + pageIndex := ctx.ParamsInt("pageIndex") + pageCount := ctx.ParamsInt("pageCount") + email := ctx.Query("email") + + result, err := userService.QueryUsers(ctx.User.ID, pageIndex, pageCount, email) + if err != nil { + ctx.Error(err) + return + } + + ctx.JSON(200, map[string]interface{}{ + "users": result, + }) +} diff --git a/template/admin/users.html b/template/admin/users.html new file mode 100644 index 0000000..bdd4ea6 --- /dev/null +++ b/template/admin/users.html @@ -0,0 +1,75 @@ +{{template "base/header" .}} +
+
+
+
+
+ Users + +
+ +
+ + + + + + + + + + + +
User NameEmailIs ActiveRoleJoined Time Operation
+
+
+
+
+ + +
+{{template "base/footer" .}} + \ No newline at end of file diff --git a/template/app/detail/deployments.html b/template/app/detail/deployments.html index 91520f1..b806a9d 100644 --- a/template/app/detail/deployments.html +++ b/template/app/detail/deployments.html @@ -4,7 +4,7 @@ {{template "app/detail/header" .}}
{{$user := .SignedUser}} {{$owner := .Owner}} {{$condition := ne $user.Email $owner}} -
+
Summary @@ -12,6 +12,7 @@ Add +
@@ -109,7 +110,10 @@
-
+ +
+
+
History @@ -174,7 +178,6 @@ -
Platform
100%
90%
@@ -216,6 +219,4 @@
{{template "base/footer" .}} - - \ No newline at end of file diff --git a/template/base/footer.html b/template/base/footer.html index 034f28d..6c79d9b 100644 --- a/template/base/footer.html +++ b/template/base/footer.html @@ -5,29 +5,18 @@
*/}}
- - + - + + + diff --git a/template/base/header.html b/template/base/header.html index 000cfe3..68d4a39 100644 --- a/template/base/header.html +++ b/template/base/header.html @@ -1,4 +1,4 @@ - + @@ -24,13 +24,13 @@ - - - - - - - + + + + + + + {{if .Title}}{{.Title}} - {{end}}{{AppName}} @@ -44,16 +44,29 @@
-
+ {{if .IsAdmin}} +
+ + Admin Panel +
+
+ + User Manager + +
+ {{end}} Apps Keys + +
@@ -69,8 +82,7 @@
- - {{if .IsSigned}} + {{if .IsSigned}}
label-image @@ -115,8 +127,7 @@ 注册 - - {{end}} + {{end}} 登陆 From 3ca602e324b5c8a33932467e1a2ba0395206a5be Mon Sep 17 00:00:00 2001 From: jayden Date: Tue, 25 Jul 2017 21:09:19 +0800 Subject: [PATCH 2/8] optimize auth --- core/core.go | 2 ++ core/tokenService/token_service.go | 4 ++++ core/userService/user_service.go | 31 ++++++++++++++++++------------ model/dto/dto_user.go | 11 +++++------ model/user.go | 31 +++++++++++++++++------------- module/context/api_context.go | 3 +++ module/context/auth.go | 24 +++++++++++------------ module/context/context.go | 1 + module/context/html_context.go | 3 ++- public/js/admin.js | 24 +++++++++++++++++++---- router/home.go | 3 ++- router/install.go | 2 +- router/web/auth.go | 20 +++++++++++++------ template/admin/users.html | 2 +- 14 files changed, 103 insertions(+), 58 deletions(-) diff --git a/core/core.go b/core/core.go index 9744bd9..8e5185a 100644 --- a/core/core.go +++ b/core/core.go @@ -76,6 +76,7 @@ const ( INTENT_ERROR_CODE_USER_ACTIVATE_VERIFY_FAILED INTENT_ERROR_CODE_USER_USERNAME_OR_PWD_INVALID + INTENT_ERROR_CODE_USER_FORBIDDEN ) var ( @@ -91,6 +92,7 @@ var ( ErrUserAlreadyActivated = WrapIntentError(errors.New("User has been activated before"), INTENT_ERROR_CODE_USER_ACTIVATE_HAS_ACTIVATED) ErrUserActivateTimeLimitCodeLength = WrapIntentError(errors.New("Time limit code length is too short"), INTENT_ERROR_CODE_USER_ACTIVATE_TIME_LIMIT_LENGTH) ErrUserActivateVerifyFailed = WrapIntentError(errors.New("Active code is invalid"), INTENT_ERROR_CODE_USER_ACTIVATE_VERIFY_FAILED) + ErrUserForbidden = WrapIntentError(errors.New("User is forbidden"), INTENT_ERROR_CODE_USER_FORBIDDEN) ) //Token diff --git a/core/tokenService/token_service.go b/core/tokenService/token_service.go index aea384d..d37c6bf 100644 --- a/core/tokenService/token_service.go +++ b/core/tokenService/token_service.go @@ -134,6 +134,10 @@ func checkToken(token string) (*model.User, *model.UserToken, error) { return nil, nil, err } + if user.Status == model.USER_STATUS_FORBIDDEN { + return nil, nil, ErrUserForbidden + } + tok := &model.UserToken{UID: user.ID, Token: token} if exist, err := tok.GetUnexpired(); err != nil || !exist { diff --git a/core/userService/user_service.go b/core/userService/user_service.go index 554a536..b531f9f 100644 --- a/core/userService/user_service.go +++ b/core/userService/user_service.go @@ -86,11 +86,11 @@ func Active(code string) (*model.User, error) { return nil, err } - if user.IsActive { + if user.Status != model.USER_STATUS_UN_ACTIVE { return nil, ErrUserAlreadyActivated } - user.IsActive = true + user.Status = model.USER_STATUS_NORMAL user.GenerateRands() if err := user.Update(nil, "is_active", "rands"); err != nil { return nil, err @@ -99,7 +99,7 @@ func Active(code string) (*model.User, error) { return user, nil } -func Create(uname, pwd, email string, isActive, isAdmin bool) (*model.User, error) { +func Create(uname, pwd, email string, status int, isAdmin bool) (*model.User, error) { if err := isUsableName(reservedUsernames, reservedUserPatterns, uname); err != nil { return nil, err @@ -110,7 +110,7 @@ func Create(uname, pwd, email string, isActive, isAdmin bool) (*model.User, erro LowerName: strings.ToLower(uname), Password: pwd, Email: email, - IsActive: isActive, + Status: status, IsAdmin: isAdmin, } if exist, err := user.Exist(); err != nil || exist { @@ -155,7 +155,7 @@ func GetByRands(rands string) (*model.User, error) { return user, nil } -func GetByUserName(uname string) (*model.User, error) { +func SignInWithUserName(uname string) (*model.User, error) { user := &model.User{LowerName: strings.ToLower(uname)} if exist, err := user.Get(); err != nil || !exist { @@ -164,10 +164,15 @@ func GetByUserName(uname string) (*model.User, error) { } return nil, err } + + if user.Status == model.USER_STATUS_FORBIDDEN { + return nil, ErrUserForbidden + } + return user, nil } -func Signin(emailOrName, pwd string) (*model.User, error) { +func SignIn(emailOrName, pwd string) (*model.User, error) { var user *model.User if strings.Contains(emailOrName, "@") { if !infrastructure.VerifyEmail(emailOrName) || len(pwd) <= 0 { @@ -192,6 +197,9 @@ func Signin(emailOrName, pwd string) (*model.User, error) { if !user.ValidatePassword(pwd) { return nil, ErrUserNameOrPasswordInvalide } + if user.Status == model.USER_STATUS_FORBIDDEN { + return nil, ErrUserForbidden + } return user, nil } @@ -213,12 +221,11 @@ func QueryUsers(uid uint64, pageIndex, pageCount int, email string) (*dto.Pager, role = 1 } return &dto.UserDetail{ - Email: u.Email, - UserName: u.UserName, - Role: role, - IsActive: u.IsActive, - IsForbidden: u.IsForbidden, - JoinedAt: u.CreatedAt, + Email: u.Email, + UserName: u.UserName, + Role: role, + Status: u.Status, + JoinedAt: u.CreatedAt, } }).ToSlice(&results) diff --git a/model/dto/dto_user.go b/model/dto/dto_user.go index cc702ef..363aef5 100644 --- a/model/dto/dto_user.go +++ b/model/dto/dto_user.go @@ -34,10 +34,9 @@ type Pager struct { } type UserDetail struct { - Email string `json:"email"` - UserName string `json:"userName"` - Role int `json:"role"` - IsActive bool `json:"isActive"` - IsForbidden bool `json:"isForbidden"` - JoinedAt time.Time `json:"joinedTime"` + Email string `json:"email"` + UserName string `json:"userName"` + Role int `json:"role"` + Status int `json:"status"` + JoinedAt time.Time `json:"joinedTime"` } diff --git a/model/user.go b/model/user.go index 83336b3..facf10d 100644 --- a/model/user.go +++ b/model/user.go @@ -19,20 +19,25 @@ import ( "github.com/go-xorm/xorm" ) +const ( + USER_STATUS_UN_ACTIVE = iota + USER_STATUS_NORMAL + USER_STATUS_FORBIDDEN +) + type User struct { - ID uint64 `xorm:"pk autoincr"` - Email string `xorm:"unique notnull"` - Password string `xorm:"notnull"` - Rands string `xorm:"index"` - UserName string - LowerName string `xorm:"unique notnull"` - IsAdmin bool `xorm:"notnull default(0)"` - IsActive bool `xorm:"notnull default(0)"` - IsForbidden bool `xorm:"notnull default(0)"` - Salt string - CreatedAt time.Time `xorm:"created"` - UpdatedAt time.Time `xorm:"updated"` - DeletedAt time.Time `xorm:"deleted"` + ID uint64 `xorm:"pk autoincr"` + Email string `xorm:"unique notnull"` + Password string `xorm:"notnull"` + Rands string `xorm:"index"` + UserName string + LowerName string `xorm:"unique notnull"` + IsAdmin bool `xorm:"notnull default(0)"` + Status int `xorm:"notnull default(0)"` + Salt string + CreatedAt time.Time `xorm:"created"` + UpdatedAt time.Time `xorm:"updated"` + DeletedAt time.Time `xorm:"deleted"` } func (self *User) EncodePasswd() { diff --git a/module/context/api_context.go b/module/context/api_context.go index 825011c..59757b0 100644 --- a/module/context/api_context.go +++ b/module/context/api_context.go @@ -64,8 +64,10 @@ func (ctx *APIContext) Auth() { if len(token) > 0 { u, err := checkAccessToken(token, ctx.Cache) if err != nil { + ctx.SignError = err return } + ctx.User = u ctx.IsSigned = true ctx.IsBasicAuth = true @@ -118,6 +120,7 @@ func APIContexter() macaron.Handler { ctx := &APIContext{ Context: c, } + ctx.Auth() c.Map(ctx) } } diff --git a/module/context/auth.go b/module/context/auth.go index 3f9abd8..3bf005e 100644 --- a/module/context/auth.go +++ b/module/context/auth.go @@ -5,7 +5,7 @@ import ( "path" "strings" - "github.com/MessageDream/goby/module/infrastructure" + "github.com/MessageDream/goby/model" "github.com/go-macaron/csrf" "gopkg.in/macaron.v1" @@ -48,17 +48,12 @@ func APIToggle(options *ToggleOptions) macaron.Handler { } if options.SignInRequire { - ctx.Auth() if !ctx.IsSigned { - ctx.Status(401) - return - - } else if !ctx.User.IsActive && registerEmailConfirm { - ctx.JSON(200, infrastructure.ApiJsonError{ - Message: "You should active your account", - Status: 401, - }) - return + if ctx.SignError != nil { + ctx.Error(ctx.SignError) + } else { + ctx.Status(403) + } } } @@ -85,14 +80,17 @@ func Toggle(options *ToggleOptions) macaron.Handler { } if options.SignInRequire { - if !ctx.IsSigned { + if ctx.SignError != nil { + ctx.Error(403, ctx.SignError.Error()) + return + } es := url.QueryEscape(ctx.Req.RequestURI) ctx.SetCookie("redirect_to", es) ctx.Redirect(path.Join(subURL, "/web/auth/signin")) return - } else if !ctx.User.IsActive && registerEmailConfirm { + } else if registerEmailConfirm && ctx.User.Status == model.USER_STATUS_UN_ACTIVE { ctx.Data["Title"] = "激活您的账户" ctx.HTML(200, "auth/activate") return diff --git a/module/context/context.go b/module/context/context.go index 0c48fe2..d4944d8 100644 --- a/module/context/context.go +++ b/module/context/context.go @@ -50,6 +50,7 @@ type Context struct { *macaron.Context Cache cache.Cache User *model.User + SignError error IsSigned bool IsBasicAuth bool } diff --git a/module/context/html_context.go b/module/context/html_context.go index ddbf23c..9e0b334 100644 --- a/module/context/html_context.go +++ b/module/context/html_context.go @@ -78,8 +78,9 @@ func (ctx *HTMLContext) Auth() { if enableReverseProxyAuth { webAuthUser := ctx.Req.Header.Get(reverseProxyAuthUser) if len(webAuthUser) > 0 { - u, err := userService.GetByUserName(webAuthUser) + u, err := userService.SignInWithUserName(webAuthUser) if err != nil { + ctx.SignError = err return } ctx.User = u diff --git a/public/js/admin.js b/public/js/admin.js index 5cf5e44..2c1f328 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -48,13 +48,29 @@ var admin_users_table = $('#table_users').dataTable({ "columns": [ { data: 'userName' }, { data: 'email' }, - { data: 'isActive' }, { data: 'role', render: function (data, type, row, meta) { return data == 1 ? 'admin' : 'member'; } }, + { + data: 'status', + render: function (data, type, row, meta) { + switch (data) { + case 0: + return 'Inactive' + break; + case 1: + return 'Normal' + case 2: + return 'Forbidden' + break; + default: + return 'Unknown' + } + } + }, { data: 'joinedTime', render: function (data, type, row, meta) { @@ -64,11 +80,11 @@ var admin_users_table = $('#table_users').dataTable({ { data: 'email', render: function (data, type, row, meta) { - if (!row.isActive) { + if (row.status == 0) { return ''; } else { - var roleButton = ''; - var forbiddenButton = ''; + var roleButton = ''; + var forbiddenButton = ''; return '
' + roleButton + forbiddenButton + '
'; } } diff --git a/router/home.go b/router/home.go index b5e8c7d..821ae51 100644 --- a/router/home.go +++ b/router/home.go @@ -3,6 +3,7 @@ package router import ( "path" + "github.com/MessageDream/goby/model" "github.com/MessageDream/goby/module/context" "github.com/MessageDream/goby/module/infrastructure" "github.com/MessageDream/goby/module/setting" @@ -15,7 +16,7 @@ const ( func Home(ctx *context.HTMLContext) { if ctx.IsSigned { - if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { + if ctx.User.Status == model.USER_STATUS_UN_ACTIVE && setting.Service.RegisterEmailConfirm { ctx.Data["Title"] = "激活您的账户" ctx.HTML(200, ACTIVATE) return diff --git a/router/install.go b/router/install.go index 43991b0..836777e 100644 --- a/router/install.go +++ b/router/install.go @@ -290,7 +290,7 @@ func InstallPost(ctx *context.HTMLContext, form forms.InstallForm) { GlobalInit() // Create admin account. - if _, err := userService.Create(form.AdminName, form.AdminPasswd, form.AdminEmail, true, true); err != nil { + if _, err := userService.Create(form.AdminName, form.AdminPasswd, form.AdminEmail, model.USER_STATUS_NORMAL, true); err != nil { if err != nil { setting.InstallLock = false ctx.RenderWithErr(fmt.Sprintf("管理员帐户设置不正确:%v", err), INSTALL, &form) diff --git a/router/web/auth.go b/router/web/auth.go index 183b619..9d39042 100644 --- a/router/web/auth.go +++ b/router/web/auth.go @@ -67,7 +67,12 @@ func SignUpPost(ctx *context.HTMLContext, cpt *captcha.Captcha, form forms.SignU return } - u, err := userService.Create(form.UserName, form.Password, form.Email, !setting.Service.RegisterEmailConfirm, false) + status := model.USER_STATUS_UN_ACTIVE + if !setting.Service.RegisterEmailConfirm { + status = model.USER_STATUS_NORMAL + } + + u, err := userService.Create(form.UserName, form.Password, form.Email, status, false) if err != nil { switch err { @@ -153,13 +158,16 @@ func SignInPost(ctx *context.HTMLContext, form forms.SignInForm) { return } - u, err := userService.Signin(form.UserName, form.Password) + u, err := userService.SignIn(form.UserName, form.Password) if err != nil { if err == ErrUserNameOrPasswordInvalide || err == ErrUserNotExist { ctx.Data["Err_UserName"] = true ctx.RenderWithErr("用户名或密码不正确。", SIGNIN, &form) + } else if err == ErrUserForbidden { + ctx.Data["Err_UserName"] = true + ctx.RenderWithErr(err.Error(), SIGNIN, &form) } else { - ctx.Handle(500, "userService.Signin", err) + ctx.Handle(500, "userService.SignIn", err) } return } @@ -202,7 +210,7 @@ func ActivateGet(ctx *context.HTMLContext) { code := ctx.Query("code") if len(code) == 0 { ctx.Data["IsActivatePage"] = true - if ctx.User.IsActive { + if ctx.User.Status != model.USER_STATUS_UN_ACTIVE { ctx.Error(404) return } @@ -271,12 +279,12 @@ func AutoSignIn(ctx *context.HTMLContext) (bool, error) { } }() - u, err := userService.GetByUserName(uname) + u, err := userService.SignInWithUserName(uname) if err != nil { if err != ErrUserNotExist { return false, fmt.Errorf("GetUserByName: %v", err) } - return false, nil + return false, err } if val, ok := ctx.GetSuperSecureCookie(u.Rands+u.Password, setting.CookieRememberName); !ok || val != u.UserName { diff --git a/template/admin/users.html b/template/admin/users.html index bdd4ea6..650eaa2 100644 --- a/template/admin/users.html +++ b/template/admin/users.html @@ -17,8 +17,8 @@ User Name Email - Is Active Role + Status Joined Time Operation From a61b4d3d0e38529c87fc42f3a41bc6d511500c87 Mon Sep 17 00:00:00 2001 From: jayden Date: Wed, 26 Jul 2017 15:56:38 +0800 Subject: [PATCH 3/8] user manager ok --- cmd/web.go | 6 +- core/userService/user_service.go | 30 ++++++ public/js/admin.js | 138 +++++++++++++++++++++++-- router/web/admin.go | 47 +++++++++ template/admin/users.html | 38 ++++--- template/app/detail/collaborators.html | 2 - template/app/detail/deployments.html | 8 +- template/base/footer.html | 2 + 8 files changed, 238 insertions(+), 33 deletions(-) diff --git a/cmd/web.go b/cmd/web.go index 1c63c5d..11c39d8 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -171,7 +171,10 @@ func runWeb(cliCtx *cli.Context) { m.Group("/admin/api", func() { m.Get("/users/:pageIndex/:pageCount", web.UsersQuery) - }) + m.Post("/users/add", web.UserAddPost) + m.Patch("/users/:email/status", web.UserPatch) + m.Patch("/users/:email/role", web.UserPatch) + }, reqAdmin) m.Group("/admin", func() { m.Get("/users", web.UsersGet) @@ -179,6 +182,7 @@ func runWeb(cliCtx *cli.Context) { }) + //cli m.Group("/auth", func() { m.Combo("/login").Get(auth.SignInGet) m.Combo("/register").Get(auth.SignUpGet) diff --git a/core/userService/user_service.go b/core/userService/user_service.go index b531f9f..0b4904e 100644 --- a/core/userService/user_service.go +++ b/core/userService/user_service.go @@ -237,3 +237,33 @@ func QueryUsers(uid uint64, pageIndex, pageCount int, email string) (*dto.Pager, Data: results, }, nil } + +func UpdateRole(email string, role int) error { + + user := &model.User{Email: email} + if exist, err := user.Get(); err != nil || !exist { + if !exist { + return ErrUserNotExist + } + return err + } + + user.IsAdmin = role == 1 + + return user.Update(nil, "is_admin") +} + +func UpdateStatus(email string, status int) error { + + user := &model.User{Email: email} + if exist, err := user.Get(); err != nil || !exist { + if !exist { + return ErrUserNotExist + } + return err + } + + user.Status = status + + return user.Update(nil, "status") +} diff --git a/public/js/admin.js b/public/js/admin.js index 2c1f328..e27d2da 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -1,14 +1,96 @@ -function active(element) { +function status(el) { + var email = $(el).attr("data-email"); + var status = $(el).attr("data-status") + switch (status) { + case '0': + status = '1' + break; + case '1': + status = '2' + break; + case '2': + status = '1' + break; + } + swal({ + text: 'Are you sure to change ' + email + '\'s status?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes', + preConfirm: function () { + return new Promise(function (resolve, reject) { + $.ajax({ + url: '/web/admin/api/users/' + email + '/status', + type: 'PATCH', + data: { status: status }, + success: function (data, textStatus) { + resolve(email); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + reject(XMLHttpRequest.responseJSON.message); + } + }); + }) + } + }).then(function (email) { + swal({ + title: 'OK!', + text: 'Status of ' + email + 'has been changed', + type: 'success' + }).then(function () { + admin_users_table.ajax.reload(); + }); + }).catch(alertError); } -function changeRole(element) { +function changeRole(el) { + var email = $(el).attr("data-email"); + var role = $(el).attr("data-role") + switch (role) { + case '0': + role = '1' + break; + case '1': + role = '0' + break; + } + swal({ + text: 'Are you sure to change ' + email + '\'s role?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes', + preConfirm: function () { + return new Promise(function (resolve, reject) { + $.ajax({ + url: '/web/admin/api/users/' + email + '/role', + type: 'PATCH', + data: { role: role }, + success: function (data, textStatus) { + resolve(email); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + reject(XMLHttpRequest.responseJSON.message); + } + }); + }) + } + }).then(function (email) { + swal({ + title: 'OK!', + text: 'Role of ' + email + 'has been changed', + type: 'success' + }).then(function () { + admin_users_table.ajax.reload(); + }); + }).catch(alertError); } -function forbid(element) { - -} function fetchAllUsers(params, callback, settings) { var start = params.start ? params.start : 0 @@ -81,13 +163,51 @@ var admin_users_table = $('#table_users').dataTable({ data: 'email', render: function (data, type, row, meta) { if (row.status == 0) { - return ''; + return ''; } else { - var roleButton = ''; - var forbiddenButton = ''; + var roleButton = ''; + var forbiddenButton = ''; return '
' + roleButton + forbiddenButton + '
'; } } } ] -}).api(); \ No newline at end of file +}).api(); + +$("#admin_user_add").on("click", function () { + var app_name = $('#app_name').attr('data-name'); + var dep_name = $(this).attr("data-name"); + $('#admin_user_add_modal').modal({ + blurring: true, + transition: 'fade up', + closable: false, + onApprove: function () { + $('#admin_add_user_confirm').addClass('loading'); + var user_add_form = document.getElementById("form_admin_user_add"); + var form_data = new FormData(user_add_form); + $.ajax({ + url: '/web/admin/api/users/add', + type: 'POST', + data: form_data, + processData: false, // 不处理数据 + contentType: false, + success: function (data, textStatus) { + $("#admin_user_add_modal").modal('hide'); + admin_users_table.ajax.reload(); + Lobibox.notify('success', { + delay: 2000, + msg: 'success' + }); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + $('#admin_add_user_confirm').removeClass('loading'); + $('#form_admin_user_add_error ul').remove(); + $('#form_admin_user_add').addClass('error'); + $('#form_admin_user_add_error').append('
  • ' + XMLHttpRequest.responseJSON.message + '
') + } + }); + + return false; + } + }).modal("show"); +}); \ No newline at end of file diff --git a/router/web/admin.go b/router/web/admin.go index b36fb8d..871e0b3 100644 --- a/router/web/admin.go +++ b/router/web/admin.go @@ -1,7 +1,10 @@ package web import ( + "strconv" + "github.com/MessageDream/goby/core/userService" + "github.com/MessageDream/goby/model" "github.com/MessageDream/goby/module/context" "github.com/MessageDream/goby/module/infrastructure" ) @@ -30,3 +33,47 @@ func UsersQuery(ctx *context.APIContext) { "users": result, }) } + +func UserAddPost(ctx *context.APIContext) { + name := ctx.Query("name") + email := ctx.Query("email") + role := ctx.QueryInt("role") + pwd := "123456" + + _, err := userService.Create(name, pwd, email, model.USER_STATUS_NORMAL, role == 1) + if err != nil { + ctx.Error(err) + return + } + + ctx.Status(200) +} + +func UserPatch(ctx *context.APIContext) { + email := ctx.Params("email") + status := ctx.Query("status") + if len(status) > 0 { + if sta, err := strconv.Atoi(status); err == nil { + if err := userService.UpdateStatus(email, sta); err != nil { + ctx.Error(err) + return + } + } else { + ctx.Error(err) + return + } + } + + role := ctx.Query("role") + if len(role) > 0 { + if rol, err := strconv.Atoi(role); err == nil { + if err := userService.UpdateRole(email, rol); err != nil { + ctx.Error(err) + return + } + } else { + ctx.Error(err) + return + } + } +} diff --git a/template/admin/users.html b/template/admin/users.html index 650eaa2..0877cee 100644 --- a/template/admin/users.html +++ b/template/admin/users.html @@ -5,7 +5,7 @@
Users - @@ -29,42 +29,46 @@
- - +
-
+
History @@ -142,7 +142,7 @@ Release Time Description Install Metrics - Operation + Operation @@ -178,6 +178,7 @@ +
100%
100%
90%
@@ -218,5 +219,4 @@
{{template "base/footer" .}} - \ No newline at end of file diff --git a/template/base/footer.html b/template/base/footer.html index 6c79d9b..45d67fd 100644 --- a/template/base/footer.html +++ b/template/base/footer.html @@ -6,6 +6,8 @@ */}}
+ + From 69e32bf10d892660fd4eb783c2ac87a57f32c02a Mon Sep 17 00:00:00 2001 From: jayden Date: Wed, 26 Jul 2017 18:45:42 +0800 Subject: [PATCH 4/8] build script --- .gitignore | 1 + scripts/build/build.sh | 74 ++++++++++++++++++++++++++++++++++ scripts/sql/upgrade_v0.1.1.sql | 3 ++ 3 files changed, 78 insertions(+) create mode 100755 scripts/build/build.sh create mode 100644 scripts/sql/upgrade_v0.1.1.sql diff --git a/.gitignore b/.gitignore index 183f0a9..cc5bf1f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ log vendor debug npm-debug.log +*.zip diff --git a/scripts/build/build.sh b/scripts/build/build.sh new file mode 100755 index 0000000..28f85a2 --- /dev/null +++ b/scripts/build/build.sh @@ -0,0 +1,74 @@ +#!/bin/bash + +usage="Usage: $0 -[v] Version" + +version=$1 + +workingdir=$(pwd) + +src_root_dir=${workingdir}"/../../" +src_main_file=${src_root_dir}"/goby.go" +exc_main_file=${workingdir}"/goby" +exc_windows_main_file=${exc_main_file}".exe" + +src_conf_dir=${src_root_dir}"/conf" +src_public_dir=${src_root_dir}"/public" +src_template_dir=${src_root_dir}"/template" + +src_scripts_dir=${src_root_dir}"/scripts" +src_scripts_sys_dir=${src_scripts_dir}"/systemd" +src_scripts_sql_dir=${src_scripts_dir}"/sql" + + +function copy_exc(){ + if [ "$1"x = "windows"x ];then + $(cp ${exc_windows_main_file} $2) + $(rm ${exc_windows_main_file}) + else + $(cp ${exc_main_file} $2) + $(rm ${exc_main_file}) + fi +} + +function copy_res(){ + $(mkdir $1) + os_build_dir=$1"/" + $(cp -rf ${src_conf_dir} ${os_build_dir}) + $(cp -rf ${src_public_dir} ${os_build_dir}) + $(cp -rf ${src_template_dir} ${os_build_dir}) + $(cp -rf ${src_scripts_sys_dir} ${os_build_dir}scripts/) + $(cp -rf ${src_scripts_sql_dir} ${os_build_dir}scripts/) + echo ${os_build_dir} +} + +function build_zip(){ + + $(CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build ${src_main_file}) + + copy_exc $1 $3 + + name="goby-v${version}-$1-$2" + zip_name=${name}".zip" + + $(mv $3 ${name}) + + $(zip -rq ${zip_name} ${name}) + + $(mv ${name} $3) + +} + +function start() { + echo $1 + os_dir=$(copy_res $1) + build_zip $1 "amd64" ${os_dir} + build_zip $1 "386" ${os_dir} + + $(rm -rf ${os_dir}) +} + +start "linux" +start "darwin" +start "windows" + + diff --git a/scripts/sql/upgrade_v0.1.1.sql b/scripts/sql/upgrade_v0.1.1.sql new file mode 100644 index 0000000..bdf23fa --- /dev/null +++ b/scripts/sql/upgrade_v0.1.1.sql @@ -0,0 +1,3 @@ +UPDATE user SET status = 1 WHERE is_active = 1; +UPDATE user SET status = 0 WHERE is_active = 0; +ALTER TABLE user DROP is_active; \ No newline at end of file From 49016e40973ab141e2259184e37a302683bb7971 Mon Sep 17 00:00:00 2001 From: jayden Date: Wed, 26 Jul 2017 19:15:26 +0800 Subject: [PATCH 5/8] change binary version --- goby.go | 2 +- template/.VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goby.go b/goby.go index b93bbb4..7942d5e 100644 --- a/goby.go +++ b/goby.go @@ -10,7 +10,7 @@ import ( "github.com/MessageDream/goby/module/setting" ) -const APP_VER = "0.1.0" +const APP_VER = "0.1.1" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/template/.VERSION b/template/.VERSION index 6c6aa7c..6da28dd 100644 --- a/template/.VERSION +++ b/template/.VERSION @@ -1 +1 @@ -0.1.0 \ No newline at end of file +0.1.1 \ No newline at end of file From 096abf1f0d90fec9230a6267e9ff641ce9ba184c Mon Sep 17 00:00:00 2001 From: jayden Date: Thu, 27 Jul 2017 11:04:29 +0800 Subject: [PATCH 6/8] install page layout --- README.md | 12 +- template/install.html | 407 +++++++++++++++++++++--------------------- 2 files changed, 206 insertions(+), 213 deletions(-) diff --git a/README.md b/README.md index c063695..0272d2d 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,16 @@ As we know microsoft CodePush cloud is slow in China, we can use goby to build o [![Go Report Card](https://goreportcard.com/badge/github.com/MessageDream/goby)](https://goreportcard.com/report/github.com/MessageDream/goby) ## INSTALL FROM BINARY #### Linux -* [386](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-linux-386.zip) -* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-linux-amd64.zip) +* [386](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-linux-386.zip) +* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-linux-amd64.zip) #### Windows -* [386](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-windows-386.zip) -* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-windows-amd64.zip) +* [386](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-windows-386.zip) +* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-windows-amd64.zip) #### Darwin -* [386](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-darwin-386.zip) -* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.0/goby-v0.1.0-darwin-amd64.zip) +* [386](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-darwin-386.zip) +* [amd64](https://github.com/MessageDream/goby/releases/download/v0.1.1/goby-v0.1.1-darwin-amd64.zip) ```shell diff --git a/template/install.html b/template/install.html index 44b3465..2452f5c 100644 --- a/template/install.html +++ b/template/install.html @@ -1,264 +1,257 @@ - {{template "base/header" .}} + {{template "base/header_2" .}}
-
-
-

+
+
+

首次运行安装程序

{{template "base/alert" .}} -
- - - {{.CsrfTokenHtml}} -

goby 要求安装 MySQL、PostgreSQL、SQLite3 或 TiDB。

-

数据库设置

-
- -
- -
{{.CurDbOption}}
- -
- {{range .DbOptions}} -
{{.}}
- {{end}} -
+ + {{.CsrfTokenHtml}} +

数据库设置

+
+ +
+ +
{{.CurDbOption}}
+ +
+ {{range .DbOptions}} +
{{.}}
+ {{end}}
+
-
-
- - -
- -
- - -
-
- - -
-
- - - 如果您使用 MySQL，请使用 INNODB 引擎以及 utf8_general_ci 字符集。 -
+
+
+ +
-
-
- -
- -
disable
- -
-
Disable
-
Require
-
Verify Full
-
-
-
+
+ +
- - -
-
- - - SQLite3 数据库文件路径。
作为服务启动时，请使用绝对路径。 -
+
+ + +
+
+ + + 如果您使用 MySQL，请使用 INNODB 引擎以及 utf8_general_ci 字符集。
+
-

goby 要求使用本地、七牛 或 阿里云OSS 作为包存储服务

-

存储服务设置

-
- +
+
+
- -
{{.CurStorageOption}}
+ +
disable
- {{range .StorageOptions}} -
{{.}}
- {{end}} +
Disable
+
Require
+
Verify Full
+
-
-
- - -
- -
- - -
- -
- - -
+
+
+ + + SQLite3 数据库文件路径。作为服务启动时，请使用绝对路径。 +
+
-
- - +

存储服务设置

+
+ +
+ +
{{.CurStorageOption}}
+ +
+ {{range .StorageOptions}} +
{{.}}
+ {{end}}
+
-
-
- - -
+
+
+ +
-
- -
- - -
+
+ +
-
-
- - - 请使用绝对路径。 -
+
+ +
-
-
- - - http://localhost:3000/download -
+ +
+ +
+
-

应用基本设置

-
- - - 该用户必须具有对仓库根目录和运行 goby 的操作权限。 +
+ +
+ +
+
+ +
-
- - - 该设置影响 本地存储的包地址。 +
+ +
+
-
- - - 该设置影响一些邮箱中的链接。 +
+
+ + + 请使用绝对路径。
+
+
+
+ + + http://localhost:3000/download +
+
+ +

应用基本设置

+
+ + + 该用户必须具有对仓库根目录和运行 goby 的操作权限。 +
+
+ + + 该设置影响 本地存储的包地址。 +
-
-
- 邮件服务设置 +
+ + + 该设置影响一些邮箱中的链接。 +
+ + +
+
+ 邮件服务设置 +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- - -
+
+
+ +
-
-
- - -
+
+
+
+ +
+
- -
-
- - 服务器和其它服务设置 -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -

管理员帐号设置

-
- - -
-
- - + +
+
+ 服务器和其它服务设置
-
- - -
-
- - +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
-
-
- - -
- +

管理员帐号设置

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + +
+
-
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer_2" .}} \ No newline at end of file From 13ad4837f534918eb7dfc084c9c0db936e84ad65 Mon Sep 17 00:00:00 2001 From: jayden Date: Thu, 27 Jul 2017 11:09:39 +0800 Subject: [PATCH 7/8] install page layout --- template/auth/activate.html | 4 ++-- template/auth/forgot_passwd.html | 4 ++-- template/auth/prohibit_login.html | 4 ++-- template/auth/reset_passwd.html | 4 ++-- template/auth/signin.html | 4 ++-- template/auth/signup.html | 4 ++-- template/base/footer_2.html | 11 --------- template/base/header_2.html | 40 ------------------------------- template/install.html | 4 ++-- template/status/401.html | 4 ++-- template/status/403.html | 4 ++-- template/status/404.html | 4 ++-- template/status/500.html | 4 ++-- 13 files changed, 22 insertions(+), 73 deletions(-) delete mode 100644 template/base/footer_2.html delete mode 100644 template/base/header_2.html diff --git a/template/auth/activate.html b/template/auth/activate.html index d85b361..6a59484 100755 --- a/template/auth/activate.html +++ b/template/auth/activate.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -32,5 +32,5 @@

-{{template "base/footer_2" .}} +{{template "base/footer_no_nav" .}} {{template "base/background" .}} \ No newline at end of file diff --git a/template/auth/forgot_passwd.html b/template/auth/forgot_passwd.html index 385a539..8e3406f 100755 --- a/template/auth/forgot_passwd.html +++ b/template/auth/forgot_passwd.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -33,5 +33,5 @@

-{{template "base/footer_2" .}} +{{template "base/footer_no_nav" .}} {{template "base/background" .}} diff --git a/template/auth/prohibit_login.html b/template/auth/prohibit_login.html index d64d7cf..d2ba895 100755 --- a/template/auth/prohibit_login.html +++ b/template/auth/prohibit_login.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -15,5 +15,5 @@

-{{template "base/footer_2" .}} +{{template "base/footer_no_nav" .}} {{template "base/background" .}} \ No newline at end of file diff --git a/template/auth/reset_passwd.html b/template/auth/reset_passwd.html index c17eb22..5ef41ae 100755 --- a/template/auth/reset_passwd.html +++ b/template/auth/reset_passwd.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -30,5 +30,5 @@

-{{template "base/footer_2" .}} +{{template "base/footer_no_nav" .}} {{template "base/background" .}} diff --git a/template/auth/signin.html b/template/auth/signin.html index 18307a3..1d27da4 100755 --- a/template/auth/signin.html +++ b/template/auth/signin.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -61,7 +61,7 @@

-{{template "base/footer_2" .}} +{{template "base/footer_no_nav" .}} {{template "base/background" .}} - - - - - - - - - \ No newline at end of file diff --git a/template/base/header_2.html b/template/base/header_2.html deleted file mode 100644 index 4591b60..0000000 --- a/template/base/header_2.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - {{if not .PageIsAdmin}} - - - - {{end}} - - - - - - {{if .PageIsAdmin}} - - - - - - {{end}} - - - - - - - - - - - - {{if .Title}}{{.Title}} - {{end}}{{AppName}} - - - - - -
\ No newline at end of file diff --git a/template/install.html b/template/install.html index 2452f5c..97bd007 100644 --- a/template/install.html +++ b/template/install.html @@ -1,4 +1,4 @@ - {{template "base/header_2" .}} + {{template "base/header_no_nav" .}}
@@ -254,4 +254,4 @@

管理员帐号设置

-{{template "base/footer_2" .}} \ No newline at end of file +{{template "base/footer_no_nav" .}} \ No newline at end of file diff --git a/template/status/401.html b/template/status/401.html index f6b1dd4..4902b4a 100644 --- a/template/status/401.html +++ b/template/status/401.html @@ -1,4 +1,4 @@ - {{template "base/header_2" .}} + {{template "base/header_no_nav" .}}
@@ -10,4 +10,4 @@
-{{template "base/footer_2" .}} \ No newline at end of file +{{template "base/footer_no_nav" .}} \ No newline at end of file diff --git a/template/status/403.html b/template/status/403.html index 952b035..a5b4ca7 100644 --- a/template/status/403.html +++ b/template/status/403.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -10,4 +10,4 @@
-{{template "base/footer_2" .}} \ No newline at end of file +{{template "base/footer_no_nav" .}} \ No newline at end of file diff --git a/template/status/404.html b/template/status/404.html index a8cef4d..e6e375f 100644 --- a/template/status/404.html +++ b/template/status/404.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -12,4 +12,4 @@
-{{template "base/footer_2" .}} \ No newline at end of file +{{template "base/footer_no_nav" .}} \ No newline at end of file diff --git a/template/status/500.html b/template/status/500.html index 1c217bf..1376fb3 100644 --- a/template/status/500.html +++ b/template/status/500.html @@ -1,4 +1,4 @@ -{{template "base/header_2" .}} +{{template "base/header_no_nav" .}}
@@ -10,4 +10,4 @@
-{{template "base/footer_2" .}} \ No newline at end of file +{{template "base/footer_no_nav" .}} \ No newline at end of file From 07ce96b22afa4060c25d94b9328944f09eda9f88 Mon Sep 17 00:00:00 2001 From: jayden Date: Thu, 27 Jul 2017 11:09:59 +0800 Subject: [PATCH 8/8] change template name --- template/base/footer_no_nav.html | 11 +++++++++ template/base/header_no_nav.html | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 template/base/footer_no_nav.html create mode 100644 template/base/header_no_nav.html diff --git a/template/base/footer_no_nav.html b/template/base/footer_no_nav.html new file mode 100644 index 0000000..8952bc1 --- /dev/null +++ b/template/base/footer_no_nav.html @@ -0,0 +1,11 @@ +
+ + + + + + + + + + \ No newline at end of file diff --git a/template/base/header_no_nav.html b/template/base/header_no_nav.html new file mode 100644 index 0000000..4591b60 --- /dev/null +++ b/template/base/header_no_nav.html @@ -0,0 +1,40 @@ + + + + + + {{if not .PageIsAdmin}} + + + + {{end}} + + + + + + {{if .PageIsAdmin}} + + + + + + {{end}} + + + + + + + + + + + + {{if .Title}}{{.Title}} - {{end}}{{AppName}} + + + + + +
\ No newline at end of file