Merge pull request #71 from markbates/webpack

add web pack to the "new" generator closes #18
gobuffalo · Dec 21, 2016 · fdd6d5c · fdd6d5c
2 parents 786fec9 + 570c80e
commit fdd6d5c
Show file tree

Hide file tree

Showing 41 changed files with 522 additions and 548 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ generated/
 .vendor/
 bin/*
 gin-bin
+*.sqlite*
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,9 @@
 FROM golang
 
+RUN apt-get update
+RUN curl -sL https://deb.nodesource.com/setup_7.x | bash
+RUN apt-get install -y build-essential nodejs
+
 ENV BP=$GOPATH/src/github.com/markbates/buffalo
 
 RUN mkdir -p $BP

diff --git a/buffalo/cmd/app_generators.go b/buffalo/cmd/app_generators.go
@@ -7,7 +7,7 @@ import (
 	"github.com/markbates/gentronics"
 )
 
-func newAppGenerator() *gentronics.Generator {
+func newAppGenerator(data gentronics.Data) *gentronics.Generator {
 	g := gentronics.New()
 	g.Add(gentronics.NewFile("main.go", nMain))
 	g.Add(gentronics.NewFile("Procfile", nProcfile))
@@ -20,17 +20,18 @@ 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/js/application.js", ""))
-	g.Add(gentronics.NewFile("assets/css/application.css", nApplicationCSS))
+	g.Add(&gentronics.RemoteFile{
+		File:       gentronics.NewFile("public/images/logo.svg", ""),
+		RemotePath: "https://raw.githubusercontent.com/markbates/buffalo/master/logo.svg",
+	})
 	g.Add(gentronics.NewFile(".gitignore", nGitignore))
 	g.Add(gentronics.NewCommand(goGet("github.com/markbates/refresh/...")))
 	g.Add(gentronics.NewCommand(goInstall("github.com/markbates/refresh")))
 	g.Add(gentronics.NewCommand(goGet("github.com/markbates/grift/...")))
 	g.Add(gentronics.NewCommand(goInstall("github.com/markbates/grift")))
 	g.Add(gentronics.NewCommand(goGet("github.com/motemen/gore")))
 	g.Add(gentronics.NewCommand(goInstall("github.com/motemen/gore")))
-	g.Add(generate.NewJQueryGenerator())
-	g.Add(generate.NewBootstrapGenerator())
+	g.Add(generate.NewWebpackGenerator(data))
 	g.Add(newSodaGenerator())
 	g.Add(gentronics.NewCommand(appGoGet()))
 	g.Add(generate.Fmt)
@@ -96,8 +97,9 @@ func App() *buffalo.App {
 		app.Use(middleware.PopTransaction(models.DB))
 		{{/if}}
 
-		app.ServeFiles("/assets", assetsPath())
 		app.GET("/", HomeHandler)
+
+		app.ServeFiles("/", publicPath())
 	}
 
 	return app
@@ -127,8 +129,8 @@ func init() {
 	})
 }
 
-func assetsPath() http.FileSystem {
-	box := rice.MustFindBox("../assets")
+func publicPath() http.FileSystem {
+	box := rice.MustFindBox("../public")
 	return box.HTTPBox()
 }
 `
@@ -165,42 +167,67 @@ func Test_HomeHandler(t *testing.T) {
 }
 `
 
-const nIndexHTML = `<h1>Welcome to Buffalo!</h1>`
+const nIndexHTML = `<div class="row">
+  <div class="col-md-2">
+    <img src="/images/logo.svg" alt="" />
+  </div>
+  <div class="col-md-10">
+    <h1>Welcome to Buffalo! [v{{version}}]</h1>
+    <h2>
+      <a href="https://github.com/markbates/buffalo"><i class="fa fa-github" aria-hidden="true"></i> https://github.com/markbates/buffalo</a>
+    </h2>
+    <h2>
+      <a href="http://gobuffalo.io"><i class="fa fa-book" aria-hidden="true"></i> Documentation</a>
+    </h2>
+
+    <hr>
+    <h2>Defined Routes</h2>
+    <table class="table table-striped">
+      <thead>
+        <tr text-align="left">
+          <th>METHOD</th>
+          <th>PATH</th>
+          <th>HANDLER</th>
+        </tr>
+      </thead>
+      <tbody>
+        \{{#each routes as |r|}}
+        <tr>
+          <td>\{{r.Method}}</td>
+          <td>\{{r.Path}}</td>
+          <td><code>\{{r.HandlerName}}</code></td>
+        </tr>
+        \{{/each}}
+      </tbody>
+    </table>
+  </div>
+</div>
+
+`
 
 const nApplicationHTML = `<html>
 <head>
   <meta charset="utf-8">
   <title>Buffalo - {{ titleName }}</title>
-  {{#if withBootstrap }}
-  <link rel="stylesheet" href="/assets/css/bootstrap.css" type="text/css" media="all" />
-  {{/if}}
-  <link rel="stylesheet" href="/assets/css/application.css" type="text/css" media="all" />
+  <link rel="stylesheet" href="/assets/application.css" type="text/css" media="all" />
 </head>
 <body>
 
-	\{{ yield }}
+  <div class="container">
+    \{{ yield }}
+  </div>
 
-  {{#if withJQuery }}
-  <script src="/assets/js/jquery.js" type="text/javascript" charset="utf-8"></script>
-  {{/if}}
-  {{#if withBootstrap }}
-  <script src="/assets/js/bootstrap.js" type="text/javascript" charset="utf-8"></script>
-  {{/if}}
-  <script src="/assets/js/application.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/assets/application.js" type="text/javascript" charset="utf-8"></script>
 </body>
 </html>
 `
 
-const nApplicationCSS = `body {
-  font-family: helvetica;
-}
-`
-
 const nGitignore = `vendor/
 **/*.log
 **/*.sqlite
 bin/
 node_modules/
+.sass-cache/
 {{ name }}
 `
 
@@ -235,12 +262,17 @@ ignored_folders:
 - log
 - logs
 - assets
+- public
 - grifts
 - tmp
+- node_modules
+- .sass-cache
 included_extensions:
 - .go
 - .html
 - .md
+- .js
+- .tmpl
 build_path: /tmp
 build_delay: 200ns
 binary_name: {{name}}-build
@@ -250,4 +282,8 @@ log_name: buffalo
 `
 
 const nProcfile = `web: {{name}}`
-const nProcfileDev = `web: buffalo dev`
+const nProcfileDev = `web: buffalo dev
+{{#if withWebpack}}
+assets: webpack --watch
+{{/if}}
+`
diff --git a/buffalo/cmd/generate.go b/buffalo/cmd/generate.go
@@ -32,11 +32,8 @@ var generateCmd = &cobra.Command{
 }
 
 func init() {
-	generateCmd.AddCommand(generate.JQueryCmd)
-	generateCmd.AddCommand(generate.RailsJSCmd)
-	generateCmd.AddCommand(generate.BootstrapCmd)
-	generateCmd.AddCommand(generate.BootswatchCmd)
 	generateCmd.AddCommand(generate.ResourceCmd)
 	generateCmd.AddCommand(generate.GothCmd)
+	generateCmd.AddCommand(generate.WebpackCmd)
 	RootCmd.AddCommand(generateCmd)
 }
diff --git a/buffalo/cmd/generate/bootstrap.go b/buffalo/cmd/generate/bootstrap.go
diff --git a/buffalo/cmd/generate/bootswatch.go b/buffalo/cmd/generate/bootswatch.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ generated/ @@
     .vendor/
     bin/*
     gin-bin
+    *.sqlite*