From 393474ed321b13379e9d6433736733921aa220c1 Mon Sep 17 00:00:00 2001 From: antonov737 Date: Thu, 19 Oct 2023 16:26:12 +0100 Subject: [PATCH 1/7] added date of birth --- gordonramsay/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gordonramsay/index.html b/gordonramsay/index.html index 0ea7226..3c145c3 100644 --- a/gordonramsay/index.html +++ b/gordonramsay/index.html @@ -171,7 +171,7 @@

Gordon Ramsay

-

Played Aussie football for St Kilda

+

Played Aussie football for St Kilda, born 22nd March 1929

Download examples From 5d9b11720db90bafafe353f8b473c63355432526 Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 10 Nov 2023 13:11:44 +0000 Subject: [PATCH 2/7] added hello world script --- examples/hello.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 examples/hello.js diff --git a/examples/hello.js b/examples/hello.js new file mode 100644 index 0000000..b8c57fe --- /dev/null +++ b/examples/hello.js @@ -0,0 +1 @@ +console.log("Hello World") \ No newline at end of file From 3d195ce2b55b9a96fe6cf96054907ecf4fa0399a Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 10 Nov 2023 13:36:30 +0000 Subject: [PATCH 3/7] slight edit --- .gitignore | 3 ++- examples/webserver.js | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 examples/webserver.js diff --git a/.gitignore b/.gitignore index 496ee2c..b74047e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.DS_Store \ No newline at end of file +.DS_Store +package-lock.json diff --git a/examples/webserver.js b/examples/webserver.js new file mode 100644 index 0000000..adaf720 --- /dev/null +++ b/examples/webserver.js @@ -0,0 +1,8 @@ +http = require("http") + +http.createServer(function (request, response) { + response.writeHead(200, ); + response.end('Hello World\n'); +}).listen(8080); + +console.log('Server running at http://127.0.0.1:8080/'); \ No newline at end of file From a96fa7729dc1f81244430ea6956c0e9f90cce971 Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 17 Nov 2023 13:22:37 +0000 Subject: [PATCH 4/7] message --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b74047e..d329af0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store package-lock.json +examples/node_modules/ \ No newline at end of file From 75d985f4e657db9b50a8b9dc25592ed68fbf6e31 Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 17 Nov 2023 13:23:16 +0000 Subject: [PATCH 5/7] message --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d329af0..8776b15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store package-lock.json -examples/node_modules/ \ No newline at end of file +examples/node_modules/ +gordonramsay/node_modules \ No newline at end of file From b25b0c8c2fbe02e069d97fbe8ef58f94771af239 Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 17 Nov 2023 13:23:20 +0000 Subject: [PATCH 6/7] changes --- examples/package.json | 14 ++++++++++++++ examples/server.js | 26 ++++++++++++++++++++++++++ gordonramsay/package.json | 14 ++++++++++++++ gordonramsay/server.js | 14 ++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 examples/package.json create mode 100644 examples/server.js create mode 100644 gordonramsay/package.json create mode 100644 gordonramsay/server.js diff --git a/examples/package.json b/examples/package.json new file mode 100644 index 0000000..35da9a7 --- /dev/null +++ b/examples/package.json @@ -0,0 +1,14 @@ +{ + "name": "examples", + "version": "0.1.0", + "description": "Starting off with express", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "anton.a.egorov@durham.ac.uk", + "license": "ISC", + "dependencies": { + "express": "^4.18.2" + } +} diff --git a/examples/server.js b/examples/server.js new file mode 100644 index 0000000..aa1ad3a --- /dev/null +++ b/examples/server.js @@ -0,0 +1,26 @@ +const express = require('express') +const app = express() + +app.get('/', function(req, resp){ + resp.send('Hello everybody'); +}) + +app.get('/bob/b', function(req, resp){ + resp.send('Hello builder'); +}) + +app.get('/random/:max', function(req, resp){ + max = parseInt(req.params.max) + rand = Math.floor(Math.random()*max) +1 + console.log('Max via url is ' + max + ' rand is ' + rand) + resp.send('' + rand) +}) + +app.get('/r', function(req, resp){ + max = parseInt(req.query.max) + rand = Math.floor(Math.random()*max) +1 + console.log('Max via query is ' + max + ' rand is ' + rand) + resp.send('' + rand) + }) + +app.listen(8090) \ No newline at end of file diff --git a/gordonramsay/package.json b/gordonramsay/package.json new file mode 100644 index 0000000..6ec1882 --- /dev/null +++ b/gordonramsay/package.json @@ -0,0 +1,14 @@ +{ + "name": "gordonramsay", + "version": "0.1.0", + "description": "Aussie sportsperson", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "", + "license": "ISC", + "dependencies": { + "express": "^4.18.2" + } +} diff --git a/gordonramsay/server.js b/gordonramsay/server.js new file mode 100644 index 0000000..e479214 --- /dev/null +++ b/gordonramsay/server.js @@ -0,0 +1,14 @@ +const express = require('express'); +const app = express(); + +let facts = [ + "He played for St. Kilda", + "Was born in 1929" +] + +app.get("/fact", function(request, response){ + let factNo = parseInt(request.query.n); + response.send(facts[factNo]); +}); + +app.listen(8090); \ No newline at end of file From f3126fa57827e415112ecc5058c431adaa4fda6c Mon Sep 17 00:00:00 2001 From: antonov737 Date: Fri, 17 Nov 2023 13:43:42 +0000 Subject: [PATCH 7/7] changes --- gordonramsay/package.json | 4 +++- gordonramsay/server.js | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gordonramsay/package.json b/gordonramsay/package.json index 6ec1882..2495044 100644 --- a/gordonramsay/package.json +++ b/gordonramsay/package.json @@ -4,11 +4,13 @@ "description": "Aussie sportsperson", "main": "server.js", "scripts": { + "start": "nodemon server.js", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", "license": "ISC", "dependencies": { - "express": "^4.18.2" + "express": "^4.18.2", + "nodemon": "^3.0.1" } } diff --git a/gordonramsay/server.js b/gordonramsay/server.js index e479214..df7f6f8 100644 --- a/gordonramsay/server.js +++ b/gordonramsay/server.js @@ -2,13 +2,23 @@ const express = require('express'); const app = express(); let facts = [ - "He played for St. Kilda", - "Was born in 1929" -] + {"text": "He played for St. Kilda", "tags": ["geography", "history"]}, + {"text": "Was born in 1929", "tags": ["history"]}, + {"text": "Is not famous for cookery", "tags": ["friday"]} +]; app.get("/fact", function(request, response){ let factNo = parseInt(request.query.n); - response.send(facts[factNo]); + response.send(facts[factNo].text); }); +app.get("/tags", function(request, response){ + let tags = []; + for(let fact of facts){ + tags = tags.concat(fact.tags) + } + let tagSet = new Set(tags); + response.send([...tagSet]) +}) + app.listen(8090); \ No newline at end of file