From 3ce0ab37ae622f5b0b3d1997c8fe1a8d494b5737 Mon Sep 17 00:00:00 2001 From: Francisca Vargas Date: Sun, 15 Jul 2018 16:11:50 +0100 Subject: [PATCH 1/3] Testing server --- package-lock.json | 373 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 22 +++ public/index.html | 59 ++++---- server.js | 22 +++ 4 files changed, 450 insertions(+), 26 deletions(-) create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 server.js diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..3329f59 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,373 @@ +{ + "name": "express-workshop", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "accepts": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "requires": { + "mime-types": "2.1.18", + "negotiator": "0.6.1" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "body-parser": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "requires": { + "bytes": "3.0.0", + "content-type": "1.0.4", + "debug": "2.6.9", + "depd": "1.1.2", + "http-errors": "1.6.3", + "iconv-lite": "0.4.19", + "on-finished": "2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "1.6.16" + } + }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express": { + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", + "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "requires": { + "accepts": "1.3.5", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.1", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "2.0.3", + "qs": "6.5.1", + "range-parser": "1.2.0", + "safe-buffer": "5.1.1", + "send": "0.16.2", + "serve-static": "1.13.2", + "setprototypeof": "1.1.0", + "statuses": "1.4.0", + "type-is": "1.6.16", + "utils-merge": "1.0.1", + "vary": "1.1.2" + } + }, + "finalhandler": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "requires": { + "debug": "2.6.9", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.4.0", + "unpipe": "1.0.0" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "requires": { + "depd": "1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": "1.4.0" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ipaddr.js": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", + "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" + }, + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "requires": { + "mime-db": "1.33.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "proxy-addr": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", + "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", + "requires": { + "forwarded": "0.1.2", + "ipaddr.js": "1.6.0" + } + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==" + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + }, + "raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + }, + "dependencies": { + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=" + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": "1.4.0" + } + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" + } + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "send": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", + "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "requires": { + "debug": "2.6.9", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "fresh": "0.5.2", + "http-errors": "1.6.3", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" + } + }, + "serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "requires": { + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", + "send": "0.16.2" + } + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + }, + "statuses": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + }, + "type-is": { + "version": "1.6.16", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", + "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "2.1.18" + } + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..eb9be66 --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "express-workshop", + "version": "1.0.0", + "description": "This is the exercise that accompanies the first Node class. Based on the Node Girls Workshop https://github.com/node-girls/express-workshop", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/franciscavargas/express-workshop.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/franciscavargas/express-workshop/issues" + }, + "homepage": "https://github.com/franciscavargas/express-workshop#readme", + "dependencies": { + "express": "^4.16.3" + } +} diff --git a/public/index.html b/public/index.html index 859031c..04b373f 100644 --- a/public/index.html +++ b/public/index.html @@ -1,31 +1,38 @@ - - - - My first Node.js blog! - - - - -
- -

Node Girls

-
-
-
- -
-
-
-
+ + + + My first Node.js blog! + + + -

Recent Posts

+ +
+ +

Node Girls

+
+
+
+

Create a blog post

+
+ + +
+
-
-
- - - - +
+
+
+ +

Recent Posts

+ +
+
+ + + + + \ No newline at end of file diff --git a/server.js b/server.js new file mode 100644 index 0000000..71da796 --- /dev/null +++ b/server.js @@ -0,0 +1,22 @@ +const express = require("express"); +const app = express(); + +app.use(express.static("public")); + +app.get("/student", function(req, res) { + console.log("New request to Student page at " + Date()); + res.writeHead(200, { "Content-Type": "text/html" }); + res.write("

This is student Page.

"); + res.end(); +}); + +app.get("*", function(req, res) { + console.log("404 at " + Date()); + res.writeHead(404, { "Content-Type": "text/html" }); + res.write("NOT FOUND!!!"); + res.end(); +}); + +app.listen(5000, function() { + console.log("Server is listening on port 5000. Ready to accept requests!"); +}); From 74d8213d1137f84aacaef5b62825ea2010888d5b Mon Sep 17 00:00:00 2001 From: Francisca Vargas Date: Mon, 16 Jul 2018 23:06:36 +0100 Subject: [PATCH 2/3] Finished point 8 --- data/posts.json | 4 +- package-lock.json | 13 + package.json | 3 +- public/README.md | 1 + public/css/style-subscribe.css | 37 +++ public/css/style.css | 290 ++++++++++++++++++++++ public/img/logo1.png | Bin 27783 -> 0 bytes public/img/logo2.png | Bin 6562 -> 0 bytes public/index.html | 440 ++++++++++++++++++++++++++++++--- public/main.css | 147 ----------- public/script.js | 78 ------ public/subscribe.html | 45 ++++ server.js | 24 +- 13 files changed, 818 insertions(+), 264 deletions(-) create mode 100755 public/README.md create mode 100644 public/css/style-subscribe.css create mode 100755 public/css/style.css delete mode 100644 public/img/logo1.png delete mode 100644 public/img/logo2.png mode change 100644 => 100755 public/index.html delete mode 100644 public/main.css delete mode 100644 public/script.js create mode 100644 public/subscribe.html diff --git a/data/posts.json b/data/posts.json index b4d8361..19483be 100644 --- a/data/posts.json +++ b/data/posts.json @@ -1,3 +1 @@ -{ - "1467390356291": "This is my very first blog post!" -} +{"1467390356291":"maria@gmail.com","1531778580603":"d","1531778622826":"d"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3329f59..0cec464 100644 --- a/package-lock.json +++ b/package-lock.json @@ -135,6 +135,14 @@ "vary": "1.1.2" } }, + "express-formidable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/express-formidable/-/express-formidable-1.0.0.tgz", + "integrity": "sha1-3JIvBFUTIyJFip7BowHYkbP/yo0=", + "requires": { + "formidable": "1.2.1" + } + }, "finalhandler": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", @@ -149,6 +157,11 @@ "unpipe": "1.0.0" } }, + "formidable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==" + }, "forwarded": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", diff --git a/package.json b/package.json index eb9be66..7b078a0 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "homepage": "https://github.com/franciscavargas/express-workshop#readme", "dependencies": { - "express": "^4.16.3" + "express": "^4.16.3", + "express-formidable": "^1.0.0" } } diff --git a/public/README.md b/public/README.md new file mode 100755 index 0000000..9400959 --- /dev/null +++ b/public/README.md @@ -0,0 +1 @@ +# tribute-page \ No newline at end of file diff --git a/public/css/style-subscribe.css b/public/css/style-subscribe.css new file mode 100644 index 0000000..a4b05b6 --- /dev/null +++ b/public/css/style-subscribe.css @@ -0,0 +1,37 @@ +/* Style the form element with a border around it */ +form { + border: 4px solid #f1f1f1; +} + +/* Add some padding and a grey background color to containers */ +.container { + padding: 20px; + background-color: #f1f1f1; +} + +/* Style the input elements and the submit button */ +input[type="text"], +input[type="submit"] { + width: 100%; + padding: 12px; + margin: 8px 0; + display: inline-block; + border: 1px solid #ccc; + box-sizing: border-box; +} + +/* Add margins to the checkbox */ +input[type="checkbox"] { + margin-top: 16px; +} + +/* Style the submit button */ +input[type="submit"] { + background-color: #4caf50; + color: white; + border: none; +} + +input[type="submit"]:hover { + opacity: 0.8; +} diff --git a/public/css/style.css b/public/css/style.css new file mode 100755 index 0000000..b19cc93 --- /dev/null +++ b/public/css/style.css @@ -0,0 +1,290 @@ +/* LEGACY BROWSERS */ +section, article, aside, footer, header, nav { + display: block; +} + +@import url('https://fonts.googleapis.com/css?family=Playfair+Display:400,700|Roboto:400,400i,700'); + +body { + background-color: rgb(255, 255, 255); + font-family: 'Roboto' , sans-serif; + line-height: 1.5rem; + margin: 0; +} + +section { + align-items: baseline; + display: flex; + flex-direction: row; + justify-content: center; + overflow-x: hidden; + padding: 6rem; +} + +article { + width: 100%; +} + +aside { + background-color: rgb(255, 255, 255); + border-radius: 4px; + box-shadow: 1px 10px 50px 10px rgba(0,0,0,0.075); + font-size: 0.8rem; + margin-left: 100px; + padding: 1rem 2rem; + width: 40%; +} + +nav , footer { + align-items: center; + background-color: rgba(47,47,47,0.98); + display: flex; + justify-content: center; + min-height: 50px; + width: 100%; +} + +footer { + color: rgb(153, 153, 153); +} + +nav { + box-shadow: 0 1px 3px rgba(0,0,0,0.2); + position: fixed; + top: 0; +} + +figure { + margin: 0; +} + +h1, h3, h4, h5, h6 { + font-family: 'Playfair Display', serif; + font-weight: 300; + line-height: 1.2; +} + +h1 , h2 { + color: rgb(255, 255, 255); + margin-right: 4%; + text-align: right; + text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.4); +} + +h1 { + font-size: 4rem; +} + +h2 { + font-size: 1.5rem; + letter-spacing: 2px; + line-height: 1.2; +} + +h3 { + font-size: 3rem; +} + +h4 { + font-size: 1.5rem; +} + +h6 { + font-size: 0.8rem; + letter-spacing: 1px; + text-transform: uppercase; +} + +/* Navbar */ + +nav > a , nav > p { + background-color: transparent; + text-decoration: none; +} + +nav > a { + color: rgb(153, 153, 153); + padding: 10px 20px; +} + +nav > a:hover { + color: rgba(255, 255, 255, 0.8); +} + +nav > p { + color: rgba(255, 255, 255, 0.8); + letter-spacing: 2px; + padding: 0 20px; +} + +.hero { + background-size: cover; + height: calc(100vh - 56px); + width: 100%; +} + +/*Section - Hero Cover */ + +.hero.cover { + background-image: url('https://cdn5.kicksonfire.com/wp-content/uploads/2017/02/Serena-Williams.jpg?x76107'); + background-position: top center; + background-size: cover; + display: flex; + flex-direction: column; + justify-content: center; + margin-top: 56px; +} + +/*Section - Intro */ + +section.intro , section.playing , section.off-court{ + background-color: #eee; +} + +section > article.intro { + width: 70%; +} + +/* Section - Facts */ + +section.facts li { + margin-bottom: 1.2rem; +} + +section.facts span { + font-weight: bold; +} + +/* Section - Visuals */ +figure.visuals { + margin: 0; + max-height: calc(100vh - 56); + overflow-y: hidden; +} + +figure.visuals img { + height: auto; + vertical-align: bottom; + width: 100%; +} + +/* Section - Career */ +.career h3 { + text-align: center; +} + +section.career table { + box-shadow: -8px 10px 36px 5px rgba(59,70,78,0.15); + margin: 0 auto; + width: 80%; +} + +section.career table { + box-shadow: -8px 10px 36px 5px rgba(59,70,78,0.15); + margin: 0 auto; + padding: 2rem; + width: 70%; +} + +.career table thead { + margin-bottom: 0.5rem; + text-align: center; +} + +.career th, td { + padding: 0.5rem; +} + +.total-slam { + background-color: rgb(102, 103, 126); + color: rgb(255, 255, 255); +} + +.career table thead , .total-category { + background-color: rgb(56, 59, 83); + color: rgb(255, 255, 255); +} + +/* Emoji */ + +figure.emoji { + animation: emoji 1.5s ease infinite; + bottom: 10px; + position: fixed; + right: 10px; +} + +figure.emoji:hover { + animation-play-state: paused; + opacity: 0.5; +} + +@keyframes emoji { + 30% { transform: scale(1.1); } + 40%, 60% { transform: rotate(-20deg) scale(1.1); } + 50% { transform: rotate(20deg) scale(1.1); } + 70% { transform: rotate(0deg) scale(1.1); } + 100% { transform: scale(1); } +} + +figure.emoji img { + max-width: 90px; +} + +/* Source */ + +div.source { + padding: 6rem; + text-align: center; +} + +/* MEDIA QUERIES */ +@media screen and (min-width: 1600px) { + section.career table { + max-width: 50%; + } +} + +@media screen and (max-width: 768px) and (orientation: portrait), (max-width: 768px){ + nav { + flex-wrap: wrap; + justify-content: space-around; + text-align: center; + } + + section.intro { + flex-wrap: wrap; + justify-content: space-around; + } + + aside { + width: 100%; + margin-left: 0; + margin-top: 2rem; + } + + section.career { + padding: 3rem; + } + + section.career table { + padding: 0; + max-width: 70%; + width: inherit; + font-size: 0.8rem; + } +} + +@media screen and (max-width: 480px) { + section { + padding: 3rem; + } + + section.career { + padding: 1rem; + } + + section.career table { + font-size: 0.6rem; + } +} diff --git a/public/img/logo1.png b/public/img/logo1.png deleted file mode 100644 index 341a80265b49beacf24b44e1010a2844aaa1051b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27783 zcmd?R^;?wh^FF+QgdpsSgyb%Yij+Zj3J8iIEU}ab(%rFi3M!~?K&2a&j-^9NP=uwH z*d?W70qN#@gRjr={1Feo$g%EyUDwQYwmJWXBRfaJ^_U%!DpwKuhV^YV?UxwrGrHcmi7O*X9qwwf9P;S`?%8pXy}tX&ef!5B)HHW%|^4kU8=F zQ^K8mk@srcjG{dpMR|fFIdURdv4ZZ2>u=pY){m2Y$aCAU$+or9P6DH%L%Px$QE#c= zBmaK=#mwMdMU`D8B$7HMFg4TGADbkD5!gQQZVqhGpgosnjcUdqo2RBQV!-kLfBGZq zPhWEd6blu=FsSY_su?ucj5VK~*?cV^1Hl48Aly}!+1<3VYLCJ04*n^ujZ`e}YKjK& z<^S=zu@+9SBWY~w-1c!2uM5hT|F`uiqx6$~& zh@1JF6Ce;o76ik$%vwnyIfH_`9tBf?0zt%}F-rE^yVH-7`(Av6U2Y(&)Y|DLg?z_( zq6N1d{)@9OW>C~Q>?HzGz(BFZ)0(J>WT(^Azf16J4~f=N@ykV)DcC!FHo3A-)b5Xj zbkR=1FHic3QSy`YVt>)04f-sp(9oF5-`;NBn1~_yu4_~Fm)|2}lvG96>oX=H zQpo8$krWpv1^Iz5mK6OmsHWlZI|2kEx&nguZfZowp$&o#A(zj+rhp2);$nPkOnH0XcX< zG9x{{(CoiWN}UhB6q3i>(!EXl-zR;yy#BY+lG%=peA4j!j*rJSWvh$ z8VMzPHg4i7u==F7p$7HW#eZr#x-JRGruoNa4l(whxRH;%@;X%SeR<(31bMs>%vNF5 zO?)ASB7=0!>P(0jxbn}Uf(?gx_`l7T?s)x=)s@}Kq=OV2`{bXZ(>_mYy8ZS}^PTsB z=>Pe*lQ0##O)DD)KT`gad+WO7mu*?v-?h^)g?~cA+JFTgEe6f$6-C5~{X2>|&*kw{ zileA-<-h)6M#U4rMjF=UQ$Y|N*MACv#kI68NanB-bX1`Kt@h;NcyIt5B=>VR)9rm1 z0lQte#c#kZ$YW@ANtnvD!MEN3`vBVEyzNED=E~mH)Zqikce;N8w^vRxWo!zVI1fLpL@+e2}=Va|=iKHXs-9pw$Dfhl@lz#Q@^}J5?nOp!5N6 z_CZ5x*yHV8*vpxh7f$mXaqy)$0`P^vrT@+aVBo^le|v*YHJn=<^rQc+=uLI$>dr!e zO*|LA4rrd}itKO*xhuP@%kPm83VZ#F^F3yg2F~)S^Pi*t`;tzu@=sFy$_H1WScZ{F ziuDMGo}L6lXTZ&X1E>Jr`Ol~W7Jt>?o||tC&wlY-m;z8p7B2w6U$~+`?eLh7{lPp^ z-&VUHZhQd~#X>}!uY&AorSIB$GG2wM6l4#!*q@NpHq)J1)=Jltf=Hf_UXd-B)^z#p z4V&lg?(GRct^9yGdD}PRHV1|rA}sfGyZ;FmLc{)~Gl~51tN9KX(&_-Y)lI6)I{U3s zqnP{>Ux1X&7gBaz3!@1GhsE~$Ci||%9Kfr?YH@^{fK`sdm>_|hkM!#$UL45kAh$(A zHaUFR?;_V<2_{#<8MdN4YFX#yl-1D_{E=Lq22H z$yZ&|>DWBsceM4!w9P*m24$S z4ozcz`;8mBGqVrQ&Nhs!Gp1EzT>OszAsx2ZqL7 z>ylG4bW*jP>Xpu71x%K^4ORml#0|4ob-a#E=801+EjKc9S5s3{$*Qoxazfe)gMhQJ4TwDpK$5#vK|*WVA|{;ft#>(4YYc@XER7Pt&Z2` zhLrTYi-|e@Ugo)Bd|poaflmR!7t0lyB;`BI$ImZJ{7X4JVgfqlo)B=@3qAP`PJQ8D zTWXDGcr9Y`f69w3+I%$oWxMOgzRNjougqGeTHbVaygHfZL80GsN+vBWt@Y`a5PR|u z)FC}9D14)DH5i8byK;DReEhjUcS703`_7G#hqs5~-N*kqvN@2xY&`D)0r~57=|%(m z51ZprLGgVzJ}*hM&R>n}wqRv#I%(~z{U3BO8{^AL4wN6tkHQj+x7rq!u$;+(y{ui| z;s50a01C_h=l|u4t>;Z`e%n(z%+ZU2=-2rZszkrSf5GQPo&U7gjeX!^l}3*CU@#&c z4Fi3(OXFY`Y28uH=y)#VlDG?l%B}yg0X`!ydX-JZWAkSIgy5p{$IXvM*(SJkC8c18 zI;SU`%R9BwhdgozeTy;@607{i4L7|Hz9c4Y&nPtcj~Kn*BAu+6M#;nf6^V9T4KgW}{D3-dqPNRdw zsPl^6AAK4ABd4U*1n8ZOZEWzF%x}2S;r+$Qvxu~b70lThW;_HeeeD- z4Y=gkv&Y}C(SO2kK_J!oT9wS+s9CWFSB*>UTFE?B!2G!1IW?dD)ik!_yJ|PW&I|WO z@4Jcxo@9_xsTgl+Ouy>AZCQNUW4zyCLN#n|BQWqmU3^=r^7Si| z=gv~Uo^Pa3l~oLVtkPl{kHH13@m2G^GvL|!t1pR zXB5&~T0=Yh+rN3rJqfk<4Ps3L78FK4t9$i5X*1}@hv!q?r|vRV1W#XPX6A#6 z{hk?xxERs42n%UC25r)#VX6JfYtSk0S!$^Cj<+3ybUR9DX2y+d@J8pkiJr_X#YGUk z){?1RpX}LENFH&umF3h@PVJ)wi%yA2Ge@Z8;a}90w@u$n8=~V6Wb*Hdf#+1CLuY|I zQ5M5M)`Y7PZzxyk=x~b)s|j`S=~N!fCAOQ$oRLpYHXuZ~%p=#{{ct`izDW$-W^}L` z6|iugZVh{Yx*%<|RNKIQraFBg<0b7YM6|_ly$l@3-(AY%X8}Y(H`Bt1^U%Ze(Y8(kr3iMfA z64^{cYCAUB;z@|?JCDxti8Ovm#tp;B$!3R)pl#7MWeEvmA#zBwIAQC1+w!vYc@-rT zgM6=3NcW|f{JO<_;JY+Zs>lakR_<9IJXK#5En|{TTQUxg_a|39gKVl!W}zi`4z(i1 zS+L^%U-ZM&VDV914mG&b#x}Ue7?2elD}5;SYb~Zv1&g zO8)~XoRN?sJ%~EB)97@`yt81T1kR^Nc?A`?bD~ySdNz_4+_|=9_oAgcxGP^P_oUIn z;9YBPN(7a3tfFR7a5VzV0TfJt;By@R)i<(PF-3d}vJQGdM$PL5946ibp>s<<2YPw& z2@4%Ks7KoBda)@%G_<0)p4dzpei>8KY&B>R*GR8&-F zlS{{$Rbr@H{nC|&PTzb0dvdbWzap9-jd@MTQMiJENJGeNGi}f;Iy}td!~FU-Z(hDC zV@nZyHu-ZVtZExx-8NxBmQCZ?V3R|H4Dh=p`ql`0H8V=tu-(W6k;kSNt zW+m~)FF@OQ#eLyQ%F$f!(3zvOerm^s3p~Cqxh4tT^?&B_1Y!VU0#goI;;+G!TtcrAMWHd3&H;c?jY zM3Me|6*-GbaU6F;?x z+gBn|k!#0I4t>imy*a}1SuE3W{Vnc%W^q-(7ohU886ll2e!U8Cu)nkED~@)CiHR-p z6D&iWM^0qb0o*{R*=o483XlDu3!cE8?!73uUim7Y*6fe8dD&-JhS+uZlbv!zS;~o* z<+j8q9gy>huBadnzT{6>g9iXUNmj*Ggb8xPhhv|)atQC(;|V{WS1?pf>w;`N>nCdR zXwBLdQU2{hs{?#!3u|A~g778Ztax6x(cjsQI&E7xC~?-R zl|rQsnk(i`hUp6Ua}@Dw$AWFq0a>}9@?C$RI$y57jX2xTr4VaDQUDPCLjx6G&?o2s zZ+pfPkn(|Ilf;jtL6&YxKAAIoOmSjWkXYcmFjd z3RtSD6@ZLNqmj%Fw{HK%_ad*4Z;F4FYNUoK7xQwQ4$JM~X2 zm7K)@6uxRvaAgypbWgu@-9_H>`+&UE9x zb5dc!H)ynMI^@rrNzwSHmq?yo$##ZId09|?9n1@E9}U05taNVZhd1P#t{1yu?k(np z@ONyt4B#D!=0vMP>@NivSap^I5VT=UP)DLb$thjeYs{VzQ0O)~;-~MSw*ZwnJXuYl(@e z-Zu=PPF>xNe#AB{YITHL^I7_?%Gvt%XyYyrGtC8&&s^@r-up(SN_6lDWI}*s?CCbB1+-cOHr~( zg74UAIF11x?_$ZzLc6gr{at6r9r49FHzOT`LHxiKeaVW$bz8OF3cZN&O`DI@4rJG< zi|Rsdv;=PhNq-;#eE4x@=Eorn#k)4yh-Z`Vuxo?8rg}{p%O&6C*mz`9`YkcZ&X&Az zb1@Ek7*mSorm)uwy`VLUOwx3cIkmL1_CW#DD3eHA=kquo-6ID1loGxL_;pQpQwxh9 zgz?(JDH=BMIg+;?-Q^w41Z}KsoDzrHhJr~+GN>u8!V*(VC9iL3Z_V>yv*P14g$YtzEpUJm3feVMQK6cRRqm^-?kd>pD~3 zxsFA8O4!(qDc_Ac7;TQmYy7l_KtV>|-?M1Ok+7J;4GSz!!5&vA?4#03b2rd1igg1T z>lUmL*N8>*8g-m~&vvta$R07SxYCAD+(Jbmvzm4tcqmm2;MVa0CuURXd!HXPje7a@ zI3|g?<~aZH?Br?scp~X&TESmwdPm~ka6m3mZS{M#z$+2pQzfZiaUfy6R~vfn*)bB; z2idPQ46uQ|E?p7>K1nD=Z=jwy zn>MpQs_Og5{RNV%is)DAAajl`TnU{DouII7=gYo6-nJkTa%4T64jWxmMb%3yv5{4- z?Y`bmEOYZ`&etD)hGcV0e0nNbUoEM!aYk=>i0lZ{H%Ot1oRSictWaJ{g6@QrY#lz* z8}{?{{Ic(3>ObFmQ3uqT2ge@OxQTbk?J2pSPq`iy*SN3&okYOtOsyJ;>#lL2LXk(x zGO9z1xqA<(i_VP(H|xT&Xy14mQEe(sy29OG9)Esmf%F@HW8_seX2^m3Pm6-e?sJ%9 z+FH6VSf-3;|1yoXv*WU@JwmwQtk1ssuz7?iqU!y|__!hGjNHuK2k=;>CB)1k>`oMV z%H57YMobY4(=sGZlK}f?OtT*%Tc{_PL*JTsE#HAER<;c(&BzCo7*+20FkjnXL|gf- zuGjnB^gh|c`}xKbw|%^=jD(0G51e#~T6;T6Uy*Fq)2J}q#l~{&CYSKL+zFgqlC5){ zDxOFwo^%pTW;nasKoWOm41X&(a1zz}DSWssNM7Q#y9-0t`b51SsiI>+5z_T9Rij4f zx$+^AN=)))X-BdZPD$}8{F5Mr2rjD{BQA3KKG?Ab=YEcB9&^y1DRP+?S+6mhPOZjO z2v)L78)PN!@!CEez~j;*Wr;OO<@o;!UZs7rFcyr0J}JHe0ryahrfqd;^v9*5>atzq z6t!g#n!aDSZ=v4l=?#2Gdvw2qx6@49<^*|!G4!vl2=4wqm(L~sq!jn{6q{^F2Bf@} zFmMs4RWtFCVv)Xyq{i+89%QIN1ubJzvB`b}>&o|zP2Ol+Ih|swEA(tvSJ$tj9d*a1 z&Bj0Z8EH3eq}K1)gIGnJu<%NLjvBxbEw1EYX;=--HjfP2Lt?+umFI!Q@#^rqNGml% zJcCHSFiuJ>j>dkb;A_m`;URhi%A_wMkkPWoTOnNW=cWwizF^B8*~v{nNHajlyHC^% zukM5(KJrWE8ek)0-Y?lv6L_<~Miqt?*Mg@+(~6Vx{JGse9gX(Inw&VAXKp?=^p$Z= z?J8D{O79xvKl-!~pE$9&%T`*%&Ia)oz$tc4L>JDu#^=HDfImGhl|DklD^ z;z}&HE|K$tI(qSV^{JcUf|YCJ2@yOFyNC|QbJPeHZ|<&{TjDtH7@k}&xt=N)GdnF! zdXtnH&O7u6t^Z|N{F!m{deafkc0Ip9mxZ7&d@p0e>>yAfxoYyK1Hw9e1_}43`+{Bu zy|nb@3oUeE0}P z6&*$o-?Qca`A+*)yqB?Uaj038GDyx^@naSRYzem8Dg{~qyf z=UPQd%Sc7HPrMkP-TISs-iCq%0xf;V?sB+%WNTy!x*E3SyW#!9u1H_Fbdpukjhe32 zP3mR6OHrzK#&kL;SetuU z(O0oyn!%3?bjE~^ER+fJYDL=y%1@q2)Jtvv)G>C4Qv$Erz`R-Lj z#lYmJH}rKG&I>Tf`o+A9=He~f2Kbu$v$bhOt;g(Fu} zd|!X1zK(w5w=|zH0aQb)XT~GX7sIkRB1i9Dtu%QAzL8#N86#zEkUbO(YgTSfI7d#0THs8B2EEPZVOMdtyz=%-ZeOU(bb0v#o5 zvdTW!C_inZ@xbhpJ)JFLe`L9d{>1!@_R$URXH6A}{ z39;E@v73QD0ulx}Q>KbRvj=}?r6Z3qX1t?u)c@J0?~YWPi9c$kSBmXKKiUp$aHr_> ziQoQ8a{^cOJUY2h`>&n|{%`l4eI97C3;67$#Za2R6?0(AKUcru=UB+0h=rid{T6pe zs*y%v*GbLo9Se`SLeiUz{RraEjpIaE`WOjb*_&#s^h8&HqUj36&3fKZXn}87w6+85P|heHJ30u0 zly>6Bj~~o4<^s5tG5L6|Y3_F)CRsv1)L4GFv@t9YHdx$fxFcZ*bYNd`Bvhgz7=n)s zg}+HHTQIbHRJ<(s3ilmSs;~^`_giosEEbfWQD73bh>(v$!NhAG7SFgrkwC(Wix}V2h<}J2dGZZ@ClJ~ zdx+#Gz1=>2I_5pNki08bQD_0ofDrj6f-8JcqOuP;*UVFEa)^Cez36vC@}YR2WKwZ$ ztf)dHSKtLx+9Fx;`OO^~%EL^_AzYHaX>+gM@i5?(pQniLZ|7owA6@PT5cf&`y2JCC zsQS$S(&!4#ULUKOyjSVR+lv^-y1|b$cZVvbS>SRAQgDFFuI1f{P@K2Y-d5VuOD|DB z;Ck-h^WZG2dcs0{VNX?f6^9EcRxN>F=xqFVuX9<2)REthYnQMF>Z9S6Df)@eFAR66 zoJnc;#bQXHZ#z&@i>(C@2+-0b_H^V?IAQGTsY9sv5+ z*qVsJ`AjrqVEhx-Hgb3*jR``-$QcOI_qdS&l5I{pPK}rtzZblj9u>^6rx_NbgW>jM z`=q1GvP~+!Xv%{?uB`Ttys6i_@AMnEn_V>6DL*h(l~ zTGtXf6-UHat=zvIK4{qaRKGK9Q08w4N1S}+R8V+tAI#U_(T%Is7NbffB?0NnQ8Ca4 zF%+&1?3GhOhh6A9(}QQk0^cKYsvM^#hb1GHzS`}s+45(9#$ctx`#Uua)L*JQVyH+} z(B@<5VN-R-4*RYf{+@-<3hxA7DTf`sjjB7{>><}O7b*Glx~REfpx2omS@&d&jYfdQ z-!AMmp+~i--Vxr>SxC^^V^MD`C6@f$k7{wNJWfkry~5a9mCvoe;Dd7z<=R)vUO^ZM zP1zp2_T+XknVacvlgqgyh51VlIW8~#?+PBLCGt^Z+STH?LPvFK5hr7E?lS?51jR}w z>Qpt6iu=M3GC&pm#VSi+QkgIaRoG0>Us0(hzj|N)MRgPJvR_HukCO)$i~0&T&wh_^ zK`#0;-^1-D+rrC)&LJJ^vIKq{Z)hGREjz{V{h{))Sf`pJQvtT*a2S>N1h4q@MkkhJ z`7TCdKcT&teEY!j^+{hASB`JbS1kD3*}K2pe+^>;!V3sdnw)BPfN05_iUYyKVl-GozuL%!@ zvx;SSIF}}AqVTE`Bx@cYLbMAc3qNxrUFsHuj+}KO^LEv+j8yc(B}4pDDLXYd_h#1^ zWQqx%=?6so(!U5V>*J1w>_;W9O2~x0cs#P0^(!9HxuIRcQv&qbfuta+d4=!Crp|$6%IrZeJr*bHt7Gl~ay?};+gfn2a^{>a) zT`mTjVp$MZmXTomGPmShqTuktK#65-8}u{i(+9{_8G=GHT3g0S)QJ2xZdMcfMQ3r? zZb$666YJtc0@lY^zqV3YSM_tscQ%hd{Y4%i|R4C0U6$gsjieF)y>6DTqWB9=Y zr({AoQ_r0+&yI`Xq`===OJ9yR0RrHwRWG#`k`*`N6!> zg@RFXh*xTGD26N;*bf$LTklll@|6@3U%iMZU#X#0J;e-m1iPn+bStR=%agt$*EqtA z>TezEA!Kc;`FxpvGE9C{g+FfAf~P7(F37ju%XQqV>0d0UaF`n()Rw!LUNQe)iZ%9k zL>QQFl&rDGAvgLNY0k(wwt1@_B2;ZQv9m1${n=S&S!Ug+YC=&qfv;4+cCJ`@>_k_E zIM8q;_JH;26<<(3q`DXvf_8es`MQ4vBp>!p2cyB` zwj{pHWMf~3+Ppq#fAuFLJH?dU>cS{{!bk}@$=}@yd13L=he*+xl2q=4ZMj&VB$D9q z(I0m}rSJo<&9;tbVc;@jp9wl8I)?a!gi}A!S9T2QJJOY+L+YyHkED<*wZ>KZZ+A*d z^B`Nx-3g~vwWs5)`p_3~5U9LOj2hYuP04Xo;oyTb_Ud&O7r(GLFb3;=8;Q)AKAR3m z!t9LL^6}M$z2MhkwtS7l5|aWnrqC;=Lw&K1A5{?)U%!0GBagM= z3+(FyUFf)jAwYxzTEFhO{xK%r(AnIPza%91r;eQ2?J7NUGR|b}zgi&dyO`kb+Z`FH zn49Jl{YsQGJ`YX-dKNUEHSeC8?s+Jb5Zt4f*8$8-7*BR;nlJiZ2`~tdp*9 zZFT!iq=>M}{|FC9-W)L0^oln2bMQ&B_7s=DnB)o^;+8=V`=9~#;IK37%&(fjjM2Cu z`|>IMLpE(I{Ps#(Yf}IX8nU%}WExh~do`W%5*k?T)4r?Sw=-KbRwt8{Yq_MRVXZq_ zVJ%gQr_s&l$4!nHo}R_fQMrV(sg(*Po(H8LVHcaxm9Ho-_Xo2y+qS;HMh`p|3TBag z(f#(X)$=KtWRBb7B1+YAp%A#dV%y)&4{TKaI;->$^z+NPFO(I}3%HEnvD|K^C$n)? zhb;o^(9TSFCnO*+YobH1h>i941uE6kG0qIk6Bbsz8Z4&RLhe$@LTid|!oVnKV})fN z8qQrVXCR0d<6u@bIr|%Pd?vQ^sy)J?zNfjcLRH(k0wPa;IUQxQG^PcYHOG)sY0KQA zfHF(!&WC9A)n98@Q+vxgsml{jc(+@oYrK5itCyj}Yk#$HHPah{cYZF@c^QT%8Kk4k z(4Z|7*0iI3lHEmvf)7>B*{3K08y;Mvujg!hB_v}bmpU8lVp%9d(-SgkL0*vHeR7d2 zRoarU1IL8L$y0~@ z146Zkd}6aP&sr$y1+GYks!SVa!DrEpwNkqcjC+NRaA{!l=2X^~?s4k~#)8>L?5(uJ zOmbP%7S5JrjA_-?b9|n6T$Rzi1_;evWoq*hHFgkVJ-c`4T|7c%|oCMlgWqJmo^$WRx# z_S|7(a!z-)QXrlk>@$u820q58CVWf4WT#snXH54EN}5(oEEst&;^$jNhi0ES#(SXR2*=SoKf=0+fDknFWh4AdmS^r#mbY1;vZd5|k zT|X&GjkRN(4g;C!FIhaimA$JG)lwDkRHh3JSk1FCYAZ z6XNb}>25xW9xL$Ya>{$J>dI2*m@?K!>}6vUwU;m5x2ub7Ya$2kx7QShxxS;~p2?}f zW6L}nyB!l)MC?hgT`1|NN!mzTgd-mguDUytVL1ZFj@ki1+ztCXe7$1px9>pn195yC zS&w@U)&&jEemc|F6jOD_5n+|`#@l;L*GGD1tJ|MlQSQnG#3^9ia>sCHn(m4~4oari z5?W&%c12cIZ?^j0v9Pdg6Dd0SE)U!}zvk{WJx(0O=Rw%D{<)HZn{Z3!qp&e8Mkz~R z?~=wGLLjn?I?u&`I z*|xkNXSzaD@0ddfTa)8lESxRYF`Nim4ld8CZKy?i)_VPYZKIINj>j>n`OkikIQcp6d?glWA!l!%XG`83 zw4M45OyplQnq)ygv$6+!`TXEVqdW}qjx^E&>EDEP zB0}7t4%aJ;&;z)~Lz;m`h^-OXsX?bW6^<7%xm*^Ot#F7Rcu+FN%+zLXA@Md;^}My9 zL|9$^|J#WdPCgWlEeT6zSQS6S1uI);^jYOc-C0ATRy+^C9fvT9?2h*9HS-%pvV^fw z8+s1<{Eu#Cuc9dYY*z?HIb_?BNl&UnNXw2%*C`ZqOeoahHBv|h)6Q$uT}-WvVut4u z4$g`;YkV-r#dqRPu0&C2I8;nvn3e()z&-Glu4JFMZx&p8|A@b{|`fZ!eN%a}F zg*p%U21Fzn@38W&9Xnd4>})^k?`bvSL(V`xg>Tz_TgI)rjy#K85capR%3Dm|aRQZ5 zvtA}jP3~QO7Cy=28PslW%zlYb`$h_!3N~M1Inm!1QrlY;9Ldm+n6tf(v!yr9H1!H7 za$|ntob(lwQj$#qTEF^?^NnAQ1!V-x~tOlCkzs z&P7&bV-If*Y*0p4VF?LF`{Yz**@JM;8JT3}gJ7*_OSoL6-tex5+DG}PB9%^9yzTYk z1bS&Y(Mp(%_g0q7$P*I0k3N+foU+_0qaH55;~s^;5A_Z;WVjN; zN8miQpOQWlj(bTb{-q{WN#48GGG$RS$F8ZuSjWHY8 zN#S=4|I&~d$&$CIpd+SDj^2DddV3v*FL-;9R0#~OXi-`5NfWZ{q!OF2!$q|Teb1>J z8o^Q_#i|huv)+;*O}T^2;hz6vDvRc zM)=%4zZQ4P0GY`YFd5b3uwt2$+1a;-vIatmi$+#N6AfB%#8D`Alz$|{ILc#grnJq2 zVN(ZQzM8(89TkbLaWCHq(-5R2HerOk>c>r+50APwCXIg*FUa z5d0hI(OcB;t*|2xu22a=TmEgsLZm*I$P^I2Rv0}U|0TlLO3zUcIofMRd5h9RnCG*i zO=bmXH$A~*-O6BMUV}=fIiLxY#%T97ND*L(2V+E`h%}?+jET(Eb8|}4V|MV|s{ht3 z9NM65UmBl~Ri;mtXjXbirioUhTI0odC_WEr^Pr%jf~JgODxOuHj1`96#?PqT%a)n? zv6!=0uy4{(!_Y1o`jARA5>hKidZp{FWKTe$ft&wbz5iJ|PZ4^xoGWZDdhxQigq@xr zEWP8VtaA`fa*XjNrA620Kh9YBWW2t=Sx0!C^WA#q6unV_Vut$7$MH>pNtS@CXAo`4 z6glK>*wG)bv}Q@`5ctZoTT;jNm{EN2P*u{C{gz^^x~WGac0K1;2+EClYa|sv5m%_C zGhb@-n-1A3zt-?yWTf8XVafK)dX_*j{cZDqS80QoVx-V3%yP$%LKAxqE#m8H-voqOE|qJ5b6 z4jy$#iN)p6MG2hWcs_F`=5jWF(R1DHwg@m8Hj^xK5G2#}a3_Fks%yuL?8-&|`4by+ z>+nO5X7awz46<&tCnveV>25|;)SjJ2)_ugX5oJh`h zt-++UjSX0jCI&^fX0uM30LP*aGryGU(?wVj{_7JP9sy^Q`^CqeXp_^q=m*78AJ*O1 z%VhqHhyho=F&D&>oM3Q5>$GAV<#17YxZDQoMx|L-N|e8?6fI%azrdfIh5={q@i zu)i?OOV)QWHOkq$GCwWtNV3Ed29YvoILJmBh_n3;1#ZwpXhK&L?xohK9H?CNbKI#g zlaZO(*5i#_GLE?oSK}?zd$_#N?jw<<5rZjd*!xxzD(PnHG~~Taqu22W1--=G4|Um% zeUQ&5Yst^SzYEoLF>%MZMyTS;SOrFjJp7T3Cvl%@~6_4S}o+5%g@hG32p`EP*_x7#Rm#ui7ShaIYVAC9miy2d5+UwqH+? zukzEPjxSjgoAfZi8QGymN;hQ$1C6Tb^ExLpi z85X|LaUZXro|dE4Mc{PetDzSKrr|M#&yu-aW)3-}q{WCXnv$|x#9e_rFl!^xm9KAr zC~OdqsI+63i#87f#tS}FN($j|5o>O)jrPm^yY`QT1?}oZ=aY>d7)kU@aCt5LsOlGa zDb!{0InN)Y!eb#D_-+t#1S3(w<-6OQ1O*rHju5vk+mwbm*ryj3X}aUzakHVaLJOd; zB^d9su6#YOd13bAF+8qtLN$&C&7?^fmFzRH!p_oOLi9=Wf?Pz*58;LfImZa@XQSUs zz#QH1W^}31>_aJm#?>?V?%J3i$1LFDx8XzE%(AUBx7TkhSG1xWY#Lu58(mgzX4n`x zyJkGAY$d&uj^6jBu#`sWeYetC9rn~+T`HED%(m3Uqu3@Xe-Nzb3lY&{yZMe+n~8e` zbNv+~!Uh?TPxp>|iu~Sh_Df5|YVaX_rMq@7OYn9OF#lTOdV}mI3RZ-R+p+_OKq^M} z3O(4lobq>7D+{!m+aeY`f#&%-&qM1>t?APnl;9ecg{Vs|#6&dLu}k!-kLb#3ew-TB zQ@$udLu{cIaLcC&FUHm~I9D)52|5JX@!7IUQ(REAkAkkIu8dEwg7m+UybX5D{;5f? zNM&U!qP2>J88-R|p+|bdF=PIW7Y4lrFvhEv_eZa(;yhcU=5a_^4LJ2%$`h2R9{w{8 zi#dP305GHrW`A%k^`g(MVh75{1aPJwwbari8YXIvj23&EnsR(L$?Wl4G7dUe>dz#h zmbcDikUDN)k|qa=v)FOa%PAtBt3>8rUZQ%D#oC8IDqq>_=}%Cr#ewzbkoZY zcx?L4mgqv}pBGAs4&Y4W-=FtH@*J2+y8gT_BWeh#TX2!IXi|ra9eUA!`lP zXp=iLOqNt~NhIa^p!+r1gIMieuF4FX-gJeCTgk_z3M}yJeHr7p{IxO%Lb%WG)knF* zG7|=y{b)4kQ+!c6;cpto6J6I1ro3=}^YXodETEfPZ#~QWzL>APLRMiBv1U6n-aW1? z>SiZ=J2U3ZjJ&X~krewNtt@j)gsGqXTHs}OB%dftIxr<`kB9H5^2-2gBwtmTk}K>J z@K#;2^=qOud@b0BoIq)@eLDwu({=o*CVcigu}DSPjM6P=_Ca=IK=Hr2O)*iWsXzQ0aOv-un+e5 zs>4Lm*o9Xv+dU%30o4Ion?QY-0lrtqCh7IiS%#4yBMrFfh1t21g;TN=C_X~J>1wRT zJyTadGN{+i@B3aCtXxBx^)Ou{-Kn2d98m@k*dN@FhJW2*Py}7L)OD4Wb=_+jmIeo< za(*T7({6OR|?HIMLQ}3D(KPpz~ggMj$bC9CA{BVa%C=q z>3e*E4G+M_Z1J0uzVbYV;wvC%bECNSnLlfveU!<;k4+?BC zW8{UIeG)%!v0fU>*(f1v!e__lZ8k)r?Z%2PE2ej$po4>h`33E7-WXV1D29m! z$}In4P>g&ui7lnN0Xe(*j;)eWI`jcw^oq{R?ZOdIhEWM8a`P24zGMw1kI!Mc3|84M zWw^xN)|-qGf92Q_Zi+!a+5S7*=@*xFcrE(<=-rH@#s4 z1aHm|f7UOBc7qo!6qwl>sFgFtRrX1apM>Xn1BYHEC7s7n^#W^U+K8VQ72XNf??=lp zeS{<+W5&kDs7)~3Hz&elHu0XW>`!U+b~8nPV6I%iH&k_nM$ak+XJ;3#T=W!}&av{f zLPWzS1Qkpl;Crg7vGNU{E5!al*u@>;`GX^cA=l_{A=pG~=t*NdC%r9=4sPy@jPv2; zYeaiFLNCQrX`2w9P97qmpnrGrtnD#or7ELHhhA2Yw^85yRi7u^aoDh!gVoeP;& zOL!q5dvruU#3V}|E0jb+Y#!PZki`*LO7Cc^Lr;luHotRX&0{DLZB{UmN5|@RH&QCT zs674Q0CI3DqAjBJ{iN{E8HJIS1qnp|zKKc1xpzw1Ddj~ReaR@ayZelmyzlueZ)`WR zS(pkYY?$)3(}G}ICPs%gM&Afu(@+Sz%J+j_NtkNnNF-Uo1$fs@(S*u~-2QPIWz0I? zm$0@@ApV?m`?BZ2uU{-Gzq|%!F;;H_9ic@;sr?Edw952Zael{phxX31*CeY5#q#pG zBr`seJlb6EmYNO;yVARkb=m3jszvabS2<4fG@M8NONe{|YKIF8zVOGZ^pmIDKV2Ej z%vx4_=1H3@S;pK0N|!3xV*li%Wm?XoL6e1ic?tWDZ9~a4!_m_BNN*Y>;Tf7{fQcEo zZKpS@A2E#ME%zwjf43%AUugitrSCQyPOpJMUppY;u|ztjDo66~IChHYS4nyKaL12C zi%A<84iF&Qpb{Bn{U;SIu7ovg?=hOK-fq8mQ?`kE*fyN=y}@%4C~w|G(GMtBp)YMv zJkP~Zm-R+@N%@}Zn5u9a2)ZyI{TT8w17492ZTAZggVO>d%D6Nc<#g{Rxd4Zp!1Nf~ z{UZ4SdF6YS8CidxhA<9CPzRG=pxcc!md>ulHu`C1Ej{9yFog}6Zd|~m;E2>$hNizl zKwv058x?{}@;R-UX>q;U+`!c1%$0{*Cg@9P13Xc(_aYf(Ng}Og;=?%%CEjUZHn$5m zl!)4Ex3pSr83(07TVBSnp`TiFiAPPFr7KOX7U-5Z9Mx618X&;bz~66>4KyqZTCbGU zvV%k5vVDk$k%mt5VW?w~80elsKaKsW9YdBkBOev9gvZ*ZX(slyN&U0@qx9)PTYAN* z#iFX-%fH!>rSV4W%el(dA=DHRYvWu<85!=>k4piId#+nA@}IbOupR%ozAup~QMSBl zYpf_?xs0o-$S&^D;c^S*u{^3E>paGu#ZBF#*>UX_t_N+swf73Dd|>{voJ6MrOW#X8 z_6`N}plN3eFq@3S@J-&7wv|&*n8jB+?nnH;;=cS5>hJr1?2K&`^0GC97F(z&%VdlZ zrHBk;-?J}e$)4SyEEN^m2}6VI`&yLjSt3#PUG^n>?o99R-|+Pt&wKB=_uO;tJ@+gR z!}{Bq`Wg3JuZ_FEsNJ7UKB_-1%y6l1n7!ecY@{`R58iiZCw(=>_8t&eaNXZ75N*EO z-ydw9zS4V$N?>Qv$?5&h#l5Qg+BWs1r0HQND5wUPkaSA~@IsA? z;V;&OK2HBI(6-_q0zd+Q447~ioRy)nNb}`K|31U2bF`A&sLveU`D%>SjFbagIfI4u z>Q+M;q5NHR8)0KPEkTxo(6c^BU%q-%Mjj9oPiq}y!<>{dLcH6U=;JJ8PU7D|EE1CH zkW__5yDe@t@5@v3yS}6yK1?&Y^rKkxHTuh!=q1BJG1x_+P}b>EsuOkv_DiEV!;Rp= zEh3C4g+e2JChXVxjTlPd5FlQV9?z!R2Na=Qj-OBofrTy~Qu^b#$amIVY8!<(L@ysZWcIG=b>($eSQCxiRRLYlrY+^(D|3{T4M>s znH=?3J_mk;!J)x3VJ!Y>T$tE3o7eC2D5lwz=TQb{BqR#OX9pg5d5uhza=6U3$Xg0? z*%la$={sh@OR#&zJEAK-96vt|2RnI1h+!hy75}Go2dIZue?a zp;N%MthheED+Hgnicfyt)zoy8q6?KFJJc5F;oCa}S6!ajH%HRo)(~y{j4KNKTXF<1 zqdKoXJ!F4Hh=DGwiDLS{v2{v2Cb%#^id7=iqhoy0x*@IpVhjhUl`m*uR?lcTyN+x8 zzEdZ2;pHd3fy;;frLuWBqdgm0G?&PM&``R#m#KmL6~NiRX~tFz#ZyM0@thSp($9MW zJi$x3L(rf&kp1>1q^3mWvhsX=>3H$=B0=OSlpbRu4fliFnHjPvu6q@-anKYu@~zB=GNDfu?`kRSuP83h@Nrj- zI3=(z1~-@y{1M(E#!ixkwhx{;Vmc`9ka?F4|7QY$p=su-8zWC+j+P0~7GCnA+d8!w zhYT2@$o2YS&cZw@JknB=QTM9jacj3VTS2f+;{Jc+r_|(nhK+_(pnTV|L;8`>o7WVP zF)ik9jJnsKO43o19s+L|TbRmC!_HVZe&q4DMST#vbm`zQgpQTyyAdc$j-*8<=Ij(a zYvHK5&s6gr^vmGnnpc5ak+RD|u23XMO%xWMD2>wQC6$mnQ zc4Dvl9QJnoUcZfEN z+l39m5l4KK+zOQrMT=S&t{8f1;AiWX=lDn(M*B$wuFnL|+NF-Zn!3L-zDL!~JYEw( z_bzX~B)2yM;kM$MGpPhO(G<5Mp!88oFU!rvQ{FK%f^)G6VqJewvefXf;WL}o-pJ;< z0f!JlALiKgz*5es9xCrT8Q5q8BYAe3P}bE4LGvs7W|EAjoaw$qEp|%OE`~8i9@bsm zWOJ@x^wjO79kOes1c!&@Jy8iO`9NG+U5ZEW&phbHOH>{azba+UuwO4Fhq%ow} zZj#5WuE?51RpKc}l9Bm>!c>Z2uY71`d-s>u5~Yr-(<4zt$pL1gR(hQ-b0@F zbv8CE^r@b9dxkatARe1l(?AHk_zidru}b9w6sW}BV47@{ZVyDM?pxG$#~kCaNl)+6 za*PsFj;QP3*5jiF55n;Nvt)ZEg6r;hWK{!{-*Ym(TPbpJ?#hpFkJYhdvaFav9JxHq zdQ93K9UZ?;=q2JDRqpnr0{D|y1ZD->qc~Az{A5ReH&KMMyfL<=tMQ;9vWi%f`0M_p zNA#&$bBd13q=UZ0heoKNSwz?!U4!oUn@b4zRp-0wtXKe>nYyJkl~NQSJ;XFj;9E%Qz(N2uA@p{I>7xLjRw!&NRSyJzva_IPU7l>b_~RVw zJLVLb7jV(tHudH%)D=|yy0CwdeF-B;gc+y8c1p&EMW4IMH%jF|m zcn=%9NIN!vQ>A%omSWA%`j=qcxbqL}Ei7tFYU>FELC$wM;k@x`SfW1&RQWYu7(#b^ z{d&hTz2^R~rM(igcE2=jTO4`>CI{1_JYov4f!`IJX!q0Q z79MrVLrX=6`?0tux9U%hR^J^Rp60l5@SR0gS{lm=FS|%dl9m?l`~ zE?||G3*#PD|L~;OnweVZ36S}@Q!wW2Hr8-3_#>S4S5zd=@Jsny@Zj~+)3pj3q<2djcrhQ1KBTiP zzYD6$e!O$ZqM~%s$Kl@@+c&wL<-B3#=_wNJ&-EojR&wRtF@o4OsqMn42?O%UwoV6-D`Z@QF zpokyzZ+RS&v#V2Y`T%m4G6MC=8A#(b3XLD#*%>KpBl<)+N}`=Mg6F;KbN1f zkPH$TUNk+h`WJ9YV-YSIq#emed+iqAL~N zN7_7${me%Y(20P3NWZN~&ydE^-yIYNI?tbkYUfXz-q>~Gk0!~zfC+x?Tp%v_4UI&0 z2pYfg>D#|{g-)N<$zmFaC+&+;vc3;;FOr8&P5D}i5>3dj_D?F9329OOU;4TfkG=?V7N`m&gyvb>)y;B z^|T0LM8&i?@{1)aX^2V+tC>$>tZ}bk7C``$W!w;(H89yroP|cVsPC=G6r|_f{;xqe zeWde9Qd)W@VnzC?iBDM*6{#--MPCBT4BG%UjSJI{ZJI_()v9OqS9X>gXS3bUTB`^c znfKL;NN_$~b}PMi>bMs8JJRNWFDzk`iCRqdQ4Lb{kC9K72rehXbXP5Xuget>Inq zp|VNs&f6v<0)(qt>93F>-N+T-K^gn2id-ttPWIdJ5{p7-0$~Ze>ANoh@bC)Ufgl1(RWBH&s}&|*(ZJf(4e48cxx95_mo5! z>QkwSun16}64Q*nl6}qfWg66g7Qo^i)f>DQ^SkJ3JF6Trr$;n;IM10 zC4sAk-@d49F=96DYI>1_1w#46NVNLq zl7qTQpEIr^;TlAU`EI5fb$IXaK&A#`&H9xzZ?m4&(OaWjVpyqQT>`<-JHtag0Z3Gi z$a|`(kaw^QREC-Pg(?u`EsFXKT*~91nAoz|xEb?H*`**2aU^DUL3ZV0#5Xf~K2l8l z@*X6U^Qi(KMh)^GFY+h*WnBq6^Hve=t`>P6w(FTWl59lVi=jC6!J9=z72*yb`*&}; zSgzU3>(0Gv)LP#K7wD}Pm>gs})F4mi<2{G&MQiLe!f`;BE?-#m`X#J4v^6AsG0flt zyU4eg9N+K2kFkwChjrE4ZqrEC>r8IYJ2-Tk@N~3e1_z~?!*Xz#3FXZ_sj>}pc?sX@ zgQV7*FLR@^t`IEL8JGW*+2eM)Vfzw zIyxw=Q{3By4j+#jhY5@}=uNn#{AWS6_%Hq4vEfIdVrk0m&Ka7gIRiXrZHMjq-aBwQ z8=pYb>IO$W9sf&7r*|mqgcR z87)G-UAw3{X3ABpQ<3|BwmGN_z3ilj|ApnDF%o$q>81#b5_*#l%E7HOvG_1Ijd>;0 z1~J`I+DhC~rDClW|Z~3UJc={LY z!$vE1ce;pX%y1xz#;g}0)it3OzUwo01M_CUg-3)tbC7t$lZ)pUmA8%ZYz-)eeX1%i z7COK3?aSWR;p>kWND6v-Wm?GFc13G)goM<`TY=N|jij{$L-`yiDj_gePiGp|BHDgB zFI@d+@SPsJDbq=T!GaW|f*}~sZ(Vw=y~*X%W|sDF+S35g%3;3$FAE-FHxksfnp}@oU{T@!;+R?VIT(-d~UYz zKZk?O7graC!3@Q;wjn;be81gaXc&|@s*3lCfj4|rBI%6lrc!fF%b}@38mbRc;S&Rh zHFh7hc@n!q!~!C9$quCdtS-Ev!pr<{AS#!YgmmeZE4$>T-BM)TIA>5onkodvQ&yX> z5;eF=5%y_T?OV8tDA~${*hXWOIM19p(j8vWrfHLj=tarBC!4&G^!M;HTTe_VdGIN5~I6DQUXZe-F&Ep%?co)9+$JDRqywT;MJm^W1b)-P z&sRV#+=N6WXmhi(o`9Q!0S>Y(3V%@Yz5rL5-zSA|g{L|qW5UfXjzdpJ1h)PuaskrY{*N1?2w zu9w@ZNju0ORoW=G_Q-@rIEH4o%#1=UigYgc&Y}b|s$;#$#o!;N58fbXU{39Z`8u|( zlyUTQto&OEuyQjtw9g4&`?@UHjFxZ5mZ@&CMZwE8idCjKvrA`DmvKBpVRN>vi$MXE zT@Oh>0M8fH8mQDH={{6-JQWDEdQB=nfe}?$W3-OI($w+}R^c;$Y2(bUiItllt?I?D z2SOxWr>3UfGV~`u^6zFNP1kc|X3u@AKMQ0u&X&44=eKzNfzWD}!qGgs?Yc{i1AvDh zom!@}(cq!1^GEI{@Vwyp@1LG*e!f+?K})p&p^cU)B=Y5-Xn-0h|$ZMOB?_d=m3rXGE{Bk9s6?$guaF%;=VvZqsf=I z&pl~$Pm(E=nOAhA-3PR_?M+RT@dhO=2&;((f9D1C8&&GSpkiePQH3-88haz{M7<`T zYig$rQ2D3MBxK`$`53zQ z3G(vg-{1%x2ezZPD+Dj@^|s#YE0*}OnkzYL1qvj+6=9XlkG}0)Pdgek`)0zlAUqG6 z2?Or7&s5YXA>AVEkNn1?Vd~hOdB}KcC@ZKSUZ#tGGippsJ1~`dAEh=}X~TwrU^o;& zvA2(PP;?)E%BEC130bE@lU{gmRl{~AW!NDdx!>bo>*-swXv#vz))kp|ml0C&w{dy} z`}lxPm7ag)e&?Y1ED|t%<3Ds+ORA@AQFs|h`#ehszjODlR3VF5>*SwTCp`}z69Jz5 z$n#76QUrb=XT=oT-$z%>eujW^d#Lh3Bnu2+F{L9JAA(Q|V&UsVpwe3g> zUu9rde%Im_YYa?5?mobA2V~*D5TW~V_&jTMH$kYNs01|~q9RF@7|b@fN<; z9HLAuKRc%YP@zZPgXP2}!ZSG}HW514G(M}3Jh;$`Oykuu2{B$udR;UH*S%h8-AD#AgQc!(nm z6IEV&+Tg-N>0WiSKa9IG>y6l9ngnNqmgn|cCUfD=9>nVbQ$-gYLL4~0=};uSed`Xq zK#}ihAL7k4-F^1i$Q%pY30BMJ$3z)1GYQmPrF;D>_)e*YC$oc!5;`bT|GE)-`w(5M z=l5#KGpPj!hwH-`a8d?F8+AP6$-+zdqYy#r*h_B7mffVd*Ss7aXUMsUKz)n;JNH(8 z*WJU|HYqiAN6G45gyy3}RTtUOe{;v2Lf>3OSS1xuv=z@6(Zp@E7{CB%DTp)rkF&g) z>?@T$<5wb?pQZCe%$Cw8ETZQP=56O%M z?`Nw>GS*~RpI$%ZwMtd?P&qumElTrEk51MgLk#>uGLdNJZ=?p z_IDRk7`lKIk+W}|>b(e|ploGii(V{_I$=|^Yn|#`y$H%F#_`E%KaWjAyCB0N1vHc$G;eIA_EZs_@;S(OZb<@{+8W(=ZwZUt&DFUZe!IGV zcZLO9^^HU-w%VrJNHd#aj=wBMpc=F8p@P9Bn_(q+ERM6iR}~`{q3XmQ2%$)1AdR_n6|flwZ;BFZ%amKcyxW>e2RciKtFdto2I04MHmH30 zL1P&X0c)I2gs@!KFD)J#(84Jcuj27Kyp)$eK?|^dUKtNQ|M@TnW|RJk4G{YDkvx)8 zC}||~4)P{(S>cy&R-V;PqGdwMStR_Nlez{)1wxcr;@RQtVCxPXQ>Xq-pf9vTtR_nz zO?{B%toZm}XNOP)L!AlMYY&=bq-7QCvmn&;k_oU|hlnc!fzQa4&H54A)3EPXm~ryt zS$80`|B)*+;u|lo$tAHNa86kW$#6>(104v=0pn;q1q_80vBv9HNilLJ#NhbKe?7D% zF{sKX6#R);6t$Wkfn){q6#GwL_YRdwJ_~tpoE@HB7X9EI#hIjH(y{}~BRU>dNk!Y0 zl7C~4P=mtsb}y@7-Pbm4$wbB&;@v&gh<1{XJXm5!Nn2ig1bY)!;QL?h`3O~O5>1#u z@uh#8XkZK|(zD@mMZoI8Qv=_Wl(Xx_JF*D@yHzYGRR2{ntfK*zk=y;qOXns9*pi1~ z9pk(L^5@Z-KUjVF!KQF|;Mx0($7^l49kqOX_k)nYr$~9{0_Mv)3!6+&DjlGAo?l=A zr)!||SS;EDun>-dToSOlpxR+PV8%?Q8~7?*O)e%O#ya6$GxXcaTnu>-SAG1~mP2Kn z(TmnB8IZ$9={iX7?di0J9GHyiXDisE-K+*!pRhm`c$LjSp0JrR+wZ&?<@p6N}DaD98X!O{CFmH0+ zwucJv#ZembKo-N>$(<_~(VkBx)que}__pVM{`JrT6N$=_+oBXlJx2MiLHE zyBV|tr{fUpU9+!T`2#yJAdWZu{ynxY|19^qTzhG~Em)9@gu|8?- zKPDhxmzq4$(~|EVI;|Y^gB3BLkG|$p;eM zfC#l3VbSr|(ruRdfDqsU)zdhH35gIGL~mpwN&l zdS}Kyw#-<^80Pm(eSZJIcV4e~=5@|<-`9Pe`@YUO&z$FhgS{0Ww>UQl1mZhyZE*<% z0z-kX1t&Yu(;jyz4+Ijsb>71Ca>T@HA>6NUA*P#v^N15x2-kwA?WVcci2Rl#S$@W78ah4O{ng9CXkGftUA zf&atBFY!A{WwEd=tFO=vb_MTltGnZg2%gE%me_|6jk#LSZ$(AS37DZe@2H6_vj!NA zOR+T@)-j^gw>r8HcBX|bIh*-fx4eRXR$>EGYZQAy0y48wo0A>i-K&Hm@~g>Mdvxm$ z&eA_|?~81|7W;EYu-4-CVijr)&0fV2m2cG*)ifSzjr%H)EzMba1wEFPnZigBxF>`Z z$;nrUF{B$OW*OiYga2=iWf z+`_9&=RwA^nL--iuh(M$-3FkLRBCKOBYrE7bB;ps)B40P=Y(Y9 z80Jc?{%TMuVBmw#*U6MKV9f(=OO{sLsNRv94hzz&&tKS}Qk}F5iJ4XcKnFE~Esl{w zrf|}Y>Bh5X$X5y0L`Lb;Xv2T@r@j5J5v<=F9I?!4@`#cBpI>2p2av01Lly=qLdq0|F#z8Q z2vBu%ceht}Yk7PpCj zjI3{L9AzM}?P(nk+c@(Vm8H6dS0p(w@B91v>+ipHCJ6CUkjSC^PIAI^Y@?jIq1v_6 z1J~W$?0T)8;Rck_Az5d5P^&SKV{^Kn$nEO%lK0K(p7OPi%e?fDHT|r}Nd>L0j5hvC z;8TBUu_|B>6|YjON9K9$n$-6i^GGkj<(y5%&-P;MQ0x33-)NcZ?J9o^`O_F;uJVcn zSswaYTC8+KmGI;M*Wd(RZ#TZQ%NalFS6*}{z^AtmQmFc7$?^De_}3{iWKm9K!NDiI z^x0hsvyp2{rINnFIq)WcmNB?kQ^7vO9a0v}Cu11&VIk9;I;3 zU0a8;LUAII`45*iY@4z>8+xytGgarOz9l>EaIF~wSb`ZjnrMk*k1TAQxw6z4W0_6e-qO(PD5UD{ORWF3DYx>^+64(ZL@AARZk(q2dFx zt03&*(>DtdlV|T278ZuyxH09>|9qlzqG^4?dGN%53U|9IUGxS&050d~R7AL{&(<2? z+I&yGu&4-%PC&tOgq{SF7H1=O*XPc4Dsqu<{A6%DX9?!##DxA4WOzV8!0|f=1jbIw z&TW$Rt%Eep0TrJ1fM(v1eITPeN-N$bDk>_?rM@Ys;+TD>i@}ly#lLfd=~T+4foc}$ z*MK{YT>Lz}V8FI!uS|7wWjSb+G4!A^V0$dNsC_}Dw)GM>(y7yzVKf`J{vQa)T90PQ z`1rWZK(B(y=Kc!r-F&wD%|2I>+?~kzNptKZ$9IMXXnt}eAtrdtXr{pwe>gJfWP)-I zsIIM{YM`1mI=lk0B8q|HIH;|>j*UO|R_hLg8@R~1cIcl2QSd)YyqB}jhW>h35!SoSTlk7eYcsu?=)$fd#S zCC(z$P$!OPCXb>%Dy=zpw8U4@CE;0kZdQb0SY~XxYU$m?e7LP0FVP z?0t&qplP$TnLj>S>N`D;U?_@ES0ZN0VOug0GggdWTvT>oKu4qiyR$`oO>1$K&53lC z!Z;XZgAiGzLARw(zf*rPrWZRbPF!?drUe&)GJ!83_e-P-m{= ze5V(7=vz3|yMpBL9FK>mtneQ*_a%Xt4bS@=QsSU!L~QF=q-Oc84t0s3{kh(kID{WP z`s*Mq9@3i%h-q0GIrG&tYUDfY{qrRE9CFk~XUJmu7-1!0?KgrDcnBGA2VhrQ?qHXH z-Y0tFi|_)FLxxmTT{tzry0$&m-C?mf%=R%miW#y=t|!9QH_xXn&OJxbSRQ&=yAVMi zDajUQ&a>iA)zWS!FNO1<;OBP^<~pt?O=?gnH7rov7_LlOSQ*~dI3vHg5)kC}@>F>1 z2BelR(9-czS$d(&;}$@oVyhPN)KR&Fp!J~%NK zf=NIZNe0DC72i%Fe9M6w4M+X@q8ZAJ50{*okyN{MWo31Bt9)gxgOUyzMsDq=z;{C{ zS>{@%FkVOTr-3OhpZeH%z3#Mcj+kE1q@j}BXh&Z1!pQp{{>6Le0?7tDDR7$)+2iBY zktoAnV9>&xF@CP6E{$>pIS>MbsrjF+Bv}t@i&v}MdXY=|D;lo&rKGawme~!QcA$!k8 zn^=B>?jplJ!gzWc>g?WVS#~OPb$9QnD67NU|117ZU&nM5peWxnF_{b+Wb=KKa_G0H zwe;mex8Q!l?jMdbt6(T@VT24`{U*sK^`&iR@)?vyDqjr28;x-|xPuO>AO?#Y>g$IY z8!P**4;nB#!$*lW1>;<*SC$-jjvD5*IFtZstslb*4`RgNSzRn_Co z!KxCpH$2ITu%Z>#!Ot`r(wNP9FSfX-$X-!Vk;7~x5#^@Q_veuA*ox|AMMcH)xXCvT zWwP5&xj@GGwzgUli|E=LrXyUcJW_7vTRQy4^t+I7OVC->&=_IfL#~Af=OR%& zj~(4)^Bmcz4Eqk{>WZcTGQof4yEV^xk~4js79g&RKgZe4vwbj|e-d6Tfd)tfj6fiu& zQLNcKZ!YVR2!gsj>Sti~);c;I(&6qTozwd5fut|I#yF9)RNLQ0(4R7V!VUhQLl53! zj3Ff$2KKtPqy!xVpCxL!iC5+F1eU$M%?R*Y+}xop*NU(dyUCJHZZ6RbzOWhNIH>nV zdXqwFj#C@2R%-2$r%i(d=w|MYTucIDn&LJ$W!DyAlH%*yDI<&H@M_W#q)k~p*hm6Z z;e74WNf59Bg>$Fco5~~v{al23YgN$aMx5cRh|u9&?N@tjK6!)Mg%=xPPg{hUn~+y` zSH7{4@F6OD;X!E2*CKLXO1rh4tIL3Yb@<)L$g@A|w$S{UwT!#P)XVDP&dNqOA)X&Km1^|JmKkWOnxxzN^?xSl`*l&MUL#!#jreYc%Qmj6IbXg`0$3#P`+z16U`e!Vm+`3v4sM-#d|u5iw`2IC#mb3I+g0}? z)FbzRS5Y4PFO8ZWfX(&BO%BZn9d`dXLjO^bz5Sy1_tF zp+_V$V9~dR2#!1jZlQ&2`c7j1I+N}D0~PdE+FiVh(z}&-SjjRttFrPfNBDYY;zC9C zaox?nNw1KRj7lHi;R--GTtqMUSx_>=??0Fa_k!X%UrT$2d4&b2~`Hsfh6zPGx;jvue7#-ocn8s-jp63bnSJ?e~}XXvAhJMf$6=P z`achkr_(-KOI5Z!1w>s=B(hk^6Ij}7Z~8gBgj%;$fM3sNOOU?FqRVOT;XgJ^~3OT*4c??j%$?gX!)}i%}D3aQCCbIBX{azS@5W(VNlyE#yZ< z+P_>*j_!TEU=-t{yT2kkwAgiF*O}$715g^056gB8&eJvI@Aw6;1xkCX0s?(Ry02h+ z&tfk-^4z~0N$S>OJV43h^vhOQ7Slue4@ILhEv)2jutR!c=f>IowvL+qwNXpKI?L(* zO@w;YfO3Kb$6riKk?U6j3s&L;|F!Z+1BPeN7Jof1CeC-{Tckj<(3QImx<)q;r+`p* zWTWzY2b+p8V6%ZrL400vL57_DAt|kphnR5X&H+Fw8FfgZxJo>}azPGp8jGiO`e}Fis z@z@b9jA2e62ni4b*0|aRpQ^WK=PL2}3+zB}y!pH#QNl0+=jtykl;cT_WY&0uFP3Ct z?7t`BxhPUpM7+k#DC#%a%2wGvx@xT0>(e`?sL(w3e|84<4ry6_RXm7D^JN3z1A|d_1lUX z#|l)~2TeomqtxVv9U##nIXY7J?`+@Eh}$LK%FND9hDC|w*xg4ge}3O%K4`Zu^=$M` zZtdL(f9SE%9Pj(SID||-vD6PSF0d8#o?qz8FaNpEdaRVga0DV!V?xrTYS6|tL{C(~ z=4QFUB4=O1pgqYZPvhRfz)|lj=8c!S-f}O#RcsHEHvwfUcV zaQ@VU%i7c3!a~Us->^W9*jgVLKWT)td%ESJZbLE-lcRyRRzpoTLaPO;QK0W3G!>EC zU(4(Q$tXUYbFXrcl$j3v&)aXT&Ubi6#_&^XgBSo#`J2;(dgS=*l!|Whl5g$Qns;Y+ zHu;{K-%@?Ng`0x0QpEQLyTIvFU48uGCfro+-H5zb{UKcF<*z3W2!o!l?2AiLnc+IX zfmugSmxB=_lNyDt{qMLD^8_uZ+rh0ZxkJxy){rMTgG^C^buu<0c}G6W?Kg)89wk$L zrpGZvK8jWi@$?binO}GUB7h)4jCU-j$&7e0^DR32#tvx$*Zql+>c^W)OzGgDk|_>H z4~i)}6&00)-ed)b<%UPX0HNf|SD5A0%%D&5O){fT^d!A4;)5;_V_c}@{RYrc z)m_|0FsSl3&ku?=Ol04SO>NI8Mee3hqfUnf`lSGed{zADJ^mbZE&(kccTBs#9v0NX z*`iDHBv2?033KX>SVfbx4m~3SFo{Lo-KUxV1UOsFykT86@U~0>KZO4g2q^y)mXFWx zOSican(e-rR_#4LX^|^q>`ie{hc~0D$6o)o!*R>1E zh=8AJv8Ht_xHDszg@MTTdEba>sn19?NlNMqEAnML@9s8#bq913m6&QC&2p)mR$ovI`Afk`R6weAvc(za8#LM?~bj7NE;S5ZqOE!Ph<=;8qI4wm9yQf3e@$ zeVB*G+A_P)_Nb7(V6Gm%!@2ZXFl1Rma9s$!v4_FAdFVAoL`HhX15A=${r>&?w09Jk zxJq>SUGNboUMT2KG03@c>erd49-hqFmZHPk!#cKPgrtlYNYs)m&Az$y7iTH!7Y7#E*c^nojJ5!})CUcQ zn31fLuCly~EpTI=oTp#5me*+cwvlln@gd7y39?LLSq@%a1I;gUSr|Q;i{qSV4dE=c zS%1xTZY*q4C($7gv?;^NOBFC{=-oOZic1l=ZHs+^BY&4poM0j963sa+6`gH7A{75G iZz%q~*eE4#GFng9J1^x()B^8bK<6#(EwE-D@&6CcFuQO7 diff --git a/public/index.html b/public/index.html old mode 100644 new mode 100755 index 04b373f..a0cc057 --- a/public/index.html +++ b/public/index.html @@ -2,37 +2,417 @@ - - - My first Node.js blog! - - + + Tribute page + + + + + + -
- -

Node Girls

+ + + + + + + Serena Wiliams - Tribute page + + + + + +
+

Serena Williams

+

The Greatest Female Tennis Player of All Time

-
-
-

Create a blog post

-
- - -
-
- -
-
-
- -

Recent Posts

- -
-
- - - - - \ No newline at end of file + + +
+
+
+

Intro

+
+ +

Serena Jameka Williams + (born September 26, 1981) is an American professional tennis player. + The Women's Tennis Association (WTA) has ranked her world No. 1 in singles on eight separate occasions over the + last 15 years from 2002 to 2017. +

+

Williams holds the most Grand Slam titles in singles, doubles, and mixed doubles combined amongst active players. + She is the most recent female player to have held all four Grand Slam singles titles simultaneously (2002–03 and + 2014–15) and all four Grand Slam women's doubles titles simultaneously (2009–10).

+
+ + +
+ + +
+
+
+

Professional and Life Facts

+
+ +
    +
  • + September 1995 - Turns professional, losing her debut tennis match at the Bell Challenge in Quebec.
    • +
  • + January 1998 - Enters the Australian Open, her first Grand Slam tournament. She loses to her sister, Venus, + in the second round, 6-7, 1-6.
    • +
  • + 1999 - Enrolls at the Art Institute of Fort Lauderdale in Florida for fashion design.
    • +
  • + September 12, 1999 - Wins the US Open, becoming the first Williams sister to win a Grand Slam.
    • +
  • + July 8, 2002 - Ranked Women's Tennis Association (WTA) world number 1 for the first time in her career, + at age 20.
    • +
  • + 2002-2003 - Completes her first "Serena Slam," by winning all four Grand Slam titles - the French Open, + Wimbledon, US Open and the Australian Open.
    • +
  • + August 1, 2003 - Has surgery to repair a partially torn tendon in her left knee.
    • +
  • + September 14, 2003 - Williams' older half-sister, Yetunde Price, is murdered in Compton, California.
    • +
  • + 2004 - Launches "Aneres" clothing line (Serena spelled backwards).
    • +
  • + 2008 - Establishes the Serena Williams Foundation, to assist American youth touched by violent crime and + also underprivileged children around the world.
    • +
  • + September 12, 2009 - Williams goes on a profanity-laced outburst against a line judge who calls her for + a foot fault in the US Open semifinals against Kim Clijsters. Clijsters is awarded a penalty point to win the + match. The Grand Slam committee later fines Williams a record $82,500 and places her on probation for the next + two years.
    • +
  • + July 7, 2010 - Receives stitches in both her feet after stepping on broken glass while leaving a restaurant + in Munich. Later, she has to have surgeries in July and October to repair a lacerated tendon on her right foot.
    • +
  • + February 2011 - Undergoes emergency treatment for a hematoma related to a pulmonary embolism, a blood + clot in her lungs.
    • +
  • + September 2011 - Appointed a UNICEF international goodwill ambassador.
    • +
  • + February 18, 2013 - At age 31, becomes the oldest female tennis player to be ranked number 1 since computer + rankings began in 1975. This is the sixth time in her career to be ranked number one.
    • +
  • + September 7, 2014 - Williams wins her third consecutive US Open title.
    • +
  • + July 9, 2016span> - Wins the Wimbledon title for the 7th time. With her 22nd victory in a major tournament, + Williams ties Steffi Graf for most singles titles in the Open era
    • +
  • + September 12, 2016 - After 186 consecutive weeks ranked Women's Tennis Association (WTA) No. 1 in the + world, falls to No. 2 behind Angelique Kerber. Williams ties Steffi Graf's record for longest consecutive weeks + ranked No. 1.
    • +
  • December 29, 2016 - Announces her engagement to Reddit co-founder Alexis Ohanian.
    • +
  • + January 28, 2017 - Beats sister Venus in the Australian Open final, collecting a 23rd grand slam title + to surpass Steffi Graf for the Open Era lead.
    • +
  • + April 19, 2017 - Williams posts a side profile photo of herself in a yellow swimsuit with a caption that + reads "20 weeks" on Snapchat, that is quickly deleted. Her spokesperson later confirms to CNN that Williams and + fiancΓ© Alexis Ohanian are expecting their first child this fall.
    • +
  • + September 1, 2017 - Gives birth to a baby girl, Alexis Olympia Ohanian Jr.
    • +
+
+
+ +
+ Serena Williams playing tennis +
+ +
+
+
+

Playing Style

+
+ +

Williams is primarily a baseline player, and her game is built around taking immediate control of rallies with her + powerful and consistent serve, return of serve, and forceful groundstrokes from both her forehand and backhand + swings. Williams's forehand is considered to be among the most powerful shots in the women's game, as is her double-handed + backhand. Williams strikes her backhand groundstroke using an open stance, and uses the same open stance for her + forehand. Williams's aggressive play, a "high risk" style, is balanced in part by her serve, which most say is + the greatest in women's tennis history.

+

Williams is known for producing exceptional comebacks, particularly on the Grand Slam level. Williams has bounced + back from a set down to win in 37 Grand Slam matches.

+

She has stated that her favorite surface is clay because it gives her extra time to set up her shots.

+ +
+
+ +
+
+
+

Career Statistics

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Career finals
DisciplineTypeWonLostTotalWR
SinglesGrand Slam236290.79
Summer Olympics1–11.00
WTA Tour Championships5270.71
Grand Slam Cup1-11.00
WTA Premier Mandatory & 5239320.71
WTA Tour193220.86
Total7220920.78
DoublesGrand Slam14–141.00
Summer Olympics3–31.00
WTA Tour Championships––––
WTA Premier Mandatory & 52–21.00
WTA Tour4150.80
Total231240.96
Mixed doublesGrand Slam2240.50
Total2240.50
Team competitionsFed Cup1120.50
Hopman Cup2130.67
Total3250.60
Total100251250.80
+ 1) WR = winning rate +
+
+
+ +
+ Serena Williams artistic pose with black bodysuit +
+ +
+
+
+

Off-court Activities

+
+ +

Equipment and endorsements

+

In the early 2000s, Williams wore Puma apparel and footwear on court. She used the Wilson Hammer 6.4 Stretch Power + Holes racquet. Today, she is endorsed by Nike and uses the Wilson Blade 104. Williams also has endorsement deals + with Gatorade, Delta Air Lines, Audemars Piguet, Aston Martin, Pepsi, Beats by Dre headphones, Mission Athletecare, + Berlei bras, OPI Products, OnePiece, IBM, Mini, Intel, Tempur and Chase Bank.

+

Williams is the current CSO (Chief Sporting Officer) for British luxury automobile manufacturer Aston Martin.

+
+ +

Fashion

+

Williams formerly had a special line with Puma. In April 2004, she signed a deal worth US$40 million for a line with + Nike. +

+

In 2015, she became the first black female athlete to have a picture by herself on the cover of Vogue, which she + did for the April 2015 issue.

+
+ +

Charity Work

+

As part of the Serena Williams Foundation's work, Williams helped to fund the construction of the Serena Williams + Secondary School in Matooni, Kenya. The Serena Williams Foundation also provides university scholarships for underprivileged + students in the United States. Serena, along with her sister Venus, is a supporter and contributor of First Serve + Miami, a foundation for youth who want to learn tennis but are socially and economically challenged. She has been + an International Goodwill Ambassador with UNICEF since 2011 and has helped launch UNICEF's Schools for Asia campaign.

+

In 2014, Williams began hosting an annual charity run named "The Serena Williams Ultimate Fun Run". The event helps + underprivileged individuals and communities that are affected by senseless violence and to ensure equal access + to education of youth.

+
+
+
+ +
+

+ Source: + Serena Williams Wikipedia page & + CNN - Serena Fast Facts + +

+

+ Last Updated: + + +

+
+ +
+ + Serena Williams with a racket + +
+ + +
+

© 2018 FVN

+
+ + + + \ No newline at end of file diff --git a/public/main.css b/public/main.css deleted file mode 100644 index 18a4da3..0000000 --- a/public/main.css +++ /dev/null @@ -1,147 +0,0 @@ -/******************* -* Basic Resets -********************/ - -body, html, div, label, p, h1, h2, h3, h4, h5, h6, form, a, input, textarea { - margin: 0; - padding: 0; - border: 0; - outline: none; -} - - -body { - line-height: 1; - font-size: 88%; - font-family: 'Open Sans', arial, sans-serif; - background: #FAFAFA; - color: #585858; -} - -div { - width: 100%; -} - - -h1, h2, h3, h4, h5, h6 { - font-size: 100%; - padding: 23px 0; - margin: 0 15px; - color: #FF0040; - letter-spacing: 1px; -} - -h1 { - font-size: 32px; -} - -h2 { - font-size: 25px; -} - -main { - display: block; - width: 80%; - margin: 0 auto; -} - -/******************* -* Header -********************/ - - -header { - background: #FF0040; - background: -webkit-linear-gradient(#F5A9BC, #FF0040); - background: -o-linear-gradient(#F5A9BC, #FF0040); - background: -moz-linear-gradient(#F5A9BC, #FF0040); - background: linear-gradient(#F5A9BC, #FF0040); -} - -.title { - color: white; -} - -.main-logo { - float: left; - width: 100px; - height: auto; -} - - -/******************* -* Enter a New Post -********************/ - -.entry-container { - margin: 20px 0 50px; -} - -label { - width: 100%; -} - -.text-wrapper { - width: 80%; -} - -textarea { - width: 96%; - border-radius: 3px; - border: 1px solid #848484; - padding: 5px 2%; -} - -button[type="submit"] { - background: #A5DF00; - background: -webkit-linear-gradient(#93C503, #ABCC4B); - background: -o-linear-gradient(#93C503, #ABCC4B); - background: -moz-linear-gradient(#93C503, #ABCC4B); - background: linear-gradient(#93C503, #ABCC4B); - border: none; - color: white; - padding: 4px 25px; - text-transform: uppercase; - letter-spacing: 1px; - float: right; - margin-top: 10px; - border-radius: 3px; -} - -/******************* -* Posts -********************/ - -hr { - background: #BDBDBD; -} - -.thumbnail { - float: left; - width: 50px; - height: auto; - margin-left: 3px; - margin-top: 3px; -} - -.post { - width: 100%; - border: 1px solid #848484; - float: left; - margin: 2%; - border-radius: 3px; - -webkit-box-shadow: 7px 7px 5px 0px rgba(50, 50, 50, 0.75); - -moz-box-shadow: 7px 7px 5px 0px rgba(50, 50, 50, 0.75); - box-shadow: 3px 3px 3px 0px rgba(50, 50, 50, 0.4); - background: white; -} - -.post p { - margin: 5px 10px; -} - -@media (min-width: 600px) { - .post { - width: 28.9%; - } -} \ No newline at end of file diff --git a/public/script.js b/public/script.js deleted file mode 100644 index b677186..0000000 --- a/public/script.js +++ /dev/null @@ -1,78 +0,0 @@ -if (document.readyState !== 'loading') { - ready(); -} else { - document.addEventListener('DOMContentLoaded', ready); -} - -function ready () { - getBlogposts('/get-posts'); - - // send posts to server - var form = document.querySelector('form'); - form.addEventListener('submit', function (event) { - - event.preventDefault(); // prevents the form from contacting our server automatically (we want to do it ourselves) - var formActionUrl = form.action; // 'form.action' is the url '/create-post' - var formData = new FormData(form); - - postBlogposts(formActionUrl, formData); - }); -} - -/**** - * Function definitions - ***/ -function postBlogposts (url, data) { - fetch(url, { - method: 'POST', - body: data - }) - .then(function (res) { - res.json() - .then(function (json) { - console.log(json); - addBlogpostsToPage(json); - document.querySelector('form').reset(); - }) - }) - .catch(function (err) { - console.error(err) - }); -} - -function getBlogposts (url) { - fetch(url, { - method: 'GET' - }) - .then(function (res) { - res.json() - .then(function (json) { - console.log(json); - addBlogpostsToPage(json); - }); - }) - .catch(function (err) { - console.error(err) - }); -} - -function addBlogpostsToPage (data) { - for (var blogpost in data) { - if (data.hasOwnProperty(blogpost)) { - - var postDiv = document.createElement('div'); - var postText = document.createElement('p'); - var thumbnail = document.createElement('img'); - var postContainer = document.querySelector('.post-container'); - - thumbnail.src = "./img/logo2.png"; - thumbnail.className = "thumbnail"; - postText.innerHTML = data[blogpost]; - postDiv.className = "post"; - - postDiv.appendChild(thumbnail); - postDiv.appendChild(postText); - postContainer.appendChild(postDiv); - } - } -} diff --git a/public/subscribe.html b/public/subscribe.html new file mode 100644 index 0000000..a0dc911 --- /dev/null +++ b/public/subscribe.html @@ -0,0 +1,45 @@ + + + + + + Contact Form + + + + + + + + + + + + + + Serena Wiliams - Tribute page + + + +
+
+

Subscribe to our Newsletter

+

Lorem ipsum..

+
+ +
+ + + +
+ +
+ +
+
+ + + + \ No newline at end of file diff --git a/server.js b/server.js index 71da796..b73ecea 100644 --- a/server.js +++ b/server.js @@ -1,13 +1,27 @@ +const fs = require("fs"); const express = require("express"); const app = express(); app.use(express.static("public")); -app.get("/student", function(req, res) { - console.log("New request to Student page at " + Date()); - res.writeHead(200, { "Content-Type": "text/html" }); - res.write("

This is student Page.

"); - res.end(); +const formidable = require("express-formidable"); + +app.use(formidable()); + +app.post("/subscribe", function(req, res) { + var email = req.fields.mail; + + fs.readFile(__dirname + "/data/posts.json", function(error, content) { + var mailingList = JSON.parse(content); + var date = Date.now(); + + mailingList[date] = email; + var newContent = JSON.stringify(mailingList); + + fs.writeFile(__dirname + "/data/posts.json", newContent, function(error) { + res.end("success!"); + }); + }); }); app.get("*", function(req, res) { From e67aec09b3911d7bbd4c27e53d7d72d1c4fb70d9 Mon Sep 17 00:00:00 2001 From: Francisca Vargas Date: Tue, 17 Jul 2018 22:52:50 +0100 Subject: [PATCH 3/3] Handlebars exercise --- data/posts.json | 2 +- package-lock.json | 316 ++++++++++++++++++++++++++++++++++ package.json | 3 +- server.js | 36 +++- views/layouts/main.handlebars | 15 ++ views/subscribers.handlebars | 8 + 6 files changed, 374 insertions(+), 6 deletions(-) create mode 100644 views/layouts/main.handlebars create mode 100644 views/subscribers.handlebars diff --git a/data/posts.json b/data/posts.json index 19483be..1e931e0 100644 --- a/data/posts.json +++ b/data/posts.json @@ -1 +1 @@ -{"1467390356291":"maria@gmail.com","1531778580603":"d","1531778622826":"d"} \ No newline at end of file +{"1467390356291":"maria@gmail.com","1531778580603":"d@gmail.com","1531778622826":"don@gmail.com","1531864160721":"luisa@gmail.com"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0cec464..ff657da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,11 +13,41 @@ "negotiator": "0.6.1" } }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, "body-parser": { "version": "1.18.2", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", @@ -35,11 +65,60 @@ "type-is": "1.6.16" } }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "optional": true + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "optional": true, + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "optional": true + } + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, "content-disposition": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", @@ -68,6 +147,21 @@ "ms": "2.0.0" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "optional": true + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.12" + } + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -143,6 +237,18 @@ "formidable": "1.2.1" } }, + "express-handlebars": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz", + "integrity": "sha1-gKBwu4GbCeSvLKbQeA91zgXnXC8=", + "requires": { + "glob": "6.0.4", + "graceful-fs": "4.1.11", + "handlebars": "4.0.11", + "object.assign": "4.1.0", + "promise": "7.3.1" + } + }, "finalhandler": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", @@ -157,6 +263,11 @@ "unpipe": "1.0.0" } }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" + }, "formidable": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", @@ -172,6 +283,44 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "handlebars": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.29" + } + }, + "has-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", + "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" + }, "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -188,6 +337,15 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", @@ -198,6 +356,30 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=" }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.6" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "optional": true + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -231,6 +413,19 @@ "mime-db": "1.33.0" } }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -241,6 +436,22 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, + "object-keys": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==" + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "requires": { + "define-properties": "1.1.2", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "object-keys": "1.0.12" + } + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -249,16 +460,46 @@ "ee-first": "1.1.1" } }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.3" + } + }, "parseurl": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=" }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "2.0.6" + } + }, "proxy-addr": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", @@ -312,6 +553,20 @@ } } }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "optional": true, + "requires": { + "align-text": "0.1.4" + } + }, "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -353,6 +608,14 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": "1.0.1" + } + }, "statuses": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", @@ -367,6 +630,31 @@ "mime-types": "2.1.18" } }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "optional": true, + "requires": { + "source-map": "0.5.7", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "optional": true + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "optional": true + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -381,6 +669,34 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "optional": true + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "optional": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } } } } diff --git a/package.json b/package.json index 7b078a0..5de3b45 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "homepage": "https://github.com/franciscavargas/express-workshop#readme", "dependencies": { "express": "^4.16.3", - "express-formidable": "^1.0.0" + "express-formidable": "^1.0.0", + "express-handlebars": "^3.0.0" } } diff --git a/server.js b/server.js index b73ecea..0fffd5c 100644 --- a/server.js +++ b/server.js @@ -1,29 +1,57 @@ +const exphbs = require("express-handlebars"); const fs = require("fs"); const express = require("express"); const app = express(); - -app.use(express.static("public")); - const formidable = require("express-formidable"); +app.use(express.static("public")); app.use(formidable()); +app.set("views", __dirname + "/views"); +app.engine("handlebars", exphbs({ defaultLayout: "main" })); +app.set("view engine", "handlebars"); + app.post("/subscribe", function(req, res) { var email = req.fields.mail; fs.readFile(__dirname + "/data/posts.json", function(error, content) { + //Convert the text in JSON to an object var mailingList = JSON.parse(content); - var date = Date.now(); + // Adding the content to the object + var date = Date.now(); mailingList[date] = email; + + // Convert the object to string in JSON format var newContent = JSON.stringify(mailingList); + // Write the file with the whole new content fs.writeFile(__dirname + "/data/posts.json", newContent, function(error) { res.end("success!"); }); }); }); +app.get("/subscribers", function(req, res) { + // Read file + fs.readFile(__dirname + "/data/posts.json", function(error, content) { + //Convert the text in JSON to an object + var mailingList = JSON.parse(content); + + //Convert the object in an array with the emails + var emails = Object.keys(mailingList).map(function(key) { + return mailingList[key]; + }); + + console.log(emails); + + // array emails to handlebars + res.render("subscribers", { + subscribersMail: emails + }); + }); +}); + app.get("*", function(req, res) { console.log("404 at " + Date()); res.writeHead(404, { "Content-Type": "text/html" }); diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars new file mode 100644 index 0000000..8c4e1e1 --- /dev/null +++ b/views/layouts/main.handlebars @@ -0,0 +1,15 @@ + + + + + + + The HTML5 Herald + + + + + {{{body}}} + + + \ No newline at end of file diff --git a/views/subscribers.handlebars b/views/subscribers.handlebars new file mode 100644 index 0000000..75c637c --- /dev/null +++ b/views/subscribers.handlebars @@ -0,0 +1,8 @@ +

Subscribers - Mailing List

+ +
    + {{#each subscribersMail}} +
  • {{this}}
    • + + {{/each}} +
\ No newline at end of file