ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

minor changes/cleanup

Browse source
This commit is contained in:
ston1th 2018-10-17 00:01:41 +02:00
commit 8ef2a2547c
6 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/log/log.go
View file

@ -19,7 +19,7 @@ func NewLogger(file string) {
log = stdlog.New(os.Stdout, "", stdlog.LstdFlags) log = stdlog.New(os.Stdout, "", stdlog.LstdFlags)
return return
} }
f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644) f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0640)
if err != nil { if err != nil {
stdlog.Fatal(err) stdlog.Fatal(err)
} }

10
pkg/server/server.go
View file

@ -52,15 +52,15 @@ func NewHTTPServer(l net.Listener, conf core.Config) (srv *HTTPServer) {
} }
func (s *HTTPServer) Start() (err error) { func (s *HTTPServer) Start() (err error) {
var buf *bytes.Buffer
if s.Secret != "" {
buf = bytes.NewBufferString(s.Secret)
}
s.DB, err = db.New(s.DataDir) s.DB, err = db.New(s.DataDir)
if err != nil { if err != nil {
return return
} }
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, buf) if s.Secret != "" {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, bytes.NewBufferString(s.Secret))
} else {
s.JWT, err = jwt.New(jwt.DefaultExpiry, s.DB, nil)
}
if err != nil { if err != nil {
return return
} }

30
pkg/server/templates.go
View file

@ -103,7 +103,7 @@ const (
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-form-label" for="password">Password</label> <label class="col-form-label" for="password">Password</label>
<input class="form-control input-sm" type="text" id="password" name="password" autofocus required> <input class="form-control input-sm" type="password" id="password" name="password" autofocus required>
</div> </div>
<button class="btn btn-sm btn-primary" type="submit">Login</button> <button class="btn btn-sm btn-primary" type="submit">Login</button>
</form> </form>
@ -242,9 +242,19 @@ const (
<div class="col"> <div class="col">
<strong>Created by:</strong> {{.Data.Created}}<br> <strong>Created by:</strong> {{.Data.Created}}<br>
{{if .Data.Updated}} {{if .Data.Updated}}
<strong>Updated by:</strong> {{.Data.Updated}} <strong>Updated by:</strong> {{.Data.Updated}}<br>
<br><br>
{{end}} {{end}}
<strong>Visibility:</strong>
{{if eq .Data.Perm 1}}
<span class="badge badge-primary">Public</span>
{{end}}
{{if eq .Data.Perm 2}}
<span class="badge badge-warning">Internal</span>
{{end}}
{{if eq .Data.Perm 3}}
<span class="badge badge-danger">Private</span>
{{end}}
<br>
</div> </div>
</div> </div>
<div class="row mt-5"> <div class="row mt-5">
@ -361,9 +371,19 @@ const (
<div class="col"> <div class="col">
<strong>Created by:</strong> {{.Data.Created}}<br> <strong>Created by:</strong> {{.Data.Created}}<br>
{{if .Data.Updated}} {{if .Data.Updated}}
<strong>Updated by:</strong> {{.Data.Updated}} <strong>Updated by:</strong> {{.Data.Updated}}<br>
<br><br>
{{end}} {{end}}
<strong>Visibility:</strong>
{{if eq .Data.Perm 1}}
<span class="badge badge-primary">Public</span>
{{end}}
{{if eq .Data.Perm 2}}
<span class="badge badge-warning">Internal</span>
{{end}}
{{if eq .Data.Perm 3}}
<span class="badge badge-danger">Private</span>
{{end}}
<br>
</div> </div>
</div> </div>
<div class="row mt-5"> <div class="row mt-5">

2
templates/login.html
View file

@ -15,7 +15,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-form-label" for="password">Password</label> <label class="col-form-label" for="password">Password</label>
<input class="form-control input-sm" type="text" id="password" name="password" autofocus required> <input class="form-control input-sm" type="password" id="password" name="password" autofocus required>
</div> </div>
<button class="btn btn-sm btn-primary" type="submit">Login</button> <button class="btn btn-sm btn-primary" type="submit">Login</button>
</form> </form>

14
templates/page.html
View file

@ -8,9 +8,19 @@
<div class="col"> <div class="col">
<strong>Created by:</strong> {{.Data.Created}}<br> <strong>Created by:</strong> {{.Data.Created}}<br>
{{if .Data.Updated}} {{if .Data.Updated}}
<strong>Updated by:</strong> {{.Data.Updated}} <strong>Updated by:</strong> {{.Data.Updated}}<br>
<br><br>
{{end}} {{end}}
<strong>Visibility:</strong>
{{if eq .Data.Perm 1}}
<span class="badge badge-primary">Public</span>
{{end}}
{{if eq .Data.Perm 2}}
<span class="badge badge-warning">Internal</span>
{{end}}
{{if eq .Data.Perm 3}}
<span class="badge badge-danger">Private</span>
{{end}}
<br>
</div> </div>
</div> </div>
<div class="row mt-5"> <div class="row mt-5">

14
templates/pageView.html
View file

@ -8,9 +8,19 @@
<div class="col"> <div class="col">
<strong>Created by:</strong> {{.Data.Created}}<br> <strong>Created by:</strong> {{.Data.Created}}<br>
{{if .Data.Updated}} {{if .Data.Updated}}
<strong>Updated by:</strong> {{.Data.Updated}} <strong>Updated by:</strong> {{.Data.Updated}}<br>
<br><br>
{{end}} {{end}}
<strong>Visibility:</strong>
{{if eq .Data.Perm 1}}
<span class="badge badge-primary">Public</span>
{{end}}
{{if eq .Data.Perm 2}}
<span class="badge badge-warning">Internal</span>
{{end}}
{{if eq .Data.Perm 3}}
<span class="badge badge-danger">Private</span>
{{end}}
<br>
</div> </div>
</div> </div>
<div class="row mt-5"> <div class="row mt-5">