From 90d9d383ffd1e365c4e792b08cbd6253f2505474 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Tue, 7 Nov 2017 23:01:07 +0100
Subject: [PATCH] added Makefile

---
 .travis.yml             | 22 ++++++++++++----------
 Makefile                | 27 +++++++++++++++++++++++++++
 handlers/handlers.go    |  2 --
 handlers/tmpls/tmpls.go |  8 ++++----
 store/store.go          |  9 ++++-----
 5 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 Makefile

diff --git a/.travis.yml b/.travis.yml
index aa97ba2..b5efb1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
-language: go
-go:
-  - 1.9.2
-before_install:
-  - go get github.com/mattn/goveralls
-script:
-  - go get github.com/mjibson/esc
-  - go generate ./...
-  - go test -v ./...
-  - goveralls -service=travis-ci
\ No newline at end of file
+matrix:
+  include:
+    language: go
+    go:
+      - 1.9.2
+    script:
+      - make
+    language: node_js
+    node_js:
+      - "9"
+    script:
+      - make buildNodeFrontend
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..321f0d1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+all: getCMDDependencies embedFrontend getGoDependencies test uploadCoveralls
+
+test:
+	go test -v ./...
+
+buildNodeFrontend:
+	@cd static && yarn install
+	@cd static && yarn build
+
+embedFrontend:
+	@cd handlers/tmpls && esc -o tmpls.go -pkg tmpls -include ^*\.tmpl .
+	@cd handlers && esc -o static.go -pkg handlers -prefix ../static/build ../static/build
+
+getCMDDependencies:
+	go get -v github.com/mattn/goveralls
+	go get -v github.com/mjibson/esc
+	go get -v github.com/mitchellh/gox
+
+getGoDependencies:
+	go get -v ./...
+
+build:
+	@mkdir releases
+	gox -output="releases/{{.Dir}}_{{.OS}}_{{.Arch}}"
+
+uploadCoveralls:
+	goveralls -service=travis-ci
\ No newline at end of file
diff --git a/handlers/handlers.go b/handlers/handlers.go
index 5f4c9e5..41a5d74 100644
--- a/handlers/handlers.go
+++ b/handlers/handlers.go
@@ -1,6 +1,4 @@
 // Package handlers provides the http functionality for the URL Shortener
-//go:generate esc -o static.go -pkg handlers -prefix ../static/build ../static/build
-//go:generate esc -o tmpls/tmpls.go -pkg tmpls -include ^*\.tmpl -prefix tmpls tmpls
 package handlers
 
 import (
diff --git a/handlers/tmpls/tmpls.go b/handlers/tmpls/tmpls.go
index 85a1eda..4faecd7 100644
--- a/handlers/tmpls/tmpls.go
+++ b/handlers/tmpls/tmpls.go
@@ -1,4 +1,4 @@
-// Code generated by "esc -o tmpls/tmpls.go -pkg tmpls -include ^*\.tmpl -prefix tmpls tmpls"; DO NOT EDIT.
+// Code generated by "esc -o tmpls.go -pkg tmpls -include ^*\.tmpl ."; DO NOT EDIT.
 
 package tmpls
 
@@ -191,9 +191,9 @@ func FSMustString(useLocal bool, name string) string {
 var _escData = map[string]*_escFile{
 
 	"/token.tmpl": {
-		local:   "tmpls/token.tmpl",
+		local:   "token.tmpl",
 		size:    506,
-		modtime: 1510047272,
+		modtime: 1510088653,
 		compressed: `
 H4sIAAAAAAAC/2RRwW7qMBC8R8o/7PMFkEjyeqtoHAml9NoeQCpHx16RFY6dJptEFeLfqwCl0M7FMzvr
 ka1J/z2/5uvt2wpKrmwWBul4glVuJwU6kYXBOENlsjAAAEgrZAW6VE2LLMVm/RI9ijvPqQql6AmH2jcs
@@ -206,6 +206,6 @@ tr6DgayFAqFBQw1qRpMmZ/ey2uqGar6oEQM544fY1+iwiQ21tWJdrnp0PHU4QN617Kuznni37LjMlbWF
 
 	"/": {
 		isDir: true,
-		local: "tmpls",
+		local: "",
 	},
 }
diff --git a/store/store.go b/store/store.go
index 7d8f7ca..cdecbd3 100644
--- a/store/store.go
+++ b/store/store.go
@@ -20,11 +20,10 @@ type Store struct {
 
 // Entry is the data set which is stored in the DB as JSON
 type Entry struct {
-	URL        string
-	VisitCount int
-	RemoteAddr string `json:",omitempty"`
-	CreatedOn  time.Time
-	LastVisit  time.Time
+	URL                  string
+	VisitCount           int
+	RemoteAddr           string `json:",omitempty"`
+	CreatedOn, LastVisit time.Time
 }
 
 // ErrNoEntryFound is returned when no entry to a id is found