diff --git a/buffalo/cmd/app_generators.go b/buffalo/cmd/app_generators.go index 0cfb917c0..6be0c89d5 100644 --- a/buffalo/cmd/app_generators.go +++ b/buffalo/cmd/app_generators.go @@ -20,8 +20,8 @@ func newAppGenerator() *gentronics.Generator { g.Add(gentronics.NewFile("grifts/routes.go", nGriftRoutes)) g.Add(gentronics.NewFile("templates/index.html", nIndexHTML)) g.Add(gentronics.NewFile("templates/application.html", nApplicationHTML)) - g.Add(gentronics.NewFile("assets/application.js", "")) - g.Add(gentronics.NewFile("assets/application.css", nApplicationCSS)) + g.Add(gentronics.NewFile("assets/js/application.js", "")) + g.Add(gentronics.NewFile("assets/css/application.css", nApplicationCSS)) g.Add(gentronics.NewFile(".gitignore", nGitignore)) g.Add(gentronics.NewCommand(goGet("github.com/markbates/refresh/..."))) g.Add(gentronics.NewCommand(goInstall("github.com/markbates/refresh"))) @@ -165,21 +165,21 @@ const nApplicationHTML = ` Buffalo - {{ .titleName }} {{if .withBootstrap -}} - + {{end -}} - + {{"{{"}} yield {{"}}"}} {{if .withJQuery -}} - + {{end -}} {{if .withBootstrap -}} - + {{end -}} - + ` diff --git a/buffalo/cmd/generate/bootstrap.go b/buffalo/cmd/generate/bootstrap.go index 3d2036320..61718571c 100644 --- a/buffalo/cmd/generate/bootstrap.go +++ b/buffalo/cmd/generate/bootstrap.go @@ -52,14 +52,14 @@ func NewBootstrapGenerator() *gentronics.Generator { } g := gentronics.New() jf := &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "bootstrap.css"), ""), + File: gentronics.NewFile(filepath.Join("assets", "css", "bootstrap.css"), ""), } jf.Should = should jf.RemotePath = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" g.Add(jf) jf = &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "bootstrap.js"), ""), + File: gentronics.NewFile(filepath.Join("assets", "js", "bootstrap.js"), ""), } jf.Should = should jf.RemotePath = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" diff --git a/buffalo/cmd/generate/bootswatch.go b/buffalo/cmd/generate/bootswatch.go index c0c60dccc..5c5ffb3df 100644 --- a/buffalo/cmd/generate/bootswatch.go +++ b/buffalo/cmd/generate/bootswatch.go @@ -77,7 +77,7 @@ func NewBootswatchGenerator(theme string) (*gentronics.Generator, error) { }, }) jf := &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "bootstrap.css"), ""), + File: gentronics.NewFile(filepath.Join("assets", "css", "bootstrap.css"), ""), } jf.RemotePath = fmt.Sprintf("https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/%s/bootstrap.min.css", theme) g.Add(jf) diff --git a/buffalo/cmd/generate/jquery.go b/buffalo/cmd/generate/jquery.go index 059317437..d4250070a 100644 --- a/buffalo/cmd/generate/jquery.go +++ b/buffalo/cmd/generate/jquery.go @@ -50,14 +50,14 @@ func NewJQueryGenerator() *gentronics.Generator { g := gentronics.New() jf := &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "jquery.js"), ""), + File: gentronics.NewFile(filepath.Join("assets", "js", "jquery.js"), ""), } jf.Should = should jf.RemotePath = "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" g.Add(jf) jm := &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "jquery.map"), ""), + File: gentronics.NewFile(filepath.Join("assets", "js", "jquery.map"), ""), } jm.Should = should jm.RemotePath = "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.map" diff --git a/buffalo/cmd/generate/railjs.go b/buffalo/cmd/generate/railjs.go index 5ed88d724..0c3c6aacd 100644 --- a/buffalo/cmd/generate/railjs.go +++ b/buffalo/cmd/generate/railjs.go @@ -43,7 +43,7 @@ https://github.com/rails/jquery-ujs`, func NewRailsJSGenerator() *gentronics.Generator { g := gentronics.New() jf := &gentronics.RemoteFile{ - File: gentronics.NewFile(filepath.Join("assets", "rails.js"), ""), + File: gentronics.NewFile(filepath.Join("assets", "js", "rails.js"), ""), } jf.RemotePath = "https://raw.githubusercontent.com/rails/jquery-ujs/master/src/rails.js" g.Add(jf)