few upgrades + docker image in Readme

Author: Nicolas Romanetti

.gitignore

@@ -21,3 +21,6 @@ hs_err_pid*
 # app
 quickstart/src/main/webapp/node_modules
 quickstart/src/main/webapp/typings
+
+#docker
+docker/*

.travis.yml

@@ -29,8 +29,8 @@ install:
  - mvn -Pdb,metadata,gen generate-sources
  - cd web
  - npm install --save @angular/animations
- - npm install --save @angular/material@2.0.0-beta.6
- - npm install --save primeng@4.1.0-rc.2
+ - npm install --save @angular/material@2.0.0-beta.7
+ - npm install --save primeng@4.1.0-rc.3
  - npm install --save font-awesome
  - cd ..
 script:

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change log
 
+
+## current -
+ 
+### Upgrades
+
+ * primeng from 4.1.0-rc.2 to 4.1.0-rc.3
+ * spring-boot from 1.5.2 to 1.5.4
+ * material from 2.0.0-beta.6 to 2.0.0-beta.7
+
+### Other
+
+ * provide a Docker image of the sample generated app (see README.md)
+ 
 ## v0.9.0 - 2017-06-18
 
 ### Upgrades

README.md

@@ -2,13 +2,13 @@
 
 [![Build Status](https://travis-ci.org/jaxio/celerio-angular-quickstart.svg?branch=master)](https://travis-ci.org/jaxio/celerio-angular-quickstart)
 
+
 This Angular quickstart uses Angular Cli to create the application skeleton and Celerio 
 to **reverse your relational database schema** and **generate** the Angular + Spring Boot code 
 to access your database content. The generated code covers much more areas than a simple Hello World app (search,
 pagination, validation, auto-complete, etc.) 
 
 To generate an application from a sample database, follow the instructions from the [quickstart][] folder.
-The following [screencast](https://www.youtube.com/watch?v=MBrgeykyTGs) shows you what to expect.
 
 Take a look at the generated code for yourself. Out of this 
 [sample SQL schema](https://github.com/jaxio/celerio-angular-quickstart/blob/master/quickstart-conf/01-create.sql)
@@ -20,6 +20,16 @@ thanks to these [templates](https://github.com/jaxio/celerio-angular-quickstart/
 By default we use a sample H2 database schema. Using your own database schema and database engine 
 is just a matter of configuration. Check as an example our instructions to [use MySQL][] instead of H2.
 
+## What to expect?
+
+The following [screencast](https://www.youtube.com/watch?v=MBrgeykyTGs) shows you what to expect.
+
+You may also run a docker image of the sample generated web:
+
+ docker run -p 8080:8080 nromanetti/celerio-angular-quickstart
+
+Remember, this is just a generated sample, the idea is to generate your own application using a more realistic database schema.
+
 ## About the project
 
 Our goal is to provide solid code generation templates for advanced Angular CRUD web applications.
@@ -39,7 +49,7 @@ Here is the folder organization:
 The generated Angular CRUD web app uses the following technologies/frameworks:
 
 * [Angular Cli](http://cli.angular.io/) a command line interface for Angular
-* [Angular 4.0.0](http://angular.io/) web framework: we try to always use the most recent version
+* [Angular 4.2](http://angular.io/) web framework: we try to always use the most recent version
 * [TypeScript](https://www.typescriptlang.org/): much easier than JavaScript... 
 * [PrimeNG](http://primefaces.org/primeng/): Angular components library, we leverage file upload, auto-complete, calendar, tri-state checkbox, server-side pagination, etc.
 * [Angular Material](https://material.angular.io/): Material Design components for Angular apps

pack-angular/celerio/pack-angular/src/main/resources/application.yml.p.vm

@@ -48,3 +48,10 @@ spring:
  chain:
  cache: false
 
+---
+
+#
+# profile used by Dockerfile... just for convenient demo
+#
+spring.profiles: demowithdocker
+spring.datasource.url: jdbc:h2:/db/angulardb;MVCC=TRUE;FILE_LOCK=NO

quickstart/README.md

@@ -32,8 +32,8 @@ Make sure you wait until spring boot starts and listen on port 8080
 
  cd celerio-angular-quickstart/quickstart/web
  npm install --save @angular/animations
- npm install --save @angular/material@2.0.0-beta.6
- npm install --save primeng@4.1.0-rc.2
+ npm install --save @angular/material@2.0.0-beta.7
+ npm install --save primeng@4.1.0-rc.3
  npm install --save font-awesome
  ng serve --proxy-config proxy.conf.json
 
@@ -42,7 +42,7 @@ Then open [http://localhost:4200/](http://localhost:4200/)
 * Commands above are explained [here](#generate-it-and-run-it)
 * [Delete all generated files](#delete-all-generated-files)
 * [How-to use your own database](#how-to-use-your-own-database)
-* [How-to package front/back in a single jar and run it](#how-package)
+* [How-to package it in a single jar and run it](How-to-package-it-in-a-single-jar-and-run-it)
 
 ## Generate it and run it
 
@@ -93,8 +93,8 @@ The backend listens on port 8080.
 The 4 command below install some additional dependencies required by the code generated by Celerio. 
 
  npm install --save @angular/animations
- npm install --save @angular/material@2.0.0-beta.6
- npm install --save primeng@4.1.0-rc.2
+ npm install --save @angular/material@2.0.0-beta.7
+ npm install --save primeng@4.1.0-rc.3
  npm install --save font-awesome
 
 Starts a node server on port 4200 using angular cli. The node server proxies the calls to /api and /img to the 
@@ -159,7 +159,7 @@ Follow the steps 2-3 from the [Generate it and run it](#generate-it-and-run-it)
 [pom.xml]: https://github.com/jaxio/celerio-angular-quickstart/blob/master/quickstart/pom.xml
 [entity.service.ts.e.vm]: https://github.com/jaxio/celerio-angular-quickstart/blob/master/pack-angular/celerio/pack-angular/web/src/app/entities/entity.service.ts.e.vm
 
-## How-to package front/back in a single jar and run it
+## How-to package it in a single jar and run it
 
 Let's go one step further. Wouldn't it be convenient for production to only have a single jar to run ?
 
@@ -176,14 +176,13 @@ Here are the command lines (hope it is self explanatory):
  mvn -Pdb,metadata,gen generate-sources
  cd web
  npm install --save @angular/animations
- npm install --save @angular/material@2.0.0-beta.6
- npm install --save primeng@4.1.0-rc.2
+ npm install --save @angular/material@2.0.0-beta.7
+ npm install --save primeng@4.1.0-rc.3
  npm install --save font-awesome
  ng build --prod
  cp dist/* ../src/main/resources/static
  cd ..
  mvn package
- java -jar target/celerio-angular-quickstart-1.0.0-SNAPSHOT.jar
+ java -jar target/celerio-angular-quickstart.jar
 
 Access it at http://localhost:8080/
-

quickstart/pom.xml

@@ -2,20 +2,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
  <groupId>com.jaxio</groupId>
  <artifactId>celerio-angular-quickstart</artifactId>
  <packaging>jar</packaging>
  <version>1.0.0-SNAPSHOT</version>
  <name>celerio-angular-quickstart</name>
  <description>
- A Spring boot webbapp with Angular JS project generated by Celerio
+ A Spring boot webapp using Angular - Generated by Celerio
  </description>
-
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.2.RELEASE</version>
+ <version>1.5.4.RELEASE</version>
  </parent>
 
  <properties>
@@ -44,7 +42,7 @@
  <jdbc.version>1.4.187</jdbc.version>
 
  <jdbc.driver>org.h2.Driver</jdbc.driver>
- <jdbc.url>jdbc:h2:${project.build.directory}/db/angular-lab;MVCC=TRUE;FILE_LOCK=NO</jdbc.url>
+ <jdbc.url>jdbc:h2:${project.build.directory}/db/angulardb;MVCC=TRUE;FILE_LOCK=NO</jdbc.url>
  <jdbc.user>root</jdbc.user>
  <jdbc.password>manager</jdbc.password>
  <jdbc.schema></jdbc.schema>
@@ -235,32 +233,6 @@
  <exclude>application.yml</exclude>
  </excludes>
  </resource>
-
- <!-- COPY aot compilation results + aot index.html -->
- <resource>
- <directory>src/main/webapp/aot</directory>
- <filtering>false</filtering>
- <includes>
- <include>index.html</include>
- <include>dist/build.js</include>
- <include>dist/build.js.map</include>
- </includes>
- <targetPath>static</targetPath>
- </resource>
-
- <!-- COPY other resources required by aot index.html -->
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>false</filtering>
- <includes>
- <include>node_modules/core-js/client/shim.min.js</include>
- <include>node_modules/zone.js/dist/zone.min.js</include>
- <include>node_modules/json.date-extensions/json.date-extensions.min.js</include>
- <include>node_modules/primeng/resources/**</include>
- <include>node_modules/@angular/material/core/theming/**</include>
- </includes>
- <targetPath>static</targetPath>
- </resource>
  </resources>
 
  <testResources>