initial load

2018-01-10 16:31:49 +00:00
commit ae1a16f94c
33 changed files with 1647 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.*.swp
+.DS_Store
+
--- a/cart/Dockerfile
+++ b/cart/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:8
+
+EXPOSE 8080
+
+WORKDIR /opt/server
+
+COPY package.json /opt/server/
+
+RUN npm install
+
+COPY server.js /opt/server/
+
+CMD ["node", "server.js"]
+
--- a/cart/package.json
+++ b/cart/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "catalogue",
+  "version": "1.0.0",
+  "description": "product catalogue REST API",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "SteveW",
+  "license": "Apache-2.0",
+  "dependencies": {
+      "body-parser": "^1.18.1",
+      "express": "^4.15.4",
+      "redis": "^2.8.0",
+      "request": "^2.83.0",
+      "instana-nodejs-sensor": "^1.28.0"
+  }
+}
--- a/cart/server.js
+++ b/cart/server.js
@@ -0,0 +1,234 @@
+const instana = require('instana-nodejs-sensor');
+const redis = require('redis');
+const request = require('request');
+const bodyParser = require('body-parser');
+const express = require('express');
+
+// init tracing
+instana({
+    tracing: {
+        enabled: true
+    }
+});
+
+var redisConnected = false;
+
+const app = express();
+
+app.use((req, res, next) => {
+    res.set('Timing-Allow-Origin', '*');
+    res.set('Access-Control-Allow-Origin', '*');
+    next();
+});
+
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.json());
+
+app.get('/health', (req, res) => {
+    var stat = {
+        app: 'OK',
+        redis: redisConnected
+    };
+    res.json(stat);
+});
+
+
+// get cart with id
+app.get('/cart/:id', (req, res) => {
+    redisClient.get(req.params.id, (err, data) => {
+        if(err) {
+            console.log('ERROR', err);
+            res.status(500).send(err);
+        } else {
+            if(data == null) {
+                res.status(404).send('cart not found');
+            } else {
+                res.set('Content-Type', 'application/json');
+                res.send(data);
+            }
+        }
+    });
+});
+
+// update/create cart
+app.get('/add/:id/:sku/:qty', (req, res) => {
+    // check quantity
+    var qty = parseInt(req.params.qty);
+    if(isNaN(qty)) {
+        res.status(400).send('quantity must be a number');
+        return;
+    } else if(qty < 1) {
+        res.status(400).send('negative quantity not allowed');
+        return;
+    }
+
+    // look up product details
+    getProduct(req.params.sku).then((product) => {
+        console.log('got product', product);
+        // is the product in stock?
+        if(product.instock == 0) {
+            res.status(404).send('out of stock');
+            return;
+        }
+        // does the cart already exist?
+        redisClient.get(req.params.id, (err, data) => {
+            if(err) {
+                console.log('ERROR', err);
+                res.status(500).send(err);
+            } else {
+                var cart;
+                if(data == null) {
+                    // create new cart
+                    cart = {
+                        total: 0,
+                        tax: 0,
+                        items: []
+                    };
+                } else {
+                    cart = JSON.parse(data);
+                }
+                console.log('got cart', cart);
+                // add sku to cart
+                var item = {
+                    qty: qty,
+                    sku: req.params.sku,
+                    name: product.name,
+                    price: product.price,
+                    subtotal: qty * product.price
+                };
+                var list = mergeList(cart.items, item, qty);
+                cart.items = list;
+                cart.total = calcTotal(cart.items);
+                // work out tax @ 20%
+                cart.tax = (cart.total - (cart.total / 1.2)).toFixed(2);
+
+                // save the new cart
+                saveCart(req.params.id, cart);
+                res.json(cart);
+            }
+        });
+    }).catch((err) => {
+        res.status(500).send(err);
+    });
+});
+
+// update quantity - remove item when qty == 0
+app.get('/update/:id/:sku/:qty', (req, res) => {
+    // check quantity
+    var qty = parseInt(req.params.qty);
+    if(isNaN(qty)) {
+        res.status(400).send('quantity must be a number');
+        return;
+    }
+
+    // get the cart
+    redisClient.get(req.params.id, (err, data) => {
+        if(err) {
+            console.log('ERROR', err);
+            res.status(500).send(err);
+        } else {
+            if(data == null) {
+                res.status(404).send('cart not found');
+            } else {
+                var cart = JSON.parse(data);
+                var idx;
+                var len = cart.items.length;
+                for(idx = 0; idx < len; idx++) {
+                    if(cart.items[idx].sku == req.params.sku) {
+                        break;
+                    }
+                }
+                if(idx == len) {
+                    // not in list
+                    res.status(404).send('not in cart');
+                } else {
+                    if(qty == 0) {
+                        cart.items.splice(idx, 1);
+                    } else {
+                        cart.items[idx].qty = qty;
+                        cart.items[idx].subtotal = cart.items[idx].price * qty;
+                    }
+                    cart.total = calcTotal(cart.items);
+                    // work out tax @ 20%
+                    cart.tax = (cart.total - (cart.total / 1.2)).toFixed(2);
+                    saveCart(req.params.id, cart);
+                    res.json(cart);
+                }
+            }
+        }
+    });
+});
+
+function mergeList(list, product, qty) {
+    var inlist = false;
+    // loop through looking for sku
+    var idx;
+    var len = list.length;
+    for(idx = 0; idx < len; idx++) {
+        if(list[idx].sku == product.sku) {
+            inlist = true;
+            break;
+        }
+    }
+
+    if(inlist) {
+        list[idx].qty += qty;
+        list[idx].subtotal = list[idx].price * list[idx].qty;
+    } else {
+        list.push(product);
+    }
+
+    return list;
+}
+
+function calcTotal(list) {
+    var total = 0;
+    for(var idx = 0, len = list.length; idx < len; idx++) {
+        total += list[idx].subtotal;
+    }
+
+    return total;
+}
+
+function getProduct(sku) {
+    return new Promise((resolve, reject) => {
+        request('http://catalogue:8080/product/' + sku, (err, res, body) => {
+            if(err) {
+                reject(err);
+            } else if(res.statusCode != 200) {
+                reject(res.statusCode);
+            } else {
+                // return object - body is a string
+                resolve(JSON.parse(body));
+            }
+        });
+    });
+}
+
+function saveCart(id, cart) {
+    console.log('saving cart', cart);
+    redisClient.setex(id, 3600, JSON.stringify(cart), (err, data) => {
+        if(err) {
+            console.log('saveCart ERROR', err);
+        }
+    });
+}
+
+// connect to Redis
+var redisClient = redis.createClient({
+    host: 'redis'
+});
+
+redisClient.on('error', (e) => {
+    console.log('Redis ERROR', e);
+});
+redisClient.on('ready', (r) => {
+    console.log('Redis READY', r);
+    redisConnected = true;
+});
+
+// fire it up!
+const port = process.env.CART_SERVER_PORT || '8080';
+app.listen(port, () => {
+    console.log('Started on port', port);
+});
--- a/catalogue/Dockerfile
+++ b/catalogue/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:8
+
+EXPOSE 8080
+
+WORKDIR /opt/server
+
+COPY package.json /opt/server/
+
+RUN npm install
+
+COPY server.js /opt/server/
+
+CMD ["node", "server.js"]
+
--- a/catalogue/package.json
+++ b/catalogue/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "catalogue",
+  "version": "1.0.0",
+  "description": "product catalogue REST API",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "SteveW",
+  "license": "Apache-2.0",
+  "dependencies": {
+      "body-parser": "^1.18.1",
+      "express": "^4.15.4",
+      "mongodb": "^2.2.33",
+      "instana-nodejs-sensor": "^1.28.0"
+  }
+}
--- a/catalogue/server.js
+++ b/catalogue/server.js
@@ -0,0 +1,146 @@
+const instana = require('instana-nodejs-sensor');
+const mongoClient = require('mongodb').MongoClient;
+const mongoObjectID = require('mongodb').ObjectID;
+const bodyParser = require('body-parser');
+const express = require('express');
+
+// MongoDB
+var db;
+var collection;
+var mongoConnected = false;
+
+// init tracing
+instana({
+    tracing: {
+        enabled: true
+    }
+});
+
+
+const app = express();
+
+app.use((req, res, next) => {
+    res.set('Timing-Allow-Origin', '*');
+    res.set('Access-Control-Allow-Origin', '*');
+    next();
+});
+
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.json());
+
+app.get('/health', (req, res) => {
+    var stat = {
+        app: 'OK',
+        mongo: mongoConnected
+    };
+    res.json(stat);
+});
+
+// all products
+app.get('/products', (req, res) => {
+    if(mongoConnected) {
+        collection.find({}).toArray().then((products) => {
+            res.json(products);
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not avaiable');
+    }
+});
+
+// product by SKU
+app.get('/product/:sku', (req, res) => {
+    if(mongoConnected) {
+        collection.findOne({sku: req.params.sku}).then((product) => {
+            console.log('product', product);
+            if(product) {
+                res.json(product);
+            } else {
+                res.status(404).send('SKU not found');
+            }
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+// products in a category
+app.get('/products/:cat', (req, res) => {
+    if(mongoConnected) {
+        collection.find({ categories: req.params.cat}).toArray().then((products) => {
+            res.json(products);
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not avaiable');
+    }
+});
+
+// all categories
+app.get('/categories', (req, res) => {
+    if(mongoConnected) {
+        collection.distinct('categories').then((categories) => {
+            res.json(categories);
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+// search name and description
+app.get('/search/:text', (req, res) => {
+    if(mongoConnected) {
+        collection.find({ '$text': { '$search': req.params.text }}).toArray().then((hits) => {
+            res.json(hits);
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+// set up Mongo
+function mongoConnect() {
+    return new Promise((resolve, reject) => {
+    var mongoURL = process.env.MONGO_URL || 'mongodb://mongodb:27017/catalogue';
+    mongoClient.connect(mongoURL, (error, _db) => {
+        if(error) {
+            reject(error);
+        } else {
+            db = _db;
+            collection = db.collection('products');
+            resolve('connected');
+        }
+    });
+});
+}
+
+function mongoLoop() {
+    mongoConnect().then((r) => {
+        mongoConnected = true;
+        console.log('MongoDB connected');
+    }).catch((e) => {
+        console.error('ERROR', e);
+        setTimeout(mongoLoop, 2000);
+    });
+}
+
+mongoLoop();
+
+// fire it up!
+const port = process.env.CATALOGUE_SERVER_PORT || '8080';
+app.listen(port, () => {
+    console.log('Started on port', port);
+});
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -0,0 +1,70 @@
+version: '3'
+services:
+  mongodb:
+    build:
+      context: mongo
+    image: steveww/rs-mongodb
+    ports:
+      - "27017"
+    networks:
+      - robot-shop
+  redis:
+    image: redis:4.0.5
+    ports:
+      - "6379"
+    networks:
+      - robot-shop
+  catalogue:
+    build:
+      context: catalogue
+    image: steveww/rs-catalogue
+    depends_on:
+      - mongodb
+    ports:
+      - "8080"
+    networks:
+      - robot-shop
+  user:
+    build:
+      context: user
+    image: steveww/rs-user
+    depends_on:
+      - mongodb
+      - redis
+    ports:
+      - "8080"
+    networks:
+      - robot-shop
+  cart:
+    build:
+      context: cart
+    image: steveww/rs-cart
+    depends_on:
+      - redis
+    ports:
+      - "8080"
+    networks:
+      - robot-shop
+  shipping:
+    build:
+      context: shipping
+    image: steveww/rs-shipping
+    ports:
+      - "8080"
+    networks:
+      - robot-shop
+  web:
+    build:
+      context: web
+    image: steveww/rs-web
+    depends_on:
+      - catalogue
+      - user
+    ports:
+      - "8080:8080"
+    networks:
+      - robot-shop
+
+networks:
+  robot-shop:
+
--- a/instana/instana-agent-private.yml
+++ b/instana/instana-agent-private.yml
@@ -0,0 +1,112 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: instana-agent
+  labels:
+    name: instana-agent
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: instana-admin
+  namespace: instana-agent
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: instana-agent-secret
+  namespace: instana-agent
+data:
+  key: SVlVS0tpbUNRLTZxVlRhd3FDSFBFdw==
+ 
+---
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  labels:
+    app: instana-agent
+  name: instana-agent
+  namespace: instana-agent
+spec:
+  selector:
+    matchLabels:
+      app: instana-agent
+  template:
+    metadata:
+      labels:
+        app: instana-agent
+    spec:
+      nodeSelector:
+        agent: instana
+      hostIPC: true
+      hostNetwork: true
+      hostPID: true
+      containers:
+        - name: instana-agent
+          image: instana/agent
+          imagePullPolicy: Always
+          env:
+            - name: INSTANA_ZONE
+              value: Robot-Shop
+            - name: INSTANA_AGENT_ENDPOINT
+              value: saas-us-west-2.instana.io
+            - name: INSTANA_AGENT_ENDPOINT_PORT
+              value: '443'
+            - name: INSTANA_AGENT_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: instana-agent-secret
+                  key: key
+            - name: INSTANA_AGENT_HTTP_LISTEN
+              value: '*'
+          securityContext:
+            privileged: true
+          volumeMounts:
+            - name: dev
+              mountPath: /dev
+            - name: run
+              mountPath: /var/run/docker.sock
+            - name: sys
+              mountPath: /sys
+            - name: log
+              mountPath: /var/log
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 42699
+            initialDelaySeconds: 120
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 42699
+            initialDelaySeconds: 120
+            periodSeconds: 10
+            timeoutSeconds: 5
+            failureThreshold: 5
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "0.2"
+            limits:
+              memory: "512Mi"
+              cpu: "0.5"
+      volumes:
+        - name: dev
+          hostPath:
+              path: /dev
+        - name: run
+          hostPath:
+              path: /var/run/docker.sock
+        - name: sys
+          hostPath:
+              path: /sys
+        - name: log
+          hostPath:
+              path: /var/log
+
--- a/mongo/Dockerfile
+++ b/mongo/Dockerfile
@@ -0,0 +1,4 @@
+FROM mongo:3.6.1
+
+COPY *.js /docker-entrypoint-initdb.d/
+
--- a/mongo/catalogue.js
+++ b/mongo/catalogue.js
@@ -0,0 +1,23 @@
+//
+// Products
+//
+db = db.getSiblingDB('catalogue');
+db.products.insertMany([
+    {sku: 'PB-1', name: 'Positronic Brain', description: 'Highly advanced sentient processing unit', price: 42000, instock: 0, categories: ['components']},
+    {sku: 'SVO-980', name: 'Servo 980Nm', description: 'Servo actuator with 980Nm of torque. Needs 24V 10A supply', price: 50, instock: 32, categories: ['components']},
+    {sku: 'ROB-1', name: 'Robbie', description: 'Large mechanical workhorse, crude but effective', price: 1200, instock: 12, categories: ['complete']},
+    {sku: 'EVE-1', name: 'Eve', description: 'Extraterrestrial Vegetation Evaluator', price: 5000, instock: 10, categories: ['complete']}
+]);
+
+// full text index for searching
+db.products.createIndex({
+    name: "text",
+    description: "text"
+});
+
+// unique index for product sku
+db.products.createIndex(
+    { sku: 1 },
+    { unique: true }
+);
+
--- a/mongo/mongo-dep.yaml
+++ b/mongo/mongo-dep.yaml
@@ -0,0 +1,22 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: mongodb
+  namespace: robot-shop
+  labels:
+    app: mongodb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: mongodb
+  template:
+    metadata:
+      labels:
+        app: mongodb
+    spec:
+      containers:
+        - name: mongodb
+          image: steveww/rs-mongodb
+          ports:
+            - containerPort: 27017
--- a/mongo/mongo-svc.yaml
+++ b/mongo/mongo-svc.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongodb
+  namespace: robot-shop
+  labels:
+    app: mongodb
+spec:
+  ports:
+    - name: mongodb
+      port: 27017
+      targetPort: 27017
+  selector:
+    app: mongodb
--- a/mongo/users.js
+++ b/mongo/users.js
@@ -0,0 +1,15 @@
+//
+// Products
+//
+db = db.getSiblingDB('users');
+db.users.insertMany([
+    {name: 'user', password: 'password', email: 'user@me.com'},
+    {name: 'stan', password: 'bigbrain', email: 'stan@instana.com'}
+]);
+
+// unique index on the name
+db.users.createIndex(
+    {name: 1},
+    {unique: true}
+);
+
--- a/shipping/Dockerfile
+++ b/shipping/Dockerfile
@@ -0,0 +1,28 @@
+#
+# Build
+#
+FROM openjdk:8-jdk as build
+
+RUN apt-get update && apt-get -y install maven
+
+WORKDIR /opt/shipping
+
+COPY pom.xml /opt/shipping/
+RUN mvn install
+
+COPY src /opt/shipping/src/
+RUN mvn package
+
+#
+# Run
+#
+FROM openjdk:8-jdk
+
+EXPOSE 8080
+
+WORKDIR /opt/shipping
+
+COPY --from=build /opt/shipping/target/shipping-1.0-jar-with-dependencies.jar shipping.jar
+
+CMD [ "java", "-jar", "shipping.jar" ]
+
--- a/shipping/pom.xml
+++ b/shipping/pom.xml
@@ -0,0 +1,58 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>steveww</groupId>
+    <artifactId>shipping</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>Spark Java Sample</name>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-jmx</artifactId>
+            <version>9.4.6.v20170531</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.steveww.spark.Main</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/shipping/shipping-dep.yaml
+++ b/shipping/shipping-dep.yaml
@@ -0,0 +1,22 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: shipping
+  namespace: robot-shop
+  labels:
+    app: shipping
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: shipping
+  template:
+    metadata:
+      labels:
+        app: shipping
+    spec:
+      containers:
+        - name: shipping
+          image: steveww/rs-shipping
+          ports:
+            - containerPort: 8080
--- a/shipping/shipping-svc.yaml
+++ b/shipping/shipping-svc.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: shipping
+  namespace: robot-shop
+  labels:
+    app: shipping
+spec:
+  ports:
+    - name: shipping
+      port: 8080
+      targetPort: 8080
+  selector:
+    app: shipping
--- a/shipping/shipping.jar
+++ b/shipping/shipping.jar
--- a/shipping/src/main/java/org/steveww/spark/Main.java
+++ b/shipping/src/main/java/org/steveww/spark/Main.java
@@ -0,0 +1,17 @@
+package org.steveww.spark;
+
+import spark.Spark;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Main {
+    private static Logger logger = LoggerFactory.getLogger(Main.class);
+
+    public static void main(String[] args) {
+        Spark.port(8080);
+        Spark.get("/hello", (req, res) -> "Hello World");
+        Spark.awaitInitialization();
+        logger.info("Ready");
+    }
+}
--- a/user/Dockerfile
+++ b/user/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:8
+
+EXPOSE 8080
+
+WORKDIR /opt/server
+
+COPY package.json /opt/server/
+
+RUN npm install
+
+COPY server.js /opt/server/
+
+CMD ["node", "server.js"]
+
--- a/user/package.json
+++ b/user/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "catalogue",
+  "version": "1.0.0",
+  "description": "product catalogue REST API",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "SteveW",
+  "license": "Apache-2.0",
+  "dependencies": {
+      "body-parser": "^1.18.1",
+      "express": "^4.15.4",
+      "mongodb": "^2.2.33",
+      "redis": "^2.8.0",
+      "instana-nodejs-sensor": "^1.28.0"
+  }
+}
--- a/user/server.js
+++ b/user/server.js
@@ -0,0 +1,170 @@
+const instana = require('instana-nodejs-sensor');
+const mongoClient = require('mongodb').MongoClient;
+const mongoObjectID = require('mongodb').ObjectID;
+const redis = require('redis');
+const bodyParser = require('body-parser');
+const express = require('express');
+
+// MongoDB
+var db;
+var collection;
+var mongoConnected = false;
+
+// init tracing
+instana({
+    tracing: {
+        enabled: true
+    }
+});
+
+
+const app = express();
+
+app.use((req, res, next) => {
+    res.set('Timing-Allow-Origin', '*');
+    res.set('Access-Control-Allow-Origin', '*');
+    next();
+});
+
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(bodyParser.json());
+
+app.get('/health', (req, res) => {
+    var stat = {
+        app: 'OK',
+        mongo: mongoConnected
+    };
+    res.json(stat);
+});
+
+// use REDIS INCR to track anonymous users
+app.get('/uniqueid', (req, res) => {
+    // get number from Redis
+    redisClient.incr('user', (err, r) => {
+        if(!err) {
+            res.json({
+                uuid: 'anonymous-' + r
+            });
+        }
+    });
+});
+
+// return all users for debugging only
+app.get('/users', (req, res) => {
+    if(mongoConnected) {
+        collection.find().toArray().then((users) => {
+            res.json(users);
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+app.post('/login', (req, res) => {
+    console.log('login', req.body);
+    if(req.body.name === undefined || req.body.password === undefined) {
+        res.status(400).send('name or passowrd not supplied');
+    } else if(mongoConnected) {
+        collection.findOne({
+            name: req.body.name,
+        }).then((user) => {
+            console.log('user', user);
+            if(user) {
+                if(user.password == req.body.password) {
+                    res.json(user);
+                } else {
+                    res.status(404).send('incorrect password');
+                }
+            } else {
+                res.status(404).send('name not found');
+            }
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+// TODO - validate email address format
+app.post('/register', (req, res) => {
+    console.log('register', req.body);
+    if(req.body.name === undefined || req.body.password === undefined || req.body.email === undefined) {
+        res.status(400).send('insufficient data');
+    } else if(mongoConnected) {
+        // check if name already exists
+        collection.findOne({name: req.body.name}).then((user) => {
+            if(user) {
+                res.status(400).send('name already exists');
+            } else {
+                // create new user
+                collection.insertOne({
+                    name: req.body.name,
+                    password: req.body.password,
+                    email: req.body.email
+                }).then((r) => {
+                    console.log('inserted', r.result);
+                    res.send('OK');
+                }).catch((e) => {
+                    console.log('ERROR', e);
+                    res.status(500).send(e);
+                });
+            }
+        }).catch((e) => {
+            console.log('ERROR', e);
+            res.status(500).send(e);
+        });
+    } else {
+        res.status(500).send('database not available');
+    }
+});
+
+// connect to Redis
+var redisClient = redis.createClient({
+    host: 'redis'
+});
+
+redisClient.on('error', (e) => {
+    console.log('Redis ERROR', e);
+});
+redisClient.on('ready', (r) => {
+    console.log('Redis READY', r);
+});
+
+// set up Mongo
+function mongoConnect() {
+    return new Promise((resolve, reject) => {
+    var mongoURL = process.env.MONGO_URL || 'mongodb://mongodb:27017/users';
+    mongoClient.connect(mongoURL, (error, _db) => {
+        if(error) {
+            reject(error);
+        } else {
+            db = _db;
+            collection = db.collection('users');
+            resolve('connected');
+        }
+    });
+});
+}
+
+function mongoLoop() {
+    mongoConnect().then((r) => {
+        mongoConnected = true;
+        console.log('MongoDB connected');
+    }).catch((e) => {
+        console.error('ERROR', e);
+        setTimeout(mongoLoop, 2000);
+    });
+}
+
+mongoLoop();
+
+// fire it up!
+const port = process.env.USER_SERVER_PORT || '8080';
+app.listen(port, () => {
+    console.log('Started on port', port);
+});
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -0,0 +1,10 @@
+FROM nginx:1.13.8
+
+EXPOSE 8080
+
+# RUN apt-get update -y && apt-get install -y curl iputils-ping dnsutils
+# RUN mkdir -p /var/cache/nginx && chmod 777 /var/cache/nginx
+
+COPY default.conf /etc/nginx/conf.d/default.conf
+COPY static /usr/share/nginx/html
+
--- a/web/default.conf
+++ b/web/default.conf
@@ -0,0 +1,62 @@
+server {
+    listen       8080;
+    server_name  localhost;
+
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+
+    location /api/catalogue/ {
+        proxy_pass http://catalogue:8080/;
+    }
+
+    location /api/user/ {
+        proxy_pass http://user:8080/;
+    }
+
+    location /api/cart/ {
+        proxy_pass http://cart:8080/;
+    }
+
+    location /nginx_status {
+        stub_status on;
+        access_log off;
+    }
+}
+
--- a/web/static/cart.html
+++ b/web/static/cart.html
@@ -0,0 +1,4 @@
+<!-- shopping cart -->
+<div>
+    Shopping cart for {{ data.uniqueid }} will be here
+</div>
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -0,0 +1,146 @@
+:root {
+    font-family: sans-serif;
+}
+
+body {
+    background: linear-gradient(180deg, #0c1415, #16363e);
+    color: cyan;
+    height: 1000px;
+}
+
+h1 {
+    font-family: 'Orbitron', sans-serif;
+}
+
+h1 a:link {
+    color: cyan;
+    text-decoration: none;
+}
+
+h1 a:visited {
+    color: cyan;
+    text-decoration: none;
+}
+
+h3 {
+    font-family: 'Orbitron', sans-serif;
+    margin: 5px;
+}
+
+h3 a:link {
+    color: cyan;
+    text-decoration: none;
+}
+
+h3 a:visited {
+    color: cyan;
+    text-decoration: none;
+}
+
+.category {
+    font-size: 14pt;
+    cursor: context-menu;
+    text-transform: capitalize;
+}
+
+ul.products {
+    margin: 5px;
+}
+
+a.product:visited {
+    color: cyan;
+    text-decoration: none;
+}
+
+a.product:link {
+    color: cyan;
+    text-decoration: none;
+}
+
+a.product:hover {
+    color: white;
+    text-decoration: none;
+}
+
+#stan {
+    float: right;
+    position: relative;
+    top: -75px;
+    padding: 0px;
+    margin-top: 0px;
+    margin-right: 20%;
+    margin-bottom: 0px;
+    margin-left: 0px;
+}
+
+#search {
+    float: right;
+    position: relative;
+    top: -50px;
+}
+
+.row, .column, .nav, .main {
+    margin: 0px;
+    box-sizing: border-box;
+}
+
+.column {
+    float: left;
+    padding: 10px;
+}
+
+.row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+.nav {
+    width: 25%;
+}
+
+.main {
+    width: auto;
+}
+
+.footer {
+    font-size: 8pt;
+}
+
+/* product details */
+.productimage {
+    border: 2px solid cyan;
+    padding: 5px;
+    margin: 10px;
+    width: 300px;
+    height: 300px;
+}
+
+.description {
+    width: 300px;
+    margin: 10px;
+}
+
+.productcart {
+    border: 1px solid cyan;
+    margin: 10px;
+    padding: 5px;
+    width: 300px;
+}
+
+/* login register */
+table.credentials {
+    border: 2px solid cyan;
+    padding: 10px;
+    margin: 10px;
+}
+
+.message {
+    color: magenta;
+    font-weight: bold;
+}
+
+.centre {
+    text-align: center;
+}
+
--- a/web/static/index.html
+++ b/web/static/index.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Stan's Robot Shop</title>
+    <style type="text/css">
+        @import url('https://fonts.googleapis.com/css?family=Orbitron');
+        @import url('css/style.css');
+    </style>
+    <meta http-equiv="Cache-Control" content="no-Cache">
+    <meta http-equiv="Pragma" content="no-cache">
+</head>
+
+<body ng-app="robotshop">
+<div ng-controller="shopform">
+    <h1><a href="/">Stan's Robot Shop</a></h1>
+    <span id="stan">
+        <img src="media/stan.png"/>
+    </span>
+    <span id="search">
+        <form>
+            <input type="text" size="20"/>
+            <button>Search</button>
+        </form>
+    </span>
+
+    <div class="row">
+        <!-- left nav -->
+        <div class="nav column">
+            <h3><a href="login">Login / Register</a></h3>
+            <h3><a href="cart">Cart</a></h3>
+            <h3>Categories</h3>
+            <ul class="products">
+                <li ng-repeat="cat in data.categories">
+                    <span ng-click="getProducts(cat);" class="category">{{ cat }}</span>
+                    <ul ng-if="data.products[cat]">
+                        <li ng-repeat="prod in data.products[cat]">
+                            <a class="product" href="product/{{ prod.sku }}">{{ prod.name }}</a>
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </div>
+
+        <!-- main display area -->
+        <div class="main column">
+            <div ng-view></div>
+        </div>
+    </div>
+
+    <div class="footer">
+        {{ data.uniqueid }}
+    </div>
+
+</div>
+
+<!-- JavaScript -->
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-route.min.js"></script>
+<script src="js/controller.js"></script>
+<script type="text/javascript">
+    angular.element(document.getElementsByTagName('head')).append(angular.element('<base href="' + window.location.pathname + '" />'));
+</script>
+
+</body>
+</html>
--- a/web/static/js/controller.js
+++ b/web/static/js/controller.js
@@ -0,0 +1,234 @@
+(function(angular) {
+    'use strict';
+
+    var robotshop = angular.module('robotshop', ['ngRoute'])
+
+    // Share user between controllers
+    robotshop.factory('currentUser', function() {
+        var data = {
+            uniqueid: '',
+            user: {},
+        };
+
+        return data;
+    });
+
+    robotshop.config(['$routeProvider', '$locationProvider', ($routeProvider, $locationProvider) => {
+        $routeProvider.when('/', {
+            templateUrl: 'splash.html',
+            controller: 'shopform'
+        }).when('/product/:sku', {
+            templateUrl: 'product.html',
+            controller: 'productform'
+        }).when('/login', {
+            templateUrl: 'login.html',
+            controller: 'loginform'
+        }).when('/cart', {
+            templateUrl: 'cart.html',
+            controller: 'cartform'
+        });
+
+        // needed for URL rewrite hash
+        $locationProvider.html5Mode(true);
+    }]);
+
+    // clear template fragment cache
+    robotshop.run(function($rootScope, $templateCache) {
+        $rootScope.$on('$viewContentLoaded', function() {
+            console.log('>>> clearing cache');
+            $templateCache.removeAll();
+        });
+    });
+
+    robotshop.controller('shopform', function($scope, $http, currentUser) {
+        $scope.data = {};
+
+        $scope.data.uniqueid = 'foo';
+        $scope.data.categories = [];
+        $scope.data.products = {};
+
+        $scope.getProducts = function(category) {
+            if($scope.data.products[category]) {
+                $scope.data.products[category] = null;
+            } else {
+                $http({
+                    url: '/api/catalogue/products/' + category,
+                    method: 'GET'
+                }).then((res) => {
+                    $scope.data.products[category] = res.data;
+                }).catch((e) => {
+                    console.log('ERROR', e);
+                });
+            }
+        };
+
+        function getCategories() {
+            $http({
+                url: '/api/catalogue/categories',
+                method: 'GET'
+            }).then((res) => {
+                $scope.data.categories = res.data;
+                console.log('categories loaded');
+            }).catch((e) => {
+                console.log('ERROR', e);
+            });
+        }
+
+        // unique id for cart etc
+        function getUniqueid() {
+            return new Promise((resolve, reject) => {
+            $http({
+                url: '/api/user/uniqueid',
+                method: 'GET'
+            }).then((res) => {
+                resolve(res.data.uuid);
+            }).catch((e) => {
+                console.log('ERROR', e);
+                reject(e);
+            });
+        });
+        }
+
+        // init
+        console.log('shopform starting...');
+        getCategories();
+        if(!currentUser.uniqueid) {
+            console.log('generating uniqueid');
+            getUniqueid().then((id) => {
+                $scope.data.uniqueid = id;
+                currentUser.uniqueid = id;
+            }).catch((e) => {
+                console.log('ERROR', e);
+            });
+        }
+        
+        // watch for login
+        $scope.$watch(() => { return currentUser.uniqueid; }, (newVal, oldVal) => {
+            if(newVal !== oldVal) {
+                $scope.data.uniqueid = currentUser.uniqueid;
+            }
+        });
+    });
+
+    robotshop.controller('productform', function($scope, $http, $routeParams, currentUser) {
+        $scope.data = {};
+        $scope.data.message = '';
+        $scope.data.product = {};
+        $scope.data.quantity = 1;
+
+        $scope.addToCart = function() {
+            var url = '/api/cart/add/' + currentUser.uniqueid + '/' + $scope.data.product.sku + '/' + $scope.data.quantity;
+            console.log('addToCart', url);
+            $http({
+                url: url,
+                method: 'GET'
+            }).then((res) => {
+                console.log('cart', res);
+                $scope.data.message = 'Added to cart';
+                setTimeout(clearMessage, 3000);
+            }).catch((e) => {
+                console.log('ERROR', e);
+                $scope.data.message = 'ERROR ' + e;
+                setTimeout(clearMessage, 3000);
+            });
+        };
+
+        function loadProduct(sku) {
+            $http({
+                url: '/api/catalogue/product/' + sku,
+                method: 'GET'
+            }).then((res) => {
+                $scope.data.product = res.data;
+            }).catch((e) => {
+                console.log('ERROR', e);
+            });
+        }
+
+        function clearMessage() {
+            $scope.data.message = '';
+        }
+
+        loadProduct($routeParams.sku);
+    });
+
+    robotshop.controller('cartform', function($scope, $http, currentUser) {
+        $scope.data = {};
+        $scope.data.uniqueid = currentUser.uniqueid;
+    });
+
+    robotshop.controller('loginform', function($scope, $http, currentUser) {
+        $scope.data = {};
+        $scope.data.name = '';
+        $scope.data.email = '';
+        $scope.data.password = '';
+        $scope.data.password2 = '';
+        $scope.data.message = '';
+        $scope.data.user = {};
+
+        $scope.login = function() {
+            $scope.data.message = '';
+            $http({
+                url: '/api/user/login',
+                method: 'POST',
+                data: {
+                    name: $scope.data.name,
+                    password: $scope.data.password,
+                    email: $scope.data.email
+                }
+            }).then((res) => {
+                $scope.data.user = res.data;
+                $scope.data.user.password = '';
+                $scope.data.password = $scope.data.password2 = '';
+                currentUser.user = $scope.data.user;
+                currentUser.uniqueid = $scope.data.user.name;
+            }).catch((e) => {
+                console.log('ERROR', e);
+                $scope.data.message = 'ERROR ' + e.data;
+                $scope.data.password = '';
+            });
+        };
+
+        $scope.register = function() {
+            $scope.data.message = '';
+            $scope.data.name = $scope.data.name.trim();
+            $scope.data.email = $scope.data.email.trim();
+            $scope.data.password = $scope.data.password.trim();
+            $scope.data.password2 = $scope.data.password2.trim();
+            // all fields complete
+            if($scope.data.name && $scope.data.email && $scope.data.password && $scope.data.password2) {
+                if($scope.data.password !== $scope.data.password2) {
+                    $scope.data.message = 'Passwords do not match';
+                    $scope.data.password = $scope.data.password2 = '';
+                    return;
+                }
+            }
+            $http({
+                url: '/api/user/register',
+                method: 'POST',
+                data: {
+                    name: $scope.data.name,
+                    email: $scope.data.email,
+                    password: $scope.data.password
+                }
+            }).then((res) => {
+                $scope.data.user = {
+                    name: $scope.data.name,
+                    email: $scope.data.email
+                };
+                $scope.data.password = $scope.data.password2 = '';
+                currentUser.user = $scope.data.user;
+                currentUser.uniqueid = $scope.data.user.name;
+            }).catch((e) => {
+                console.log('ERROR', e);
+                $scope.data.message = 'ERROR ' + e.data;
+                $scope.data.password = $scope.data.password2 = '';
+            });
+        };
+
+        console.log('loginform init');
+        if(!angular.equals(currentUser.user, {})) {
+            $scope.data.user = currentUser.user;
+        }
+    });
+
+}) (window.angular);
--- a/web/static/login.html
+++ b/web/static/login.html
@@ -0,0 +1,51 @@
+<!-- login / register -->
+<div ng-controller="loginform">
+    <div class="message">
+        {{ data.message }}
+    </div>
+
+    <div ng-if="data.user.name === undefined">
+        <table class="credentials">
+            <tr>
+                <td>Name</td>
+                <td><input type="text" size="20" ng-model="data.name"/></td>
+            </tr>
+            <tr>
+                <td>Password</td>
+                <td><input type="password" size="20" ng-model="data.password"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" class="centre"><button ng-click="login();">Login</button></td>
+            </tr>
+        </table>
+
+        <table class="credentials">
+            <tr>
+                <td>Name</td>
+                <td><input type="text" size="20" ng-model="data.name"/></td>
+            </tr>
+            <tr>
+                <td>Email</td>
+                <td><input type="email" size="20" ng-model="data.email"/></td>
+            </tr>
+            <tr>
+                <td>Password</td>
+                <td><input type="password" size="20" ng-model="data.password"/></td>
+            </tr>
+            <tr>
+                <td>Confirm Password</td>
+                <td><input type="password" size="20" ng-model="data.password2"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" class="centre"><button ng-click="register();">Register</button></td>
+            </tr>
+        </table>
+    </div>
+
+    <div ng-if="data.user.name !== undefined">
+        <h3>Greetings {{ data.user.name }}</h3>
+        <p>Email - {{ data.user.email }}</p>
+        <h3>Order History</h3>
+        <p>Order history will be here</p>
+    </div>
+</div>
--- a/web/static/media/stan.png
+++ b/web/static/media/stan.png
--- a/web/static/product.html
+++ b/web/static/product.html
@@ -0,0 +1,24 @@
+<!-- product details -->
+<div ng-controller="productform">
+    <div class="message">
+        {{ data.message }}
+    </div>
+
+    <h3>{{ data.product.name }}</h3>
+    <div class="productimage">
+        <img src="images/{{ data.product.sku }}"/>
+    </div>
+    <div class="description">
+        {{ data.product.description }}
+    </div>
+    <div class="productcart">
+        Price &euro;{{ data.product.price }}
+        <span ng-if="data.product.instock == 0">
+            Out of stock
+        </span>
+        <span ng-if="data.product.instock != 0">
+            Quantity <input type="number" size="2" min="1" max="10" ng-model="data.quantity"/>
+            <button ng-click="addToCart();">Add to cart</button>
+        </span>
+    </div>
+</div>
--- a/web/static/splash.html
+++ b/web/static/splash.html
@@ -0,0 +1,4 @@
+<!-- splash page -->
+<div>
+    Splash content will be here
+</div>