Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Wfer 5 update home screen #143

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -4,4 +4,10 @@
# Ignore coverage reports
/coverage

.idea
.idea

.DS_Store

newrelic_agent.log

agentlog.log
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM node:10-alpine
FROM node:12-alpine
ENV NODE_ENV "production"
ENV PORT 8079
EXPOSE 8079
ENV NEW_RELIC_NO_CONFIG_FILE=true
RUN addgroup mygroup && adduser -D -G mygroup myuser && mkdir -p /usr/src/app && chown -R myuser /usr/src/app

# Prepare app directory
2 changes: 2 additions & 0 deletions NEW_README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# this is the new readme file
- Add Some Content
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

Front-end app
---
Front-end application written in [Node.js](https://nodejs.org/en/) that puts together all of the microservices under [microservices-demo](https://github.com/microservices-demo/microservices-demo).
Front-end application written in [Node.js](https://nodejs.org/en/) that puts together all of the microservices under [microservices-demo](https://github.com/microservices-demo/microservices-demo)

# Build

@@ -96,3 +96,7 @@ make e2e
# Push

`GROUP=weaveworksdemos COMMIT=test ./scripts/push.sh`

this is new changes

some changes
8 changes: 7 additions & 1 deletion api/cart/index.js
Original file line number Diff line number Diff line change
@@ -109,15 +109,21 @@
// Update cart item
app.post("/cart/update", function (req, res, next) {
console.log("Attempting to update cart item: " + JSON.stringify(req.body));

if (req.body.id == null) {
next(new Error("Must pass id of item to update"), 400);
return;
}

if (req.body.quantity == null) {
next(new Error("Must pass quantity to update"), 400);
return;
}

if (parseInt(req.body.quantity) > 100) {
throw new Error("Qantity cannot be greater than 100");
}

var custId = helpers.getCustomerId(req, app.get("env"));

async.waterfall([
2 changes: 2 additions & 0 deletions helpers/index.js
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
'use strict';

var request = require("request");
var newrelic = require("newrelic");
var helpers = {};

/* Public: errorHandler is a middleware that handles your errors
@@ -17,6 +18,7 @@
message: err.message,
error: err
};
newrelic.noticeError(err);
res.
status(err.status || 500).
send(ret);
6,589 changes: 6,589 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -20,23 +20,24 @@
"dependencies": {
"async": "^1.5.2",
"body-parser": "^1.15.1",
"connect-redis": "^3.2.0",
"cookie-parser": "^1.4.3",
"express": "^4.13.4",
"express-session": "^1.13.0",
"finalhandler": "^0.4.1",
"request": "^2.72.0",
"serve-static": "^1.10.2",
"prom-client": "^6.3.0",
"morgan": "^1.7.0",
"connect-redis": "^3.2.0"
"newrelic": "^8.7.1",
"prom-client": "^6.3.0",
"request": "^2.72.0",
"serve-static": "^1.10.2"
},
"devDependencies": {
"chai": "^3.5.0",
"chai-http": "^3.0.0",
"sinon": "^1.17.5",
"istanbul": "^0.4.4",
"mocha": "^3.0.0",
"mocha-junit-reporter": "^1.12.1",
"istanbul": "^0.4.4",
"mongodb": "^2.2.5"
"mongodb": "^2.2.5",
"sinon": "^1.17.5"
}
}
6 changes: 6 additions & 0 deletions public/js/front.js

Large diffs are not rendered by default.

42 changes: 22 additions & 20 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
var request = require("request")
, express = require("express")
, morgan = require("morgan")
, path = require("path")
, bodyParser = require("body-parser")
, async = require("async")
require('newrelic');

var request = require("request")
, express = require("express")
, morgan = require("morgan")
, path = require("path")
, bodyParser = require("body-parser")
, async = require("async")
, cookieParser = require("cookie-parser")
, session = require("express-session")
, config = require("./config")
, helpers = require("./helpers")
, cart = require("./api/cart")
, catalogue = require("./api/catalogue")
, orders = require("./api/orders")
, user = require("./api/user")
, metrics = require("./api/metrics")
, app = express()
, session = require("express-session")
, config = require("./config")
, helpers = require("./helpers")
, cart = require("./api/cart")
, catalogue = require("./api/catalogue")
, orders = require("./api/orders")
, user = require("./api/user")
, metrics = require("./api/metrics")
, app = express()


app.use(helpers.rewriteSlash);
app.use(metrics);
app.use(express.static("public"));
if(process.env.SESSION_REDIS) {
console.log('Using the redis based session manager');
app.use(session(config.session_redis));
if (process.env.SESSION_REDIS) {
console.log('Using the redis based session manager');
app.use(session(config.session_redis));
}
else {
console.log('Using local session manager');
app.use(session(config.session));
console.log('Using local session manager');
app.use(session(config.session));
}

app.use(bodyParser.json());
3,715 changes: 2,416 additions & 1,299 deletions yarn.lock

Large diffs are not rendered by default.