Skip to content

Commit 53a2cc5

Browse files
committed
Merge pull request #77 from TimothyYe/master
Fix issue #46
2 parents 08ecd07 + ec6f897 commit 53a2cc5

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

app/handler/auth.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package handler
22

33
import (
4-
"github.com/dinever/golf"
5-
"github.com/dingoblog/dingo/app/model"
64
"regexp"
75
"strconv"
6+
7+
"github.com/dinever/golf"
8+
"github.com/dingoblog/dingo/app/model"
89
)
910

1011
const Email string = "^(((([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+(\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.)+(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])([a-zA-Z]|\\d|-|\\.|_|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*([a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.?$"
1112

1213
var rxEmail = regexp.MustCompile(Email)
1314

1415
func AuthLoginPageHandler(ctx *golf.Context) {
15-
ctx.Loader("admin").Render("login.html")
16+
userNum, _ := model.GetNumberOfUsers()
17+
ctx.Loader("admin").Render("login.html", map[string]interface{}{
18+
"UserExists": userNum > 0,
19+
})
1620
}
1721

1822
func AuthSignUpPageHandler(ctx *golf.Context) {

view/admin/login.html

+2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ <h2 class="mdl-card__title-text">
4242
<button type="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect mdl-color--light-blue">
4343
Login
4444
</button>
45+
{{ if not .UserExists }}
4546
<a href="/signup" class="mdl-button mdl-js-button mdl-js-ripple-effect">
4647
Sign up
4748
</a>
49+
{{ end }}
4850
</div>
4951

5052
</form>

0 commit comments

Comments
 (0)