Compilation fixes

Makefile

@@ -2,22 +2,24 @@
 
 all: backend frontend
 
-docker: Dockerfile
+docker: 
 	docker build --rm -t hexasoftware.com:5000/myapp .
 
 deploy: docker
 	docker push hexasoftware.com:5000/myapp
 
+
 backend: distpath 
 	@echo "Building backend... "
-	GOPATH=${CURDIR}/backend CGO_ENABLED=0 go build -o DIST/bin/server backend/src/simple-web/server/server.go
+	GOPATH=${CURDIR}/backend go get  simple-web
+	GOPATH=${CURDIR}/backend GO_ENABLED=0 go build -o DIST/bin/server backend/src/simple-web/simple-web.go
 
 frontend: distpath 
 	@echo "Building frontend..."
 	# Frontend
 	@cd frontend/web;node build/build.js
 
-test: backend
+test: backend #Front end has dev server
 	cd DIST;tmux split "DBHOST=localhost PORT=8080 DEVMODE=1 bin/server"
 	cd frontend/web; npm run dev
 
@@ -26,6 +28,6 @@ distpath:
 	@mkdir -p DIST/public
 
 
-.PHONY: all test clean backend frontend
+.PHONY: all test clean backend frontend docker
 
 

backend/src/dev.hexasoftware.com/hxs/hqi.git

@@ -0,0 +1 @@
+Subproject commit 81b45dc27beaf8c35e7f6ea9b2589aed25030a42

backend/src/dev.hexasoftware.com/hxs/prettylog.git

@@ -0,0 +1 @@
+Subproject commit 4081df3443fcc5b79e78b36a300c83831dd9f28b

backend/src/simple-web/cmd/simple-cli/main.go

@@ -1,92 +0,0 @@
-package main
-
-import (
-	"core"
-	"log"
-	"regexp"
-	"strings"
-
-	"github.com/chzyer/readline"
-)
-
-// Helper
-type Param []string
-
-func (p Param) String() string {
-	var str = ""
-	for i, v := range p {
-		if i != 0 {
-			str += ", "
-		}
-		str += "'" + v + "'"
-	}
-	return str
-}
-
-func main() {
-	//mgo.SetDebug(true)
-	//mgo.SetLogger(log.New(os.Stderr, "MGO: ", 0))
-
-	rl, err := readline.New("> ")
-	if err != nil {
-		panic(err)
-	}
-
-	for {
-		line, err := rl.Readline()
-		if err == readline.ErrInterrupt {
-			log.Println("Exiting...")
-			return
-		}
-		// Process line
-		//log.Println("Processing line", line)
-
-		cmdParam := []string{}
-		// Split line properly
-		quotePart := strings.Split(line, "\"")
-		re := regexp.MustCompile("\\s+")
-		for i, p := range quotePart { // Even is normal odd is quoted
-			if i&1 == 0 { // Even
-				s := re.Split(strings.TrimSpace(p), -1)
-				cmdParam = append(cmdParam, s...)
-				continue
-			}
-			cmdParam = append(cmdParam, p) // Add full string
-		}
-		log.Println("Process cmds", len(cmdParam), Param(cmdParam))
-
-		if cmdParam[0] == "user" {
-			if len(cmdParam) == 1 {
-				continue
-			}
-			// User Processor
-			if cmdParam[1] == "new" {
-
-				if len(cmdParam) != 6 {
-					log.Println("Invalid param should be: user new [name] [description] [email] [passw]")
-					continue
-				}
-				// ENV based config, docker friendly
-				c := core.New()
-
-				// Session on the core
-				s := c.Session()
-
-				s.User().NewUser(cmdParam[2], cmdParam[3], cmdParam[4], cmdParam[5])
-				// Login:
-				//u, err := s.Login("stdiopt@gmail.com", "1q2w3e")
-				u, err := s.User().Login("admin", "1q2w3e")
-				if err != nil {
-					panic(err)
-				}
-				log.Println("User logged in:", u)
-
-				//res := s.MustList()
-				//log.Println("Res:", res)
-
-			}
-		}
-
-	}
-
-}

backend/src/simple-web/core/session.go

@@ -1,10 +1,11 @@
 package core
 
 import (
-	"hxs/hqi"
-	"hxs/hqi/drv/mgodrv"
 	"simple-web/core/usersvc"
 
+	hqi "dev.hexasoftware.com/hxs/hqi.git"
+	mgodrv "dev.hexasoftware.com/hxs/hqi.git/drv/mgodrv"
+
 	mgo "gopkg.in/mgo.v2-unstable"
 )
 

backend/src/simple-web/core/usersvc/service.go

@@ -2,9 +2,10 @@ package usersvc
 
 import (
 	"errors"
-	"hxs/hqi"
 	"log"
 
+	hqi "dev.hexasoftware.com/hxs/hqi.git"
+
 	"github.com/google/uuid"
 )
 

backend/src/simple-web/server/server.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	_ "hxs/prettylog/global"
 	"log"
 	"net/http"
 	"net/http/httputil"
@@ -12,6 +11,8 @@ import (
 	"path/filepath"
 	"simple-web/core"
 	"strings"
+
+	_ "dev.hexasoftware.com/hxs/prettylog.git/global"
 )
 
 var (

backend/src/vendor/hxs/hqi

@@ -1 +0,0 @@
-Subproject commit e38e5c41d34abc3efb8b86abcdd885a320a14d0d

backend/src/vendor/hxs/prettylog

@@ -1 +0,0 @@
-Subproject commit cdd7c2b265fd5f4182e98e282ccca9bc3a53c545

backend/vendor/src

@@ -1 +0,0 @@
-../src/vendor/