Main page

Author: zainhoda

main.go

@@ -8,6 +8,7 @@ import (
 	"math/rand"
 	"net/http"
 	"os/exec"
+	"regexp"
 	"strconv"
 	"time"
 
@@ -55,7 +56,7 @@ func init() {
 		return nil
 	})
 	db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists([]byte("UserToBlog")) // random string -> email
+		_, err := tx.CreateBucketIfNotExists([]byte("UserToBlog")) // user -> blogdetails
 		if err != nil {
 			return fmt.Errorf("Error with UserToBlog: %s", err)
 		}
@@ -114,6 +115,17 @@ func MainPage(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	})
 }
 
+func ErrorPage(w http.ResponseWriter, r *http.Request, pm httprouter.Params) {
+	baseT := template.Must(template.New("base").Parse(base))
+	baseT = template.Must(baseT.Parse(errorPage))
+
+	baseT.ExecuteTemplate(w, "base", map[string]string{
+		"PageName": "error",
+		"User":     getUser(w, r),
+		"Error":    pm.ByName("errorcode"),
+	})
+}
+
 func SignupPage(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	baseT := template.Must(template.New("base").Parse(base))
 	baseT = template.Must(baseT.Parse(signup))
@@ -180,6 +192,10 @@ func AdminHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 	blogname := r.FormValue("blogname")
 	website := r.FormValue("website")
 	port := rand.Intn(63000) + 2000
+
+	re := regexp.MustCompile("[^A-Za-z]")
+	blogname = re.ReplaceAllString(blogname, "")
+
 	blogcheck := []byte("")
 
 	username := getUser(w, r)
@@ -194,6 +210,7 @@ func AdminHandler(w http.ResponseWriter, r *http.Request, ps httprouter.Params)
 			blogcheck = b.Get([]byte(blogname))
 			return nil
 		})
+
 		if blogcheck == nil {
 			create, err := exec.Command("./create.sh", blogname, website, strconv.Itoa(port)).Output()
 			if err != nil && !DEBUG {
@@ -376,5 +393,6 @@ func main() {
 	router.GET("/admin/", AdminPage)
 	router.POST("/admin/", AdminHandler)
 	router.GET("/logout/", LogoutHandler)
+	router.GET("/error/:errorcode/", ErrorPage)
 	log.Fatal(http.ListenAndServe(":1337", router))
 }

pages.go

@@ -12,7 +12,7 @@ var base = `
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
 		
 		<!-- Optional theme -->
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.6/paper/bootstrap.min.css">
 		
 		<!-- Latest compiled and minified JavaScript -->
 		<script src="https://code.jquery.com/jquery-2.2.0.min.js"></script>
@@ -210,8 +210,53 @@ var signup = `
 {{end}}
 `
 
+var errorPage = `
+{{define "content"}}
+
+<div class="col-md-6 col-md-offset-3">
+	<div class="alert alert-danger" role="alert">
+	  <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+	  <span class="sr-only">Error:</span>
+	  {{.Error}}
+	</div>
+</div>
+
+{{end}}
+`
+
 var mainPage = `
 {{define "content"}}
-Main
+
+<div class="row">
+	<div class="col-md-5 col-md-offset-1">
+		<h1>GoBlog</h1>
+		<h2>Simple Free Blog Hosting</h2>
+		<hr>
+		<h3>Deploy your own blog in as little as 15 seconds</h3>
+	</div>
+	<div class="col-md-6">
+		<img src="https://placeholdit.imgix.net/~text?txtsize=100&txt=Animated%20GIF%20goes%20here&w=600&h=500" style="width:100%">
+	</div>
+</div>
+
+<hr>
+
+<div class="row text-center">
+	<h2>Simple to Set Up</h2>
+	<div class="col-md-4">
+		<h3>Easy to Deploy</h3>
+		<i class="glyphicon glyphicon-ok" style="font-size: 20vw; color: #2196f3"></i>
+	</div>
+	<div class="col-md-4">
+		<h3>Upload a Custom Theme</h3>
+		<i class="glyphicon glyphicon-cloud-upload" style="font-size: 20vw; color: #2196f3"></i>
+	</div>
+	<div class="col-md-4">
+		<h3>Use Your Own Domain Name</h3>
+		<i class="glyphicon glyphicon-globe" style="font-size: 20vw; color: #2196f3"></i>
+	</div>
+
+</div>
+
 {{end}}
 `