first

core.go

@@ -1,6 +1,5 @@
 package main
 
-
 type Core struct {
 	Name    string
 	Config  string
@@ -9,7 +8,6 @@ type Core struct {
 	Version string
 }
 
-
 func SelectCore() (*Core, error) {
 	var core Core
 	rows, err := db.Query("SELECT * FROM core")

main.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"database/sql"
+	"fmt"
 	"github.com/GeertJohan/go.rice"
 	"github.com/go-yaml/yaml"
 	"github.com/gorilla/sessions"
 	_ "github.com/lib/pq"
 	"golang.org/x/crypto/bcrypt"
 	"io/ioutil"
-	"fmt"
 )
 
 var (
@@ -46,7 +46,6 @@ func main() {
 	mainProcess()
 }
 
-
 func mainProcess() {
 	var err error
 	DbConnection()
@@ -60,8 +59,6 @@ func mainProcess() {
 	}
 }
 
-
-
 func RenderBoxes() {
 	sqlBox = rice.MustFindBox("sql")
 	cssBox = rice.MustFindBox("html/css")

setup.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	"net/http"
-	"strconv"
-	"os"
 	"github.com/go-yaml/yaml"
+	"net/http"
+	"os"
+	"strconv"
 	"time"
 )
 
@@ -56,7 +56,6 @@ func ProcessSetupHandler(w http.ResponseWriter, r *http.Request) {
 
 }
 
-
 func (c *DbConfig) Save() error {
 	var err error
 	config, err := os.Create("config.yml")

web.go

@@ -91,7 +91,6 @@ func CreateServiceHandler(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/services", http.StatusSeeOther)
 }
 
-
 func SetupHandler(w http.ResponseWriter, r *http.Request) {
 	setupFile, err := tmplBox.String("setup.html")
 	if err != nil {
@@ -109,31 +108,23 @@ type index struct {
 }
 
 func IndexHandler(w http.ResponseWriter, r *http.Request) {
-	//session, _ := store.Get(r, "apizer_auth")
+	if core == nil {
-	//if auth, ok := session.Values["authenticated"].(bool); !ok || !auth {
-	//	http.Redirect(w, r, "/", http.StatusSeeOther)
-	//	return
-	//}
-
-	if setupMode {
 		http.Redirect(w, r, "/setup", http.StatusSeeOther)
 		return
 	}
 
-	dashboardFile, err := tmplBox.String("index.html")
+	indexFile, err := tmplBox.String("index.html")
 	if err != nil {
 		panic(err)
 	}
 
-	dashboardTmpl, err := template.New("message").Funcs(template.FuncMap{
+	indexTmpl, err := template.New("message").Funcs(template.FuncMap{
 		"js": func(html string) template.JS {
 			return template.JS(html)
 		},
-	}).Parse(dashboardFile)
+	}).Parse(indexFile)
-
 	out := index{SelectAllServices()}
-
+	indexTmpl.Execute(w, out)
-	dashboardTmpl.Execute(w, out)
 }
 
 func DashboardHandler(w http.ResponseWriter, r *http.Request) {