Merge remote-tracking branch 'origin/master' into sam/post-handler

Author: samdfonseca

README.md

@@ -3,7 +3,7 @@
 ![Dingo Logo](https://cloud.githubusercontent.com/assets/1311594/15427334/652081ae-1e62-11e6-9ae3-1dd0a667f22d.png)
 
 [![CI status](https://img.shields.io/travis/dingoblog/dingo.svg)]()
-[![Join Dingo Gitter](https://img.shields.io/gitter/room/dingoblog/dingo.svg)](https://gitter.im/dingoblog?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
+[![Gitter](https://badges.gitter.im/dingoblog/dingo.svg)](https://gitter.im/dingoblog/dingo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Dingo is a full-featured blog engine written in Go.
 

app/handler/auth.go

@@ -1,18 +1,22 @@
 package handler
 
 import (
-	"github.com/dinever/golf"
-	"github.com/dingoblog/dingo/app/model"
 	"regexp"
 	"strconv"
+
+	"github.com/dinever/golf"
+	"github.com/dingoblog/dingo/app/model"
 )
 
 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}])))\\.?$"
 
 var rxEmail = regexp.MustCompile(Email)
 
 func AuthLoginPageHandler(ctx *golf.Context) {
-	ctx.Loader("admin").Render("login.html")
+	userNum, _ := model.GetNumberOfUsers()
+	ctx.Loader("admin").Render("login.html", map[string]interface{}{
+		"UserExists": userNum > 0,
+	})
 }
 
 func AuthSignUpPageHandler(ctx *golf.Context) {

app/model/post.go

@@ -8,9 +8,10 @@ import (
 	"strings"
 	"time"
 
+	"net/http"
+
 	"github.com/dingoblog/dingo/app/utils"
 	"github.com/russross/meddler"
-	"net/http"
 )
 
 const stmtGetPostById = `SELECT * FROM posts WHERE id = ?`
@@ -221,6 +222,7 @@ func (p *Post) Update() error {
 
 func (p *Post) UpdateFromRequest(r *http.Request) {
 	p.Title = r.FormValue("title")
+	p.Image = r.FormValue("image")
 	p.Slug = r.FormValue("slug")
 	p.Markdown = r.FormValue("content")
 	p.Html = utils.Markdown2Html(p.Markdown)

view/admin/assets/dist/js/app.js

@@ -12,7 +12,7 @@ $(function () {
     success: function (json) {
       if (json.status === "success") {
         alertify.success("Content saved", 'success');
-        window.history.pushState({},"", "../" + json.content.Id + "/");
+        window.history.pushState({}, "", "/admin/editor/" + json.content.Id + "/");
       } else {
         alertify.error(json.msg);
       }

view/admin/assets/src/js/editor.js

@@ -42,6 +42,13 @@ <h3><i class="material-icons f-left m-r-5">info</i> Content information</h3>
                   </div>
                 </div>
 
+                <div class="mdl-cell mdl-cell--12-col mdl-cell--12-col-tablet mdl-cell--12-col-phone">
+                  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label fullwidth">
+                    <input class="mdl-textfield__input" type="text" name="image" id="image" value="{{ .Post.Image }}">
+                    <label class="mdl-textfield__label" for="image">Cover Image</label>
+                  </div>
+                </div>
+
                 <div class="mdl-cell mdl-cell--12-col mdl-cell--12-col-tablet mdl-cell--12-col-phone">
                   <textarea name="content" id="content" class="ipt">{{Html .Post.Markdown}}</textarea>
                 </div>

view/admin/edit_post.html

@@ -42,9 +42,11 @@ <h2 class="mdl-card__title-text">
                 <button type="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored mdl-js-ripple-effect mdl-color--light-blue">
                   Login
                 </button>
+								{{ if not .UserExists }}
                 <a href="/signup" class="mdl-button mdl-js-button mdl-js-ripple-effect">
                   Sign up
                 </a>
+								{{ end }}
               </div>
 
             </form>