Merge branch 'release/1.0.0'

.dockercfg.template

@@ -0,0 +1 @@
+{"https://index.docker.io/v1/":{"auth":"<AUTH>","email":"<EMAIL>"}}

.elasticbeanstalk/config.yml

@@ -0,0 +1,10 @@
+branch-defaults:
+  develop:
+    environment: thisissoon
+global:
+  application_name: My First Elastic Beanstalk Application
+  default_ec2_keyname: soon-eu-vpc
+  default_platform: docker
+  default_region: eu-west-1
+  profile: default
+  sc: git

.jshintrc

@@ -6,7 +6,7 @@
 
     // Enforcing
     "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
-    "camelcase"     : true,     // true: Identifiers must be in camelCase
+    "camelcase"     : false,     // true: Identifiers must be in camelCase
     "curly"         : true,     // true: Require {} for every new block or scope
     "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
     "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
@@ -26,16 +26,16 @@
                                 //   "single" : require single quotes
                                 //   "double" : require double quotes
     "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)
-    "unused"        : true,     // true: Require all defined variables be used
+    "unused"        : false,     // true: Require all defined variables be used
     "strict"        : true,     // true: Requires all functions run in ES5 Strict Mode
     "maxparams"     : false,    // {int} Max number of formal params allowed per function
     "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
     "maxstatements" : false,    // {int} Max number statements per function
     "maxcomplexity" : false,    // {int} Max cyclomatic complexity per function
-    "maxlen"        : 80,       // {int} Max number of characters per line
+    "maxlen"        : 130,       // {int} Max number of characters per line
 
     // Relaxing
-    "asi"           : false,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
+    "asi"           : true,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
     "boss"          : false,     // true: Tolerate assignments where comparisons would be expected
     "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
     "eqnull"        : false,     // true: Tolerate use of `== null`

Dockerfile

@@ -0,0 +1,15 @@
+# Pull base image.
+FROM nginx:1.7.6
+
+# Add nginx config - overwrite bundled nginx.conf
+ADD nginx.conf /etc/nginx/
+
+# Volumes
+VOLUME ["/etc/nginx"]
+
+# Expose ports - 80 only, SSL will terminate at ELB
+EXPOSE 80
+
+# Add the grunt build dist to /thisissoon
+ADD ./dist /thisissoon
+

Dockerrun.aws.json

@@ -0,0 +1,13 @@
+{
+  "AWSEBDockerrunVersion": "1",
+  "Image": {
+    "Name": "soon/thisissoon-frontend:develop",
+    "Update": "true"
+  },
+  "Ports": [
+    {
+      "ContainerPort": "80"
+    }
+  ],
+  "Logging": "/var/eb_log"
+}

Gruntfile.js

@@ -5,6 +5,7 @@ var modRewrite = require("connect-modrewrite");
 module.exports = function (grunt) {
 
     var base = grunt.option("baseDir") || "",
+        env = grunt.option("env") || "production",
         protractorConf = grunt.option("ci") ?
                         "tests/e2e/protractor.saucelabs.conf.js" :
                         "tests/e2e/protractor.conf.js" ;
@@ -16,6 +17,7 @@ module.exports = function (grunt) {
         config: {
             outputDir: "dist/",
             applicationFiles: grunt.file.readJSON("scripts.json").application,
+            env: grunt.file.readJSON("env.json")[env],
             vendorFiles: grunt.file.readJSON("scripts.json").vendor
         },
 
@@ -198,7 +200,9 @@ module.exports = function (grunt) {
                     "<%= config.outputDir %>js/app.min.js":
                     [
                         "<%= config.vendorFiles %>",
-                        "<%= config.applicationFiles %>"
+                        "<%= config.applicationFiles %>",
+                        "!app/js/config.js",
+                        "<%= config.outputDir %>js/config.js"
                     ]
                 }
             }
@@ -213,6 +217,22 @@ module.exports = function (grunt) {
                     dest: "<%= config.outputDir %>img/"
                 }]
             },
+            favicons: {
+                files: [{
+                    expand: true,
+                    cwd: "app/favicons",
+                    src: ["**/*", "!test/**"],
+                    dest: "<%= config.outputDir %>"
+                }]
+            },
+            fonts: {
+                files: [{
+                    expand: true,
+                    cwd: "app/fonts",
+                    src: ["**/*", "!test/**"],
+                    dest: "<%= config.outputDir %>fonts/"
+                }]
+            },
             partials: {
                 files: [{
                     expand: true,
@@ -272,8 +292,18 @@ module.exports = function (grunt) {
                     outdir: "docs/"
                 }
             }
-        }
+        },
 
+        ngconstant: {
+            options: {
+                name: "config",
+                dest: "<%= config.outputDir %>js/config.js",
+                constants: {
+                    ENV: "<%= config.env %>"
+                }
+            },
+            production: {}
+        },
 
     });
 
@@ -290,19 +320,30 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-protractor-runner");
     grunt.loadNpmTasks("grunt-protractor-webdriver");
     grunt.loadNpmTasks("grunt-processhtml");
+    grunt.loadNpmTasks("grunt-ng-constant");
+    grunt.loadNpmTasks("grunt-bump");
 
     grunt.registerTask("build", [
         "clean:beforeBuild",
         "jshint",
+        "ngconstant:production",
         "uglify",
         "jasmine:production",
         "less:production",
         "copy:images",
+        "copy:fonts",
+        "copy:favicons",
         "copy:partials",
         "processhtml:production",
         "yuidoc"
     ]);
 
+    grunt.registerTask("release", [
+        "bump-only",
+        "build",
+        "bump-commit"
+    ]);
+
     grunt.registerTask("server", [
         "less:development",
         "connect:server",
@@ -327,6 +368,7 @@ module.exports = function (grunt) {
     ]);
 
     grunt.registerTask("e2e", [
+        "ngconstant:production",
         "uglify",
         "less:production",
         "copy",
@@ -338,6 +380,5 @@ module.exports = function (grunt) {
     ]);
 
     grunt.registerTask("default", ["build"]);
-    grunt.registerTask("release", ["build"]);
 
 };

VERSION.txt

@@ -0,0 +1 @@
+2015.1.30.1

app/favicons/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/mstile-70x70.png"/>
+      <square150x150logo src="/mstile-150x150.png"/>
+      <square310x310logo src="/mstile-310x310.png"/>
+      <wide310x150logo src="/mstile-310x150.png"/>
+      <TileColor>#000000</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

app/favicons/manifest.json

@@ -0,0 +1,43 @@
+{
+	"name": "SOON_",
+	"icons": [
+		{
+			"src": "\/android-chrome-36x36.png",
+			"sizes": "36x36",
+			"type": "image\/png",
+			"density": "0.75"
+		},
+		{
+			"src": "\/android-chrome-48x48.png",
+			"sizes": "48x48",
+			"type": "image\/png",
+			"density": "1.0"
+		},
+		{
+			"src": "\/android-chrome-72x72.png",
+			"sizes": "72x72",
+			"type": "image\/png",
+			"density": "1.5"
+		},
+		{
+			"src": "\/android-chrome-96x96.png",
+			"sizes": "96x96",
+			"type": "image\/png",
+			"density": "2.0"
+		},
+		{
+			"src": "\/android-chrome-144x144.png",
+			"sizes": "144x144",
+			"type": "image\/png",
+			"density": "3.0"
+		},
+		{
+			"src": "\/android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png",
+			"density": "4.0"
+		}
+	],
+	"start_url": "http:\/\/www.thisissoon.com",
+	"display": "standalone"
+}