Merge branch 'root' into 'master'

Clean project root path



See merge request !9

.gitignore

@@ -1,4 +1,3 @@
-static
 node_modules
-tmp
+build
 config.yml

Makefile

@@ -6,8 +6,8 @@ DB_DSN_DEV=postgres://$(DB_USER):$(DB_PASS)@127.0.0.1:5432/dev?sslmode=disable
 DB_DSN_TEST=postgres://$(DB_USER):$(DB_PASS)@127.0.0.1:5432/test?sslmode=disable
 
 MIGRATION=migrate -url '$(DB_DSN_DEV)'
-MIGRATION_SCHEMA=./sql
+MIGRATION_SCHEMA=./sql/migration
-MIGRATION_TEST_DATA=./sqltest
+MIGRATION_TEST_DATA=./sql/dev
 
 DOCKER_COMPOSE_FILE=./docker/docker-compose.yml
 DOCKER_COMPOSE=docker-compose -f $(DOCKER_COMPOSE_FILE)

fontify.json

@@ -2,5 +2,5 @@
   "modules": [
     "bootstrap"
   ],
-  "dest": "static"
+  "dest": "build/public"
 }

fresh.conf

@@ -1,3 +1,5 @@
-ignored: node_modules,src,static
+ignored: node_modules,src/public
 build_name: dev-build
 build_log: dev-build.log
+tmp_path: ./build
+root: ./src

package.json

@@ -4,11 +4,11 @@
   "description": "``` make dev ```",
   "main": "index.js",
   "scripts": {
-    "build-js": "mkdir -p ./static/js & node node_modules/.bin/browserify src/js/app.js -o static/js/app.js",
+    "build-js": "mkdir -p ./build/public/js & node node_modules/.bin/browserify src/public/js/app.js -o build/public/js/app.js",
-    "build-less": "mkdir -p ./static/css & node ./node_modules/.bin/lessc --include-path=./node_modules src/less/app.less static/css/app.css",
+    "build-less": "mkdir -p ./build/public/css & node ./node_modules/.bin/lessc --include-path=./node_modules src/public/less/app.less build/public/css/app.css",
-    "build-font": "mkdir ./static & node ./node_modules/.bin/fontify",
+    "build-font": "mkdir -p ./build & node ./node_modules/.bin/fontify",
-    "watch-js": "node ./node_modules/.bin/nodemon -e js -w src/js/app.js -x 'npm run build-js'",
+    "watch-js": "node ./node_modules/.bin/nodemon -e js -w src/public/js/app.js -x 'npm run build-js'",
-    "watch-less": "node ./node_modules/.bin/nodemon -e less -w src/less/app.less -x 'npm run build-less'",
+    "watch-less": "node ./node_modules/.bin/nodemon -e less -w src/public/less/app.less -x 'npm run build-less'",
     "build": "npm run build-js & npm run build-less & npm run build-font",
     "watch": "npm run watch-js & npm run watch-less"
   },

src/internal/movies/explorer.go

@@ -1,6 +1,6 @@
 package movies
 
-import "gitlab.quimbo.fr/odwrtw/canape-sql/web"
+import "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web"
 
 func updatePopular(env *web.Env, clientID string) error {
 	return nil

src/internal/movies/handlers.go

@@ -12,10 +12,10 @@ import (
 	traktdetailer "github.com/odwrtw/polochon/modules/trakttv"
 	"github.com/odwrtw/trakttv"
 
-	"gitlab.quimbo.fr/odwrtw/canape-sql/auth"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/config"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/users"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/web"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web"
 )
 
 var ErrPolochonUnavailable = fmt.Errorf("Invalid polochon address")

src/internal/movies/movies.go

@@ -7,8 +7,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/jmoiron/sqlx"
 	"github.com/odwrtw/polochon/lib"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/sqly"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/sqly"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/web"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web"
 )
 
 const (
@@ -101,7 +101,7 @@ func (m *Movie) GetDetails(db *sqlx.DB, log *logrus.Entry) error {
 	}
 
 	// Download poster
-	err = web.Download(m.Thumb, filepath.Join("./static/img/movies", m.ImdbID+".jpg"))
+	err = web.Download(m.Thumb, filepath.Join("./build/public/img/movies", m.ImdbID+".jpg"))
 	if err != nil {
 		return err
 	}

src/internal/shows/shows.go

@@ -3,8 +3,8 @@ package shows
 import (
 	"fmt"
 
-	"gitlab.quimbo.fr/odwrtw/canape-sql/sqly"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/sqly"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/users"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/jmoiron/sqlx"

src/internal/users/handlers.go

@@ -7,9 +7,9 @@ import (
 	"github.com/gorilla/Schema"
 	"github.com/kr/pretty"
 
-	"gitlab.quimbo.fr/odwrtw/canape-sql/auth"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/config"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/web"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web"
 )
 
 func LoginGETHandler(e *web.Env, w http.ResponseWriter, r *http.Request) error {

src/internal/users/users.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/jmoiron/sqlx/types"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/random"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/random"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/sqly"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/sqly"
 )
 
 const (

src/internal/web/env.go

@@ -3,8 +3,8 @@ package web
 import (
 	"fmt"
 
-	"gitlab.quimbo.fr/odwrtw/canape-sql/auth"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/config"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/negroni"

src/main.go

@@ -3,11 +3,11 @@ package main
 import (
 	"net/http"
 
-	"gitlab.quimbo.fr/odwrtw/canape-sql/auth"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/config"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/movies"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/movies"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/users"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users"
-	"gitlab.quimbo.fr/odwrtw/canape-sql/web"
+	"gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/negroni"
@@ -51,7 +51,7 @@ func main() {
 		Auth:         authorizer,
 		Log:          log,
 		Config:       cf,
-		TemplatesDir: "./templates",
+		TemplatesDir: "./src/templates",
 	})
 
 	authMiddleware := auth.NewMiddleware(env.Auth)
@@ -72,7 +72,7 @@ func main() {
 
 	n := negroni.Classic()
 	n.Use(authMiddleware)
-	n.Use(negroni.NewStatic(http.Dir("./static")))
+	n.Use(negroni.NewStatic(http.Dir("./build/public")))
 	n.UseHandler(env.Router)
 	n.Run(":" + cf.Port)
 }