Merge pull request #50 from markbates/resource-model

generate js & css files into sub directory of assets
gobuffalo · Dec 12, 2016 · 2748fe5 · 2748fe5
2 parents b98d1af + 63aea18
commit 2748fe5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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 = `<html>
   <meta charset="utf-8">
   <title>Buffalo - {{ .titleName }}</title>
   {{if .withBootstrap -}}
-  <link rel="stylesheet" href="/assets/bootstrap.css" type="text/css" media="all" />
+  <link rel="stylesheet" href="/assets/css/bootstrap.css" type="text/css" media="all" />
   {{end -}}
-  <link rel="stylesheet" href="/assets/application.css" type="text/css" media="all" />
+  <link rel="stylesheet" href="/assets/css/application.css" type="text/css" media="all" />
 </head>
 <body>
 
   {{"{{"}} yield {{"}}"}}
 
   {{if .withJQuery -}}
-  <script src="/assets/jquery.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/assets/js/jquery.js" type="text/javascript" charset="utf-8"></script>
   {{end -}}
   {{if .withBootstrap -}}
-  <script src="/assets/bootstrap.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/assets/js/bootstrap.js" type="text/javascript" charset="utf-8"></script>
   {{end -}}
-  <script src="/assets/application.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/assets/js/application.js" type="text/javascript" charset="utf-8"></script>
 </body>
 </html>
 `

diff --git 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
@@ -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
@@ -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
@@ -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)