Merge pull request #60 from FoalTS/v-0-4-0-beta-3

LoicPoullain · web-flow · commit bb315cd49c03 · 2018-03-24T20:19:06.000+01:00
v.0.4.0-beta.3
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -171,7 +171,11 @@ Welcome to the FoalTS generator! The following questions will help you create yo
     this.fs.copy(
       this.templatePath('public/logo.png'),
       this.destinationPath(`${this.names.kebabName}/public/logo.png`),
-    )
+    );
+    this.fs.copy(
+      this.templatePath('../../../node_modules/bootstrap/dist/css/bootstrap.min.css'),
+      this.destinationPath(`${this.names.kebabName}/public/bootstrap.min.css`),
+    );
   }
 
   install() {
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "lint": "tslint -c tslint.json -p tsconfig.json",
     "build": "gulp clean && gulp build",
-    "shell": "cd dist/app && node -e \"const { app } = require('./app')\" -i",
+    "shell": "node -e \"const { app } = require('./dist/app/app')\" -i",
     "test": "mocha -r source-map-support/register \"./dist/**/*.spec.js\"",
     "start": "node server.js",
     "dev:app": "gulp clean && gulp dev:app",
diff --git a/generators/app/templates/src/app/auth/templates/login-view.html b/generators/app/templates/src/app/auth/templates/login-view.html
@@ -5,15 +5,29 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <title>Login</title>
+  <link rel="stylesheet" href="bootstrap.min.css">
+  <style>
+    body {
+      background-color: #f5f5f5;
+      padding-top: 40px;
+    }
+    form {
+      margin: auto;
+      max-width: 400px;
+    }
+  </style>
 </head>
 <body>
-  <form action="/auth/local" method="post"><% if (invalidCredentials) { %>
-    <strong>Invalid credentials.</strong><% } %>
+  <form class="text-center" action="/auth/local" method="post">
+    <h1 class="h3 mb-4">Log in</h1><% if (invalidCredentials) { %>
+    <div class="alert alert-danger">
+      <strong>Invalid credentials.</strong>
+    </div><% } %>
     <input type="hidden" name="_csrf" value="<%- csrfToken %>">
-    <input type="email" name="email" required autofocus>
+    <input class="form-control" type="email" name="email" placeholder="Email adress" required autofocus>
     <br>
-    <input type="password" name="password" required>
-    <button type="submit">Log in</button>
+    <input class="form-control mb-3" type="password" name="password" placeholder="Password" required>
+    <button class="btn btn-primary btn-block" type="submit">Log in</button>
   </form>
 </body>
 </html>
diff --git a/generators/app/templates/src/app/templates/index.html b/generators/app/templates/src/app/templates/index.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-foal",
-  "version": "0.4.0-beta.2",
+  "version": "0.4.0-beta.3",
   "description": "Yeoman generators to quickly start a project and create components (services, controllers, etc.)",
   "files": [
     "generators"
@@ -20,7 +20,8 @@
     "lodash": "^4.17.4",
     "mkdirp": "^0.5.1",
     "yeoman-assert": "^3.1.0",
-    "yeoman-generator": "^1.1.1"
+    "yeoman-generator": "^1.1.1",
+    "bootstrap": "^4.0.0"
   },
   "repository": {
     "type": "git",
