angular-fullstack · Awk34 · Jun 6, 2016 · Jun 7, 2016 · Jun 9, 2016 · Jun 6, 2016
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,7 @@ bower_components
 demo
 .idea
 .DS_Store
-release.txt
+release.txt
+static
+generator-angular-fullstack.iml
+src/generator-angular-fullstack.iml
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "angular-fullstack-deps"]
 	path = angular-fullstack-deps
 	url = [email protected]:angular-fullstack/angular-fullstack-deps.git
+[submodule "angular-fullstack-dockerfile"]
+	path = angular-fullstack-dockerfile
+	url = [email protected]:angular-fullstack/angular-fullstack-dockerfile.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,123 @@
+<a name="4.0.5"></a>
+## [4.0.5](https://github.com/angular-fullstack/generator-angular-fullstack/compare/4.0.4...v4.0.5) (2016-09-15)
+
+
+### Bug Fixes
+
+* **client:auth:** fix hasOwnProperty instances, fix User usage ([#2232](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2232)) ([f41e420](https://github.com/angular-fullstack/generator-angular-fullstack/commit/f41e420)), closes [#2232](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2232) [#2212](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2212)
+* **client:oauthButtons:** add ngInject ([#2209](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2209)) ([9ce58e8](https://github.com/angular-fullstack/generator-angular-fullstack/commit/9ce58e8)), closes [#2206](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2206)
+* **endpoint:controller:** fix findOneAndUpdate syntax ([1c2a219](https://github.com/angular-fullstack/generator-angular-fullstack/commit/1c2a219)), closes [#2221](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2221)
+* **heroku:** Changed port variable to capital letters so heroku recognize it ([44dccba](https://github.com/angular-fullstack/generator-angular-fullstack/commit/44dccba)), closes [#2185](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2185)
+* **karma:** remove extra `require` ([c188229](https://github.com/angular-fullstack/generator-angular-fullstack/commit/c188229)), closes [#2219](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2219)
+* **server:twitter:** make sure IDs are strings ([5991a72](https://github.com/angular-fullstack/generator-angular-fullstack/commit/5991a72)), closes [#1997](https://github.com/angular-fullstack/generator-angular-fullstack/issues/1997)
+* **socket:** add ngInject ([#2208](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2208)) ([b530695](https://github.com/angular-fullstack/generator-angular-fullstack/commit/b530695)), closes [#2203](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2203)
+
+
+
+<a name="4.0.4"></a>
+## [4.0.4](https://github.com/angular-fullstack/generator-angular-fullstack/compare/4.0.3...v4.0.4) (2016-09-01)
+
+
+### Bug Fixes
+
+* **webpack:** 
+  * conditionally exclude ui-bootstrap ([dd131d9](https://github.com/angular-fullstack/generator-angular-fullstack/commit/dd131d9))
+  * fix webpack vendor import ([#2177](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2177)) ([aa32054](https://github.com/angular-fullstack/generator-angular-fullstack/commit/aa32054)), closes [#2177](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2177)
+
+
+
+<a name="4.0.3"></a>
+## [4.0.3](https://github.com/angular-fullstack/generator-angular-fullstack/compare/4.0.2...v4.0.3) (2016-09-01)
+
+
+### Bug Fixes
+
+* **gen:** fix doc img generation\n\nAdd gulp task to copy images to gh-pages ([5bb43be](https://github.com/angular-fullstack/generator-angular-fullstack/commit/5bb43be))
+* **gen:heroku:** fix module export, gen base ([8e50326](https://github.com/angular-fullstack/generator-angular-fullstack/commit/8e50326)), closes [#2148](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2148)
+* **webpack:** fix boostrap-sass import path ([bae1c86](https://github.com/angular-fullstack/generator-angular-fullstack/commit/bae1c86))
+
+
+
+<a name="4.0.2"></a>
+## [4.0.2](https://github.com/angular-fullstack/generator-angular-fullstack/compare/4.0.1...v4.0.2) (2016-09-01)
+
+
+### Bug Fixes
+
+* **client:socket.service:** import lodash named exports ([231e500](https://github.com/angular-fullstack/generator-angular-fullstack/commit/231e500))
+* **gulp:build:** remove protractor typings ([#2144](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2144)) ([b9abc58](https://github.com/angular-fullstack/generator-angular-fullstack/commit/b9abc58))
+
+
+### Features
+
+* **docs:** add daux.io docs ([f1e7a87](https://github.com/angular-fullstack/generator-angular-fullstack/commit/f1e7a87))
+* **gen:app:** 
+  * add eslint to the yo write stream ([85921be](https://github.com/angular-fullstack/generator-angular-fullstack/commit/85921be)), closes [#2157](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2157)
+  * run eslint w/ fix on both client & server ([c5ab431](https://github.com/angular-fullstack/generator-angular-fullstack/commit/c5ab431))
+* **gen:gulp:** add TODO tasks in gulpfile. rm 2 old grunt tasks ([1e25de7](https://github.com/angular-fullstack/generator-angular-fullstack/commit/1e25de7))
+
+
+
+<a name="4.0.0"></a>
+## [4.0.0](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.6...v4.0.0) (2016-08-08)
+
+
+## Notable Changes
+
+### [Webpack](http://webpack.github.io/)
+* No more Bower
+* Webpack is a Module Bundler for the front-end.
+* Everything starts in `client/app.js`. It imports (using CommonJS / ES2015 imports) everything else needed from there.
+* Whenever we create a new Angular 1 module, we export its name, and import that name in another module up the tree, all the way to `client/app.js`. This design pattern allows for easy lazy-loading.
+
+### Gulp v Grunt
+Grunt has been removed. 
+* Gulp is significantly faster to run
+* Gulp focuses on programmatic configuration, which makes it a breeze to configure compared to Grunt's JSON-config-focused configuration.
+* Gulp development is much more active, with Gulp 4.0.0 hopefully being released soon.
+
+### ESLint
+JSHint + JSCS have been replaced with ESLint. ESLint provides a gigantic amount of rules, and is easily pluggable with many plugins. It uses Espree. Also, JSCS has merged with ESLint.
+
+### Types
+Flow support has been added. TypeScript type errors have been fixed.
+
+### Async/Sync Auth methods
+The following methods from the client Auth service have been split into two: `getCurrentUser`, `isLoggedIn`, `hasRole`, `isAdmin`. The reason that these methods could be both synchronous and asynchronous depending on how many arguments were passed is because they were called from Angular templates. Now, the Angular templates call the sync form of these methods (e.x. `getCurrentUserSync`), and the original functions are now only async.
+
+### Constants
+The task runner no longer takes care of creating an Angular module for config constants. It is taken care of by webpack now (the `shared.js` files is now just `require`d)
+
+### Endpoint PUT/PATCH
+PUT now defaults to an upsert. PATCH now actually does an HTTP PATCH.
+
+### -Livereload +Browsersync
+Livereload has been removed in favor of [Browsersync](https://www.browsersync.io/)
+
+
+
+<a name="3.8.0"></a>
+# [3.8.0](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.6...v3.8.0) (2016-09-15)
+
+
+### Bug Fixes
+
+* **authorization:** header workaround for IE11 ([2362103](https://github.com/angular-fullstack/generator-angular-fullstack/commit/2362103)), closes [#2051](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2051)
+* **endpoint:controller:** wrap saveUpdates in an if(entity) statement ([31c0a79](https://github.com/angular-fullstack/generator-angular-fullstack/commit/31c0a79)), closes [#2052](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2052) [#2059](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2059)
+* **grunt:** 
+  * add comma ([485c44b](https://github.com/angular-fullstack/generator-angular-fullstack/commit/485c44b))
+  * run express:prod on production port ([aac61b2](https://github.com/angular-fullstack/generator-angular-fullstack/commit/aac61b2)), closes [#1814](https://github.com/angular-fullstack/generator-angular-fullstack/issues/1814)
+* **gulp:** fix plain css generation ([#2013](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2013)) ([54479fc](https://github.com/angular-fullstack/generator-angular-fullstack/commit/54479fc)), closes [#2013](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2013)
+* **gulpfile:** gulp-filter[@4](https://github.com/4).0.0 need "dot:true" option ([1fbf24b](https://github.com/angular-fullstack/generator-angular-fullstack/commit/1fbf24b)), closes [#2146](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2146) [#2151](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2151)
+* **server:** return express stuff ([81ea8fa](https://github.com/angular-fullstack/generator-angular-fullstack/commit/81ea8fa))
+
+
+### Features
+
+* **gen:** add configurable ports ([#2005](https://github.com/angular-fullstack/generator-angular-fullstack/issues/2005)) ([50e6d0c](https://github.com/angular-fullstack/generator-angular-fullstack/commit/50e6d0c))
+
+
+
 <a name="3.7.6"></a>
 ## [3.7.6](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.5...v3.7.6) (2016-06-21)
 
@@ -8,7 +128,6 @@
 * Bumped a few generator dependencies
 
 
-
 <a name="3.7.5"></a>
 ## [3.7.5](https://github.com/angular-fullstack/generator-angular-fullstack/compare/3.7.4...v3.7.5) (2016-06-02)
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -261,49 +261,6 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.registerTask('updateFixtures', 'updates package and bower fixtures', function(target) {
-    var genVer = require('./package.json').version;
-    var dest = __dirname + ((target === 'deps') ? '/angular-fullstack-deps/' : '/test/fixtures/');
-    var appName = (target === 'deps') ? 'angular-fullstack-deps' : 'tempApp';
-
-    var processJson = function(s, d) {
-      // read file, strip all ejs conditionals, and parse as json
-      var json = JSON.parse(fs.readFileSync(path.resolve(s), 'utf8').replace(/<%(.*)%>/g, ''));
-      // set properties
-      json.name = appName, json.version = genVer;
-      if (target === 'deps') { json.private = false; }
-      // stringify json and write it to the destination
-      fs.writeFileSync(path.resolve(d), JSON.stringify(json, null, 2));
-    };
-
-    processJson('templates/app/_package.json', dest + 'package.json');
-    processJson('templates/app/_bower.json', dest + 'bower.json');
-  });
-
-  grunt.registerTask('installFixtures', 'install package and bower fixtures', function() {
-    var done = this.async();
-
-    shell.cd('test/fixtures');
-    grunt.log.ok('installing npm dependencies for generated app');
-    child_process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {
-
-      grunt.log.ok('installing bower dependencies for generated app');
-      child_process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
-
-        if(!process.env.SAUCE_USERNAME) {
-          grunt.log.ok('running npm run-script update-webdriver');
-          child_process.exec('npm run-script update-webdriver', function() {
-            shell.cd('../../');
-            done();
-          });
-        } else {
-          shell.cd('../../');
-          done();
-        }
-      })
-    });
-  });
-
   grunt.registerTask('test', function(target, option) {
     if (target === 'fast') {
       grunt.task.run([

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -11,7 +11,7 @@ etc | etc
 Item | Answer
 ----- | -----
 Transpiler | Babel / TypeScript
-Markup | HTML / Jade
+Markup | HTML / Pug
 CSS | CSS / LESS / SCSS / Stylus
 Router | ngRoute / ui-router
 Client Tests | Jasmine / Mocha

diff --git a/angular-fullstack-deps b/angular-fullstack-deps
diff --git a/angular-fullstack-dockerfile b/angular-fullstack-dockerfile
diff --git a/circle.yml b/circle.yml
@@ -5,6 +5,11 @@ machine:
   post:
     - npm install -g gulp-cli
 
+    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo apt-get update
+    - sudo apt-get install google-chrome-stable
+
 ## Customize checkout
 checkout:
   post:
@@ -29,6 +34,14 @@ notify:
     # gitter hook
     - url: https://webhooks.gitter.im/e/ac3980c61cb722b9e789
 
+## Deployments
+deployment:
+  docker:
+    # update the upstream dockerfile after a push
+    branch: [master, docker-integration]
+    commands:
+      - generator-angular-fullstack/angular-fullstack-dockerfile/create_branch.sh
+
 test:
   pre:
     - cd sc-*-linux && ./bin/sc --user $SAUCE_USERNAME --api-key $SAUCE_ACCESS_KEY --readyfile ~/sauce_is_ready:

diff --git a/daux/templates/content.php b/daux/templates/content.php
@@ -0,0 +1,41 @@
+<?php $this->layout('theme::layout/05_page') ?>
+<article class="Page">
+    <?php if ($params['html']['date_modified']) {
+    ?>
+        <div class="Page__header">
+            <h1><?= $page['breadcrumbs'] ? $this->get_breadcrumb_title($page, $base_page) : $page['title'] ?></h1>
+        </div>
+    <?php
+
+} else {
+    ?>
+        <div class="Page__header">
+            <h1><?= $page['breadcrumbs'] ? $this->get_breadcrumb_title($page, $base_page) : $page['title'] ?></h1>
+        </div>
+    <?php
+
+} ?>
+
+    <div class="s-content">
+        <?= $page['content']; ?>
+    </div>
+
+    <?php if (!empty($page['prev']) || !empty($page['next'])) {
+    ?>
+    <nav>
+        <ul class="Pager">
+            <?php if (!empty($page['prev'])) {
+        ?><li class=Pager--prev><a href="<?= $base_url . $page['prev']->getUrl() ?>">Previous</a></li><?php
+
+    } ?>
+            <?php if (!empty($page['next'])) {
+        ?><li class=Pager--next><a href="<?= $base_url . $page['next']->getUrl() ?>">Next</a></li><?php
+
+    } ?>
+        </ul>
+    </nav>
+    <?php
+
+} ?>
+</article>
+
diff --git a/daux/templates/error.php b/daux/templates/error.php
@@ -0,0 +1,11 @@
+<?php $this->layout('theme::layout/05_page') ?>
+
+<article class="Page">
+    <div class="Page__header">
+        <h1><?= $page['title']; ?></h1>
+    </div>
+
+    <div class="s-content">
+        <?= $page['content']; ?>
+    </div>
+</article>
diff --git a/daux/templates/home.php b/daux/templates/home.php
@@ -0,0 +1,85 @@
+<?php $this->layout('theme::layout/00_layout') ?>
+<div class="Navbar hidden-print">
+    <div class="container">
+        <?php $this->insert('theme::partials/navbar_content', ['params' => $params]); ?>
+    </div>
+</div>
+
+<?php if ($params['html']['repo']) {
+    ?>
+    <a href="https://github.com/<?= $params['html']['repo']; ?>" target="_blank" id="github-ribbon" class="Github hidden-print"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
+<?php
+
+} ?>
+
+<div class="Homepage">
+    <div class="HomepageTitle container">
+        <?php if ($params['tagline']) {
+    echo '<h2>' . $params['tagline'] . '</h2>';
+} ?>
+    </div>
+
+    <div class="HomepageImage container">
+        <?php if ($params['image']) {
+    echo '<img class="homepage-image img-responsive" src="' . $params['image'] . '" alt="' . $params['title'] . '">';
+} ?>
+    </div>
+
+    <div class="HomepageButtons">
+        <div class="container">
+            <?php
+            if ($params['html']['repo']) {
+                echo '<a href="https://github.com/' . $params['html']['repo'] . '" class="Button Button--secondary Button--hero">View On GitHub</a>';
+            }
+            foreach ($page['entry_page'] as $key => $node) {
+                echo '<a href="' . $node . '" class="Button Button--primary Button--hero">' . $key . '</a>';
+            }
+            ?>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+</div>
+
+<div class="HomepageContent">
+    <div class="container">
+        <div class="container--inner">
+            <div class="doc_content s-content">
+                <?= $page['content']; ?>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="HomepageFooter">
+    <div class="container">
+        <div class="container--inner">
+            <?php if (!empty($params['html']['links'])) {
+                ?>
+                <ul class="HomepageFooter__links">
+                    <?php foreach ($params['html']['links'] as $name => $url) {
+                    echo '<li><a href="' . $url . '" target="_blank">' . $name . '</a></li>';
+                } ?>
+                </ul>
+            <?php
+
+            } ?>
+
+            <?php if (!empty($params['html']['twitter'])) {
+                ?>
+                <div class="HomepageFooter__twitter">
+                    <?php foreach ($params['html']['twitter'] as $handle) {
+                    ?>
+                    <div class="Twitter">
+                        <iframe allowtransparency="true" frameborder="0" scrolling="no" style="width:162px; height:20px;" src="https://platform.twitter.com/widgets/follow_button.html?screen_name=<?= $handle; ?>&amp;show_count=false"></iframe>
+                    </div>
+                    <?php
+
+                } ?>
+                </div>
+            <?php
+
+            } ?>
+        </div>
+    </div>
+    <div class="clearfix"></div>
+</div>