diff --git a/README.md b/README.md index 456ce246..c28d4231 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Hugo add-on for Caddy +# staticmin [![Build](https://img.shields.io/travis/hacdias/staticmin.svg?style=flat-square)](https://travis-ci.org/hacdias/staticmin) [![Documentation](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](http://godoc.org/github.com/hacdias/staticmin) @@ -8,11 +8,7 @@ Deploy your Hugo website and enjoy of an admin interface with Caddy server. ## Configuration ``` -<<<<<<< HEAD staticmin { -======= -cms { ->>>>>>> 7b68c78b12d9b7aee61788d5e85cd3b0722906de styles file hugo true / false # default is true command command # needed when hugo is false @@ -41,7 +37,7 @@ If you want to go deeper and make changes in front-end assets like JavaScript or ### Run it -If you have already installed everything above to meet the requirements for what you want to do, let's start. Firstly, open the terminal and navigate to your clone of ```caddy-hugo```. Then execute: +If you have already installed everything above to meet the requirements for what you want to do, let's start. Firstly, open the terminal and navigate to your clone of ```staticmin```. Then execute: ``` go-bindata [-debug] -pkg assets -o assets/assets.go templates/ assets/css/ assets/js/ assets/fonts/ @@ -75,4 +71,4 @@ Navigate to ```localhost:8080``` to see your blog running on Caddy and Hugo. Go Everything is working now. Whenever you make a change in the back-end source code, you'll have to run the command above again. -**For those who want to make changes in front-end**, make sure you have every needed tool installed and run ```npm install``` in the root of ```caddy-hugo``` clone. Then, run ```grunt watch```. +**For those who want to make changes in front-end**, make sure you have every needed tool installed and run ```npm install``` in the root of ```staticmin``` clone. Then, run ```grunt watch```. diff --git a/browse/browse.go b/browse/browse.go index e7517ebb..8ebb981a 100644 --- a/browse/browse.go +++ b/browse/browse.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/hacdias/caddy-hugo/config" + "github.com/hacdias/staticmin/config" ) // ServeHTTP is used to serve the content of Browse page diff --git a/browse/get.go b/browse/get.go index a018c471..609b41f2 100644 --- a/browse/get.go +++ b/browse/get.go @@ -4,8 +4,8 @@ import ( "net/http" "text/template" - "github.com/hacdias/caddy-hugo/config" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/config" + "github.com/hacdias/staticmin/utils" "github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware/browse" ) diff --git a/browse/post.go b/browse/post.go index bc690ad1..38fec511 100644 --- a/browse/post.go +++ b/browse/post.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/utils" ) // POST handles the POST method on browse page diff --git a/editor/editor.go b/editor/editor.go index c2c8dd4e..5af99e77 100644 --- a/editor/editor.go +++ b/editor/editor.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/hacdias/caddy-hugo/config" + "github.com/hacdias/staticmin/config" ) type editor struct { diff --git a/editor/get.go b/editor/get.go index 193143cf..91a9fbe9 100644 --- a/editor/get.go +++ b/editor/get.go @@ -10,9 +10,9 @@ import ( "strings" "text/template" - "github.com/hacdias/caddy-hugo/config" - "github.com/hacdias/caddy-hugo/frontmatter" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/config" + "github.com/hacdias/staticmin/frontmatter" + "github.com/hacdias/staticmin/utils" "github.com/spf13/hugo/parser" ) diff --git a/editor/post.go b/editor/post.go index 7b74ecd2..a66b4a30 100644 --- a/editor/post.go +++ b/editor/post.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hacdias/caddy-hugo/config" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/config" + "github.com/hacdias/staticmin/utils" "github.com/robfig/cron" "github.com/spf13/hugo/parser" ) diff --git a/frontmatter/frontmatter.go b/frontmatter/frontmatter.go index c8668ea7..8c75040c 100644 --- a/frontmatter/frontmatter.go +++ b/frontmatter/frontmatter.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/utils" "github.com/spf13/hugo/parser" ) diff --git a/package.json b/package.json index 6c24bde3..ebf6f8ca 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { - "name": "caddy-hugo", + "name": "staticmin", "version": "1.0.0", "description": "Deploy your Hugo website and enjoy of an admin interface with Caddy server.", "repository": { "type": "git", - "url": "git+https://github.com/hacdias/caddy-hugo.git" + "url": "git+https://github.com/hacdias/staticmin.git" }, "main": "Gruntfile.js", "author": "Henrique Dias ", "license": "MIT", "bugs": { - "url": "https://github.com/hacdias/caddy-hugo/issues" + "url": "https://github.com/hacdias/staticmin/issues" }, - "homepage": "https://github.com/hacdias/caddy-hugo#readme", + "homepage": "https://github.com/hacdias/staticmin#readme", "scripts": { "install": "napa defunkt/jquery-pjax" }, diff --git a/cms.go b/staticmin.go similarity index 93% rename from cms.go rename to staticmin.go index 42efde45..eeed046a 100644 --- a/cms.go +++ b/staticmin.go @@ -2,7 +2,7 @@ //go:generate go install github.com/jteeuwen/go-bindata/go-bindata //go:generate go-bindata -pkg assets -o assets/assets.go templates/ assets/css/ assets/js/ assets/fonts/ -package cms +package staticmin import ( "mime" @@ -11,11 +11,11 @@ import ( "path/filepath" "strings" - "github.com/hacdias/caddy-hugo/assets" - "github.com/hacdias/caddy-hugo/browse" - "github.com/hacdias/caddy-hugo/config" - "github.com/hacdias/caddy-hugo/editor" - "github.com/hacdias/caddy-hugo/utils" + "github.com/hacdias/staticmin/assets" + "github.com/hacdias/staticmin/browse" + "github.com/hacdias/staticmin/config" + "github.com/hacdias/staticmin/editor" + "github.com/hacdias/staticmin/utils" "github.com/mholt/caddy/config/setup" "github.com/mholt/caddy/middleware" ) diff --git a/utils/utils.go b/utils/utils.go index 5244e6ec..416d3342 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -12,8 +12,8 @@ import ( "text/template" "unicode" - "github.com/hacdias/caddy-hugo/assets" - "github.com/hacdias/caddy-hugo/config" + "github.com/hacdias/staticmin/assets" + "github.com/hacdias/staticmin/config" "github.com/spf13/hugo/commands" )