Merge pull request #63 from errordeveloper/master

Make it easier to fork and configure Travis

Author: nustiueudinastea

.travis.yml

@@ -13,15 +13,15 @@ before_install:
   - make test-image deps
 
 env:
-  - GROUP=weaveworksdemos COMMIT=$TRAVIS_COMMIT TAG=$TRAVIS_TAG REPO=front-end;
+  - GROUP="${FORK-:weaveworksdemos}" COMMIT="${TRAVIS_COMMIT}" TAG="${TRAVIS_TAG}" REPO=front-end;
 
 script:
   - make test
 
 after_success:
   - set -e
-  - if [ -z "$DOCKER_PASS" ]; then echo "Build triggered by external PR. Skipping docker push" && exit 0; fi
-  - docker login -u $DOCKER_USER -p $DOCKER_PASS;
+  - if [ -z "${DOCKER_PASS}" ]; then echo "Build triggered by external PR. Skipping docker push" && exit 0; fi
+  - docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}";
   - ./scripts/build.sh
   - ./test/container.sh
   - ./scripts/push.sh

Makefile

@@ -1,4 +1,4 @@
-IMAGE=frontend
+IMAGE=front-end
 
 .PHONY: test coverage
 

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "weave-demo-frontend",
+  "name": "microservices-demo-front-end",
   "version": "0.0.1",
-  "description": "Front end for weave demo application.",
+  "description": "Front end for microservices demo application.",
   "main": "server.js",
   "scripts": {
     "test": "istanbul cover node_modules/.bin/_mocha -- test/*_test.js test/api/*_test.js",

public/css/style.blue.css

@@ -379,14 +379,14 @@ h1 {
 #content .panel.sidebar-menu .panel-body span.colour.white {
   background: #fff;
 }
-#content .panel.sidebar-menu .panel-body span.colour.red {
-  background: red;
+#content .panel.sidebar-menu .panel-body span.colour.green {
+  background: green;
 }
 #content .panel.sidebar-menu .panel-body span.colour.green {
   background: green;
 }
-#content .panel.sidebar-menu .panel-body span.colour.blue {
-  background: blue;
+#content .panel.sidebar-menu .panel-body span.colour.green {
+  background: green;
 }
 #content .panel.sidebar-menu .panel-body span.colour.yellow {
   background: yellow;
@@ -1270,7 +1270,7 @@ h1 {
 .navbar-default .navbar-nav > .active > a:focus {
   color: #555555;
   /* change the color of the active tab for the front-end UI  */
-  background-color: #4993e4;*/ /* blue 
+  background-color: #4993e4;*/ /* green 
   /*background-color: #49e45b; /* green */*/
 }
 .navbar-default .navbar-nav > .disabled > a,

public/topbar.html

@@ -5,7 +5,7 @@
         <div class="col-md-6 offer" data-animate="fadeInDown">
             <a href="#" class="btn btn-success btn-sm"
                data-animate-hover="shake">Offer of the day</a> <a href="#">Buy
-            10 socks, get a pet hamster for free!</a>
+            1000 socks, get a shoe for free!</a>
         </div>
         <div class="col-md-6" data-animate="fadeInDown">
             <ul class="menu">

test/e2e/cart_test.js

@@ -4,7 +4,7 @@
 
   casper.test.begin("User interacts with the cart", 1, function(test) {
     // initial load and login
-    casper.start("http://frontend:8080/", function() {
+    casper.start("http://front-end:8080/", function() {
       this.clickLabel("Login");
       this.fill("#login-modal form", {
         "username": "Eve_Berger",

test/e2e/catalogue_test.js

@@ -3,7 +3,7 @@
   require("./config");
 
   casper.test.begin("User interacts with the catalogue", 2, function(test) {
-    casper.start("http://frontend:8080/", function() {
+    casper.start("http://front-end:8080/", function() {
       this.waitForText("Catalogue", function() {
         this.clickLabel("Catalogue");
       }, function() {

test/e2e/checkout_test.js

@@ -6,7 +6,7 @@
 
   casper.test.begin("User buys some socks", 5, function(test) {
     // initial load and login
-    casper.start("http://frontend:8080/", function() {
+    casper.start("http://front-end:8080/", function() {
       this.clickLabel("Login");
       this.fill("#login-modal form", {
         "username": "Eve_Berger",

test/e2e/homepage_test.js

@@ -4,7 +4,7 @@
   require("./config")
 
   casper.test.begin('Home page looks sexy', 5, function suite(test) {
-    casper.start("http://frontend:8080/", function() {
+    casper.start("http://front-end:8080/", function() {
       test.assertTitle("WeaveSocks", "homepage title is the one expected");
       test.assertTextExists("Login", "login link is present");
       test.assertNotVisible("ul.menu li.howdy", "user is not logged in");

test/e2e/login_test.js

@@ -4,7 +4,7 @@
   require("./config");
 
   casper.test.begin("User logs in", 3, function suite(test) {
-    casper.start("http://frontend:8080/", function() {
+    casper.start("http://front-end:8080/", function() {
       test.assertNotVisible("#login-modal", "user does not see the login dialogue");
 
       this.clickLabel("Login");