Merge pull request #2 from data-studio/develop

eviratec.software · web-flow · commit c212ef3616b8 · 2017-05-27T15:58:00.000+10:00
Develop
diff --git a/README.md b/README.md
@@ -6,14 +6,25 @@
 
 ## Getting started
 
-1. Install [Vagrant](https://www.vagrantup.com/) by [HashiCorp](https://www.hashicorp.com/)
-2. Clone/checkout/download this repository: `$ git clone https://github.com/data-studio/angular-app.git && cd angular-app`
-3. Start the development VM using [Vagrant](https://www.vagrantup.com/): `$ vagrant up`
-4. Add an entry for `ng.data-studio.localhost` in your `hosts` file: `$ echo "192.168.110.30	ng.data-studio.localhost" >> /etc/hosts`
-5. Direct your browser to `http://ng.data-studio.localhost`
+1. Clone this repository
+```shell
+$ git clone https://github.com/data-studio/angular-app.git && cd angular-app
+```
+2. Install [Vagrant](https://www.vagrantup.com/) by [HashiCorp](https://www.hashicorp.com/)
+3. Start the Vagrant development VM
+```shell
+$ vagrant up
+```
+4. Add an entry for `ng.data-studio.localhost` to your `hosts` file
+```shell
+$ echo "192.168.110.30	ng.data-studio.localhost" >> /etc/hosts
+```
+5. Direct your browser to [http://ng.data-studio.localhost](http://ng.data-studio.localhost)
 
 ## License
 
+By [Eviratec Software](https://www.eviratec.com.au)
+
 ```
 Copyright (c) 2017 Callan Peter Milne
 
diff --git a/Vagrantfile b/Vagrantfile
@@ -71,20 +71,32 @@ Vagrant.configure("2") do |config|
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
+
+    echo "=== INSTALLING NODE/NPM ==="
+    wget https://nodejs.org/dist/v7.10.0/node-v7.10.0-linux-x64.tar.xz -o wget.txt
+    tar -xf node-v7.10.0-linux-x64.tar.xz
+    mv node-v7.10.0-linux-x64 /usr/local/lib/node && cd $_
+    chmod 777 bin/*
+    ln -s /usr/local/lib/node/bin/* /usr/local/bin/
+
+    echo "=== INSTALLING UPDATES ==="
     apt-get update
     apt-get install --assume-yes nginx curl
+
+    echo "====== NGINX SET-UP ======"
     cp /vagrant/etc/nginx/dev-server /etc/nginx/sites-available/angular-app
     ln -s /etc/nginx/sites-available/angular-app /etc/nginx/sites-enabled/angular-app
     rm /etc/nginx/sites-enabled/default
     service nginx restart
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | NVM_DIR=/usr/local/nvm bash
-    export NVM_DIR="$HOME/.nvm"
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-    nvm install v7.8.0
+
+    echo "=== RESOLVING NPM DEPS ==="
     cd /vagrant
     npm install
     npm ln -s
-    ds-build-app
+
+    echo "== STARTING DEV SERVER =="
+    nohup /usr/local/lib/node/bin/ds-dev-server &
+
+    cd ~
   SHELL
 end
diff --git a/bin/start-dev-server b/bin/start-dev-server
@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+/**
+ * Data Studio
+ * Copyright (c) 2017 Callan Peter Milne
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+'use strict';
+
+require('../src/ops/process.js')('build');
+require('../src/ops/process.js')('watch-dev');
diff --git a/etc/nginx/dev-server b/etc/nginx/dev-server
@@ -1,13 +1,26 @@
 server {
 
-  listen localhost:8080;
-  listen 0.0.0.0:80;
+  listen 80;
+  server_name ng.data-studio.localhost;
 
   root /vagrant/build;
   index app.html;
 
+  sendfile off;
+  server_tokens off;
+
+  location app.js {
+    sendfile on;
+    try_files $uri /app.js;
+  }
+
+  location app.css {
+    sendfile on;
+    try_files $uri /app.css;
+  }
+
   location / {
-    try_files $uri /app.html;
+    try_files $uri /app.html$uri /app.html;
   }
 
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -27,6 +27,7 @@ const TASKS = [
   'unit',
   'csscompile',
   'jscompile',
+  'watch-dev',
 ];
 
 /**
diff --git a/package.json b/package.json
@@ -4,11 +4,14 @@
   "description": "Data Studio Angular App",
   "main": "index.js",
   "scripts": {
-    "test": "./bin/unit"
+    "test": "./bin/unit",
+    "prestart": "./bin/build",
+    "start": "./bin/start-dev-server"
   },
   "bin": {
     "ds-build-app": "./bin/build",
-    "ds-prepare-dist": "./bin/dist"
+    "ds-prepare-dist": "./bin/dist",
+    "ds-dev-server": "./bin/start-dev-server"
   },
   "author": "Callan Peter Milne <callan.milne@eviratec.com.au>",
   "license": "ISC",
@@ -18,12 +21,15 @@
     "angular-animate": "1.6.4",
     "angular-aria": "1.6.4",
     "angular-cookies": "1.6.4",
+    "angular-environment-config": "1.0.0",
     "angular-material": "1.1.4",
+    "angular-messages": "1.6.4",
     "angular-mocks": "1.6.4",
     "babel": "6.23.0",
     "babel-polyfill": "6.23.0",
     "babel-preset-env": "1.5.1",
     "gulp": "3.9.1",
+    "gulp-angular-templatecache": "2.0.0",
     "gulp-babel": "6.1.2",
     "gulp-concat": "2.6.1",
     "gulp-sass": "3.1.0",
diff --git a/src/app/modules/app/appController.es b/src/app/modules/app/appController.es
@@ -0,0 +1,10 @@
+
+  angular.module('angularApp')
+    .controller('AppController', AppController);
+
+  AppController.$inject = ['$scope'];
+  function AppController (  $scope) {
+
+    this.test = 'Meow';
+
+  };
diff --git a/src/app/modules/app/html/app.html b/src/app/modules/app/html/app.html
@@ -0,0 +1,2 @@
+<h1>{{ $app.test }}</h1>
+<p>A fewmany fabric</p>
diff --git a/src/app/modules/app/module.es b/src/app/modules/app/module.es
@@ -0,0 +1,10 @@
+
+  angular.module('angularApp', [
+    'ngAnimate',
+    'ngAria',
+    'ngCookies',
+    'ngMaterial',
+    'ngMessages',
+    'ui.router',
+    'luminous.environment',
+  ]);
diff --git a/src/app/modules/app/routes.es b/src/app/modules/app/routes.es
@@ -0,0 +1,14 @@
+
+  angular.module('angularApp')
+    .config(['$stateProvider', function ($stateProvider) {
+
+      $stateProvider
+
+        .state('app', {
+          url: '^',
+          templateUrl: 'modules/app/html/app.html',
+          controller: 'AppController',
+          controllerAs: '$app',
+        });
+
+  }]);
diff --git a/src/ops/gulp/build.js b/src/ops/gulp/build.js
@@ -17,5 +17,12 @@
 'use strict';
 
 module.exports = function (gulp) {
-  gulp.task('build', [ 'jscompile', 'csscompile' ]);
+
+  gulp.task('copystatic', function () {
+    gulp.src('src/static/**/*')
+      .pipe(gulp.dest('build'));
+  });
+
+  gulp.task('build', [ 'vendorjscompile', 'tplcachecompile', 'jscompile', 'csscompile', 'copystatic' ]);
+
 };
diff --git a/src/ops/gulp/jscompile.js b/src/ops/gulp/jscompile.js
@@ -16,19 +16,59 @@
  */
 'use strict';
 
+const templateCache = require('gulp-angular-templatecache');
 const sourcemaps = require('gulp-sourcemaps');
 const babel = require('gulp-babel');
 const concat = require('gulp-concat');
 
 module.exports = function (gulp) {
 
   gulp.task('jscompile', function () {
-    gulp.src('src/app/**/*.es')
+
+    let paths = [
+      'src/app/modules/app/module.es',
+      'src/app/modules/app/**/*.es',
+      'src/app/**/*/module.es',
+      'src/app/**/*.es',
+    ];
+
+    gulp.src(paths)
       .pipe(sourcemaps.init())
       .pipe(babel())
       .pipe(concat('app.js'))
       .pipe(sourcemaps.write('.'))
       .pipe(gulp.dest('build'));
+
+  });
+
+  gulp.task('tplcachecompile', function () {
+    return gulp.src('src/app/**/*/html/**/*.html')
+      .pipe(templateCache('templates.js', { module: 'angularApp' }))
+      .pipe(gulp.dest('build'));
+  });
+
+  gulp.task('vendorjscompile', function () {
+
+    let paths = [];
+    let deps = [
+      'angular',
+      'angular-animate',
+      'angular-aria',
+      'angular-cookies',
+      'angular-material',
+      'angular-messages',
+      'angular-ui-router',
+      'angular-environment-config',
+    ];
+
+    deps.forEach(vendorModule => {
+      paths.push(`node_modules/${vendorModule}/**/*${vendorModule}.js`);
+    });
+
+    gulp.src(paths)
+      .pipe(concat('vendor.js', {newLine: ';'}))
+      .pipe(gulp.dest('build'));
+
   });
 
 };
diff --git a/src/ops/gulp/watch-dev.js b/src/ops/gulp/watch-dev.js
@@ -0,0 +1,27 @@
+/**
+ * Data Studio
+ * Copyright (c) 2017 Callan Peter Milne
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+'use strict';
+
+module.exports = function (gulp) {
+
+  gulp.task('watch-dev', function() {
+    gulp.watch(['src/app/**/*.es'], ['jscompile']);
+    gulp.watch(['src/app/**/*.scss'], ['csscompile']);
+    gulp.watch(['src/app/**/*.html'], ['tplcachecompile']);
+  });
+
+};
diff --git a/src/static/app.html b/src/static/app.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<html ng-app="angularApp">
+<head>
+
+  <meta name="charset" charset="utf-8">
+
+  <title>Data Studio</title>
+
+</head>
+<body>
+
+  <div id="root"
+    ui-view>
+  </div>
+
+  <script type="application/javascript">
+    (function (d, s) {'use strict';
+
+      requireScript('vendor.js', function () {
+        requireScripts([
+          'app.js',
+          'templates.js',
+        ]);
+      });
+
+      requireStyle('app.css');
+
+      function requireStyle (src) {
+
+        var el = d.createElement('link');
+
+        el.setAttribute('rel', 'stylesheet');
+        el.setAttribute('type', 'text/css');
+        el.setAttribute('src', src);
+
+        appendEl(el);
+
+      }
+
+      function requireScripts (srcs) {
+        srcs.forEach(src => requireScript(src));
+      }
+
+      function requireScript (src, next) {
+
+        var el = d.createElement('script');
+
+        el.setAttribute('src', src);
+
+        appendEl(el);
+
+        if (next) {
+          el.addEventListener('load', function () {
+            next();
+          });
+        }
+
+      }
+
+      function appendEl (el) {
+        d[s].appendChild(el);
+      }
+
+    })(document, 'body');
+  </script>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<h1>{{ $app.test }}</h1>`
	`2`	`+<p>A fewmany fabric</p>`