dan
/
transmet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor login work

This commit is contained in:
Dan Ballard 2015-05-01 08:20:02 -07:00
parent c6ededd3d3
commit d87901b122
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.go
View File

@ -53,7 +53,6 @@ func loadConfig() {
func dbConnect() { func dbConnect() {
var err error var err error
fmt.Println(fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=require", config.Sql.Username, config.Sql.Password, config.Sql.Host, config.Sql.Dbname))
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=require", config.Sql.Username, config.Sql.Password, config.Sql.Host, config.Sql.Dbname)) db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=require", config.Sql.Username, config.Sql.Password, config.Sql.Host, config.Sql.Dbname))
if err != nil { if err != nil {
@ -90,7 +89,7 @@ func main() {
initTemplates() initTemplates()
init_route_handlers() init_route_handlers()
fmt.Println("Running...") fmt.Println("Listening on", config.Port, "...")
err := http.ListenAndServe(":"+config.Port, nil) err := http.ListenAndServe(":"+config.Port, nil)
if err != nil { if err != nil {
fmt.Println("Fatal Error: ", err) fmt.Println("Fatal Error: ", err)

2
route_handlers.go
View File

@ -34,7 +34,7 @@ func userHandler(next func(http.ResponseWriter, *http.Request, *user.User)) func
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
user, _ := initSessionUser(r) user, _ := initSessionUser(r)
if user == nil { if user == nil {
http.Redirect(w, r, "/", http.StatusFound) http.Redirect(w, r, "/login", http.StatusFound)
} else { } else {
next(w, r, user) next(w, r, user)
} }

8
templates/layout.html
View File

@ -26,20 +26,16 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="/">MasterTracker</a> <a class="navbar-brand" href="/">transmet</a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<!--<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> -->
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
{{if .user}} {{if .user}}
<li><a href="/user/edit">{{.user.Displayname}}</a></li> <li>{{.user.Username}}</li>
<li><a href="/logout">Logout</a></li> <li><a href="/logout">Logout</a></li>
{{else}} {{else}}
<li><a href="/signup">Sign up</a></li>
<li><a href="/login">Log in</a></li> <li><a href="/login">Log in</a></li>
{{end}} {{end}}
</ul> </ul>